actix/examples
1
0
Fork 0
mirror of https://github.com/actix/examples synced 2025-02-20 00:14:21 +01:00
Code Issues Releases Wiki Activity

Fix some issues at chat client (#71)

Browse Source
This commit is contained in:
Vane 2018-12-31 07:28:42 +01:00 committed by Douman
parent 3a29f1927b
commit 3afe400bdf
2 changed files with 48 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
websocket-chat-broker/client.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
"""websocket cmd client for wssrv.py example.""" """websocket cmd client for actix/websocket-tcp-chat example."""
import argparse import argparse
import asyncio import asyncio
import signal import signal
@ -7,46 +7,54 @@ import sys
import aiohttp import aiohttp
queue = asyncio.Queue()
def start_client(loop, url):
async def start_client(url, loop):
name = input('Please enter your name: ') name = input('Please enter your name: ')
# send request ws = await aiohttp.ClientSession().ws_connect(url, autoclose=False, autoping=False)
ws = yield from aiohttp.ClientSession().ws_connect(url, autoclose=False, autoping=False)
# input reader
def stdin_callback(): def stdin_callback():
line = sys.stdin.buffer.readline().decode('utf-8') line = sys.stdin.buffer.readline().decode('utf-8')
if not line: if not line:
loop.stop() loop.stop()
else: else:
ws.send_str(name + ': ' + line) # Queue.put is a coroutine, so you can't call it directly.
loop.add_reader(sys.stdin.fileno(), stdin_callback) asyncio.ensure_future(queue.put(ws.send_str(name + ': ' + line)))
@asyncio.coroutine loop.add_reader(sys.stdin, stdin_callback)
def dispatch():
async def dispatch():
while True: while True:
msg = yield from ws.receive() msg = await ws.receive()
if msg.type == aiohttp.WSMsgType.TEXT: if msg.type == aiohttp.WSMsgType.TEXT:
print('Text: ', msg.data.strip()) print('Text: ', msg.data.strip())
elif msg.type == aiohttp.WSMsgType.BINARY: elif msg.type == aiohttp.WSMsgType.BINARY:
print('Binary: ', msg.data) print('Binary: ', msg.data)
elif msg.type == aiohttp.WSMsgType.PING: elif msg.type == aiohttp.WSMsgType.PING:
ws.pong() await ws.pong()
elif msg.type == aiohttp.WSMsgType.PONG: elif msg.type == aiohttp.WSMsgType.PONG:
print('Pong received') print('Pong received')
else: else:
if msg.type == aiohttp.WSMsgType.CLOSE: if msg.type == aiohttp.WSMsgType.CLOSE:
yield from ws.close() await ws.close()
elif msg.type == aiohttp.WSMsgType.ERROR: elif msg.type == aiohttp.WSMsgType.ERROR:
print('Error during receive %s' % ws.exception()) print('Error during receive %s' % ws.exception())
elif msg.type == aiohttp.WSMsgType.CLOSED: elif msg.type == aiohttp.WSMsgType.CLOSED:
pass pass
break break
yield from dispatch() await dispatch()
async def tick():
while True:
await (await queue.get())
async def main(url, loop):
await asyncio.wait([start_client(url, loop), tick()])
ARGS = argparse.ArgumentParser( ARGS = argparse.ArgumentParser(
@ -68,5 +76,5 @@ if __name__ == '__main__':
loop = asyncio.get_event_loop() loop = asyncio.get_event_loop()
loop.add_signal_handler(signal.SIGINT, loop.stop) loop.add_signal_handler(signal.SIGINT, loop.stop)
asyncio.Task(start_client(loop, url)) asyncio.Task(main(url, loop))
loop.run_forever() loop.run_forever()

40
websocket-chat/client.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
"""websocket cmd client for wssrv.py example.""" """websocket cmd client for actix/websocket-tcp-chat example."""
import argparse import argparse
import asyncio import asyncio
import signal import signal
@ -7,46 +7,54 @@ import sys
import aiohttp import aiohttp
queue = asyncio.Queue()
def start_client(loop, url):
async def start_client(url, loop):
name = input('Please enter your name: ') name = input('Please enter your name: ')
# send request ws = await aiohttp.ClientSession().ws_connect(url, autoclose=False, autoping=False)
ws = yield from aiohttp.ClientSession().ws_connect(url, autoclose=False, autoping=False)
# input reader
def stdin_callback(): def stdin_callback():
line = sys.stdin.buffer.readline().decode('utf-8') line = sys.stdin.buffer.readline().decode('utf-8')
if not line: if not line:
loop.stop() loop.stop()
else: else:
ws.send_str(name + ': ' + line) # Queue.put is a coroutine, so you can't call it directly.
loop.add_reader(sys.stdin.fileno(), stdin_callback) asyncio.ensure_future(queue.put(ws.send_str(name + ': ' + line)))
@asyncio.coroutine loop.add_reader(sys.stdin, stdin_callback)
def dispatch():
async def dispatch():
while True: while True:
msg = yield from ws.receive() msg = await ws.receive()
if msg.type == aiohttp.WSMsgType.TEXT: if msg.type == aiohttp.WSMsgType.TEXT:
print('Text: ', msg.data.strip()) print('Text: ', msg.data.strip())
elif msg.type == aiohttp.WSMsgType.BINARY: elif msg.type == aiohttp.WSMsgType.BINARY:
print('Binary: ', msg.data) print('Binary: ', msg.data)
elif msg.type == aiohttp.WSMsgType.PING: elif msg.type == aiohttp.WSMsgType.PING:
ws.pong() await ws.pong()
elif msg.type == aiohttp.WSMsgType.PONG: elif msg.type == aiohttp.WSMsgType.PONG:
print('Pong received') print('Pong received')
else: else:
if msg.type == aiohttp.WSMsgType.CLOSE: if msg.type == aiohttp.WSMsgType.CLOSE:
yield from ws.close() await ws.close()
elif msg.type == aiohttp.WSMsgType.ERROR: elif msg.type == aiohttp.WSMsgType.ERROR:
print('Error during receive %s' % ws.exception()) print('Error during receive %s' % ws.exception())
elif msg.type == aiohttp.WSMsgType.CLOSED: elif msg.type == aiohttp.WSMsgType.CLOSED:
pass pass
break break
yield from dispatch() await dispatch()
async def tick():
while True:
await (await queue.get())
async def main(url, loop):
await asyncio.wait([start_client(url, loop), tick()])
ARGS = argparse.ArgumentParser( ARGS = argparse.ArgumentParser(
@ -68,5 +76,5 @@ if __name__ == '__main__':
loop = asyncio.get_event_loop() loop = asyncio.get_event_loop()
loop.add_signal_handler(signal.SIGINT, loop.stop) loop.add_signal_handler(signal.SIGINT, loop.stop)
asyncio.Task(start_client(loop, url)) asyncio.Task(main(url, loop))
loop.run_forever() loop.run_forever()