3.0.22

.gitlab-ci.yml

@@ -12,20 +12,12 @@ stages:
   - release
   - metadata
 
+before_script:
+  - npm install -g @shipzone/npmci
+
 # ====================
 # security stage
 # ====================
-mirror:
-  stage: security
-  script:
-    - npmci git mirror
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
 auditProductionDependencies:
   image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
@@ -36,6 +28,7 @@ auditProductionDependencies:
     - npmci command npm audit --audit-level=high --only=prod --production
   tags:
     - docker
+  allow_failure: true
 
 auditDevDependencies:
   image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
@@ -96,10 +89,9 @@ codequality:
   only:
     - tags
   script:
-    - npmci command npm install -g tslint typescript
+    - npmci command npm install -g typescript
     - npmci npm prepare
     - npmci npm install
-    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
     - lossless
     - docker
@@ -119,11 +111,10 @@ trigger:
 pages:
   stage: metadata
   script:
-    - npmci node install lts
-    - npmci command npm install -g @gitzone/tsdoc
+    - npmci node install stable 
     - npmci npm prepare
     - npmci npm install
-    - npmci command tsdoc
+    - npmci command npm run buildDocs
   tags:
     - lossless
     - docker

.vscode/launch.json

@@ -2,28 +2,10 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "current file",
-      "type": "node",
+      "command": "npm test",
+      "name": "Run npm test",
       "request": "launch",
-      "args": [
-        "${relativeFile}"
-      ],
-      "runtimeArgs": ["-r", "@gitzone/tsrun"],
-      "cwd": "${workspaceRoot}",
-      "protocol": "inspector",
-      "internalConsoleOptions": "openOnSessionStart"
-    },
-    {
-      "name": "test.ts",
-      "type": "node",
-      "request": "launch",
-      "args": [
-        "test/test.ts"
-      ],
-      "runtimeArgs": ["-r", "@gitzone/tsrun"],
-      "cwd": "${workspaceRoot}",
-      "protocol": "inspector",
-      "internalConsoleOptions": "openOnSessionStart"
+      "type": "node-terminal"
     }
   ]
 }

npmextra.json

@@ -5,7 +5,7 @@
       "githost": "gitlab.com",
       "gitscope": "pushrocks",
       "gitrepo": "smartproxy",
-      "shortDescription": "a proxy for handling high workloads of proxying",
+      "description": "a proxy for handling high workloads of proxying",
       "npmPackagename": "@pushrocks/smartproxy",
       "license": "MIT",
       "projectDomain": "push.rocks"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartproxy",
-  "version": "2.0.16",
+  "version": "3.0.22",
   "private": false,
   "description": "a proxy for handling high workloads of proxying",
   "main": "dist_ts/index.js",
