Refactored ws client

Author: jscriptcoder

package.json

@@ -8,13 +8,14 @@
     "fetch-client": "babel-node src/clients/http/fetch_client.js",
     "superagent-client": "babel-node src/clients/http/superagent_client.js",
     "socketio-client": "babel-node src/clients/ws/socketio_client.js",
-    "websocket-client": "babel-node src/clients/ws/websocket_client.js"
+    "websocket-client": "babel-node src/clients/ws/websocket_client.js",
+    "ws-client": "babel-node src/clients/ws/ws_client.js"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/jscriptcoder/HTTP-vs-WebSockets-performance.git"
   },
-  "author": "[email protected]",
+  "author": "Francisco Ramos <[email protected]>",
   "license": "ISC",
   "bugs": {
     "url": "https://github.com/jscriptcoder/HTTP-vs-WebSockets-performance/issues"
@@ -23,7 +24,7 @@
   "dependencies": {
     "@stomp/stompjs": "^5.4.4",
     "axios": "^0.20.0",
-    "chalk": "^4.1.0",
+    "chalk": "^4.1.0", 
     "node-fetch": "^2.6.1",
     "socket.io-client": "^2.3.0",
     "superagent": "^6.1.0",

src/clients/ws/websocket_client.js

@@ -59,7 +59,7 @@ async function runTest() {
 
         // https://www.iana.org/assignments/websocket/websocket.xhtml#close-code-number
         connection.close(1000, 'Done testing')
-
+        
     } catch(err) {
         console.error('Error connecting')
     }

src/clients/ws/ws_client.js

@@ -1,56 +1,66 @@
 #!/usr/bin/env node
 
-const { PerformanceObserver, performance } = require('perf_hooks')
-const WebSocket = require('ws')
-import { randomName } from '../utils'
+import WebSocket from 'ws'
+import { host, port, wsApi, iters } from '../config'
+import PerformanceTimer from '../PerformanceTimer'
+import { Deferred, randomName } from '../utils'
 
-const host = process.env.HOST || '0.0.0.0'
-const port = process.env.PORT || 5000
-const server = process.env.SERVER || 'unknown'
-const wsApi = `ws://${host}:${port}/greeting`
+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
+        }
+    }
 
-let iters = 10000
+    return requester
+}
 
 async function runTest() {
-    console.log(`ws client <===> ${server} server on ws://${host}:${port}/greeting`)
+    console.log(`ws client connecting to ws://${host}:${port}/greeting`)
 
+    const timer = new PerformanceTimer()
+    const connect = new Deferred()
     const ws = new WebSocket(wsApi)
 
-    function requestGreeting() {
-        ws.send(JSON.stringify({ name: randomName() }))
-    }
+    ws.on('open', () => connect.resolve())
+    ws.on('error', err => connect.reject(err))
+
+    try {
+        await connect.promise
 
-    ws.on('open', () => {
         console.log(`Running test with ${iters} iterations...`)
 
-        ws.on('message', message => {
+        const requester = createRequester(ws)
+
+        ws.on('message', message => requester.incoming.resolve(message))
+
+        let i = iters
+        await (async function asyncLoop() {
+            const sendData = { name: randomName() }
+            const message = await requester.greeting(sendData)
             const data = JSON.parse(message)
             const { greeting } = data
-    
-            if (--iters > 0) {
-                requestGreeting()
-            } else {
-                performance.mark('END')
-                performance.measure('START to END', 'START', 'END')
 
-                ws.terminate()
+            if (--i === 0) {
+                console.log(`Last greeting: ${greeting}`)
+                return
             }
-        })
+    
+            await asyncLoop()
+        })()
 
-        performance.mark('START')
+        timer.end()
+        ws.terminate()
 
-        requestGreeting()
-    })
+    } catch(err) {
+        console.error('Error connecting')
+    }
 }
 
-const obs = new PerformanceObserver(items => {
-    console.log('End test')
-    console.log(`Duration: ${items.getEntries()[0].duration}`)
-    performance.clearMarks()
-})
-
-obs.observe({ entryTypes: ['measure'] })
-
 if (require.main === module) {
     runTest()
 }