3.1.0

.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

.gitlab-ci.yml

@@ -1,128 +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
-
-before_script:
-  - npm install -g @shipzone/npmci
-
-# ====================
-# security stage
-# ====================
-auditProductionDependencies:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-  stage: security
-  script:
-    - 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:
-    - docker
-  allow_failure: true
-
-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
-# ====================
-
-testStable:
-  stage: test
-  script:
-    - npmci npm prepare
-    - npmci node install stable
-    - npmci npm install
-    - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-    - docker
-
-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:
-    - docker
-
-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
-  only:
-    - tags
-  script:
-    - npmci command npm install -g typescript
-    - npmci npm prepare
-    - npmci npm install
-  tags:
-    - lossless
-    - docker
-    - priv
-
-trigger:
-  stage: metadata
-  script:
-    - npmci trigger
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-pages:
-  stage: metadata
-  script:
-    - npmci node install stable 
-    - npmci npm prepare
-    - npmci npm install
-    - npmci command npm run buildDocs
-  tags:
-    - lossless
-    - docker
-    - notpriv
-  only:
-    - tags
-  artifacts:
-    expire_in: 1 week
-    paths:
-      - public
-  allow_failure: true

changelog.md

@@ -0,0 +1,34 @@
+# Changelog
+
+## 2024-10-07 - 3.1.0 - feat(NetworkProxy)
+Introduce WebSocket heartbeat to maintain active connections in NetworkProxy
+
+- Added heartbeat mechanism to WebSocket connections to ensure they remain active.
+- Terminating WebSocket if no pong is received for 5 minutes.
+- Set up heartbeat interval to run every 1 minute for connection checks.
+
+## 2024-10-07 - 3.0.61 - fix(networkproxy)
+Improve error handling for proxy requests
+
+- Wrapped proxy request logic in a try-catch block to handle errors gracefully.
+- Improved error handling for WebSocket communication by checking errors before attempting to send messages.
+- Added logging for error cases to aid in debugging.
+
+## 2024-05-29 - 3.0.60 - various updates
+Maintenance updates and adjustments.
+
+- Updated project description
+- Updated tsconfig settings
+- Updated npmextra.json with new githost info
+
+## 2023-07-27 - 3.0.58 to 3.0.59 - core improvements
+Improvements and internal restructuring.
+
+- Switch to a new organizational scheme
+- Core updates and adjustments
+
+## 2022-07-29 - 2.0.16 to 3.0.0 - major transition
+This release marks a major transition with several breaking changes.
+
+- BREAKING CHANGE: switched core to ESM (EcmaScript Module)
+- Major core updates

npmextra.json

