3.0.43

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartproxy",
-  "version": "3.0.18",
+  "version": "3.0.43",
   "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/tstest": "^1.0.72",
+    "@gitzone/tsbuild": "^2.1.65",
+    "@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.5",
+    "@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.18',
+  version: '3.0.43',
   description: 'a proxy for handling high workloads of proxying'
 }

ts/smartproxy.classes.networkproxy.ts

@@ -116,26 +116,30 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
 -----END CERTIFICATE-----
     `,
       },
-      async (req, res) => {
+      async (originRequest, originResponse) => {
         /**
          * endRequest function
          * can be used to prematurely end a request
          */
-        const endRequest = (
+        const endOriginReqRes = (
           statusArg: number = 404,
           messageArg: string = 'This route is not available on this server.',
           headers: plugins.http.OutgoingHttpHeaders = {}
         ) => {
-          res.writeHead(statusArg, messageArg);
-          res.end(messageArg);
+          originResponse.writeHead(statusArg, messageArg);
+          originResponse.end(messageArg);
+          if (originRequest.socket !== originResponse.socket) {
+            console.log('hey, something is strange.')
+          }
+          originResponse.destroy();
         };
 
-        console.log(`got request: ${req.headers.host}${plugins.url.parse(req.url).path}`);
-        const destinationConfig = this.router.routeReq(req);
+        console.log(`got request: ${originRequest.headers.host}${plugins.url.parse(originRequest.url).path}`);
+        const destinationConfig = this.router.routeReq(originRequest);
 
         if (!destinationConfig) {
-          console.log(`${req.headers.host} can't be routed properly. Terminating request.`);
-          endRequest();
+          console.log(`${originRequest.headers.host} can't be routed properly. Terminating request.`);
+          endOriginReqRes();
           return;
         }
 
