2.0.13

.gitignore

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

.gitlab-ci.yml

@@ -1,18 +1,16 @@
 # gitzone ci_default
 image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-variables:
-  GIT_STRATEGY: clone
 
 cache:
   paths:
-  - .npmci_cache/
+    - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- security
+  - security
-- test
+  - test
-- release
+  - release
-- metadata
+  - metadata
 
 # ====================
 # security stage
@@ -20,21 +18,36 @@ stages:
 mirror:
   stage: security
   script:
-  - npmci git mirror
+    - npmci git mirror
+  only:
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
-snyk:
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
-    - npmci command npm install -g snyk
+    - npmci command npm install --production --ignore-scripts
-    - npmci command npm install --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command snyk test
+    - npmci command npm audit --audit-level=high --only=prod --production
   tags:
-  - docker
+    - docker
-  - notpriv
+
+auditDevDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=dev
+  tags:
+    - docker
+  allow_failure: true
 
 # ====================
 # test stage
@@ -43,37 +56,36 @@ snyk:
 testStable:
   stage: test
   script:
-  - npmci npm prepare
+    - npmci npm prepare
-  - npmci node install stable
+    - npmci node install stable
-  - npmci npm install
+    - npmci npm install
-  - npmci npm test
+    - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
+    - docker
-  - priv
 
 testBuild:
   stage: test
   script:
-  - npmci npm prepare
+    - npmci npm prepare
-  - npmci node install lts
+    - npmci node install stable
-  - npmci npm install
+    - npmci npm install
-  - npmci command npm run build
+    - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
+    - docker
-  - notpriv
 
 release:
   stage: release
   script:
-  - npmci node install lts
+    - npmci node install stable
-  - npmci npm publish
+    - npmci npm publish
   only:
-  - tags
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 # ====================
 # metadata stage
@@ -81,35 +93,39 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  only:
+    - tags
   script:
     - npmci command npm install -g tslint typescript
+    - npmci npm prepare
     - npmci npm install
     - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
-  - docker
+    - lossless
-  - priv
+    - docker
+    - priv
 
 trigger:
   stage: metadata
   script:
-  - npmci trigger
+    - npmci trigger
   only:
-  - tags
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 pages:
-  image: hosttoday/ht-docker-dbase:npmci
-  services:
-   - docker:18-dind
   stage: metadata
   script:
+    - npmci node install lts
     - npmci command npm install -g @gitzone/tsdoc
     - npmci npm prepare
     - npmci npm install
     - npmci command tsdoc
   tags:
+    - lossless
     - docker
     - notpriv
   only:
@@ -117,5 +133,5 @@ pages:
   artifacts:
     expire_in: 1 week
     paths:
-    - public
+      - public
   allow_failure: true

.vscode/settings.json