@@ -2,17 +2,33 @@
   "gitzone": {
     "projectType": "npm",
     "module": {
-      "githost": "gitlab.com",
-      "gitscope": "pushrocks",
+      "githost": "code.foss.global",
+      "gitscope": "push.rocks",
       "gitrepo": "smartproxy",
       "description": "a proxy for handling high workloads of proxying",
-      "npmPackagename": "@pushrocks/smartproxy",
+      "npmPackagename": "@push.rocks/smartproxy",
       "license": "MIT",
-      "projectDomain": "push.rocks"
+      "projectDomain": "push.rocks",
+      "keywords": [
+        "proxy",
+        "network traffic",
+        "high workload",
+        "http",
+        "https",
+        "websocket",
+        "network routing",
+        "ssl redirect",
+        "port mapping",
+        "reverse proxy",
+        "authentication"
+      ]
     }
   },
   "npmci": {
     "npmGlobalTools": [],
     "npmAccessLevel": "public"
+  },
+  "tsdoc": {
+    "legal": "\n## License and Legal Information\n\nThis repository contains open-source code that is licensed under the MIT License. A copy of the MIT License can be found in the [license](license) file within this repository. \n\n**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.\n\n### Trademarks\n\nThis project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH and are not included within the scope of the MIT license granted herein. Use of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines, and any usage must be approved in writing by Task Venture Capital GmbH.\n\n### Company Information\n\nTask Venture Capital GmbH  \nRegistered at District court Bremen HRB 35230 HB, Germany\n\nFor any legal inquiries or if you require further information, please contact us via email at hello@task.vc.\n\nBy using this repository, you acknowledge that you have read this section, agree to comply with its terms, and understand that the licensing of the code does not imply endorsement by Task Venture Capital GmbH of any derivative works.\n"
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@pushrocks/smartproxy",
-  "version": "3.0.37",
+  "name": "@push.rocks/smartproxy",
+  "version": "3.1.0",
   "private": false,
   "description": "a proxy for handling high workloads of proxying",
   "main": "dist_ts/index.js",
@@ -15,20 +15,21 @@
     "buildDocs": "tsdoc"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.65",
-    "@gitzone/tstest": "^1.0.73",
-    "@pushrocks/tapbundle": "^5.0.4",
-    "@types/node": "^18.6.3"
+    "@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": "^6.0.0",
-    "@pushrocks/smartdelay": "^2.0.13",
-    "@pushrocks/smartpromise": "^3.1.7",
-    "@pushrocks/smartrequest": "^2.0.9",
-    "@pushrocks/smartstring": "^4.0.2",
-    "@tsclass/tsclass": "^4.0.17",
-    "@types/ws": "^8.5.3",
-    "ws": "^8.8.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/**/*",
@@ -44,5 +45,23 @@
   ],
   "browserslist": [
     "last 1 chrome versions"
-  ]
+  ],
+  "keywords": [
+    "proxy",
+    "network traffic",
+    "high workload",
+    "http",
+    "https",
+    "websocket",
+    "network routing",
+    "ssl redirect",
+    "port mapping",
+    "reverse proxy",
+    "authentication"
+  ],
+  "homepage": "https://code.foss.global/push.rocks/smartproxy",
+  "repository": {
+    "type": "git",
+    "url": "https://code.foss.global/push.rocks/smartproxy.git"
+  }
 }

readme.hints.md

@@ -0,0 +1 @@
+ 

readme.md

@@ -1,41 +1,118 @@
-# @pushrocks/smartproxy
-a proxy for handling high workloads of proxying
+# @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/)
+## Install
+To install `@push.rocks/smartproxy`, run the following command in your project's root directory:
 
-## Status for master
+```bash
+npm install @push.rocks/smartproxy --save
+```
 
-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)
+This will add `@push.rocks/smartproxy` to your project's dependencies.
 
 ## Usage
 
-## Contribution
+`@push.rocks/smartproxy` is a versatile package for setting up and handling proxies with various capabilities such as SSL redirection, port proxying, and creating network proxies with complex routing rules. Below is a comprehensive guide on using its features.
 
-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). :)
+### Setting Up a Network Proxy
 
-## Contribution
+Create a network proxy to route incoming HTTPS requests to different local servers based on the hostname.
 
