Some refactoring ongoing

Author: jscriptcoder

.babelrc

@@ -1,5 +1,9 @@
 {
+    "presets": [
+        "@babel/preset-env"
+    ],
     "plugins": [
-        "@babel/plugin-transform-async-to-generator"
+        "@babel/plugin-transform-async-to-generator",
+        "@babel/plugin-proposal-class-properties"
     ]
 }

package-lock.json

@@ -3,24 +3,8 @@
   "version": "1.0.0",
   "description": "This is an experiment to compare HTTP vs WebSockets performance using `Nodejs client` <==> `Python server`",
   "scripts": {
-    "fetch-flask": "PORT=5000 SERVER=flask babel-node src/clients/fetch_client.js",
-    "axios-flask": "PORT=5000 SERVER=flask babel-node src/clients/axios_client.js",
-    "flask": "python src/servers/flask_server.py --port 5000",
-    "fetch-fastapi": "PORT=5001 SERVER=fastapi babel-node src/clients/fetch_client.js",
-    "axios-fastapi": "PORT=5001 SERVER=fastapi babel-node src/clients/axios_client.js",
-    "fastapi": "python src/servers/fastapi_server.py --port 5001",
-    "websocket-fastapi-websocket": "PORT=5002 SERVER=fastapi-websocket babel-node src/clients/websocket_client.js",
-    "fastapi-websocket": "python src/servers/fastapi-websocket_server.py --port 5002",
-    "socketio-flask-socketio": "PORT=5003 SERVER=flask-socketio babel-node src/clients/socketio_client.js",
-    "flask-socketio": "python src/servers/flask-socketio_server.py --port 5003",
-    "ws-eventlet": "PORT=5004 SERVER=eventlet babel-node src/clients/ws_client.js",
-    "websocket-eventlet": "PORT=5004 SERVER=eventlet babel-node src/clients/websocket_client.js",
-    "eventlet": "python src/servers/eventlet_server.py --port 5004",
-    "ws-websockets": "PORT=5005 SERVER=websockets babel-node src/clients/ws_client.js",
-    "websocket-websockets": "PORT=5005 SERVER=websockets babel-node src/clients/websocket_client.js",
-    "websockets": "python src/servers/websockets_server.py --port 5005",
-    "socketio-socketio": "PORT=5006 SERVER=socketio babel-node src/clients/socketio_client.js",
-    "socketio": "python src/servers/socketio_server.py --port 5006"
+    "axios-client": "babel-node src/clients/http/axios_client.js",
+    "fetch-client": "babel-node src/clients/http/fetch_client.js"
   },
   "repository": {
     "type": "git",
@@ -33,6 +17,7 @@
   },
   "homepage": "https://github.com/jscriptcoder/HTTP-vs-WebSockets-performance#readme",
   "dependencies": {
+    "@stomp/stompjs": "^5.4.4",
     "axios": "^0.20.0",
     "chalk": "^4.1.0",
     "node-fetch": "^2.6.1",
@@ -44,6 +29,9 @@
   "devDependencies": {
     "@babel/core": "^7.11.6",
     "@babel/node": "^7.10.5",
-    "@babel/plugin-transform-async-to-generator": "^7.10.4"
+    "@babel/plugin-proposal-class-properties": "^7.10.4",
+    "@babel/plugin-transform-async-to-generator": "^7.10.4",
+    "@babel/polyfill": "^7.11.5",
+    "@babel/preset-env": "^7.11.5"
   }
 }

package.json

@@ -1,8 +1,6 @@
-#!/usr/bin/env node
-
-const axios = require('axios')
-const { host, port, serverUrl, iters } = require('../config')
-const PerformanceTimer = require('../PerformanceTimer')
+import axios from 'axios'
+import { host, port, serverUrl, iters } from '../config'
+import PerformanceTimer from '../PerformanceTimer'
 
 export async function runTest() {
     console.log(`Axios client connecting to http://${host}:${port}`)
@@ -14,11 +12,12 @@ export async function runTest() {
     timer.start()
 
     // async loop
+    let i = iters
     await (async function asyncLoop() {
         const response = await axios.post(serverUrl, { name: 'Fran' })
         const { hello } = response.data
 
-        if (--iters === 0) return
+        if (--i === 0) return
         await asyncLoop()
     })()
 

src/clients/http/axios_client.js

@@ -1,8 +1,6 @@
-#!/usr/bin/env node
-
-const fetch = require('node-fetch')
-const { host, port, serverUrl, iters } = require('../config')
-const PerformanceTimer = require('../PerformanceTimer')
+import fetch from 'node-fetch'
+import { host, port, serverUrl, iters } from '../config'
+import PerformanceTimer from '../PerformanceTimer'
 
 const requestInit = {
     method: 'POST',
@@ -20,12 +18,13 @@ export async function runTest() {
     timer.start()
 
     // async loop
+    let i = iters
     await (async function asyncLoop() {
         const response = await fetch(serverUrl, requestInit)
         const data = await response.json()
         const { hello } = data
 
-        if (--iters === 0) return
+        if (--i === 0) return
         await asyncLoop()
     })()
 

src/clients/http/fetch_client.js

@@ -4,4 +4,5 @@
 parser.add_argument('-l', '--host', default='0.0.0.0')
 parser.add_argument('-p', '--port', default=5000, type=int)
 
-args = parser.parse_args()
+args = parser.parse_args()
+host, port = args.host, args.port

src/servers/__init__.py renamed to src/clients/ws/stomp.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 from flask import Flask, request, jsonify
+from src.servers.config import host, port
 import logging
-from servers.config import host, port
 
 log = logging.getLogger('werkzeug')
 log.setLevel(logging.ERROR)
@@ -11,7 +11,9 @@
 
 @app.route('/hello', methods=['POST'])
 def hello():
-    return jsonify(hello = request.get_json().get('name'))
+    json = request.get_json()
+    name = json.get('name')
+    return jsonify(hello = name)
 
 def run_test():
     print('Server starting at ' + 'http://{}:{}'.format(host, port))