3.0.54

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartproxy",
-  "version": "3.0.35",
+  "version": "3.0.54",
   "private": false,
   "description": "a proxy for handling high workloads of proxying",
   "main": "dist_ts/index.js",
@@ -15,18 +15,19 @@
     "buildDocs": "tsdoc"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.63",
+    "@gitzone/tsbuild": "^2.1.65",
-    "@gitzone/tstest": "^1.0.72",
+    "@gitzone/tsrun": "^1.2.39",
+    "@gitzone/tstest": "^1.0.73",
     "@pushrocks/tapbundle": "^5.0.4",
-    "@types/node": "^18.6.2"
+    "@types/node": "^18.7.8"
   },
   "dependencies": {
     "@pushrocks/lik": "^6.0.0",
     "@pushrocks/smartdelay": "^2.0.13",
     "@pushrocks/smartpromise": "^3.1.7",
-    "@pushrocks/smartrequest": "^2.0.6",
+    "@pushrocks/smartrequest": "^2.0.10",
     "@pushrocks/smartstring": "^4.0.2",
-    "@tsclass/tsclass": "^4.0.17",
+    "@tsclass/tsclass": "^4.0.19",
     "@types/ws": "^8.5.3",
     "ws": "^8.8.1"
   },

ts/00_commitinfo_data.ts

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

ts/smartproxy.classes.networkproxy.ts

@@ -186,7 +186,11 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
           destinationUrl,
           {
             method: originRequest.method,
-            headers: originRequest.headers,
+            headers: {
+              ...originRequest.headers,
+              'X-Forwarded-Host': originRequest.headers.host,
+              'X-Forwarded-Proto': 'https'
+            },
             keepAlive: true,
           },
           true, // lets make this streaming
@@ -241,47 +245,36 @@ 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', (ws: plugins.wsDefault) => {
+    wsServer.on('connection', async (wsIncoming: plugins.wsDefault, reqArg: plugins.http.IncomingMessage) => {
-      console.log('got connection for wsc');
+      console.log(`wss: got connection for wsc for https://${reqArg.headers.host}${reqArg.url}`);
-      let wscConnectedDeferred: plugins.smartpromise.Deferred<plugins.wsDefault>;
       
-      ws.on('message', async (message) => {
+      let wsOutgoing: plugins.wsDefault;
-        if (!wscConnectedDeferred) {
+      try {
-          wscConnectedDeferred = plugins.smartpromise.defer();
+        wsOutgoing = new plugins.wsDefault(`ws://${this.router.routeReq(reqArg).destinationIp}:${this.router.routeReq(reqArg).destinationPort}${reqArg.url}`);
-          const wsc = new plugins.wsDefault(this.router.routeWs(ws), {
+      } catch (err) {
-            headers: {
+        console.log(err);
-              Host: ws.url,
+        wsIncoming.terminate();
-            },
+        return;
-          });
+      }
 
-          wsc.on('open', () => {
+      wsIncoming.on("message", (message, isBinary) => {
-            wscConnectedDeferred.resolve(wsc);
+        console.log("client to upstream", message);
-          });
+        wsOutgoing.send(message, { binary: isBinary });
-        }
-        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();
-        });
       });
+    
+      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 = 61000;
+    this.httpsServer.keepAliveTimeout = 600 * 1000;
-    this.httpsServer.headersTimeout = 65000;
+    this.httpsServer.headersTimeout = 600 * 1000;
 
     this.httpsServer.on('connection', (connection: plugins.net.Socket) => {
       this.socketMap.add(connection);
@@ -309,7 +302,7 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
 
     this.httpsServer.listen(this.options.port);
     console.log(
-      `ProxyWorker -> OK: now listening for new connections on port ${this.options.port}`
+      `NetworkProxy -> OK: now listening for new connections on port ${this.options.port}`
     );
   }
 

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;
-  }
 }