3.0.20

.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,36 +1,34 @@
 {
   "name": "@pushrocks/smartproxy",
-  "version": "2.0.9",
+  "version": "3.0.20",
   "private": false,
   "description": "a proxy for handling high workloads of proxying",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "author": "Lossless GmbH",
   "license": "MIT",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild --web)",
-    "format": "(gitzone format)"
+    "build": "(tsbuild --web --allowimplicitany)",
+    "format": "(gitzone format)",
+    "buildDocs": "tsdoc"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.25",
-    "@gitzone/tstest": "^1.0.52",
-    "@pushrocks/tapbundle": "^3.2.10",
-    "@types/node": "^14.14.22",
-    "tslint": "^6.1.3",
-    "tslint-config-prettier": "^1.15.0"
+    "@gitzone/tsbuild": "^2.1.63",
+    "@gitzone/tstest": "^1.0.72",
+    "@pushrocks/tapbundle": "^5.0.4",
+    "@types/node": "^18.6.2"
   },
   "dependencies": {
-    "@pushrocks/lik": "^4.0.20",
-    "@pushrocks/smartnetwork": "^1.1.22",
-    "@pushrocks/smartpromise": "^3.1.3",
-    "@pushrocks/smartrequest": "^1.1.51",
-    "@pushrocks/smartspawn": "^2.0.9",
-    "@pushrocks/smartstring": "^3.0.24",
-    "@pushrocks/smartsystem": "^2.0.9",
-    "@tsclass/tsclass": "^3.0.29",
-    "@types/ws": "^7.4.0",
-    "ws": "^7.4.2"
+    "@pushrocks/lik": "^6.0.0",
+    "@pushrocks/smartdelay": "^2.0.13",
+    "@pushrocks/smartpromise": "^3.1.7",
+    "@pushrocks/smartrequest": "^2.0.6",
+    "@pushrocks/smartstring": "^4.0.2",
+    "@tsclass/tsclass": "^4.0.17",
+    "@types/ws": "^8.5.3",
+    "ws": "^8.8.1"
   },
   "files": [
     "ts/**/*",

test/test.ts

@@ -1,10 +1,13 @@
 import { expect, tap } from '@pushrocks/tapbundle';
-import * as smartproxy from '../ts/index';
+import * as smartproxy from '../ts/index.js';
 
-let testProxy: smartproxy.SmartProxy;
+let testProxy: smartproxy.NetworkProxy;
 
 tap.test('first test', async () => {
-  testProxy = new smartproxy.SmartProxy({});
+  testProxy = new smartproxy.NetworkProxy({
+    port: 3001,
+  });
+  expect(testProxy).toBeInstanceOf(smartproxy.NetworkProxy);
 });
 
 tap.test('should start the testproxy', async () => {
@@ -12,9 +15,9 @@ tap.test('should start the testproxy', async () => {
 });
 
 tap.test('should supply reverse proxy config', async () => {
-  testProxy.updateReverseConfigs([
+  testProxy.updateProxyConfigs([
     {
-      destinationIp: 'localhost',
+      destinationIp: '127.0.0.1',
       destinationPort: '3000',
       hostName: 'push.rocks',
       privateKey: `-----BEGIN PRIVATE KEY-----

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@pushrocks/smartproxy',
+  version: '3.0.20',
+  description: 'a proxy for handling high workloads of proxying'
+}

ts/index.ts

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

ts/smartproxy.classes.networkproxy.ts

@@ -1,14 +1,26 @@
-import { expose } from '@pushrocks/smartspawn';
-import * as plugins from './smartproxy.plugins';
-import { SmartproxyRouter } from './smartproxy.classes.router';
+import * as plugins from './smartproxy.plugins.js';
+import { ProxyRouter } from './smartproxy.classes.router.js';
 
-export class ProxyWorker {
+export interface INetworkProxyOptions {
+  port: number;
+}
+
+export class NetworkProxy {
+  // INSTANCE
+  public options: INetworkProxyOptions;
   public proxyConfigs: plugins.tsclass.network.IReverseProxyConfig[] = [];
-  public httpsServer: plugins.https.Server; // | plugins.http.Server;
-  public port = 8001;
-  public router = new SmartproxyRouter();
+  public httpsServer: plugins.https.Server;
+  public router = new ProxyRouter();
   public socketMap = new plugins.lik.ObjectMap<plugins.net.Socket>();
-  public defaultHeaders: {[key: string]: string} = {};
+  public defaultHeaders: { [key: string]: string } = {};
+
+  public alreadyAddedReverseConfigs: {
+    [hostName: string]: plugins.tsclass.network.IReverseProxyConfig;
+  } = {};
+
+  constructor(optionsArg: INetworkProxyOptions) {
+    this.options = optionsArg;
+  }
 
   /**
    * starts the proxyInstance
@@ -105,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.',
@@ -118,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;
@@ -162,6 +183,7 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
           {
             method: req.method,
             headers: req.headers,
+            keepAlive: true,
           },
           true, // lets make this streaming
           (request) => {
@@ -171,13 +193,22 @@ 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;
         console.log(response.statusCode);
         for (const defaultHeader of Object.keys(this.defaultHeaders)) {
           res.setHeader(defaultHeader, this.defaultHeaders[defaultHeader]);
-        } 
+        }
         for (const header of Object.keys(response.headers)) {
           res.setHeader(header, response.headers[header]);
         }
@@ -187,11 +218,20 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
         response.on('end', () => {
           res.end();
         });
+        response.on('error', () => {
+          res.end();
+        });
+        response.on('close', () => {
+          res.end();
+        });
+        response.on('timeout', () => {
+          res.end();
+        });
       }
     );
 
     // Enable websockets
-    const wss = new plugins.ws.Server({ server: this.httpsServer });
+    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();
@@ -201,6 +241,7 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
           Host: ws.url,
         },
       });
+      
       wsc.on('open', () => {
         wscConnected.resolve();
       });
@@ -214,39 +255,101 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
       });
 
       // handle closing
-      ws.on('close', (message) => {
+      const cleanUp = () => {
+        ws.close();
+        ws.terminate();
         wsc.close();
+        wsc.terminate();
+      };
+
+      ws.on('close', (message) => {
+        cleanUp();
       });
       wsc.on('close', (message) => {
-        ws.close();
+        cleanUp();
       });
     });
     this.httpsServer.keepAliveTimeout = 61000;
     this.httpsServer.headersTimeout = 65000;
 
-    this.httpsServer.on('connection', (connection) => {
+    this.httpsServer.on('connection', (connection: plugins.net.Socket) => {
+      connection.setTimeout(60000);
+      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.on('close', () => {
-        this.socketMap.remove(connection);
+        cleanupConnection();
+      });
+      connection.on('error', () => {
+        cleanupConnection();
+      });
+      connection.on('end', () => {
+        cleanupConnection();
+      });
+      connection.on('timeout', () => {
+        cleanupConnection();
       });
     });
 
-    this.httpsServer.listen(this.port);
-    console.log(`ProxyWorker -> OK: now listening for new connections on port ${this.port}`);
+    this.httpsServer.listen(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) {
       // console.log(hostCandidate);
+
+      const existingHostNameConfig = this.alreadyAddedReverseConfigs[hostCandidate.hostName];
+
+      if (!existingHostNameConfig) {
+        this.alreadyAddedReverseConfigs[hostCandidate.hostName] = hostCandidate;
+      } else {
+        if (
+          existingHostNameConfig.publicKey === hostCandidate.publicKey &&
+          existingHostNameConfig.privateKey === hostCandidate.privateKey
+        ) {
+          continue;
+        } else {
+          this.alreadyAddedReverseConfigs[hostCandidate.hostName] = hostCandidate;
+        }
+      }
+
       this.httpsServer.addContext(hostCandidate.hostName, {
         cert: hostCandidate.publicKey,
         key: hostCandidate.privateKey,
       });
+      this.httpsServer;
+    }
+  }
+
+  public async addDefaultHeaders(headersArg: { [key: string]: string }) {
+    for (const headerKey of Object.keys(headersArg)) {
+      this.defaultHeaders[headerKey] = headersArg[headerKey];
     }
-    /* this.httpsServer.close();
-    this.httpsServer.listen(this.port); */
   }
 
   public async stop() {
@@ -260,23 +363,3 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
     await done.promise;
   }
 }
-
-const proxyWorkerInstance = new ProxyWorker();
-
-// the following is interesting for the master process only
-const proxyWorkerCalls = {
-  stop: async () => {
-    await proxyWorkerInstance.stop();
-  },
-  start: async () => {
-    await proxyWorkerInstance.start();
-  },
-  updateReverseConfigs: async (configArray: plugins.tsclass.network.IReverseProxyConfig[]) => {
-    await proxyWorkerInstance.updateProxyConfigs(configArray);
-  },
-  addDefaultHeaders: async (headers: {[key: string]: string}) => {}
-};
-
-export type TProxyWorkerCalls = typeof proxyWorkerCalls;
-expose(proxyWorkerCalls);
-console.log('ProxyWorker initialized');

ts/smartproxy.classes.router.ts

@@ -1,6 +1,6 @@
-import * as plugins from './smartproxy.plugins';
+import * as plugins from './smartproxy.plugins.js';
 
-export class SmartproxyRouter {
+export class ProxyRouter {
   public reverseProxyConfigs: plugins.tsclass.network.IReverseProxyConfig[] = [];
 
   /**

ts/smartproxy.classes.smartproxy.ts

@@ -1,57 +0,0 @@
-import * as plugins from './smartproxy.plugins';
-
-import { TProxyWorkerCalls } from './smartproxy.classes.proxyworker';
-import { TPortProxyCalls } from './smartproxy.portproxy';
-
-export interface ISmartProxyOptions {
-  port?: number;
-}
-
-export class SmartProxy {
-  public smartsystem = new plugins.smartsystem.Smartsystem();
-  public reverseConfigs: plugins.tsclass.network.IReverseProxyConfig[] = [];
-  public proxyWorkerFunctions: plugins.smartspawn.ModuleThread<TProxyWorkerCalls>;
-  public portProxyFunctions: plugins.smartspawn.ModuleThread<TPortProxyCalls>;
-
-  public options: ISmartProxyOptions;
-
-  constructor(optionsArg: ISmartProxyOptions = {}) {
-    this.options = optionsArg;
-  }
-
-  public async updateReverseConfigs(
-    reverseConfigsArg: plugins.tsclass.network.IReverseProxyConfig[]
-  ) {
-    // TODO search for old hostCandidates with that target
-    this.reverseConfigs = reverseConfigsArg;
-    if (this.proxyWorkerFunctions) {
-      await this.proxyWorkerFunctions.updateReverseConfigs(this.reverseConfigs);
-    }
-  }
-
-  public async start() {
-    this.proxyWorkerFunctions = await plugins.smartspawn.spawn<TProxyWorkerCalls>(
-      new plugins.smartspawn.Worker('./smartproxy.classes.proxyworker')
-    );
-    this.proxyWorkerFunctions.updateReverseConfigs(this.reverseConfigs);
-
-    this.portProxyFunctions = await plugins.smartspawn.spawn<TPortProxyCalls>(
-      new plugins.smartspawn.Worker('./smartproxy.portproxy')
-    );
-
-    await this.portProxyFunctions.start(this.options.port);
-    await this.proxyWorkerFunctions.start();
-
-    console.log('successfully spawned portproxy and proxyworkers!');
-  }
-
-  public async stop() {
-    await this.proxyWorkerFunctions.stop();
-    await plugins.smartspawn.Thread.terminate(this.proxyWorkerFunctions);
-    console.log('proxy worker stopped');
-    await this.portProxyFunctions.stop();
-    await plugins.smartspawn.Thread.terminate(this.portProxyFunctions);
-    console.log('portproxy stopped');
-    console.log('Terminated all childs!');
-  }
-}

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,13 +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 smartspawn from '@pushrocks/smartspawn';
 import * as smartstring from '@pushrocks/smartstring';
-import * as smartsystem from '@pushrocks/smartsystem';
 
-export { lik, smartrequest, smartpromise, smartspawn, smartstring, smartsystem };
+export { lik, smartdelay, smartrequest, smartpromise, smartstring };
 
 // third party scope
 import * as ws from 'ws';

ts/smartproxy.portproxy.ts

@@ -1,23 +1,17 @@
-import * as plugins from './smartproxy.plugins';
-import { expose } from '@pushrocks/smartspawn';
+import * as plugins from './smartproxy.plugins.js';
 import * as net from 'net';
-let netServer: plugins.net.Server;
-let httpServer: plugins.http.Server;
 
-const portProxyCalls = {
-  start: async (portArg = 8000) => {
-    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(7999);
+export class PortProxy {
+  netServer: plugins.net.Server;
+  fromPort: number;
+  toPort: number;
+
+  constructor(fromPortArg: number, toPortArg: number) {
+    this.fromPort = fromPortArg;
+    this.toPort = toPortArg;
+  }
+
+  public async start() {
     const cleanUpSockets = (from: plugins.net.Socket, to: plugins.net.Socket) => {
       from.end();
       to.end();
@@ -27,12 +21,12 @@ const portProxyCalls = {
       to.unpipe();
       from.destroy();
       to.destroy();
-    }
-    netServer = net
+    };
+    this.netServer = net
       .createServer((from) => {
         const to = net.createConnection({
           host: 'localhost',
-          port: 8001,
+          port: this.toPort,
         });
         from.setTimeout(120000);
         from.pipe(to);
@@ -57,26 +51,20 @@ const portProxyCalls = {
         });
         from.on('end', () => {
           cleanUpSockets(from, to);
-        })
+        });
         to.on('end', () => {
           cleanUpSockets(from, to);
-        })
+        });
       })
-      .listen(portArg);
-    console.log(`PortProxy -> OK: Now listening on port ${portArg}`);
-  },
-  stop: async () => {
+      .listen(this.fromPort);
+    console.log(`PortProxy -> OK: Now listening on port ${this.fromPort}`);
+  }
+
+  public async stop() {
     const done = plugins.smartpromise.defer();
-    httpServer.close(() => {
-      netServer.close(() => {
-        done.resolve();
-      });
+    this.netServer.close(() => {
+      done.resolve();
     });
     await done.promise;
-  },
-};
-
-export type TPortProxyCalls = typeof portProxyCalls;
-expose(portProxyCalls);
-
-console.log('PortProxy Initialized');
+  }
+}

tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "nodenext",
+    "esModuleInterop": true
+  }
+}

tslint.json

@@ -1,17 +0,0 @@
-{
-  "extends": ["tslint:latest", "tslint-config-prettier"],
-  "rules": {
-    "semicolon": [true, "always"],
-    "no-console": false,
-    "ordered-imports": false,
-    "object-literal-sort-keys": false,
-    "member-ordering": {
-      "options":{
-        "order": [
-          "static-method"
-        ]
-      }
-    }
-  },
-  "defaultSeverity": "warning"
-}