3.0.30

package-lock.json

@@ -1,17 +1,18 @@
 {
   "name": "@pushrocks/smartproxy",
-  "version": "3.0.7",
+  "version": "3.0.30",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@pushrocks/smartproxy",
-      "version": "3.0.7",
+      "version": "3.0.30",
       "license": "MIT",
       "dependencies": {
         "@pushrocks/lik": "^6.0.0",
+        "@pushrocks/smartdelay": "^2.0.13",
         "@pushrocks/smartpromise": "^3.1.7",
-        "@pushrocks/smartrequest": "^2.0.0",
+        "@pushrocks/smartrequest": "^2.0.6",
         "@pushrocks/smartstring": "^4.0.2",
         "@tsclass/tsclass": "^4.0.17",
         "@types/ws": "^8.5.3",
@@ -1554,9 +1555,9 @@
       }
     },
     "node_modules/@pushrocks/smartrequest": {
-      "version": "2.0.0",
+      "version": "2.0.6",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartrequest/-/smartrequest-2.0.0.tgz",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartrequest/-/smartrequest-2.0.6.tgz",
-      "integrity": "sha512-Xmi+2xYvy67aOMg+XO08RaIZ2QjZZonvz7lEFx5esFzu4LIbwYOzN3GEmZ6/gz9yqdGCBknUxTSLfKCO/hZgTg==",
+      "integrity": "sha512-rfE7vSr3ZrXLddCiyddU0vpL1ok0PbwL6bpd2gPNzwpCx4+q+4khQFADMKprzykRtQ4jYdKdhplJzwJGxBMI+g==",
       "license": "MIT",
       "dependencies": {
         "@pushrocks/smartpromise": "^3.1.7",
@@ -9973,9 +9974,9 @@
       }
     },
     "@pushrocks/smartrequest": {
-      "version": "2.0.0",
+      "version": "2.0.6",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartrequest/-/smartrequest-2.0.0.tgz",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartrequest/-/smartrequest-2.0.6.tgz",
-      "integrity": "sha512-Xmi+2xYvy67aOMg+XO08RaIZ2QjZZonvz7lEFx5esFzu4LIbwYOzN3GEmZ6/gz9yqdGCBknUxTSLfKCO/hZgTg==",
+      "integrity": "sha512-rfE7vSr3ZrXLddCiyddU0vpL1ok0PbwL6bpd2gPNzwpCx4+q+4khQFADMKprzykRtQ4jYdKdhplJzwJGxBMI+g==",
       "requires": {
         "@pushrocks/smartpromise": "^3.1.7",
         "@pushrocks/smarturl": "^3.0.2",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartproxy",
-  "version": "3.0.7",
+  "version": "3.0.30",
   "private": false,
   "description": "a proxy for handling high workloads of proxying",
   "main": "dist_ts/index.js",
@@ -22,8 +22,9 @@
   },
   "dependencies": {
     "@pushrocks/lik": "^6.0.0",
+    "@pushrocks/smartdelay": "^2.0.13",
     "@pushrocks/smartpromise": "^3.1.7",
-    "@pushrocks/smartrequest": "^2.0.0",
+    "@pushrocks/smartrequest": "^2.0.6",
     "@pushrocks/smartstring": "^4.0.2",
     "@tsclass/tsclass": "^4.0.17",
     "@types/ws": "^8.5.3",

ts/00_commitinfo_data.ts

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

ts/smartproxy.classes.networkproxy.ts

@@ -117,9 +117,6 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
     `,
       },
       async (req, res) => {
-        console.log('got request');
-        const destinationConfig = this.router.routeReq(req);
-
         /**
          * endRequest function
          * can be used to prematurely end a request
@@ -133,6 +130,15 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
           res.end(messageArg);
         };
 
+        console.log(`got request: ${req.headers.host}${plugins.url.parse(req.url).path}`);
+        const destinationConfig = this.router.routeReq(req);
+
+        if (!destinationConfig) {
+          console.log(`${req.headers.host} can't be routed properly. Terminating request.`);
+          endRequest();
+          return;
+        }
+
         // authentication
         if (destinationConfig.authentication) {
           const authInfo = destinationConfig.authentication;
@@ -187,6 +193,15 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
             req.on('end', (data) => {
               request.end();
             });
+            req.on('error', () => {
+              request.end();
+            });
+            req.on('close', () => {
+              request.end();
+            });
+            req.on('timeout', () => {
+              request.end();
+            })
           }
         );
         res.statusCode = response.statusCode;