@@ -0,0 +1,26 @@
+{
+  "json.schemas": [
+    {
+      "fileMatch": ["/npmextra.json"],
+      "schema": {
+        "type": "object",
+        "properties": {
+          "npmci": {
+            "type": "object",
+            "description": "settings for npmci"
+          },
+          "gitzone": {
+            "type": "object",
+            "description": "settings for gitzone",
+            "properties": {
+              "projectType": {
+                "type": "string",
+                "enum": ["website", "element", "service", "npm", "wcc"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

npmextra.json

@@ -1,5 +1,6 @@
 {
   "gitzone": {
+    "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
       "gitscope": "pushrocks",

package.json

@@ -1,10 +1,10 @@
 {
   "name": "@pushrocks/smartproxy",
-  "version": "1.0.26",
+  "version": "2.0.13",
   "private": false,
   "description": "a proxy for handling high workloads of proxying",
-  "main": "dist/index.js",
+  "main": "dist_ts/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "dist_ts/index.d.ts",
   "author": "Lossless GmbH",
   "license": "MIT",
   "scripts": {
@@ -13,32 +13,38 @@
     "format": "(gitzone format)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.17",
+    "@gitzone/tsbuild": "^2.1.25",
-    "@gitzone/tstest": "^1.0.15",
+    "@gitzone/tstest": "^1.0.52",
-    "@pushrocks/tapbundle": "^3.0.13",
+    "@pushrocks/tapbundle": "^3.2.10",
-    "@types/node": "^12.7.5",
+    "@types/node": "^14.14.22",
-    "tslint": "^5.20.0",
+    "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
-    "@pushrocks/smartnetwork": "^1.1.14",
+    "@pushrocks/lik": "^4.0.20",
-    "@pushrocks/smartpromise": "^3.0.5",
+    "@pushrocks/smartnetwork": "^1.1.22",
-    "@pushrocks/smartrequest": "^1.1.27",
+    "@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": "^2.0.6",
+    "@tsclass/tsclass": "^3.0.29",
-    "@types/ws": "^6.0.3",
+    "@types/ws": "^7.4.0",
-    "ws": "^7.1.2"
+    "ws": "^7.4.3"
   },
   "files": [
-    "ts/*",
+    "ts/**/*",
-    "ts_web/*",
+    "ts_web/**/*",
-    "dist/*",
+    "dist/**/*",
-    "dist_web/*",
+    "dist_*/**/*",
-    "dist_ts_web/*",
+    "dist_ts/**/*",
-    "assets/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

readme.md

@@ -8,16 +8,31 @@ a proxy for handling high workloads of proxying
 * [docs (typedoc)](https://pushrocks.gitlab.io/smartproxy/)
 
 ## Status for master
-[![build status](https://gitlab.com/pushrocks/smartproxy/badges/master/build.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)
+Status Category | Status Badge
-[![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)
+GitLab Pipelines | [![pipeline status](https://gitlab.com/pushrocks/smartproxy/badges/master/pipeline.svg)](https://lossless.cloud)
-[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/pushrocks/smartproxy/badges/master/coverage.svg)](https://lossless.cloud)
-[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@pushrocks/smartproxy)](https://lossless.cloud)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
+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
+
+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). :)
+
 For further information read the linked docs at the top of this readme.
 
 > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)

test/test.ts

@@ -4,7 +4,7 @@ import * as smartproxy from '../ts/index';
 let testProxy: smartproxy.SmartProxy;
 
 tap.test('first test', async () => {
-  testProxy = new smartproxy.SmartProxy();
+  testProxy = new smartproxy.SmartProxy({});
 });
 
 tap.test('should start the testproxy', async () => {
@@ -12,11 +12,12 @@ tap.test('should start the testproxy', async () => {
 });
 
 tap.test('should supply reverse proxy config', async () => {
-  testProxy.updateReversConfigs([{
+  testProxy.updateReverseConfigs([
-    destinationIp: 'localhost',
+    {
-    destinationPort: '8080',
+      destinationIp: 'localhost',
-    hostName: 'central.eu',
+      destinationPort: '3000',
-    privateKey: `-----BEGIN PRIVATE KEY-----
+      hostName: 'push.rocks',
+      privateKey: `-----BEGIN PRIVATE KEY-----
 MIIJRQIBADANBgkqhkiG9w0BAQEFAASCCS8wggkrAgEAAoICAQDi2F/0kQr96mhe
 3yEWvy2mRHOZoSSBtIqg6Bre4ZcMu901/cHNIjFnynNGFl9Se61yZbW2F3PfCt7+
 kQlHug1Cx+LFssvz+hLlB5cqJQZfRKx92DhbROygtxG9r7UBmx/fwx+JQ+HOHX9R
@@ -69,7 +70,7 @@ h+7fBVO49PLL0NWy+8GT8y7a04calFfLvZEA2UMaunBis3dE1KMFfJL/0JO+sKnF
 2TkK01XDDJURK5Lhuvc7WrK2rSJ/fK+0GA==
 -----END PRIVATE KEY-----
     `,
-    publicKey: `-----BEGIN CERTIFICATE-----
+      publicKey: `-----BEGIN CERTIFICATE-----
 MIIEljCCAn4CCQDY+ZbC9FASVjANBgkqhkiG9w0BAQsFADANMQswCQYDVQQGEwJE
 RTAeFw0xOTA5MjAxNjAxNDRaFw0yMDA5MTkxNjAxNDRaMA0xCzAJBgNVBAYTAkRF
 MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA4thf9JEK/epoXt8hFr8t
@@ -96,12 +97,13 @@ 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(60000);
+  await tools.delayFor(10000);
 });
 
 tap.test('should close the testproxy', async () => {

ts/smartproxy.classes.proxyworker.ts

@@ -3,17 +3,26 @@ import * as plugins from './smartproxy.plugins';
 import { SmartproxyRouter } from './smartproxy.classes.router';
 
 export class ProxyWorker {
-  public hostCandidates: plugins.tsclass.network.IReverseProxyConfig[] = [];
+  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 defaultHeaders: {[key: string]: string} = {};
 
   /**
    * starts the proxyInstance
    */
   public async start() {
-    this.httpsServer = plugins.https.createServer({
+    this.httpsServer = plugins.https.createServer(
-      key: `-----BEGIN PRIVATE KEY-----
+      // ================
+      // Spotted this keypair in the code?
+      // Don't get exited:
+      // It is an invalid default keypair.
+      // For proper requests custom domain level keypairs are used that are provided in the reverse config
+      // ================
+      {
+        key: `-----BEGIN PRIVATE KEY-----
 MIIJRQIBADANBgkqhkiG9w0BAQEFAASCCS8wggkrAgEAAoICAQDi2F/0kQr96mhe
 3yEWvy2mRHOZoSSBtIqg6Bre4ZcMu901/cHNIjFnynNGFl9Se61yZbW2F3PfCt7+
 kQlHug1Cx+LFssvz+hLlB5cqJQZfRKx92DhbROygtxG9r7UBmx/fwx+JQ+HOHX9R
@@ -66,7 +75,7 @@ h+7fBVO49PLL0NWy+8GT8y7a04calFfLvZEA2UMaunBis3dE1KMFfJL/0JO+sKnF
 2TkK01XDDJURK5Lhuvc7WrK2rSJ/fK+0GA==
 -----END PRIVATE KEY-----
     `,
-    cert: `-----BEGIN CERTIFICATE-----
+        cert: `-----BEGIN CERTIFICATE-----
 MIIEljCCAn4CCQDY+ZbC9FASVjANBgkqhkiG9w0BAQsFADANMQswCQYDVQQGEwJE
 RTAeFw0xOTA5MjAxNjAxNDRaFw0yMDA5MTkxNjAxNDRaMA0xCzAJBgNVBAYTAkRF
 MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA4thf9JEK/epoXt8hFr8t
@@ -93,68 +102,159 @@ TzJTbTCteOUUJTrcfZ0gGhGkF4nYLmX5OI+TPqrDJf0fZ+mzAEHzDDVXcBYpYRDr
 r8d9QwrK+WaqVi2ofbMfMByVF72jgeJNa4nxwT9bVbu/Q1T2Lt+YPb4pQ7yCoUgS
 JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
 -----END CERTIFICATE-----
-    `
+    `,
-    }, async (req, res) => {
+      },
-      console.log('got request');
+      async (req, res) => {
-      const destinationConfig = this.router.routeReq(req);
+        console.log('got request');
-      const response = await plugins.smartrequest.request(
+        const destinationConfig = this.router.routeReq(req);
-        `http://${destinationConfig.destinationIp}:${destinationConfig.destinationPort}${req.url}`,
-        {
-          method: req.method,
-          headers: req.headers
-        },
-        true // lets make this streaming
-      );
-      res.statusCode = response.statusCode;
-      for (const header of Object.keys(response.headers)) {
-        res.setHeader(header, response.headers[header]);
-      }
-      response.on('data', data => {
-        res.write(data);
-      });
-      response.on('end', () => {
-        res.end();
-      });
-    });
 
-    const Websocket = await import('ws');
+        // endRequest function
+        const endRequest = (
+          statusArg: number = 404,
+          messageArg: string = 'This route is not available on this server.',
+          headers: plugins.http.OutgoingHttpHeaders = {}
+        ) => {
+          res.writeHead(statusArg, messageArg);
+          res.end(messageArg);
+        };
+
+        // authentication
+        if (destinationConfig.authentication) {
+          const authInfo = destinationConfig.authentication;
+          switch (authInfo.type) {
+            case 'Basic':
+              const authHeader = req.headers.authorization;
+              if (authHeader) {
+                if (!authHeader.includes('Basic ')) {
+                  return endRequest(401, 'Authentication required', {
+                    'WWW-Authenticate': 'Basic realm="Access to the staging site", charset="UTF-8"',
+                  });
+                }
+                const authStringBase64 = req.headers.authorization.replace('Basic ', '');
+                const authString: string = plugins.smartstring.base64.decode(authStringBase64);
+                const userPassArray = authString.split(':');
+                const user = userPassArray[0];
+                const pass = userPassArray[1];
+                if (user === authInfo.user && pass === authInfo.pass) {
+                  console.log('request successfully authenticated');
+                } else {
+                  return endRequest(403, 'Forbidden: Wrong credentials');
+                }
+              }
+              break;
+            default:
+              return endRequest(
+                403,
+                'Forbidden: unsupported authentication method configured. Please report to the admin.'
+              );
+          }
+        }
+
+        let destinationUrl: string;
+        if (destinationConfig) {
+          destinationUrl = `http://${destinationConfig.destinationIp}:${destinationConfig.destinationPort}${req.url}`;
+        } else {
+          return endRequest();
+        }
+        console.log(destinationUrl);
+        const response = await plugins.smartrequest.request(
+          destinationUrl,
+          {
+            method: req.method,
+            headers: req.headers,
+            keepAlive: true
+          },
+          true, // lets make this streaming
+          (request) => {
+            req.on('data', (data) => {
+              request.write(data);
+            });
+            req.on('end', (data) => {
+              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) => {
+          res.write(data);
+        });
+        response.on('end', () => {
+          res.end();
+        });
+      }
+    );
 
     // Enable websockets
     const wss = new plugins.ws.Server({ server: this.httpsServer });
-    wss.on('connection', function connection(ws) {
+    wss.on('connection', (ws: plugins.wsDefault) => {
       console.log('got connection for wsc');
       const wscConnected = plugins.smartpromise.defer();
 
-      const wsc = new Websocket.default(`${ws.url}`);
+      const wsc = new plugins.wsDefault(this.router.routeWs(ws), {
+        headers: {
+          Host: ws.url,
+        },
+      });
       wsc.on('open', () => {
         wscConnected.resolve();
       });
 
-      ws.on('message', async message => {
+      ws.on('message', async (message) => {
         await wscConnected.promise;
         wsc.emit('message', message);
       });
-      wsc.on('message', message => {
+      wsc.on('message', (message) => {
         ws.emit('message', message);
       });
 
       // handle closing
-      ws.on('close', message => {
+      ws.on('close', (message) => {
         wsc.close();
       });
-      wsc.on('close', message => {
+      wsc.on('close', (message) => {
         ws.close();
       });
     });
+    this.httpsServer.keepAliveTimeout = 61000;
+    this.httpsServer.headersTimeout = 65000;
+
+    this.httpsServer.on('connection', (connection: plugins.net.Socket) => {
+      connection.setTimeout(120000);
+      this.socketMap.add(connection);
+      const cleanupConnection = (connectionArg: plugins.net.Socket) => {
+        connectionArg.removeAllListeners();
+        this.socketMap.remove(connection);
+        connection.destroy();
+      }
+      connection.on('close', () => {
+        cleanupConnection(connection);
+      });
+      connection.on('error', () => {
+        cleanupConnection(connection);
+      });
+      connection.on('end', () => {
+        cleanupConnection(connection);
+      });
+      connection.on('timeout', () => {
+        cleanupConnection(connection);
+      });
+    });
 
     this.httpsServer.listen(this.port);
-    console.log(`OK: now listening for new connections on port ${this.port}`);
+    console.log(`ProxyWorker -> OK: now listening for new connections on port ${this.port}`);
   }
 
-  public async updateCandidates(arrayOfReverseCandidates: plugins.tsclass.IReverseProxyConfig[]) {
+  public async updateProxyConfigs(proxyConfigsArg: plugins.tsclass.network.IReverseProxyConfig[]) {
-    this.hostCandidates = arrayOfReverseCandidates;
+    this.proxyConfigs = proxyConfigsArg;
-    this.router.setNewCandidates(arrayOfReverseCandidates);
+    this.router.setNewProxyConfigs(proxyConfigsArg);
-    for (const hostCandidate of this.hostCandidates) {
+    for (const hostCandidate of this.proxyConfigs) {
       // console.log(hostCandidate);
       this.httpsServer.addContext(hostCandidate.hostName, {
         cert: hostCandidate.publicKey,
@@ -170,6 +270,9 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
     this.httpsServer.close(() => {
       done.resolve();
     });
+    await this.socketMap.forEach(async (socket) => {
+      socket.destroy();
+    });
     await done.promise;
   }
 }
@@ -185,8 +288,9 @@ const proxyWorkerCalls = {
     await proxyWorkerInstance.start();
   },
   updateReverseConfigs: async (configArray: plugins.tsclass.network.IReverseProxyConfig[]) => {
-    await proxyWorkerInstance.updateCandidates(configArray);
+    await proxyWorkerInstance.updateProxyConfigs(configArray);
-  }
+  },
+  addDefaultHeaders: async (headers: {[key: string]: string}) => {}
 };
 
 export type TProxyWorkerCalls = typeof proxyWorkerCalls;

ts/smartproxy.classes.router.ts

@@ -1,20 +1,32 @@
 import * as plugins from './smartproxy.plugins';
 
 export class SmartproxyRouter {
-  public reverseCandidates: plugins.tsclass.network.IReverseProxyConfig[] = [];
+  public reverseProxyConfigs: plugins.tsclass.network.IReverseProxyConfig[] = [];
 
   /**
    * sets a new set of reverse configs to be routed to
    * @param reverseCandidatesArg
    */
-  public setNewCandidates(reverseCandidatesArg: plugins.tsclass.network.IReverseProxyConfig[]) {
+  public setNewProxyConfigs(reverseCandidatesArg: plugins.tsclass.network.IReverseProxyConfig[]) {
-    this.reverseCandidates = reverseCandidatesArg;
+    this.reverseProxyConfigs = reverseCandidatesArg;
   }
+
+  /**
+   * routes a request
+   */
   public routeReq(req: plugins.http.IncomingMessage): plugins.tsclass.network.IReverseProxyConfig {
     const originalHost = req.headers.host;
-    const correspodingReverseProxyConfig = this.reverseCandidates.find(reverseConfig => {
+    const correspodingReverseProxyConfig = this.reverseProxyConfigs.find((reverseConfig) => {
       return reverseConfig.hostName === originalHost;
     });
     return correspodingReverseProxyConfig;
   }
+
+  public routeWs(ws: plugins.wsDefault) {
+    const originalHost = plugins.url.parse(ws.url).host;
+    const correspodingReverseProxyConfig = this.reverseProxyConfigs.find((reverseConfig) => {
+      return reverseConfig.hostName === originalHost;
+    });
+    return correspodingReverseProxyConfig.destinationIp;
+  }
 }

ts/smartproxy.classes.smartproxy.ts

@@ -3,13 +3,23 @@ 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 async updateReversConfigs(
+  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
@@ -28,11 +38,17 @@ export class SmartProxy {
     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 updateDefaultHeaders(defaultHeadersArg: {[key: string]: string}) {
+    await this.proxyWorkerFunctions.addDefaultHeaders(defaultHeadersArg);
+  }
+
   public async stop() {
     await this.proxyWorkerFunctions.stop();
     await plugins.smartspawn.Thread.terminate(this.proxyWorkerFunctions);

ts/smartproxy.plugins.ts

@@ -1,8 +1,10 @@
 // node native scope
 import * as http from 'http';
 import * as https from 'https';
+import * as net from 'net';
+import * as url from 'url';
 
-export { http, https };
+export { http, https, net, url };
 
 // tsclass scope
 import * as tsclass from '@tsclass/tsclass';
@@ -10,14 +12,17 @@ import * as tsclass from '@tsclass/tsclass';
 export { tsclass };
 
 // pushrocks scope
+import * as lik from '@pushrocks/lik';
 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 { smartrequest, smartpromise, smartspawn, smartsystem };
+export { lik, smartrequest, smartpromise, smartspawn, smartstring, smartsystem };
 
 // third party scope
 import * as ws from 'ws';
+import wsDefault from 'ws';
 
-export { ws };
+export { wsDefault, ws };

ts/smartproxy.portproxy.ts

@@ -1,25 +1,79 @@
 import * as plugins from './smartproxy.plugins';
 import { expose } from '@pushrocks/smartspawn';
 import * as net from 'net';
-const server = net
+let netServer: plugins.net.Server;
-  .createServer(from => {
+let httpServer: plugins.http.Server;
-    const to = net.createConnection({
-      host: 'localhost',
-      port: 8001
-    });
-    from.pipe(to);
-    to.pipe(from);
-  })
-  .listen(8000);
 
 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);
+    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();
+    }
+    netServer = net
+      .createServer((from) => {
+        const to = net.createConnection({
+          host: 'localhost',
+          port: 8001,
+        });
+        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 () => {
     const done = plugins.smartpromise.defer();
-    server.close(() => {
+    httpServer.close(() => {
-      done.resolve();
+      netServer.close(() => {
+        done.resolve();
+      });
     });
     await done.promise;
-  }
+  },
 };
 
 export type TPortProxyCalls = typeof portProxyCalls;