From bfb2c738104660f014ac26898229b6e5ce9302fa Mon Sep 17 00:00:00 2001 From: Aliabbas Merchant Date: Sun, 10 Feb 2019 23:37:42 +0530 Subject: [PATCH] Fixed some issues with the chat example (#120) * Fixed some issues with the chat example * Bump version to Python 3.7 (#121) * bump version * enable 3.7 in travis * Minor refactor --- examples/chat/chat.py | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/examples/chat/chat.py b/examples/chat/chat.py index c03c946d..07764062 100755 --- a/examples/chat/chat.py +++ b/examples/chat/chat.py @@ -2,6 +2,7 @@ import asyncio import sys import click +import multiaddr from libp2p import new_node from libp2p.peer.peerinfo import info_from_p2p_addr @@ -12,34 +13,28 @@ PROTOCOL_ID = '/chat/1.0.0' async def read_data(stream): while True: - read_string = (await stream.read()).decode() - - if not read_string: - return - - if read_string != "\n": - # Green console colour: \x1b[32m - # Reset console colour: \x1b[0m - print("\x1b[32m%s\x1b[0m> " % read_string, end="") + read_string = await stream.read() + if read_string is not None: + read_string = read_string.decode() + if read_string != "\n": + # Green console colour: \x1b[32m + # Reset console colour: \x1b[0m + print("\x1b[32m %s\x1b[0m " % read_string, end="") async def write_data(stream): loop = asyncio.get_event_loop() - while True: line = await loop.run_in_executor(None, sys.stdin.readline) await stream.write(line.encode()) async def run(port, destination): - host = await new_node(transport_opt=["/ip4/127.0.0.1/tcp/%s" % port]) - if not destination: - + if not destination: # its the server async def stream_handler(stream): asyncio.ensure_future(read_data(stream)) asyncio.ensure_future(write_data(stream)) - host.set_stream_handler(PROTOCOL_ID, stream_handler) port = None @@ -50,13 +45,12 @@ async def run(port, destination): if not port: raise RuntimeError("was not able to find the actual local port") - print("Run './examples/chat/chat.py --port %s -d /ip4/127.0.0.1/tcp/%s/p2p/%s' on another console.\n" % - (int(port)+1, port, host.get_id().pretty())) + print("Run './examples/chat/chat.py -p %s -d /ip4/127.0.0.1/tcp/%s/p2p/%s' on another console.\n" % + (int(port) + 1, port, host.get_id().pretty())) print("You can replace 127.0.0.1 with public IP as well.") print("\nWaiting for incoming connection\n\n") - else: - + else: # its the client m = multiaddr.Multiaddr(destination) info = info_from_p2p_addr(m) # Associate the peer with local ip address @@ -68,11 +62,11 @@ async def run(port, destination): asyncio.ensure_future(read_data(stream)) asyncio.ensure_future(write_data(stream)) - print("Already connected to peer %s" % info.addrs[0]) + print("Connected to peer %s" % info.addrs[0]) @click.command() -@click.option('--port', help='source port number', default=8000) +@click.option('--port', '-p', help='source port number', default=8000) @click.option('--destination', '-d', help="Destination multiaddr string") @click.option('--help', is_flag=True, default=False, help='display help') # @click.option('--debug', is_flag=True, default=False, help='Debug generates the same node ID on every execution') @@ -80,8 +74,8 @@ def main(port, destination, help): if help: print("This program demonstrates a simple p2p chat application using libp2p\n\n") - print("Usage: Run './chat -sp ' where can be any port number.") - print("Now run './chat -d ' where is multiaddress of previous listener host.") + print("Usage: Run './chat -p ' where can be any port number.") + print("Now run './chat -p -d ' where is multiaddress of previous listener host.") return loop = asyncio.get_event_loop()