commit
330ed8363a
|
@ -1,27 +0,0 @@
|
||||||
from abc import ABC, abstractmethod
|
|
||||||
|
|
||||||
class IConnection(ABC):
|
|
||||||
|
|
||||||
@abstractmethod
|
|
||||||
def get_observed_addrs(self):
|
|
||||||
"""
|
|
||||||
retrieve observed addresses from underlying transport
|
|
||||||
:return: list of multiaddrs
|
|
||||||
"""
|
|
||||||
pass
|
|
||||||
|
|
||||||
@abstractmethod
|
|
||||||
def get_peer_info(self):
|
|
||||||
"""
|
|
||||||
retrieve peer info object that the connection connects to
|
|
||||||
:return: a peer info object
|
|
||||||
"""
|
|
||||||
pass
|
|
||||||
|
|
||||||
@abstractmethod
|
|
||||||
def set_peer_info(self, peer_info):
|
|
||||||
"""
|
|
||||||
:param peer_info: a peer info object that contains info of peer
|
|
||||||
:return: True if successful
|
|
||||||
"""
|
|
||||||
pass
|
|
|
@ -0,0 +1,14 @@
|
||||||
|
import asyncio
|
||||||
|
from .raw_connection_interface import IRawConnection
|
||||||
|
|
||||||
|
class RawConnection(IRawConnection):
|
||||||
|
|
||||||
|
def __init__(self, ip, port):
|
||||||
|
self.conn_ip = ip
|
||||||
|
self.conn_port = port
|
||||||
|
self.reader = None
|
||||||
|
self.writer = None
|
||||||
|
|
||||||
|
async def open_connection(self):
|
||||||
|
self.reader, self.writer = \
|
||||||
|
await asyncio.open_connection(self.conn_ip, self.conn_port)
|
|
@ -0,0 +1,8 @@
|
||||||
|
from abc import ABC, abstractmethod
|
||||||
|
|
||||||
|
class IRawConnection(ABC):
|
||||||
|
|
||||||
|
@abstractmethod
|
||||||
|
async def open_connection(self):
|
||||||
|
pass
|
||||||
|
|
|
@ -88,7 +88,8 @@ class MultiAddr:
|
||||||
Gives back a dictionary with access to transport information from this multiaddr.
|
Gives back a dictionary with access to transport information from this multiaddr.
|
||||||
Example: MultiAddr('/ip4/127.0.0.1/tcp/4001').to_options()
|
Example: MultiAddr('/ip4/127.0.0.1/tcp/4001').to_options()
|
||||||
= { family: 'ipv4', host: '127.0.0.1', transport: 'tcp', port: '4001' }
|
= { family: 'ipv4', host: '127.0.0.1', transport: 'tcp', port: '4001' }
|
||||||
:return: {{family: String, host: String, transport: String, port: String}} with None if field does not exist
|
:return: {{family: String, host: String, transport: String, port: String}}
|
||||||
|
with None if field does not exist
|
||||||
"""
|
"""
|
||||||
options = dict()
|
options = dict()
|
||||||
|
|
||||||
|
|
|
@ -2,10 +2,6 @@ from abc import ABC, abstractmethod
|
||||||
|
|
||||||
class INetwork(ABC):
|
class INetwork(ABC):
|
||||||
|
|
||||||
def __init__(self, my_peer_id, peer_store):
|
|
||||||
self.my_peer_id = my_peer_id
|
|
||||||
self.peer_store = peer_store
|
|
||||||
|
|
||||||
@abstractmethod
|
@abstractmethod
|
||||||
def set_stream_handler(self, stream_handler):
|
def set_stream_handler(self, stream_handler):
|
||||||
"""
|
"""
|
||||||
|
@ -15,9 +11,10 @@ class INetwork(ABC):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
@abstractmethod
|
@abstractmethod
|
||||||
def new_stream(self, peer_id):
|
def new_stream(self, peer_id, protocol_id):
|
||||||
"""
|
"""
|
||||||
:param peer_id: peer_id of destination
|
:param peer_id: peer_id of destination
|
||||||
|
:param protocol_id: protocol id
|
||||||
:return: stream instance
|
:return: stream instance
|
||||||
"""
|
"""
|
||||||
pass
|
pass
|
||||||
|
@ -28,4 +25,4 @@ class INetwork(ABC):
|
||||||
:param *args: one or many multiaddrs to start listening on
|
:param *args: one or many multiaddrs to start listening on
|
||||||
:return: True if at least one success
|
:return: True if at least one success
|
||||||
"""
|
"""
|
||||||
pass
|
pass
|
||||||
|
|
|
@ -1,10 +1,13 @@
|
||||||
from .network_interface import INetwork
|
from .network_interface import INetwork
|
||||||
|
from ..connection.muxed_connection import MuxedConnection
|
||||||
|
from ..connection.raw_connection import RawConnection
|
||||||
|
|
||||||
class Swarm(INetwork):
|
class Swarm(INetwork):
|
||||||
|
|
||||||
def __init__(self, my_peer_id, peer_store):
|
def __init__(self, my_peer_id, peer_store):
|
||||||
self.my_peer_id = my_peer_id
|
self.my_peer_id = my_peer_id
|
||||||
self.peer_store = peer_store
|
self.peer_store = peer_store
|
||||||
|
self.connections = {}
|
||||||
|
|
||||||
def set_stream_handler(self, stream_handler):
|
def set_stream_handler(self, stream_handler):
|
||||||
"""
|
"""
|
||||||
|
@ -13,12 +16,32 @@ class Swarm(INetwork):
|
||||||
"""
|
"""
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def new_stream(self, peer_id):
|
def new_stream(self, peer_id, protocol_id):
|
||||||
"""
|
"""
|
||||||
|
Determine if a connection to peer_id already exists
|
||||||
|
If a connection to peer_id exists, then
|
||||||
|
c = existing connection,
|
||||||
|
otherwise c = new muxed connection to peer_id
|
||||||
|
s = c.open_stream(protocol_id)
|
||||||
|
return s
|
||||||
|
|
||||||
:param peer_id: peer_id of destination
|
:param peer_id: peer_id of destination
|
||||||
|
:param protocol_id: protocol id
|
||||||
:return: stream instance
|
:return: stream instance
|
||||||
"""
|
"""
|
||||||
pass
|
muxed_connection = None
|
||||||
|
if peer_id in self.connections:
|
||||||
|
muxed_connection = self.connections[peer_id]
|
||||||
|
else:
|
||||||
|
addrs = self.peer_store.addrs(peer_id)
|
||||||
|
stream_ip = addrs.get_protocol_value("ip")
|
||||||
|
stream_port = addrs.get_protocol_value("port")
|
||||||
|
if len(addrs) > 0:
|
||||||
|
conn = RawConnection(stream_ip, stream_port)
|
||||||
|
muxed_connection = MuxedConnection(conn, True)
|
||||||
|
else:
|
||||||
|
raise Exception("No IP and port in addr")
|
||||||
|
return muxed_connection.open_stream(protocol_id, "")
|
||||||
|
|
||||||
def listen(self, *args):
|
def listen(self, *args):
|
||||||
"""
|
"""
|
||||||
|
|
4
network/walkthrough.txt
Normal file
4
network/walkthrough.txt
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
host.go --> config.go
|
||||||
|
config.go: newNode --> swarm.go: newSwarm
|
||||||
|
newSwarm | initializes data stores
|
||||||
|
|
|
@ -1,21 +1,20 @@
|
||||||
from .stream_interface import IStream
|
|
||||||
import asyncio
|
import asyncio
|
||||||
|
from .stream_interface import IStream
|
||||||
|
|
||||||
class Stream(IStream):
|
class Stream(IStream):
|
||||||
|
|
||||||
def __init__(self, peer_id, multi_addr):
|
def __init__(self, peer_id, multi_addr, connection):
|
||||||
IStream.__init__(self, peer_id, multi_addr)
|
IStream.__init__(self, peer_id, multi_addr)
|
||||||
self.peer_id = peer_id
|
self.peer_id = peer_id
|
||||||
|
|
||||||
ip = multi_addr.get_protocol_value("ip4")
|
stream_ip = multi_addr.get_protocol_value("ip4")
|
||||||
port = multi_addr.get_protocol_value("tcp")
|
stream_port = multi_addr.get_protocol_value("tcp")
|
||||||
|
self.reader = connection.reader
|
||||||
|
self.writer = connection.writer
|
||||||
|
# TODO should construct protocol id from constructor
|
||||||
|
self.protocol_id = None
|
||||||
|
|
||||||
self.open_connection(ip, port)
|
def get_protocol(self):
|
||||||
|
|
||||||
async def open_connection(self, ip, port):
|
|
||||||
self.reader, self.writer = await asyncio.open_connection(ip, port)
|
|
||||||
|
|
||||||
def protocol(self):
|
|
||||||
"""
|
"""
|
||||||
:return: protocol id that stream runs on
|
:return: protocol id that stream runs on
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -2,12 +2,13 @@ from abc import ABC, abstractmethod
|
||||||
|
|
||||||
class IStream(ABC):
|
class IStream(ABC):
|
||||||
|
|
||||||
def __init__(self, peer_id, multi_addr):
|
def __init__(self, peer_id, multi_addr, connection):
|
||||||
self.peer_id = peer_id
|
self.peer_id = peer_id
|
||||||
self.multi_addr = multi_addr
|
self.multi_addr = multi_addr
|
||||||
|
self.connection = connection
|
||||||
|
|
||||||
@abstractmethod
|
@abstractmethod
|
||||||
def protocol(self):
|
def get_protocol(self):
|
||||||
"""
|
"""
|
||||||
:return: protocol id that stream runs on
|
:return: protocol id that stream runs on
|
||||||
"""
|
"""
|
||||||
|
|
Loading…
Reference in New Issue
Block a user