3.0.60

.gitea/workflows/default_nottags.yaml

@@ -0,0 +1,66 @@
+name: Default (not tags)
+
+on:
+  push:
+    tags-ignore:
+      - '**'
+
+env:
+  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
+
+jobs:
+  security:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install pnpm and npmci
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+
+      - name: Run npm prepare
+        run: npmci npm prepare
+
+      - name: Audit production dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --prod
+        continue-on-error: true
+
+      - name: Audit development dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --dev
+        continue-on-error: true
+
+  test:
+    if: ${{ always() }}
+    needs: security
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Test stable
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm test
+
+      - name: Test build
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm build

.gitea/workflows/default_tags.yaml

@@ -0,0 +1,124 @@
+name: Default (tags)
+
+on:
+  push:
+    tags:
+      - '*'
+
+env:
+  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
+
+jobs:
+  security:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Audit production dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --prod
+        continue-on-error: true
+
+      - name: Audit development dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --dev
+        continue-on-error: true
+
+  test:
+    if: ${{ always() }}
+    needs: security
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Test stable
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm test
+
+      - name: Test build
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm build
+
+  release:
+    needs: test
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Release
+        run: |
+          npmci node install stable
+          npmci npm publish
+
+  metadata:
+    needs: test
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+    continue-on-error: true
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Code quality
+        run: |
+          npmci command npm install -g typescript
+          npmci npm install
+
+      - name: Trigger
+        run: npmci trigger
+
+      - name: Build docs and upload artifacts
+        run: |
+          npmci node install stable
+          npmci npm install
+          pnpm install -g @gitzone/tsdoc
+          npmci command tsdoc
+        continue-on-error: true

.gitignore

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

.gitlab-ci.yml

@@ -1,126 +0,0 @@
-# gitzone ci_default
-image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-
-cache:
-  paths:
-    - .npmci_cache/
-  key: '$CI_BUILD_STAGE'
-
-stages:
-  - security
-  - test
-  - release
-  - metadata
-
-# ====================
-# security stage
-# ====================
-mirror:
-  stage: security
-  script:
-    - npmci git mirror
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-snyk:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:snyk
-  stage: security
-  script:
-    - npmci npm prepare
-    - npmci command npm install --ignore-scripts
-    - npmci command snyk test
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-# ====================
-# test stage
-# ====================
-
-testStable:
-  stage: test
-  script:
-    - npmci npm prepare
-    - npmci node install stable
-    - npmci npm install
-    - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-    - lossless
-    - docker
-    - priv
-
-testBuild:
-  stage: test
-  script:
-    - npmci npm prepare
-    - npmci node install stable
-    - npmci npm install
-    - npmci command npm run build
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-release:
-  stage: release
-  script:
-    - npmci node install stable
-    - npmci npm publish
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-# ====================
-# metadata stage
-# ====================
-codequality:
-  stage: metadata
-  allow_failure: true
-  script:
-    - npmci command npm install -g tslint typescript
-    - npmci npm prepare
-    - npmci npm install
-    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
-  tags:
-    - lossless
-    - docker
-    - priv
-
-trigger:
-  stage: metadata
-  script:
-    - npmci trigger
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-pages:
-  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:
-    - tags
-  artifacts:
-    expire_in: 1 week
-    paths:
-      - public
-  allow_failure: true

.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

@@ -3,10 +3,10 @@
     "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
-      "gitscope": "pushrocks",
+      "gitscope": "push.rocks",
       "gitrepo": "smartproxy",
-      "shortDescription": "a proxy for handling high workloads of proxying",
-      "npmPackagename": "@pushrocks/smartproxy",
+      "description": "a proxy for handling high workloads of proxying",
+      "npmPackagename": "@push.rocks/smartproxy",
       "license": "MIT",
       "projectDomain": "push.rocks"
     }

package.json

