3.0.58

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartproxy",
-  "version": "3.0.53",
+  "version": "3.0.58",
   "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.53',
+  version: '3.0.58',
   description: 'a proxy for handling high workloads of proxying'
 }

ts/smartproxy.classes.networkproxy.ts

@@ -245,32 +245,49 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
     );
 
     // Enable websockets
-    const wss = new plugins.ws.WebSocketServer({ server: this.httpsServer  });
+    const wsServer = new plugins.ws.WebSocketServer({ server: this.httpsServer  });
-    wss.on('connection', async (ws: plugins.wsDefault, reqArg: plugins.http.IncomingMessage) => {
+    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}`);
+      console.log(`wss proxy: got connection for wsc for https://${reqArg.headers.host}${reqArg.url}`);
+      
+      let wsOutgoing: plugins.wsDefault;
+
+      const outGoingDeferred = plugins.smartpromise.defer();
 
-      let wsc: plugins.wsDefault;
       try {
-        wsc = new plugins.wsDefault(`ws://${this.router.routeReq(reqArg).destinationIp}:${this.router.routeReq(reqArg).destinationPort}${reqArg.url}`);
+        wsOutgoing = new plugins.wsDefault(`ws://${this.router.routeReq(reqArg).destinationIp}:${this.router.routeReq(reqArg).destinationPort}${reqArg.url}`);
+        console.log('wss proxy: initiated outgoing proxy');
+        wsOutgoing.on('open', async () => {
+          outGoingDeferred.resolve();
+        })
       } catch (err) {
         console.log(err);
-        ws.terminate();
+        wsIncoming.terminate();
         return;
       }
 
-      ws.on("message", (message, isBinary) => {
+      wsIncoming.on("message", async (message, isBinary) => {
-        console.log("client to upstream", message);
+        await outGoingDeferred.promise;
-        wsc.send(message, { binary: isBinary });
+        // console.log("client to upstream", message);
+        wsOutgoing.send(message, { binary: isBinary });
       });
     
-      wsc.on("message", (message, isBinary) => {
+      wsOutgoing.on("message", async (message, isBinary) => {
-        console.log("upstream to client", message);
+        // console.log("upstream to client", message);
-        ws.send(message, { binary: isBinary });
+        wsIncoming.send(message, { binary: isBinary });
       });
-      ws.on("error", () => wsc.terminate());
+      const terminateWsOutgoing = () => {
-      wsc.on("error", () => ws.terminate());
+        wsOutgoing.terminate();
-      ws.on("close", () => wsc.terminate());
+        console.log('terminated outgoing ws.');
-      wsc.on("close", () => ws.terminate());
+      }
+      wsIncoming.on("error", () => terminateWsOutgoing());
+      wsIncoming.on("close", () => terminateWsOutgoing());
+
+      const terminateWsIncoming = () => {
+        wsIncoming.terminate();
+        console.log('terminated incoming ws.');
+      }
+      wsOutgoing.on("error", () => terminateWsIncoming());
+      wsOutgoing.on("close", () => terminateWsIncoming());
 
     });
     this.httpsServer.keepAliveTimeout = 600 * 1000;