Merge pull request #29 from zixuanzh/muxed-conn

Muxer Scaffolding
This commit is contained in:
ZX 2018-10-31 23:02:49 +01:00 committed by GitHub
commit 3cec9942ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 261 additions and 0 deletions

41
muxer/muxed_connection.py Normal file
View File

@ -0,0 +1,41 @@
from .muxed_connection_interface import IMuxedConn
class MuxedConn(IMuxedConn):
"""
reference: https://github.com/libp2p/go-mplex/blob/master/multiplex.go
"""
def __init__(self, conn, initiator):
"""
create a new muxed connection
:param conn: an instance of raw connection
:param initiator: boolean to prevent multiplex with self
"""
self.raw_conn = conn
self.initiator = initiator
def close(self):
"""
close the stream muxer and underlying raw connection
"""
pass
def is_closed(self):
"""
check connection is fully closed
:return: true if successful
"""
pass
def open_stream(self, protocol_id, stream_name):
"""
creates a new muxed_stream
:return: a new stream
"""
pass
def accept_stream(self):
"""
accepts a muxed stream opened by the other end
:return: the accepted stream
"""
pass

View File

@ -0,0 +1,34 @@
from abc import ABC, abstractmethod
class IMuxedConn(ABC):
"""
reference: https://github.com/libp2p/go-stream-muxer/blob/master/muxer.go
"""
# TODO closer
@abstractmethod
def is_closed(self):
"""
check connection is fully closed
:return: true if successful
"""
pass
@abstractmethod
def open_stream(self, protocol_id, stream_name):
"""
creates a new muxed_stream
:param protocol_id: id to be associated with stream
:param stream_name: name as part of identifier
:return: a new stream
"""
pass
@abstractmethod
def accept_stream(self):
"""
accepts a muxed stream opened by the other end
:return: the accepted stream
"""
pass

34
muxer/muxed_stream.py Normal file
View File

@ -0,0 +1,34 @@
from .muxed_stream_interface import IMuxedStream
class MuxedStream(IMuxedStream):
"""
reference: https://github.com/libp2p/go-mplex/blob/master/stream.go
"""
def __init__(self, protocol_id, stream_name):
self.protocol_id = protocol_id
self.name = stream_name
def read(self):
pass
def write(self):
pass
def close(self):
pass
def reset(self):
"""
closes both ends of the stream
tells this remote side to hang up
:return: error/exception
"""
pass
def set_deadline(self, ttl):
"""
set deadline for muxed stream
:return: a new stream
"""
pass

View File

@ -0,0 +1,25 @@
from abc import ABC, abstractmethod
# from datetime import time
class IMuxedStream(ABC):
# TODO Reader
# TODO Writer
# TODO Closer
@abstractmethod
def reset(self):
"""
closes both ends of the stream
tells this remote side to hang up
:return: error/exception
"""
pass
@abstractmethod
def set_deadline(self, ttl):
"""
set deadline for muxed stream
:return: a new stream
"""
pass

View File

@ -0,0 +1,44 @@
from .muxed_stream import MuxedStream
from .muxed_connection import MuxedConn
class Multiplex(object):
"""
reference: https://github.com/whyrusleeping/go-smux-multiplex/blob/master/multiplex.go
"""
def __init__(self, conn, initiator):
"""
:param conn: an instance of raw connection
: param initiator: boolean to prevent multiplex with self
"""
self.muxed_conn = MuxedConn(conn, initiator)
def close(self):
"""
close the stream muxer and underlying raw connection
"""
return self.muxed_conn.close()
def is_closed(self):
"""
check connection is fully closed
:return: true if successful
"""
return self.muxed_conn.is_closed()
def open_stream(self, protocol_id, stream_name):
"""
creates a new muxed_stream
:return: a new stream
"""
return self.muxed_conn.open_stream(protocol_id, stream_name)
def accept_stream(self, _muxed_stream):
"""
accepts a muxed stream opened by the other end
:param _muxed_stream: stream to be accepted
:return: the accepted stream
"""
pass
# def new_conn(raw_conn, is_server):
# pass

83
network/tcp.py Normal file
View File

@ -0,0 +1,83 @@
import asyncio
from .transport_interface import ITransport
from .listener_interface import IListener
class TCP(ITransport):
def __init__(self):
self.listener = self.Listener()
class Listener(IListener):
def __init__(self, handler_function=None):
self.multiaddrs = []
self.server = None
self.handler = staticmethod(handler_function)
def listen(self, multiaddr):
"""
put listener in listening mode and wait for incoming connections
:param multiaddr: multiaddr of peer
:return: return True if successful
"""
# TODO check for exceptions
_multiaddr = multiaddr
if "ipfs" in multiaddr.get_protocols():
# ipfs_id = multiaddr.get_ipfs_id()
_multiaddr = multiaddr.remove_protocol("ipfs")
self.multiaddrs.append(_multiaddr)
_multiaddr_dict = _multiaddr.to_dict()
_loop = asyncio.get_event_loop()
_coroutine = asyncio.start_server(self.handler, _multiaddr_dict.host,\
_multiaddr_dict.port, loop=_loop)
self.server = _loop.run_until_complete(_coroutine)
return True
def get_addrs(self):
"""
retrieve list of addresses the listener is listening on
:return: return list of addrs
"""
# TODO check if server is listening
return self.multiaddrs
def close(self, options=None):
"""
close the listener such that no more connections
can be open on this transport instance
:param options: optional object potential with timeout
a timeout value in ms that fires and destroy all connections
:return: return True if successful
"""
if self.server is None:
return False
self.server.close()
_loop = asyncio.get_event_loop()
_loop.run_until_complete(self.server.wait_closed())
_loop.close()
self.server = None
return True
def dial(self, multiaddr, options=None):
"""
dial a transport to peer listening on multiaddr
:param multiaddr: multiaddr of peer
:param options: optional object
:return: True if successful
"""
_multiaddr_dict = multiaddr.to_dict()
reader, writer = await asyncio.open_connection(_multiaddr_dict.host,\
_multiaddr_dict.port)
return False
# TODO dial behavior not fully understood
def create_listener(self, handler_function, options=None):
"""
create listener on transport
:param options: optional object with properties the listener must have
:param handler_function: a function called when a new conntion is received
that takes a connection as argument which implements interface-connection
:return: a listener object that implements listener_interface.py
"""
return self.Listener(handler_function)