@@ -11,7 +11,8 @@
   "scripts": {
     "test": "(tstest test/)",
     "build": "(tsbuild --web --allowimplicitany)",
-    "format": "(gitzone format)"
+    "format": "(gitzone format)",
+    "buildDocs": "tsdoc"
   },
   "devDependencies": {
     "@gitzone/tsbuild": "^2.1.63",
@@ -21,9 +22,9 @@
   },
   "dependencies": {
     "@pushrocks/lik": "^6.0.0",
-    "@pushrocks/smartnetwork": "^3.0.0",
+    "@pushrocks/smartdelay": "^2.0.13",
     "@pushrocks/smartpromise": "^3.1.7",
-    "@pushrocks/smartrequest": "^1.1.56",
+    "@pushrocks/smartrequest": "^2.0.6",
     "@pushrocks/smartstring": "^4.0.2",
     "@tsclass/tsclass": "^4.0.17",
     "@types/ws": "^8.5.3",

test/test.ts

@@ -5,7 +5,7 @@ let testProxy: smartproxy.NetworkProxy;
 
 tap.test('first test', async () => {
   testProxy = new smartproxy.NetworkProxy({
-    port: 3001
+    port: 3001,
   });
   expect(testProxy).toBeInstanceOf(smartproxy.NetworkProxy);
 });

ts/00_commitinfo_data.ts

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

ts/index.ts

@@ -1,2 +1,3 @@
-export * from './smartproxy.classes.networkproxy.js'
+export * from './smartproxy.classes.networkproxy.js';
 export * from './smartproxy.portproxy.js';
+export * from './smartproxy.classes.sslredirect.js'

ts/smartproxy.classes.networkproxy.ts

@@ -6,7 +6,6 @@ export interface INetworkProxyOptions {
 }
 
 export class NetworkProxy {
-
   // INSTANCE
   public options: INetworkProxyOptions;
   public proxyConfigs: plugins.tsclass.network.IReverseProxyConfig[] = [];
@@ -118,10 +117,10 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
     `,
       },
       async (req, res) => {
-        console.log('got request');
-        const destinationConfig = this.router.routeReq(req);
-
-        // endRequest function
+        /**
+         * endRequest function
+         * can be used to prematurely end a request
+         */
         const endRequest = (
           statusArg: number = 404,
           messageArg: string = 'This route is not available on this server.',
@@ -131,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;
@@ -185,6 +193,16 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
             req.on('end', (data) => {
               request.end();
             });
+            req.on('error', () => {
+              request.end();
+            });
+            req.on('close', () => {
+              request.end();
+            });
+            req.on('timeout', () => {
+              request.end();
+              request.destroy();
+            })
           }
         );
         res.statusCode = response.statusCode;
@@ -201,6 +219,16 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
         response.on('end', () => {
           res.end();
         });
+        response.on('error', () => {
+          res.end();
+        });
+        response.on('close', () => {
+          res.end();
+        });
+        response.on('timeout', () => {
+          res.end();
+          res.destroy();
+        });
       }
     );
 
@@ -208,54 +236,64 @@ 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();
-
-      const wsc = new plugins.wsDefault(this.router.routeWs(ws), {
-        headers: {
-          Host: ws.url,
-        },
-      });
-      wsc.on('open', () => {
-        wscConnected.resolve();
-      });
+      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.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) => {
-        ws.emit('message', message);
-      });
+        wsc.on('message', (message) => {
+          ws.emit('message', message);
+        });
+  
+        // handle closing
+        const cleanUp = () => {
+          ws.close();
+          ws.terminate();
+          wsc.close();
+          wsc.terminate();
+        };
+  
+        ws.on('close', (message) => {
+          cleanUp();
+        });
 
-      // handle closing
-      const cleanUp = () => {
-        ws.removeAllListeners();
-        ws.close();
-        ws.terminate();
-        wsc.removeAllListeners();
-        wsc.close();
-        wsc.terminate();
-      };
-
-      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.on('connection', (connection: plugins.net.Socket) => {
-      connection.setTimeout(120000);
+      connection.setTimeout(60000);
       this.socketMap.add(connection);
+      console.log(`added connection. now ${this.socketMap.getArray().length} sockets connected.`);
+      const destroyConnection = () => {
+      }
       const cleanupConnection = () => {
         if (this.socketMap.checkForObject(connection)) {
           this.socketMap.remove(connection);
+          console.log(`removed connection. ${this.socketMap.getArray().length} sockets remaining.`);
           connection.end();
-          connection.removeAllListeners();
           connection.destroy();
+          console.log(`socket successfully destroyed.`);
+          /* plugins.smartdelay.delayFor(10000).then(() => {
+            connection.removeAllListeners();
+          }) */
         }
       };
       connection.on('close', () => {
@@ -273,10 +311,13 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
     });
 
     this.httpsServer.listen(this.options.port);
-    console.log(`ProxyWorker -> OK: now listening for new connections on port ${this.options.port}`);
+    console.log(
+      `ProxyWorker -> OK: now listening for new connections on port ${this.options.port}`
+    );
   }
 
   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) {
@@ -303,8 +344,12 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
       });
       this.httpsServer;
     }
-    /* this.httpsServer.close();
-    this.httpsServer.listen(this.port); */
+  }
+
+  public async addDefaultHeaders(headersArg: { [key: string]: string }) {
+    for (const headerKey of Object.keys(headersArg)) {
+      this.defaultHeaders[headerKey] = headersArg[headerKey];
+    }
   }
 
   public async stop() {

ts/smartproxy.classes.sslredirect.ts

@@ -0,0 +1,32 @@
+import * as plugins from './smartproxy.plugins.js';
+
+export class SslRedirect {
+  httpServer: plugins.http.Server;
+  port: number;
+  constructor(portArg: number) {
+    this.port = portArg;
+  }
+
+  public async start() {
+    this.httpServer = plugins.http.createServer((request, response) => {
+      const requestUrl = new URL(request.url, `http://${request.headers.host}`);
+      const completeUrlWithoutProtocol = `${requestUrl.host}${requestUrl.pathname}${requestUrl.search}`;
+      const redirectUrl = `https://${completeUrlWithoutProtocol}`;
+      console.log(`Got http request for http://${completeUrlWithoutProtocol}`);
+      console.log(`Redirecting to ${redirectUrl}`);
+      response.writeHead(302, {
+        Location: redirectUrl,
+      });
+      response.end();
+    });
+    this.httpServer.listen(this.port);
+  }
+
+  public async stop() {
+    const done = plugins.smartpromise.defer();
+    this.httpServer.close(() => {
+      done.resolve();
+    });
+    await done.promise;
+  }
+}

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

