WIP: socketio client and server

Author: jscriptcoder

.gitignore

@@ -1,4 +1,5 @@
 node_modules
 __pycache__
 .vscode
-.ipynb_checkpoints
+.ipynb_checkpoints
+yarn-error.log

src/clients/ws/socketio_client.js

@@ -1,16 +1,30 @@
 #!/usr/bin/env node
 
 import io from 'socket.io-client'
-import { host, port, httpApi, iters } from '../config'
+import { host, port, wsApi, iters } from '../config'
 import PerformanceTimer from '../PerformanceTimer'
 import { Deferred, randomName } from '../utils'
 
+function createRequester(socket) {
+    const requester = {
+        incoming: null,
+        greeting(data) {
+            // new incoming message on the way
+            const incoming = requester.incoming = new Deferred()
+            socket.send(data)
+            return incoming.promise
+        }
+    }
+
+    return requester
+}
+
 async function runTest() {
     console.log(`SocketIO client connecting to http://${host}:${port}`)
 
     const timer = new PerformanceTimer()
     const connect = new Deferred()
-    const socket = io(httpApi, { transports: ['websocket'] })
+    const socket = io(wsApi, { transports: ['websocket'] })
 
     socket.on('connect', () => connect.resolve())
     socket.on('connect_error', err => connect.reject(err))
@@ -19,28 +33,30 @@ async function runTest() {
         await connect.promise
 
         console.log(`Running test with ${iters} iterations...`)
-        
-        const requestGreeting = () => socket.send({ name: randomName() })
-    
-        socket.on('message', data => {
+
+        const requester = createRequester(socket)
+
+        socket.on('message', data => requester.incoming.resolve(data))
+
+        let i = iters
+        await (async function asyncLoop() {
+            const sendData = { name: randomName() }
+            const data = await requester.greeting(sendData)
             const { greeting } = data
-    
-            if (--iters > 0) {
-                requestGreeting()
-            } else {
+
+            if (--i === 0) {
                 console.log(`Last greeting: ${greeting}`)
-                timer.end()
-                socket.close()
+                return
             }
-        })
-    
-        timer.start()
 
-        requestGreeting()
+            await asyncLoop()
+        })()
+
+        timer.end()
+        socket.close()
 
     } catch(err) {
         console.error('Error connecting')
-        socket.close()
     }
 }
 

src/servers/http/fastapi_server.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 
 import uvicorn
-import argparse
 import json
 from fastapi import FastAPI
 from pydantic import BaseModel
@@ -14,7 +13,8 @@ class Data(BaseModel): name: str
 
 @app.post('/greeting')
 def greeting(data: Data):
-    return { 'greeting': random_greeting(data.name) }
+    greeting = random_greeting(data.name)
+    return { 'greeting': greeting }
 
 def run_test():
     print('Server starting at ' + 'http://{}:{}'.format(host, port))

src/servers/http/flask_server.py

@@ -14,6 +14,7 @@
 def greeting():
     json = request.get_json()
     name = json.get('name')
+    greeting = random_greeting(name)
     return jsonify(greeting = random_greeting(name))
 
 def run_test():

src/servers/http/pyramid_server.py

@@ -9,7 +9,8 @@
 
 def greeting(request):
     data = request.json_body
-    return { 'greeting': random_greeting(data['name']) }
+    greeting = random_greeting(data['name'])
+    return { 'greeting': greeting }
 
 def run_test():
     # print('Server starting at ' + 'http://{}:{}'.format(host, port))

src/servers/http/tornado_server.py

@@ -9,8 +9,9 @@
 class GreetingHandler(RequestHandler):
     def post(self):
         data = json.loads(self.request.body)
+        greeting = random_greeting(data['name'])
         self.set_header('Content-Type', 'application/json')
-        self.write(json.dumps({ 'greeting': random_greeting(data['name']) }))
+        self.write(json.dumps({ 'greeting': greeting }))
 
 def make_app():
     urls = [('/greeting', GreetingHandler)]

src/servers/ws/eventlet_server.py

@@ -2,7 +2,6 @@
 
 import json
 import eventlet
-import argparse
 from eventlet import wsgi, websocket
 from src.servers.config import host, port
 from src.servers.utils import random_greeting
@@ -14,7 +13,8 @@ def greeting_handle(ws):
         if message is None: break
 
         data = json.loads(message)
-        ws.send(json.dumps({ 'greeting': random_greeting(data['name']) }))
+        greeting = random_greeting(data['name'])
+        ws.send(json.dumps({ 'greeting': greeting }))
 
 def site(env, start_response):
     if env['PATH_INFO'] == '/greeting':

src/servers/ws/fastapi-websocket_server.py

@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-from fastapi import FastAPI, WebSocket
-import argparse
 import uvicorn
+from fastapi import FastAPI, WebSocket
+from src.servers.config import host, port
+from src.servers.utils import random_greeting
 
 app = FastAPI()
 
@@ -12,16 +13,15 @@ async def greeting(websocket: WebSocket):
     while True:
         try:
             data = await websocket.receive_json()
-            await websocket.send_json({ 'greeting': data['name'] })
+            greeting = random_greeting(data['name'])
+            await websocket.send_json({ 'greeting': greeting })
         except:
             await websocket.close()
             break
 
+def run_test():
+    print('Server starting at: ' + 'ws://{}:{}/greeting'.format(host, port))
+    uvicorn.run(app, host=host, port=port, log_level='error')
+
 if __name__ == '__main__':
-    parser = argparse.ArgumentParser()
-    parser.add_argument('-l', '--host', default='0.0.0.0')
-    parser.add_argument('-p', '--port', default=5000, type=int)
-    
-    args = parser.parse_args()
-    print('Server starting at: ' + 'ws://{}:{}/greeting'.format(args.host, args.port))
-    uvicorn.run(app, host=args.host, port=args.port, log_level='error')
+    run_test()

src/servers/ws/flask-socketio_server.py

@@ -1,26 +1,26 @@
 #!/usr/bin/env python
 
+import logging
 from flask import Flask, render_template
 from flask_socketio import SocketIO, send
-import argparse
-import logging
+from src.servers.config import host, port
+from src.servers.utils import random_greeting
 
-log = logging.getLogger('werkzeug')
-log.setLevel(logging.ERROR)
+# log = logging.getLogger('werkzeug')
+# log.setLevel(logging.ERROR)
 
 app = Flask(__name__)
 app.config['SECRET_KEY'] = 'secret!'
 socketio = SocketIO(app)
 
 @socketio.on('message', namespace='/greeting')
 def greeting(data):
-    send({'greeting': data['name']})
+    greeting = random_greeting(data['name'])
+    send({ 'greeting': greeting })
 
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser()
-    parser.add_argument('-l', '--host', default='0.0.0.0')
-    parser.add_argument('-p', '--port', default=5000, type=int)
+def run_test():
+    print('Server starting at: ' + 'ws://{}:{}'.format(host, port))
+    socketio.run(app, host=host, port=port)
 
-    args = parser.parse_args()
-    print('Server starting at: ' + 'ws://{}:{}'.format(args.host, args.port))
-    socketio.run(app, host=args.host, port=args.port)
+if __name__ == '__main__':
+    run_test()