-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). :)
+```typescript
+import { NetworkProxy } from '@push.rocks/smartproxy';
 
-For further information read the linked docs at the top of this readme.
+// Instantiate the NetworkProxy with desired options
+const myNetworkProxy = new NetworkProxy({ port: 443 });
 
-> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
-| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
+// Define your reverse proxy configurations
+const proxyConfigs = [
+  {
+    destinationIp: '127.0.0.1',
+    destinationPort: '3000',
+    hostName: 'example.com',
+    privateKey: `-----BEGIN PRIVATE KEY-----
+PRIVATE_KEY_CONTENT
+-----END PRIVATE KEY-----`,
+    publicKey: `-----BEGIN CERTIFICATE-----
+CERTIFICATE_CONTENT
+-----END CERTIFICATE-----`,
+  },
+  // Add more reverse proxy configurations here
+];
 
-[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)
+// Start the network proxy
+await myNetworkProxy.start();
+
+// Update proxy configurations dynamically
+await myNetworkProxy.updateProxyConfigs(proxyConfigs);
+
+// Optionally, add default headers to all responses
+await myNetworkProxy.addDefaultHeaders({
+  'X-Powered-By': 'smartproxy',
+});
+```
+
+### Port Proxying
+
+You can also set up a port proxy to forward traffic from one port to another, which is useful for dynamic port forwarding scenarios.
+
+```typescript
+import { PortProxy } from '@push.rocks/smartproxy';
+
+// Create a PortProxy to forward traffic from port 5000 to port 3000
+const myPortProxy = new PortProxy(5000, 3000);
+
+// Start the port proxy
+await myPortProxy.start();
+
+// To stop the port proxy, simply call
+await myPortProxy.stop();
+```
+
+### Enabling SSL Redirection
+
+Easily redirect HTTP traffic to HTTPS using the `SslRedirect` class. This is particularly useful when ensuring all traffic uses encryption.
+
+```typescript
+import { SslRedirect } from '@push.rocks/smartproxy';
+
+// Instantiate the SslRedirect on port 80 (HTTP)
+const mySslRedirect = new SslRedirect(80);
+
+// Start listening and redirecting to HTTPS
+await mySslRedirect.start();
+
+// To stop the redirection, use
+await mySslRedirect.stop();
+```
+
+### Advanced Usage
+
+The package integrates seamlessly with TypeScript, allowing for advanced use cases, such as implementing custom routing logic, authentication mechanisms, and handling WebSocket connections through the network proxy.
+
+For a more advanced setup involving WebSocket proxying and dynamic configuration reloading, refer to the network proxy example provided above. The WebSocket support demonstrates how seamless it is to work with real-time applications.
+
+Remember, when dealing with certificates and private keys for HTTPS configurations, always secure your keys and store them appropriately.
+
+`@push.rocks/smartproxy` provides a solid foundation for handling high workloads and complex proxying requirements with ease, whether you're implementing SSL redirections, port forwarding, or extensive routing and WebSocket support in your network.
+
+For more information on how to use the features, refer to the in-depth documentation available in the package's repository or the npm package description.
+
+## License and Legal Information
+
+This repository contains open-source code that is licensed under the MIT License. A copy of the MIT License can be found in the [license](license) file within this repository. 
+
+**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.
+
+### Trademarks
+
+This project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH and are not included within the scope of the MIT license granted herein. Use of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines, and any usage must be approved in writing by Task Venture Capital GmbH.
+
+### Company Information
+
+Task Venture Capital GmbH  
+Registered at District court Bremen HRB 35230 HB, Germany
+
+For any legal inquiries or if you require further information, please contact us via email at hello@task.vc.
+
+By using this repository, you acknowledge that you have read this section, agree to comply with its terms, and understand that the licensing of the code does not imply endorsement by Task Venture Capital GmbH of any derivative works.

test/test.ts

@@ -1,4 +1,4 @@
-import { expect, tap } from '@pushrocks/tapbundle';
+import { expect, tap } from '@push.rocks/tapbundle';
 import * as smartproxy from '../ts/index.js';
 
 let testProxy: smartproxy.NetworkProxy;

ts/00_commitinfo_data.ts

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

ts/index.ts

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

ts/smartproxy.classes.networkproxy.ts

@@ -5,6 +5,10 @@ export interface INetworkProxyOptions {
   port: number;
 }
 
+interface WebSocketWithHeartbeat extends plugins.wsDefault {
+  lastPong: number;
+}
+
 export class NetworkProxy {
   // INSTANCE
   public options: INetworkProxyOptions;
@@ -13,6 +17,7 @@ export class NetworkProxy {
   public router = new ProxyRouter();
   public socketMap = new plugins.lik.ObjectMap<plugins.net.Socket>();
   public defaultHeaders: { [key: string]: string } = {};
+  public heartbeatInterval: NodeJS.Timeout;
 
   public alreadyAddedReverseConfigs: {
     [hostName: string]: plugins.tsclass.network.IReverseProxyConfig;
@@ -129,16 +134,20 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
           originResponse.writeHead(statusArg, messageArg);
           originResponse.end(messageArg);
           if (originRequest.socket !== originResponse.socket) {
-            console.log('hey, something is strange.')
+            console.log('hey, something is strange.');
           }
           originResponse.destroy();
         };
 
-        console.log(`got request: ${originRequest.headers.host}${plugins.url.parse(originRequest.url).path}`);
+        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.`);
+          console.log(
+            `${originRequest.headers.host} can't be routed properly. Terminating request.`
+          );
           endOriginReqRes();
           return;
         }
@@ -182,110 +191,162 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
           return endOriginReqRes();
         }
         console.log(destinationUrl);