ts/smartproxy.portproxy.ts

@@ -1,30 +1,17 @@
 import * as plugins from './smartproxy.plugins.js';
 import * as net from 'net';
-let netServer: plugins.net.Server;
-let httpServer: plugins.http.Server;
 
 export class PortProxy {
+  netServer: plugins.net.Server;
   fromPort: number;
   toPort: number;
 
   constructor(fromPortArg: number, toPortArg: number) {
     this.fromPort = fromPortArg;
-    this.toPort = toPortArg
+    this.toPort = toPortArg;
   }
 
-  public async start () {
-    httpServer = plugins.http.createServer((request, response) => {
-      const requestUrl = new URL(request.url, `http://${request.headers.host}`);
-      const completeUrlWithoutProtocol = `${requestUrl.host}${requestUrl.pathname}${requestUrl.search}`;
-      const redirectUrl = `https://${completeUrlWithoutProtocol}`;
-      console.log(`Got http request for http://${completeUrlWithoutProtocol}`);
-      console.log(`Redirecting to ${redirectUrl}`);
-      response.writeHead(302, {
-        Location: redirectUrl,
-      });
-      response.end();
-    });
-    httpServer.listen(this.fromPort);
+  public async start() {
     const cleanUpSockets = (from: plugins.net.Socket, to: plugins.net.Socket) => {
       from.end();
       to.end();
@@ -34,8 +21,8 @@ export class PortProxy {
       to.unpipe();
       from.destroy();
       to.destroy();
-    }
-    netServer = net
+    };
+    this.netServer = net
       .createServer((from) => {
         const to = net.createConnection({
           host: 'localhost',
@@ -64,10 +51,10 @@ export class PortProxy {
         });
         from.on('end', () => {
           cleanUpSockets(from, to);
-        })
+        });
         to.on('end', () => {
           cleanUpSockets(from, to);
-        })
+        });
       })
       .listen(this.fromPort);
     console.log(`PortProxy -> OK: Now listening on port ${this.fromPort}`);
@@ -75,11 +62,9 @@ export class PortProxy {
 
   public async stop() {
     const done = plugins.smartpromise.defer();
-    httpServer.close(() => {
-      netServer.close(() => {
-        done.resolve();
-      });
+    this.netServer.close(() => {
+      done.resolve();
     });
     await done.promise;
   }
-};
+}