3.0.32

.gitignore

@@ -15,8 +15,6 @@ node_modules/
 
 # builds
 dist/
-dist_web/
-dist_serve/
-dist_ts_web/
+dist_*/
 
 # custom

.gitlab-ci.yml

@@ -12,29 +12,35 @@ stages:
   - release
   - metadata
 
+before_script:
+  - npm install -g @shipzone/npmci
+
 # ====================
 # security stage
 # ====================
-mirror:
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
-    - npmci git mirror
+    - npmci npm prepare
+    - npmci command npm install --production --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=prod --production
   tags:
-    - lossless
     - docker
-    - notpriv
+  allow_failure: true
 
-snyk:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:snyk
+auditDevDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
     - npmci command npm install --ignore-scripts
-    - npmci command snyk test
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=dev
   tags:
-    - lossless
     - docker
-    - notpriv
+  allow_failure: true
 
 # ====================
 # test stage
@@ -49,9 +55,7 @@ testStable:
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - priv
 
 testBuild:
   stage: test
@@ -62,9 +66,7 @@ testBuild:
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - notpriv
 
 release:
   stage: release
@@ -84,11 +86,12 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  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
@@ -108,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"
     }
   ]
 }

.vscode/settings.json

@@ -15,7 +15,7 @@
             "properties": {
               "projectType": {
                 "type": "string",
-                "enum": ["website", "element", "service", "npm"]
+                "enum": ["website", "element", "service", "npm", "wcc"]
               }
             }
           }

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,46 +1,48 @@
 {
   "name": "@pushrocks/smartproxy",
-  "version": "2.0.0",
+  "version": "3.0.32",
   "private": false,
   "description": "a proxy for handling high workloads of proxying",
-  "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "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.17",
-    "@gitzone/tstest": "^1.0.28",
-    "@pushrocks/tapbundle": "^3.2.0",
-    "@types/node": "^13.7.0",
-    "tslint": "^6.0.0",
-    "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": "^3.0.16",
-    "@pushrocks/smartnetwork": "^1.1.18",
-    "@pushrocks/smartpromise": "^3.0.6",
-    "@pushrocks/smartrequest": "^1.1.47",
-    "@pushrocks/smartspawn": "^2.0.9",
-    "@pushrocks/smartstring": "^3.0.18",
-    "@pushrocks/smartsystem": "^2.0.9",
-    "@tsclass/tsclass": "^3.0.3",
-    "@types/ws": "^7.2.1",
-    "ws": "^7.2.1"
+    "@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/**/*",
     "ts_web/**/*",
     "dist/**/*",
-    "dist_web/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
     "dist_ts_web/**/*",
     "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

readme.md

@@ -8,16 +8,26 @@ a proxy for handling high workloads of proxying
 * [docs (typedoc)](https://pushrocks.gitlab.io/smartproxy/)
 
 ## Status for master
-[![pipeline status](https://gitlab.com/pushrocks/smartproxy/badges/master/pipeline.svg)](https://gitlab.com/pushrocks/smartproxy/commits/master)
-[![coverage report](https://gitlab.com/pushrocks/smartproxy/badges/master/coverage.svg)](https://gitlab.com/pushrocks/smartproxy/commits/master)
-[![npm downloads per month](https://img.shields.io/npm/dm/@pushrocks/smartproxy.svg)](https://www.npmjs.com/package/@pushrocks/smartproxy)
-[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/smartproxy/badge.svg)](https://snyk.io/test/npm/@pushrocks/smartproxy)
-[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
+
+Status Category | Status Badge
+-- | --
+GitLab Pipelines | [![pipeline status](https://gitlab.com/pushrocks/smartproxy/badges/master/pipeline.svg)](https://lossless.cloud)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/pushrocks/smartproxy/badges/master/coverage.svg)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@pushrocks/smartproxy)](https://lossless.cloud)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/pushrocks/smartproxy)](https://lossless.cloud)
+TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
+node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
+PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@pushrocks/smartproxy)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/smartproxy)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/smartproxy)](https://lossless.cloud)
+Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
 
 ## Usage
 
+## Contribution
+
+We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
 
 ## Contribution
 

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.updateReversConfigs([
+  testProxy.updateProxyConfigs([
     {
-      destinationIp: 'localhost',
+      destinationIp: '127.0.0.1',
       destinationPort: '3000',
       hostName: 'push.rocks',
       privateKey: `-----BEGIN PRIVATE KEY-----
@@ -97,12 +100,12 @@ TzJTbTCteOUUJTrcfZ0gGhGkF4nYLmX5OI+TPqrDJf0fZ+mzAEHzDDVXcBYpYRDr
 r8d9QwrK+WaqVi2ofbMfMByVF72jgeJNa4nxwT9bVbu/Q1T2Lt+YPb4pQ7yCoUgS
 JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
 -----END CERTIFICATE-----
-    `
-    }
+    `,
+    },
   ]);
 });
 
-tap.test('should wait for 60 seconds', async tools => {
+tap.test('should wait for 60 seconds', async (tools) => {
   await tools.delayFor(10000);
 });
 

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@pushrocks/smartproxy',
+  version: '3.0.32',
+  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,13 +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 socketMap = new plugins.lik.Objectmap<plugins.net.Socket>();
+  public httpsServer: plugins.https.Server;
+  public router = new ProxyRouter();
+  public socketMap = new plugins.lik.ObjectMap<plugins.net.Socket>();
+  public defaultHeaders: { [key: string]: string } = {};
+
+  public alreadyAddedReverseConfigs: {
+    [hostName: string]: plugins.tsclass.network.IReverseProxyConfig;
+  } = {};
+
+  constructor(optionsArg: INetworkProxyOptions) {
+    this.options = optionsArg;
+  }
 
   /**
    * starts the proxyInstance
@@ -101,13 +114,13 @@ TzJTbTCteOUUJTrcfZ0gGhGkF4nYLmX5OI+TPqrDJf0fZ+mzAEHzDDVXcBYpYRDr
 r8d9QwrK+WaqVi2ofbMfMByVF72jgeJNa4nxwT9bVbu/Q1T2Lt+YPb4pQ7yCoUgS
 JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
 -----END CERTIFICATE-----
-    `
+    `,
       },
       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.',
@@ -115,8 +128,18 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
         ) => {
           res.writeHead(statusArg, messageArg);
           res.end(messageArg);
+          res.destroy();
         };
 
+        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;
@@ -126,7 +149,7 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
               if (authHeader) {
                 if (!authHeader.includes('Basic ')) {
                   return endRequest(401, 'Authentication required', {
-                    'WWW-Authenticate': 'Basic realm="Access to the staging site", charset="UTF-8"'
+                    'WWW-Authenticate': 'Basic realm="Access to the staging site", charset="UTF-8"',
                   });
                 }
                 const authStringBase64 = req.headers.authorization.replace('Basic ', '');
@@ -160,89 +183,164 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
           destinationUrl,
           {
             method: req.method,
-            headers: req.headers
+            headers: req.headers,
+            keepAlive: true,
           },
           true, // lets make this streaming
-          request => {
-            req.on('data', data => {
+          (request) => {
+            req.on('data', (data) => {
               request.write(data);
             });
-            req.on('end', data => {
+            req.on('end', (data) => {
               request.end();
             });
+            req.on('error', () => {
+              request.end();
+            });
+            req.on('close', () => {
+              request.end();
+            });
+            req.on('timeout', () => {
+              req.destroy();
+              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]);
         }
-        response.on('data', data => {
+        response.on('data', (data) => {
           res.write(data);
         });
         response.on('end', () => {
           res.end();
         });
+        response.on('error', () => {
+          res.end();
+        });
+        response.on('close', () => {
+          res.end();
+        });
+        response.on('timeout', () => {
+          res.end();
+          res.destroy()
+        });
+
       }
     );
 
     // 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();
+      let wscConnectedDeferred: plugins.smartpromise.Deferred<plugins.wsDefault>;
 
-      const wsc = new plugins.wsDefault(this.router.routeWs(ws), {
-        headers: {
-          Host: ws.url
+      ws.on('message', async (message) => {
+        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);
+          });
         }
-      });
-      wsc.on('open', () => {
-        wscConnected.resolve();
-      });
-
-      ws.on('message', async message => {
-        await wscConnected.promise;
+        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();
+          wsc.close();
+        };
+  
+        ws.on('close', (message) => {
+          cleanUp();
+        });
 
-      // handle closing
-      ws.on('close', message => {
-        wsc.close();
-      });
-      wsc.on('close', message => {
-        ws.close();
+        wsc.on('close', (message) => {
+          cleanUp();
+        });
       });
     });
     this.httpsServer.keepAliveTimeout = 61000;
     this.httpsServer.headersTimeout = 65000;
 
-    this.httpsServer.on('connection', connection => {
+    this.httpsServer.on('connection', (connection: plugins.net.Socket) => {
       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);
+          console.log(`removed connection. ${this.socketMap.getArray().length} sockets remaining.`);
+          connection.destroy();
+        }
+      };
       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
+        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() {
@@ -250,28 +348,9 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
     this.httpsServer.close(() => {
       done.resolve();
     });
-    await this.socketMap.forEach(async socket => {
+    await this.socketMap.forEach(async (socket) => {
       socket.destroy();
     });
     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);
-  }
-};
-
-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[] = [];
 
   /**
@@ -16,7 +16,7 @@ export class SmartproxyRouter {
    */
   public routeReq(req: plugins.http.IncomingMessage): plugins.tsclass.network.IReverseProxyConfig {
     const originalHost = req.headers.host;
-    const correspodingReverseProxyConfig = this.reverseProxyConfigs.find(reverseConfig => {
+    const correspodingReverseProxyConfig = this.reverseProxyConfigs.find((reverseConfig) => {
       return reverseConfig.hostName === originalHost;
     });
     return correspodingReverseProxyConfig;
@@ -24,7 +24,7 @@ export class SmartproxyRouter {
 
   public routeWs(ws: plugins.wsDefault) {
     const originalHost = plugins.url.parse(ws.url).host;
-    const correspodingReverseProxyConfig = this.reverseProxyConfigs.find(reverseConfig => {
+    const correspodingReverseProxyConfig = this.reverseProxyConfigs.find((reverseConfig) => {
       return reverseConfig.hostName === originalHost;
     });
     return correspodingReverseProxyConfig.destinationIp;

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,32 +1,70 @@
-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;
 
-const portProxyCalls = {
-  start: async (portArg = 8000) => {
-    netServer = net
-      .createServer(from => {
+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();
+      from.removeAllListeners();
+      to.removeAllListeners();
+      from.unpipe();
+      to.unpipe();
+      from.destroy();
+      to.destroy();
+    };
+    this.netServer = net
+      .createServer((from) => {
         const to = net.createConnection({
           host: 'localhost',
-          port: 8001
+          port: this.toPort,
         });
+        from.setTimeout(120000);
         from.pipe(to);
         to.pipe(from);
+        from.on('error', () => {
+          cleanUpSockets(from, to);
+        });
+        to.on('error', () => {
+          cleanUpSockets(from, to);
+        });
+        from.on('close', () => {
+          cleanUpSockets(from, to);
+        });
+        to.on('close', () => {
+          cleanUpSockets(from, to);
+        });
+        from.on('timeout', () => {
+          cleanUpSockets(from, to);
+        });
+        to.on('timeout', () => {
+          cleanUpSockets(from, to);
+        });
+        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();
-    netServer.close(() => {
+    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"
-}