@push.rocks/smartproxy 3.0.61 → 3.1.0

package/dist_ts/00_commitinfo_data.js

@@ -3,7 +3,7 @@
  */
 export const commitinfo = {
     name: '@push.rocks/smartproxy',
-    version: '3.0.61',
+    version: '3.1.0',
     description: 'a proxy for handling high workloads of proxying'
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLGlEQUFpRDtDQUMvRCxDQUFBIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLGlEQUFpRDtDQUMvRCxDQUFBIn0=

package/dist_ts/smartproxy.classes.networkproxy.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
 import * as plugins from './smartproxy.plugins.js';
 import { ProxyRouter } from './smartproxy.classes.router.js';
 export interface INetworkProxyOptions {
@@ -14,6 +15,7 @@ export declare class NetworkProxy {
     defaultHeaders: {
         [key: string]: string;
     };
+    heartbeatInterval: NodeJS.Timeout;
     alreadyAddedReverseConfigs: {
         [hostName: string]: plugins.tsclass.network.IReverseProxyConfig;
     };

package/dist_ts/smartproxy.classes.networkproxy.js

@@ -168,7 +168,7 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
                         'X-Forwarded-Proto': 'https',
                     },
                     keepAlive: true,
-                }, true, // lets make this streaming
+                }, true, // lets make this streaming (keepAlive)
                 (proxyRequest) => {
                     originRequest.on('data', (data) => {
                         proxyRequest.write(data);
@@ -222,8 +222,28 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
         });
         // Enable websockets
         const wsServer = new plugins.ws.WebSocketServer({ server: this.httpsServer });
+        // Set up the heartbeat interval
+        this.heartbeatInterval = setInterval(() => {
+            wsServer.clients.forEach((ws) => {
+                const wsIncoming = ws;
+                if (!wsIncoming.lastPong) {
+                    wsIncoming.lastPong = Date.now();
+                }
+                if (Date.now() - wsIncoming.lastPong > 5 * 60 * 1000) {
+                    console.log('Terminating websocket due to missing pong for 5 minutes.');
+                    wsIncoming.terminate();
+                }
+                else {
+                    wsIncoming.ping();
+                }
+            });
+        }, 60000); // runs every 1 minute
         wsServer.on('connection', async (wsIncoming, reqArg) => {
             console.log(`wss proxy: got connection for wsc for https://${reqArg.headers.host}${reqArg.url}`);
+            wsIncoming.lastPong = Date.now();
+            wsIncoming.on('pong', () => {
+                wsIncoming.lastPong = Date.now();
+            });
             let wsOutgoing;
             const outGoingDeferred = plugins.smartpromise.defer();
             try {
@@ -305,7 +325,6 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
         this.proxyConfigs = proxyConfigsArg;
         this.router.setNewProxyConfigs(proxyConfigsArg);
         for (const hostCandidate of this.proxyConfigs) {
-            // console.log(hostCandidate);
             const existingHostNameConfig = this.alreadyAddedReverseConfigs[hostCandidate.hostName];
             if (!existingHostNameConfig) {
                 this.alreadyAddedReverseConfigs[hostCandidate.hostName] = hostCandidate;
@@ -339,7 +358,8 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
             socket.destroy();
         });
         await done.promise;
+        clearInterval(this.heartbeatInterval);
         console.log('NetworkProxy -> OK: Server has been stopped and all connections closed.');
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartproxy.classes.networkproxy.js","sourceRoot":"","sources":["../ts/smartproxy.classes.networkproxy.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartproxy.classes.networkproxy.js","sourceRoot":"","sources":["../ts/smartproxy.classes.networkproxy.ts"],"names":[],"mappings":"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"}

package/package.json

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

package/ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@push.rocks/smartproxy',
-  version: '3.0.61',
+  version: '3.1.0',
   description: 'a proxy for handling high workloads of proxying'
 }

package/ts/smartproxy.classes.networkproxy.ts

@@ -5,6 +5,10 @@ export interface INetworkProxyOptions {
   port: number;
 }
 
+interface WebSocketWithHeartbeat extends plugins.wsDefault {
+  lastPong: number;
+}
+
 export class NetworkProxy {
   // INSTANCE
   public options: INetworkProxyOptions;
@@ -13,6 +17,7 @@ export class NetworkProxy {
   public router = new ProxyRouter();
   public socketMap = new plugins.lik.ObjectMap<plugins.net.Socket>();
   public defaultHeaders: { [key: string]: string } = {};
+  public heartbeatInterval: NodeJS.Timeout;
 
   public alreadyAddedReverseConfigs: {
     [hostName: string]: plugins.tsclass.network.IReverseProxyConfig;
@@ -198,7 +203,7 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
               },
               keepAlive: true,
             },
-            true, // lets make this streaming
+            true, // lets make this streaming (keepAlive)
             (proxyRequest) => {
               originRequest.on('data', (data) => {
                 proxyRequest.write(data);
@@ -254,13 +259,35 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
 
     // Enable websockets
     const wsServer = new plugins.ws.WebSocketServer({ server: this.httpsServer });
+
+    // Set up the heartbeat interval
+    this.heartbeatInterval = setInterval(() => {
+      wsServer.clients.forEach((ws: plugins.wsDefault) => {
+        const wsIncoming = ws as WebSocketWithHeartbeat;
+        if (!wsIncoming.lastPong) {
+          wsIncoming.lastPong = Date.now();
+        }
+        if (Date.now() - wsIncoming.lastPong > 5 * 60 * 1000) {
+          console.log('Terminating websocket due to missing pong for 5 minutes.');
+          wsIncoming.terminate();
+        } else {
+          wsIncoming.ping();
+        }
+      });
+    }, 60000); // runs every 1 minute
+
     wsServer.on(
       'connection',
-      async (wsIncoming: plugins.wsDefault, reqArg: plugins.http.IncomingMessage) => {
+      async (wsIncoming: WebSocketWithHeartbeat, reqArg: plugins.http.IncomingMessage) => {
         console.log(
           `wss proxy: got connection for wsc for https://${reqArg.headers.host}${reqArg.url}`
         );
 
+        wsIncoming.lastPong = Date.now();
+        wsIncoming.on('pong', () => {
+          wsIncoming.lastPong = Date.now();
+        });
+
         let wsOutgoing: plugins.wsDefault;
 
         const outGoingDeferred = plugins.smartpromise.defer();
@@ -315,8 +342,6 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
         };
         wsOutgoing.on('error', () => terminateWsIncoming());
         wsOutgoing.on('close', () => terminateWsIncoming());
-
-        
       }
     );
 
@@ -358,8 +383,6 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
     this.proxyConfigs = proxyConfigsArg;
     this.router.setNewProxyConfigs(proxyConfigsArg);
     for (const hostCandidate of this.proxyConfigs) {
-      // console.log(hostCandidate);
-
       const existingHostNameConfig = this.alreadyAddedReverseConfigs[hostCandidate.hostName];
 
       if (!existingHostNameConfig) {
@@ -397,6 +420,7 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
       socket.destroy();
     });
     await done.promise;
+    clearInterval(this.heartbeatInterval);
     console.log('NetworkProxy -> OK: Server has been stopped and all connections closed.');
   }
-}
+}