-        const proxyResponse = await plugins.smartrequest.request(
-          destinationUrl,
-          {
-            method: originRequest.method,
-            headers: {
-              ...originRequest.headers,
-              'X-Forwarded-Host': originRequest.headers.host,
-              'X-Forwarded-Proto': 'https'
+        try {
+          const proxyResponse = await plugins.smartrequest.request(
+            destinationUrl,
+            {
+              method: originRequest.method,
+              headers: {
+                ...originRequest.headers,
+                'X-Forwarded-Host': originRequest.headers.host,
+                'X-Forwarded-Proto': 'https',
+              },
+              keepAlive: true,
             },
-            keepAlive: true,
-          },
-          true, // lets make this streaming
-          (proxyRequest) => {
-            originRequest.on('data', (data) => {
-              proxyRequest.write(data);
-            });
-            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();
-            })
+            true, // lets make this streaming (keepAlive)
+            (proxyRequest) => {
+              originRequest.on('data', (data) => {
+                proxyRequest.write(data);
+              });
+              originRequest.on('end', () => {
+                proxyRequest.end();
+              });
+              originRequest.on('error', () => {
+                proxyRequest.end();
+              });
+              originRequest.on('close', () => {
+                proxyRequest.end();
+              });
+              originRequest.on('timeout', () => {
+                proxyRequest.end();
+                originRequest.destroy();
+              });
+              proxyRequest.on('error', () => {
+                endOriginReqRes();
+              });
+            }
+          );
+          originResponse.statusCode = proxyResponse.statusCode;
+          console.log(proxyResponse.statusCode);
+          for (const defaultHeader of Object.keys(this.defaultHeaders)) {
+            originResponse.setHeader(defaultHeader, this.defaultHeaders[defaultHeader]);
           }
-        );
-        originResponse.statusCode = proxyResponse.statusCode;
-        console.log(proxyResponse.statusCode);
-        for (const defaultHeader of Object.keys(this.defaultHeaders)) {
-          originResponse.setHeader(defaultHeader, this.defaultHeaders[defaultHeader]);
+          for (const header of Object.keys(proxyResponse.headers)) {
+            originResponse.setHeader(header, proxyResponse.headers[header]);
+          }
+          proxyResponse.on('data', (data) => {
+            originResponse.write(data);
+          });
+          proxyResponse.on('end', () => {
+            originResponse.end();
+          });
+          proxyResponse.on('error', () => {
+            originResponse.destroy();
+          });
+          proxyResponse.on('close', () => {
+            originResponse.end();
+          });
+          proxyResponse.on('timeout', () => {
+            originResponse.end();
+            originResponse.destroy();
+          });
+        } catch (error) {
+          console.error('Error while processing request:', error);
+          endOriginReqRes(502, 'Bad Gateway: Error processing the request');
         }
-        for (const header of Object.keys(proxyResponse.headers)) {
-          originResponse.setHeader(header, proxyResponse.headers[header]);
-        }
-        proxyResponse.on('data', (data) => {
-          originResponse.write(data);
-        });
-        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.WebSocketServer({ server: this.httpsServer });
-    wss.on('connection', (ws: plugins.wsDefault) => {
-      console.log('got connection for wsc');
-      let wscConnectedDeferred: plugins.smartpromise.Deferred<plugins.wsDefault>;
+    const wsServer = new plugins.ws.WebSocketServer({ server: this.httpsServer });
 
-      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);
-          });
+    // Set up the heartbeat interval
+    this.heartbeatInterval = setInterval(() => {
+      wsServer.clients.forEach((ws: plugins.wsDefault) => {
+        const wsIncoming = ws as WebSocketWithHeartbeat;
+        if (!wsIncoming.lastPong) {
+          wsIncoming.lastPong = Date.now();
         }
-        const wsc = await wscConnectedDeferred.promise;
-        wsc.emit('message', message);
-        wsc.on('message', (message) => {
-          ws.emit('message', message);
-        });
-  
-        // handle closing
-        const cleanUp = () => {
-          ws.terminate();
-          wsc.terminate();
-        };
-  
-        ws.on('close', (message) => {
-          cleanUp();
+        if (Date.now() - wsIncoming.lastPong > 5 * 60 * 1000) {
+          console.log('Terminating websocket due to missing pong for 5 minutes.');
+          wsIncoming.terminate();
+        } else {
+          wsIncoming.ping();
+        }
+      });
+    }, 60000); // runs every 1 minute
+
+    wsServer.on(
+      'connection',
+      async (wsIncoming: WebSocketWithHeartbeat, reqArg: plugins.http.IncomingMessage) => {
+        console.log(
+          `wss proxy: got connection for wsc for https://${reqArg.headers.host}${reqArg.url}`
+        );
+
+        wsIncoming.lastPong = Date.now();
+        wsIncoming.on('pong', () => {
+          wsIncoming.lastPong = Date.now();
         });
 
-        wsc.on('close', (message) => {
-          cleanUp();
+        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;
+        }
+
+        wsIncoming.on('message', async (message, isBinary) => {
+          try {
+            await outGoingDeferred.promise;
+            wsOutgoing.send(message, { binary: isBinary });
+          } catch (error) {
+            console.error('Error sending message to wsOutgoing:', error);
+          }
         });
-      });
-    });
-    this.httpsServer.keepAliveTimeout = 61000;
-    this.httpsServer.headersTimeout = 65000;
+
+        wsOutgoing.on('message', async (message, isBinary) => {
+          try {
+            wsIncoming.send(message, { binary: isBinary });
+          } catch (error) {
+            console.error('Error sending message to wsIncoming:', error);
+          }
+        });
+
+        const terminateWsOutgoing = () => {
+          if (wsOutgoing) {
+            wsOutgoing.terminate();
+            console.log('terminated outgoing ws.');
+          }
+        };
+        wsIncoming.on('error', () => terminateWsOutgoing());
+        wsIncoming.on('close', () => terminateWsOutgoing());
+
+        const terminateWsIncoming = () => {
+          if (wsIncoming) {
+            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);
@@ -308,7 +369,7 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
       });
       connection.on('timeout', () => {
         cleanupConnection();
-      })
+      });
     });
 
     this.httpsServer.listen(this.options.port);