@@ -203,6 +218,16 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
         response.on('end', () => {
           res.end();
         });
+        response.on('error', () => {
+          res.end();
+        });
+        response.on('close', () => {
+          res.end();
+        });
+        response.on('timeout', () => {
+          res.end();
+        });
+
       }
     );
 
@@ -210,53 +235,52 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
     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();
+      let wscConnectedDeferred: plugins.smartpromise.Deferred<plugins.wsDefault>;
-
-      const wsc = new plugins.wsDefault(this.router.routeWs(ws), {
-        headers: {
-          Host: ws.url,
-        },
-      });
-      wsc.on('open', () => {
-        wscConnected.resolve();
-      });
 
       ws.on('message', async (message) => {
-        await wscConnected.promise;
+        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) => {
-      wsc.on('message', (message) => {
+          ws.emit('message', message);
-        ws.emit('message', message);
+        });
-      });
+  
+        // handle closing
+        const cleanUp = () => {
+          ws.close();
+          wsc.close();
+        };
+  
+        ws.on('close', (message) => {
+          cleanUp();
+        });
 
-      // handle closing
+        wsc.on('close', (message) => {
-      const cleanUp = () => {
+          cleanUp();
-        ws.removeAllListeners();
+        });
-        ws.close();
-        ws.terminate();
-        wsc.removeAllListeners();
-        wsc.close();
-        wsc.terminate();
-      };
-
-      ws.on('close', (message) => {
-        cleanUp();
-      });
-      wsc.on('close', (message) => {
-        cleanUp();
       });
     });
     this.httpsServer.keepAliveTimeout = 61000;
     this.httpsServer.headersTimeout = 65000;
 
     this.httpsServer.on('connection', (connection: plugins.net.Socket) => {
-      connection.setTimeout(120000);
       this.socketMap.add(connection);
+      console.log(`added connection. now ${this.socketMap.getArray().length} sockets connected.`);
       const cleanupConnection = () => {
         if (this.socketMap.checkForObject(connection)) {
           this.socketMap.remove(connection);
-          connection.end();
+          console.log(`removed connection. ${this.socketMap.getArray().length} sockets remaining.`);
-          connection.removeAllListeners();
           connection.destroy();
         }
       };
@@ -271,7 +295,7 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
       });
       connection.on('timeout', () => {
         cleanupConnection();
-      });
+      })
     });
 
     this.httpsServer.listen(this.options.port);
@@ -281,6 +305,7 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
   }
 
   public async updateProxyConfigs(proxyConfigsArg: plugins.tsclass.network.IReverseProxyConfig[]) {
+    console.log(`got new proxy configs`);
     this.proxyConfigs = proxyConfigsArg;
     this.router.setNewProxyConfigs(proxyConfigsArg);
     for (const hostCandidate of this.proxyConfigs) {

ts/smartproxy.plugins.ts

@@ -13,11 +13,12 @@ export { tsclass };
 
 // pushrocks scope
 import * as lik from '@pushrocks/lik';
+import * as smartdelay from '@pushrocks/smartdelay';
 import * as smartpromise from '@pushrocks/smartpromise';
 import * as smartrequest from '@pushrocks/smartrequest';
 import * as smartstring from '@pushrocks/smartstring';
 
-export { lik, smartrequest, smartpromise, smartstring };
+export { lik, smartdelay, smartrequest, smartpromise, smartstring };
 
 // third party scope
 import * as ws from 'ws';