3.0.54

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartproxy",
-  "version": "3.0.41",
+  "version": "3.0.54",
   "private": false,
   "description": "a proxy for handling high workloads of proxying",
   "main": "dist_ts/index.js",

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@pushrocks/smartproxy',
-  version: '3.0.41',
+  version: '3.0.54',
   description: 'a proxy for handling high workloads of proxying'
 }

ts/smartproxy.classes.networkproxy.ts

@@ -245,44 +245,33 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
     );
 
     // Enable websockets
-    const wss = new plugins.ws.WebSocketServer({ server: this.httpsServer });
-    wss.on('connection', (ws) => {
-      console.log(`got connection for wsc for ${ws.url}`);
-      let wscConnectedDeferred: plugins.smartpromise.Deferred<plugins.wsDefault>;
+    const wsServer = new plugins.ws.WebSocketServer({ server: this.httpsServer  });
+    wsServer.on('connection', async (wsIncoming: plugins.wsDefault, reqArg: plugins.http.IncomingMessage) => {
+      console.log(`wss: got connection for wsc for https://${reqArg.headers.host}${reqArg.url}`);
+      
+      let wsOutgoing: plugins.wsDefault;
+      try {
+        wsOutgoing = new plugins.wsDefault(`ws://${this.router.routeReq(reqArg).destinationIp}:${this.router.routeReq(reqArg).destinationPort}${reqArg.url}`);
+      } catch (err) {
+        console.log(err);
+        wsIncoming.terminate();
+        return;
+      }
 
-      ws.on('message', async (message) => {
-        if (!wscConnectedDeferred) {
-          wscConnectedDeferred = plugins.smartpromise.defer();
-          const wsc = new plugins.wsDefault(this.router.routeWs(ws), {
-            headers: {
-              Host: ws.url,
-            },
-          });
-    
-          wsc.on('open', () => {
-            wscConnectedDeferred.resolve(wsc);
-          });
-        }
-        const wsc = await wscConnectedDeferred.promise;
-        wsc.emit('message', message);
-        wsc.on('message', (message) => {
-          ws.emit('message', message);
-        });
-  
-        // handle closing
-        const cleanUp = () => {
-          ws.terminate();
-          wsc.terminate();
-        };
-  
-        ws.on('close', (message) => {
-          cleanUp();
-        });
-
-        wsc.on('close', (message) => {
-          cleanUp();
-        });
+      wsIncoming.on("message", (message, isBinary) => {
+        console.log("client to upstream", message);
+        wsOutgoing.send(message, { binary: isBinary });
       });
+    
+      wsOutgoing.on("message", (message, isBinary) => {
+        console.log("upstream to client", message);
+        wsIncoming.send(message, { binary: isBinary });
+      });
+      wsIncoming.on("error", () => wsOutgoing.terminate());
+      wsOutgoing.on("error", () => wsIncoming.terminate());
+      wsIncoming.on("close", () => wsOutgoing.terminate());
+      wsOutgoing.on("close", () => wsIncoming.terminate());
+
     });
     this.httpsServer.keepAliveTimeout = 600 * 1000;
     this.httpsServer.headersTimeout = 600 * 1000;

ts/smartproxy.classes.router.ts

@@ -21,12 +21,4 @@ export class ProxyRouter {
     });
     return correspodingReverseProxyConfig;
   }
-
-  public routeWs(ws: plugins.wsDefault) {
-    const originalHost = plugins.url.parse(ws.url).host;
-    const correspodingReverseProxyConfig = this.reverseProxyConfigs.find((reverseConfig) => {
-      return reverseConfig.hostName === originalHost;
-    });
-    return correspodingReverseProxyConfig.destinationIp;
-  }
 }