@@ -322,8 +383,6 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
     this.proxyConfigs = proxyConfigsArg;
     this.router.setNewProxyConfigs(proxyConfigsArg);
     for (const hostCandidate of this.proxyConfigs) {
-      // console.log(hostCandidate);
-
       const existingHostNameConfig = this.alreadyAddedReverseConfigs[hostCandidate.hostName];
 
       if (!existingHostNameConfig) {
@@ -343,7 +402,6 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
         cert: hostCandidate.publicKey,
         key: hostCandidate.privateKey,
       });
-      this.httpsServer;
     }
   }
 
@@ -362,5 +420,7 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
       socket.destroy();
     });
     await done.promise;
+    clearInterval(this.heartbeatInterval);
+    console.log('NetworkProxy -> OK: Server has been stopped and all connections closed.');
   }
 }

ts/smartproxy.classes.router.ts

@@ -21,12 +21,4 @@ export class ProxyRouter {
     });
     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.sslredirect.ts

@@ -29,4 +29,4 @@ export class SslRedirect {
     });
     await done.promise;
   }
-}
+}

ts/smartproxy.plugins.ts

@@ -12,11 +12,11 @@ import * as tsclass from '@tsclass/tsclass';
 export { tsclass };
 
 // pushrocks scope
-import * as lik from '@pushrocks/lik';
-import * as smartdelay from '@pushrocks/smartdelay';
-import * as smartpromise from '@pushrocks/smartpromise';
-import * as smartrequest from '@pushrocks/smartrequest';
-import * as smartstring from '@pushrocks/smartstring';
+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, smartdelay, smartrequest, smartpromise, smartstring };
 

tsconfig.json

@@ -3,8 +3,12 @@
     "experimentalDecorators": true,
     "useDefineForClassFields": false,
     "target": "ES2022",
-    "module": "ES2022",
-    "moduleResolution": "nodenext",
-    "esModuleInterop": true
-  }
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "esModuleInterop": true,
+    "verbatimModuleSyntax": true
+  },
+  "exclude": [
+    "dist_*/**/*.d.ts"
+  ]
 }