@@ -144,14 +148,14 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
           const authInfo = destinationConfig.authentication;
           switch (authInfo.type) {
             case 'Basic':
-              const authHeader = req.headers.authorization;
+              const authHeader = originRequest.headers.authorization;
               if (authHeader) {
                 if (!authHeader.includes('Basic ')) {
-                  return endRequest(401, 'Authentication required', {
+                  return endOriginReqRes(401, 'Authentication required', {
                     'WWW-Authenticate': 'Basic realm="Access to the staging site", charset="UTF-8"',
                   });
                 }
-                const authStringBase64 = req.headers.authorization.replace('Basic ', '');
+                const authStringBase64 = originRequest.headers.authorization.replace('Basic ', '');
                 const authString: string = plugins.smartstring.base64.decode(authStringBase64);
                 const userPassArray = authString.split(':');
                 const user = userPassArray[0];
@@ -159,12 +163,12 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
                 if (user === authInfo.user && pass === authInfo.pass) {
                   console.log('request successfully authenticated');
                 } else {
-                  return endRequest(403, 'Forbidden: Wrong credentials');
+                  return endOriginReqRes(403, 'Forbidden: Wrong credentials');
                 }
               }
               break;
             default:
-              return endRequest(
+              return endOriginReqRes(
                 403,
                 'Forbidden: unsupported authentication method configured. Please report to the admin.'
               );
@@ -173,129 +177,120 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
 
         let destinationUrl: string;
         if (destinationConfig) {
-          destinationUrl = `http://${destinationConfig.destinationIp}:${destinationConfig.destinationPort}${req.url}`;
+          destinationUrl = `http://${destinationConfig.destinationIp}:${destinationConfig.destinationPort}${originRequest.url}`;
         } else {
-          return endRequest();
+          return endOriginReqRes();
         }
         console.log(destinationUrl);
-        const response = await plugins.smartrequest.request(
+        const proxyResponse = await plugins.smartrequest.request(
           destinationUrl,
           {
-            method: req.method,
-            headers: req.headers,
+            method: originRequest.method,
+            headers: {
+              ...originRequest.headers,
+              'X-Forwarded-Host': originRequest.headers.host,
+              'X-Forwarded-Proto': 'https'
+            },
             keepAlive: true,
           },
           true, // lets make this streaming
-          (request) => {
-            req.setTimeout(60000);
-            req.on('data', (data) => {
-              request.write(data);
+          (proxyRequest) => {
+            originRequest.on('data', (data) => {
+              proxyRequest.write(data);
             });
-            req.on('end', (data) => {
-              request.end();
+            originRequest.on('end', (data) => {
+              proxyRequest.end();
             });
-            req.on('error', () => {
-              request.end();
+            originRequest.on('error', () => {
+              proxyRequest.end();
             });
-            req.on('close', () => {
-              request.end();
+            originRequest.on('close', () => {
+              proxyRequest.end();
             });
-            req.on('timeout', () => {
-              request.end();
+            originRequest.on('timeout', () => {
+              proxyRequest.end();
+              originRequest.destroy();
+            });
+            proxyRequest.on('error', () => {
+              endOriginReqRes();
             })
           }
         );
-        res.statusCode = response.statusCode;
-        console.log(response.statusCode);
+        originResponse.statusCode = proxyResponse.statusCode;
+        console.log(proxyResponse.statusCode);
         for (const defaultHeader of Object.keys(this.defaultHeaders)) {
-          res.setHeader(defaultHeader, this.defaultHeaders[defaultHeader]);
+          originResponse.setHeader(defaultHeader, this.defaultHeaders[defaultHeader]);
         }
-        for (const header of Object.keys(response.headers)) {
-          res.setHeader(header, response.headers[header]);
+        for (const header of Object.keys(proxyResponse.headers)) {
+          originResponse.setHeader(header, proxyResponse.headers[header]);
         }
-        response.on('data', (data) => {
-          res.write(data);
+        proxyResponse.on('data', (data) => {
+          originResponse.write(data);
         });
-        response.on('end', () => {
-          res.end();
+        proxyResponse.on('end', () => {
+          originResponse.end();
         });
-        response.on('error', () => {
-          res.end();
+        proxyResponse.on('error', () => {
+          originResponse.destroy();
         });
-        response.on('close', () => {
-          res.end();
+        proxyResponse.on('close', () => {
+          originResponse.end();
         });
-        response.on('timeout', () => {
-          res.end();
+        proxyResponse.on('timeout', () => {
+          originResponse.end();
+          originResponse.destroy()
         });
+
       }
     );
 
     // Enable websockets
-    const wss = new plugins.ws.WebSocketServer({ server: this.httpsServer });
-    wss.on('connection', (ws: plugins.wsDefault) => {
-      console.log('got connection for wsc');
-      const wscConnected = plugins.smartpromise.defer();
-
-      const wsc = new plugins.wsDefault(this.router.routeWs(ws), {
-        headers: {
-          Host: ws.url,
-        },
-      });
-      wsc.on('open', () => {
-        wscConnected.resolve();
-      });
+    const wss = new plugins.ws.WebSocketServer({ server: this.httpsServer  });
+    wss.on('connection', (ws: plugins.wsDefault, reqArg) => {
+      console.log(`got connection for wsc for https://${req.get('host')}${reqArg.url}`);
+      let wscConnectedDeferred: plugins.smartpromise.Deferred<plugins.wsDefault>;
 
       ws.on('message', async (message) => {
-        await wscConnected.promise;
+        if (!wscConnectedDeferred) {
+          wscConnectedDeferred = plugins.smartpromise.defer();
+          const wsc = new plugins.wsDefault(`${this.router.routeReq(reqArg)}${reqArg.url}`);
+    
+          wsc.on('open', () => {
+            wscConnectedDeferred.resolve(wsc);
+          });
+        }
+        const wsc = await wscConnectedDeferred.promise;
         wsc.emit('message', message);
-      });
-      wsc.on('message', (message) => {
-        ws.emit('message', message);
-      });
+        wsc.on('message', (message) => {
+          ws.emit('message', message);
+        });
+  
+        // handle closing
+        const cleanUp = () => {
+          ws.terminate();
+          wsc.terminate();
+        };
+  
+        ws.on('close', (message) => {
+          cleanUp();
+        });
 
-      // handle closing
-      const cleanUp = () => {
-        ws.close();
-        ws.terminate();
-        ws.removeAllListeners();
-        wsc.close();
-        wsc.terminate();
-        wsc.removeAllListeners();
-      };
-
-      ws.on('close', (message) => {
-        cleanUp();
-      });
-      wsc.on('close', (message) => {
-        cleanUp();
+        wsc.on('close', (message) => {
+          cleanUp();
+        });
       });
     });
-    this.httpsServer.keepAliveTimeout = 61000;
-    this.httpsServer.headersTimeout = 65000;
+    this.httpsServer.keepAliveTimeout = 600 * 1000;
+    this.httpsServer.headersTimeout = 600 * 1000;
 
     this.httpsServer.on('connection', (connection: plugins.net.Socket) => {
-      connection.setTimeout(61000);
-      let destroyed = false;
       this.socketMap.add(connection);
       console.log(`added connection. now ${this.socketMap.getArray().length} sockets connected.`);
-      const destroyConnection = () => {
-        if (!destroyed) {
-          destroyed = true;
-          connection.destroy();
-          console.log(`socket successfully destroyed.`);
-        }
-      }
       const cleanupConnection = () => {
         if (this.socketMap.checkForObject(connection)) {
           this.socketMap.remove(connection);
-          plugins.smartdelay.delayFor(200).then(() => {
-            destroyConnection();
-          });
           console.log(`removed connection. ${this.socketMap.getArray().length} sockets remaining.`);
-          connection.end(() => {
-            destroyConnection();
-          });
+          connection.destroy();
         }
       };
       connection.on('close', () => {
@@ -309,12 +304,12 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
       });
       connection.on('timeout', () => {
         cleanupConnection();
-      });
+      })
     });
 
     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;
-  }
 }