Some more work on ws

Author: jscriptcoder

src/clients/utils.js

@@ -25,4 +25,18 @@ export class Deferred {
       this.reject = reject
     })
   }
+}
+
+export function createRequester(sender) {
+  const requester = {
+      incoming: null,
+      greeting(data) {
+          // new incoming message on the way
+          const incoming = requester.incoming = new Deferred()
+          sender(data)
+          return incoming.promise
+      }
+  }
+  
+  return requester
 }

src/clients/ws/socketio_client.js

@@ -1,30 +1,16 @@
 #!/usr/bin/env node
 
 import io from 'socket.io-client'
-import { host, port, wsApi, iters } from '../config'
+import { host, port, httpApi, 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
-}
+import { Deferred, randomName, createRequester } from '../utils'
 
 async function runTest() {
     console.log(`SocketIO client connecting to http://${host}:${port}`)
 
     const timer = new PerformanceTimer()
     const connect = new Deferred()
-    const socket = io(wsApi, { transports: ['websocket'] })
+    const socket = io(httpApi, { transports: ['websocket'] })
 
     socket.on('connect', () => connect.resolve())
     socket.on('connect_error', err => connect.reject(err))
@@ -34,8 +20,7 @@ async function runTest() {
 
         console.log(`Running test with ${iters} iterations...`)
 
-        const requester = createRequester(socket)
-
+        const requester = createRequester(data => socket.send(data))
         socket.on('message', data => requester.incoming.resolve(data))
 
         let i = iters

src/clients/ws/websocket_client.js

@@ -3,21 +3,7 @@
 import { client as WebSocketClient} from 'websocket'
 import { host, port, wsApi, iters } from '../config'
 import PerformanceTimer from '../PerformanceTimer'
-import { Deferred, randomName } from '../utils'
-
-function createRequester(connection) {
-    const requester = {
-        incoming: null,
-        greeting(data) {
-            // new incoming message on the way
-            const incoming = requester.incoming = new Deferred()
-            connection.sendUTF(JSON.stringify(data))
-            return incoming.promise
-        }
-    }
-
-    return requester
-}
+import { Deferred, createRequester, randomName } from '../utils'
 
 async function runTest() {
     console.log(`websocket client connecting to ws://${host}:${port}/greeting`)
@@ -36,13 +22,12 @@ async function runTest() {
 
         console.log(`Running test with ${iters} iterations...`)
 
-        const requester = createRequester(connection)
-
+        const requester = createRequester(data => connection.sendUTF(data))
         connection.on('message', message => requester.incoming.resolve(message))
 
         let i = iters
         await (async function asyncLoop() {
-            const sendData = { name: randomName() }
+            const sendData = JSON.stringify({ name: randomName() })
             const message = await requester.greeting(sendData)
             const data = JSON.parse(message.utf8Data)
             const { greeting } = data

src/clients/ws/ws_client.js

@@ -3,21 +3,7 @@
 import WebSocket from 'ws'
 import { host, port, wsApi, iters } from '../config'
 import PerformanceTimer from '../PerformanceTimer'
-import { Deferred, randomName } from '../utils'
-
-function createRequester(ws) {
-    const requester = {
-        incoming: null,
-        greeting(data) {
-            // new incoming message on the way
-            const incoming = requester.incoming = new Deferred()
-            ws.send(JSON.stringify(data))
-            return incoming.promise
-        }
-    }
-
-    return requester
-}
+import { Deferred, createRequester, randomName } from '../utils'
 
 async function runTest() {
     console.log(`ws client connecting to ws://${host}:${port}/greeting`)
@@ -34,13 +20,12 @@ async function runTest() {
 
         console.log(`Running test with ${iters} iterations...`)
 
-        const requester = createRequester(ws)
-
+        const requester = createRequester(data => ws.send(data))
         ws.on('message', message => requester.incoming.resolve(message))
 
         let i = iters
         await (async function asyncLoop() {
-            const sendData = { name: randomName() }
+            const sendData = JSON.stringify({ name: randomName() })
             const message = await requester.greeting(sendData)
             const data = JSON.parse(message)
             const { greeting } = data

src/servers/ws/flask-socketio_server.py

@@ -1,14 +1,10 @@
 #!/usr/bin/env python
 
-import logging
 from flask import Flask, render_template
 from flask_socketio import SocketIO, send
 from src.servers.config import host, port
 from src.servers.utils import random_greeting
 
-# log = logging.getLogger('werkzeug')
-# log.setLevel(logging.ERROR)
-
 app = Flask(__name__)
 app.config['SECRET_KEY'] = 'secret!'
 socketio = SocketIO(app)

src/servers/ws/socketio_server.py

@@ -3,26 +3,27 @@
 import eventlet
 import socketio
 import json
-import argparse
+from src.servers.config import host, port
+from src.servers.utils import random_greeting
 
 sio = socketio.Server()
 app = socketio.WSGIApp(sio)
 
 # @sio.on('message', namespace='/greeting')
 # def greeting(sid, data):
-#     sio.send({'greeting': data['name']}, namespace='/greeting')
+#     greeting = random_greeting(data['name'])
+#     sio.send({ 'greeting': greeting }, namespace='/greeting')
 
 class GreetingNamespace(socketio.Namespace):
     def on_message(self, sid, data):
-        self.send({'greeting': data['name']})
+        greeting = random_greeting(data['name'])
+        self.send({ 'greeting': greeting })
 
 sio.register_namespace(GreetingNamespace('/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))
+    eventlet.wsgi.server(eventlet.listen((host, port)), app)
 
-    args = parser.parse_args()
-    print('Server starting at: ' + 'ws://{}:{}'.format(args.host, args.port))
-    eventlet.wsgi.server(eventlet.listen((args.host, args.port)), app)
+if __name__ == '__main__':
+    run_test()

src/servers/ws/websockets_server.py

@@ -3,30 +3,26 @@
 import asyncio
 import websockets
 import json
-import argparse
-import logging
-
-logger = logging.getLogger('websockets.server')
-logger.setLevel(logging.ERROR)
+from src.servers.config import host, port
+from src.servers.utils import random_greeting
 
 async def greeting(websocket, path):
     if path == '/greeting':
         while True:
             try:
                 message = await websocket.recv()
                 data = json.loads(message)
-                await websocket.send(json.dumps({ 'greeting': data['name'] }))
+                greeting = random_greeting(data['name'])
+                await websocket.send(json.dumps({ 'greeting': greeting }))
             except:
                 await websocket.close()
                 break
 
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser()
-    parser.add_argument('-l', '--host', default='0.0.0.0')
-    parser.add_argument('-p', '--port', default=5005, type=int)
-
-    args = parser.parse_args()
-    print('Server starting at: ' + 'ws://{}:{}'.format(args.host, args.port))
-    start_server = websockets.serve(greeting, host=args.host, port=args.port)
+def run_test():
+    print('Server starting at: ' + 'ws://{}:{}'.format(host, port))
+    start_server = websockets.serve(greeting, host=host, port=port)
     asyncio.get_event_loop().run_until_complete(start_server)
-    asyncio.get_event_loop().run_forever()
+    asyncio.get_event_loop().run_forever()
+
+if __name__ == '__main__':
+    run_test()