@@ -1,46 +1,49 @@
 {
-  "name": "@pushrocks/smartproxy",
-  "version": "1.0.37",
+  "name": "@push.rocks/smartproxy",
+  "version": "3.0.60",
   "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.66",
+    "@gitzone/tsrun": "^1.2.44",
+    "@gitzone/tstest": "^1.0.77",
+    "@push.rocks/tapbundle": "^5.0.12",
+    "@types/node": "^20.4.5"
   },
   "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"
+    "@push.rocks/lik": "^6.0.3",
+    "@push.rocks/smartdelay": "^3.0.5",
+    "@push.rocks/smartpromise": "^4.0.3",
+    "@push.rocks/smartrequest": "^2.0.18",
+    "@push.rocks/smartstring": "^4.0.7",
+    "@tsclass/tsclass": "^4.0.42",
+    "@types/ws": "^8.5.5",
+    "ws": "^8.13.0"
   },
   "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

@@ -1,23 +1,32 @@
-# @pushrocks/smartproxy
+# @push.rocks/smartproxy
 a proxy for handling high workloads of proxying
 
 ## Availabililty and Links
-* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartproxy)
-* [gitlab.com (source)](https://gitlab.com/pushrocks/smartproxy)
-* [github.com (source mirror)](https://github.com/pushrocks/smartproxy)
-* [docs (typedoc)](https://pushrocks.gitlab.io/smartproxy/)
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@push.rocks/smartproxy)
+* [gitlab.com (source)](https://gitlab.com/push.rocks/smartproxy)
+* [github.com (source mirror)](https://github.com/push.rocks/smartproxy)
+* [docs (typedoc)](https://push.rocks.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/push.rocks/smartproxy/badges/master/pipeline.svg)](https://lossless.cloud)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/push.rocks/smartproxy/badges/master/coverage.svg)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@push.rocks/smartproxy)](https://lossless.cloud)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/push.rocks/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/@push.rocks/smartproxy)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@push.rocks/smartproxy)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@push.rocks/smartproxy)](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
 
@@ -25,7 +34,6 @@ We are always happy for code contributions. If you are not the code contributing
 
 For further information read the linked docs at the top of this readme.
 
-> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+## Legal
+> MIT licensed | **©** [Task Venture Capital GmbH](https://task.vc)
 | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
-
-[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

test/test.ts

@@ -1,10 +1,13 @@
-import { expect, tap } from '@pushrocks/tapbundle';
-import * as smartproxy from '../ts/index';
+import { expect, tap } from '@push.rocks/tapbundle';
+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: '@push.rocks/smartproxy',
+  version: '3.0.60',
+  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,35 +114,52 @@ 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
-        const endRequest = (
+      async (originRequest, originResponse) => {
+        /**
+         * endRequest function
+         * can be used to prematurely end a request
+         */
+        const endOriginReqRes = (
           statusArg: number = 404,
           messageArg: string = 'This route is not available on this server.',
           headers: plugins.http.OutgoingHttpHeaders = {}
         ) => {
-          res.writeHead(statusArg, messageArg);
-          res.end(messageArg);
+          originResponse.writeHead(statusArg, messageArg);
+          originResponse.end(messageArg);
+          if (originRequest.socket !== originResponse.socket) {
+            console.log('hey, something is strange.');
+          }
+          originResponse.destroy();
         };
 
+        console.log(
+          `got request: ${originRequest.headers.host}${plugins.url.parse(originRequest.url).path}`
+        );
+        const destinationConfig = this.router.routeReq(originRequest);
+
+        if (!destinationConfig) {
+          console.log(
+            `${originRequest.headers.host} can't be routed properly. Terminating request.`
+          );
+          endOriginReqRes();
+          return;
+        }
+
         // authentication
         if (destinationConfig.authentication) {
           const authInfo = destinationConfig.authentication;
           switch (authInfo.type) {
             case 'Basic':
-              const authHeader = req.headers.authorization;
+              const authHeader = originRequest.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"'
+                  return endOriginReqRes(401, 'Authentication required', {
+                    'WWW-Authenticate': 'Basic realm="Access to the staging site", charset="UTF-8"',
                   });
                 }
-                const authStringBase64 = req.headers.authorization.replace('Basic ', '');
+                const authStringBase64 = originRequest.headers.authorization.replace('Basic ', '');
                 const authString: string = plugins.smartstring.base64.decode(authStringBase64);
                 const userPassArray = authString.split(':');
                 const user = userPassArray[0];
@@ -137,12 +167,12 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
                 if (user === authInfo.user && pass === authInfo.pass) {
                   console.log('request successfully authenticated');
                 } else {
-                  return endRequest(403, 'Forbidden: Wrong credentials');
+                  return endOriginReqRes(403, 'Forbidden: Wrong credentials');
                 }
               }
               break;
             default:
-              return endRequest(
+              return endOriginReqRes(
                 403,
                 'Forbidden: unsupported authentication method configured. Please report to the admin.'
               );
@@ -151,98 +181,193 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
 
         let destinationUrl: string;
         if (destinationConfig) {
-          destinationUrl = `http://${destinationConfig.destinationIp}:${destinationConfig.destinationPort}${req.url}`;
+          destinationUrl = `http://${destinationConfig.destinationIp}:${destinationConfig.destinationPort}${originRequest.url}`;
         } else {
-          return endRequest();
+          return endOriginReqRes();
         }
         console.log(destinationUrl);
-        const response = await plugins.smartrequest.request(
+        const proxyResponse = await plugins.smartrequest.request(
           destinationUrl,
           {
-            method: req.method,
-            headers: req.headers
+            method: originRequest.method,
+            headers: {
+              ...originRequest.headers,
+              'X-Forwarded-Host': originRequest.headers.host,
+              'X-Forwarded-Proto': 'https',
+            },
+            keepAlive: true,
           },
           true, // lets make this streaming
-          request => {
-            req.on('data', data => {
-              request.write(data);
+          (proxyRequest) => {
+            originRequest.on('data', (data) => {
+              proxyRequest.write(data);
             });
-            req.on('end', data => {
-              request.end();
+            originRequest.on('end', (data) => {
+              proxyRequest.end();
+            });
+            originRequest.on('error', () => {
+              proxyRequest.end();
+            });
+            originRequest.on('close', () => {
+              proxyRequest.end();
+            });
+            originRequest.on('timeout', () => {
+              proxyRequest.end();
+              originRequest.destroy();
+            });
+            proxyRequest.on('error', () => {
+              endOriginReqRes();
             });
           }
         );
-        res.statusCode = response.statusCode;
-        console.log(response.statusCode);
-        for (const header of Object.keys(response.headers)) {
-          res.setHeader(header, response.headers[header]);
+        originResponse.statusCode = proxyResponse.statusCode;
+        console.log(proxyResponse.statusCode);
+        for (const defaultHeader of Object.keys(this.defaultHeaders)) {
+          originResponse.setHeader(defaultHeader, this.defaultHeaders[defaultHeader]);
         }
-        response.on('data', data => {
-          res.write(data);
+        for (const header of Object.keys(proxyResponse.headers)) {
+          originResponse.setHeader(header, proxyResponse.headers[header]);
+        }
+        proxyResponse.on('data', (data) => {
+          originResponse.write(data);
         });
-        response.on('end', () => {
-          res.end();
+        proxyResponse.on('end', () => {
+          originResponse.end();
+        });
+        proxyResponse.on('error', () => {
+          originResponse.destroy();
+        });
+        proxyResponse.on('close', () => {
+          originResponse.end();
+        });
+        proxyResponse.on('timeout', () => {
+          originResponse.end();
+          originResponse.destroy();
         });
       }
     );
 
     // Enable websockets
-    const wss = new plugins.ws.Server({ server: this.httpsServer });
-    wss.on('connection', (ws: plugins.wsDefault) => {
-      console.log('got connection for wsc');
-      const wscConnected = plugins.smartpromise.defer();
+    const wsServer = new plugins.ws.WebSocketServer({ server: this.httpsServer });
+    wsServer.on(
+      'connection',
+      async (wsIncoming: plugins.wsDefault, reqArg: plugins.http.IncomingMessage) => {
+        console.log(
+          `wss proxy: got connection for wsc for https://${reqArg.headers.host}${reqArg.url}`
+        );
 
-      const wsc = new plugins.wsDefault(this.router.routeWs(ws), {
-        headers: {
-          Host: ws.url
+        let wsOutgoing: plugins.wsDefault;
+
+        const outGoingDeferred = plugins.smartpromise.defer();
+
+        try {
+          wsOutgoing = new plugins.wsDefault(
+            `ws://${this.router.routeReq(reqArg).destinationIp}:${
+              this.router.routeReq(reqArg).destinationPort
+            }${reqArg.url}`
+          );
+          console.log('wss proxy: initiated outgoing proxy');
+          wsOutgoing.on('open', async () => {
+            outGoingDeferred.resolve();
+          });
+        } catch (err) {
+          console.log(err);
+          wsIncoming.terminate();
+          return;
         }
-      });
-      wsc.on('open', () => {
-        wscConnected.resolve();
-      });
 
-      ws.on('message', async message => {
-        await wscConnected.promise;
-        wsc.emit('message', message);
-      });
-      wsc.on('message', message => {
-        ws.emit('message', message);
-      });
+        wsIncoming.on('message', async (message, isBinary) => {
+          await outGoingDeferred.promise;
+          // console.log("client to upstream", message);
+          wsOutgoing.send(message, { binary: isBinary });
+        });
 
-      // handle closing
-      ws.on('close', message => {
-        wsc.close();
-      });
-      wsc.on('close', message => {
-        ws.close();
-      });
-    });
-    this.httpsServer.keepAliveTimeout = 61000;
-    this.httpsServer.headersTimeout = 65000;
+        wsOutgoing.on('message', async (message, isBinary) => {
+          // console.log("upstream to client", message);
+          wsIncoming.send(message, { binary: isBinary });
+        });
+        const terminateWsOutgoing = () => {
+          wsOutgoing.terminate();
+          console.log('terminated outgoing ws.');
+        };
+        wsIncoming.on('error', () => terminateWsOutgoing());
+        wsIncoming.on('close', () => terminateWsOutgoing());
 
-    this.httpsServer.on('connection', connection => {
+        const terminateWsIncoming = () => {
+          wsIncoming.terminate();
+          console.log('terminated incoming ws.');
+        };
+        wsOutgoing.on('error', () => terminateWsIncoming());
+        wsOutgoing.on('close', () => terminateWsIncoming());
+      }
+    );
+    this.httpsServer.keepAliveTimeout = 600 * 1000;
+    this.httpsServer.headersTimeout = 600 * 1000;
+
+    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(
+      `NetworkProxy -> OK: now listening for new connections on port ${this.options.port}`
+    );
   }
 
-  public async updateProxyConfigs(proxyConfigsArg: plugins.tsclass.IReverseProxyConfig[]) {
+  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 +375,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,17 +16,9 @@ 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;
   }
-
-  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

@@ -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 updateReversConfigs(
-    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

@@ -12,14 +12,13 @@ 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';
+import * as lik from '@push.rocks/lik';
+import * as smartdelay from '@push.rocks/smartdelay';
+import * as smartpromise from '@push.rocks/smartpromise';
+import * as smartrequest from '@push.rocks/smartrequest';
+import * as smartstring from '@push.rocks/smartstring';
 
-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,11 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "nodenext",
+    "esModuleInterop": true,
+    "verbatimModuleSyntax": 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"
-}