3.1.2

fix(core): Refactor certificate handling across the project
3.1.1
2025-02-04 00:38:39 +01:00 · 2025-02-04 00:38:39 +01:00 · 2025-02-03 23:41:14 +01:00 · 2025-02-03 23:41:13 +01:00 · 2024-10-07 12:52:02 +02:00 · 2024-10-07 12:52:01 +02:00
20 changed files with 9064 additions and 3814 deletions
--- a/.gitea/workflows/default_nottags.yaml
+++ b/.gitea/workflows/default_nottags.yaml
@ -6,8 +6,8 @@ on:
      - '**'

 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
+  IMAGE: code.foss.global/host.today/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@/${{gitea.repository}}.git
  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
@ -26,7 +26,7 @@ jobs:
      - name: Install pnpm and npmci
        run: |
          pnpm install -g pnpm
-          pnpm install -g @shipzone/npmci
+          pnpm install -g @ship.zone/npmci

      - name: Run npm prepare
        run: npmci npm prepare
--- a/.gitea/workflows/default_tags.yaml
+++ b/.gitea/workflows/default_tags.yaml
@ -6,8 +6,8 @@ on:
      - '*'

 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
+  IMAGE: code.foss.global/host.today/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@/${{gitea.repository}}.git
  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
@ -26,7 +26,7 @@ jobs:
      - name: Prepare
        run: |
          pnpm install -g pnpm
-          pnpm install -g @shipzone/npmci
+          pnpm install -g @ship.zone/npmci
          npmci npm prepare

      - name: Audit production dependencies
@ -54,7 +54,7 @@ jobs:
      - name: Prepare
        run: |
          pnpm install -g pnpm
-          pnpm install -g @shipzone/npmci
+          pnpm install -g @ship.zone/npmci
          npmci npm prepare

      - name: Test stable
@ -82,7 +82,7 @@ jobs:
      - name: Prepare
        run: |
          pnpm install -g pnpm
-          pnpm install -g @shipzone/npmci
+          pnpm install -g @ship.zone/npmci
          npmci npm prepare

      - name: Release
@ -104,7 +104,7 @@ jobs:
      - name: Prepare
        run: |
          pnpm install -g pnpm
-          pnpm install -g @shipzone/npmci
+          pnpm install -g @ship.zone/npmci
          npmci npm prepare

      - name: Code quality
@ -119,6 +119,6 @@ jobs:
        run: |
          npmci node install stable
          npmci npm install
-          pnpm install -g @gitzone/tsdoc
+          pnpm install -g @git.zone/tsdoc
          npmci command tsdoc
        continue-on-error: true
--- a/.gitignore
+++ b/.gitignore
@ -3,7 +3,6 @@
 # artifacts
 coverage/
 public/
-pages/

 # installs
 node_modules/
@ -17,4 +16,4 @@ node_modules/
 dist/
 dist_*/

-# custom
+#------# custom
--- a/assets/certs/cert.pem
+++ b/assets/certs/cert.pem
@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDCzCCAfOgAwIBAgIUPU4tviz3ZvsMDjCz1NZRT16b0Y4wDQYJKoZIhvcNAQEL
+BQAwFTETMBEGA1UEAwwKcHVzaC5yb2NrczAeFw0yNTAyMDMyMzA5MzRaFw0yNjAy
+MDMyMzA5MzRaMBUxEzARBgNVBAMMCnB1c2gucm9ja3MwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCZMkBYD/pYLBv9MiyHTLRT24kQyPeJBtZqryibi1jk
+BT1ZgNl3yo5U6kjj/nYBU/oy7M4OFC0xyaJQ4wpvLHu7xzREqwT9N9WcDcxaahUi
+P8+PsjGyznPrtXa1ASzGAYMNvXyWWp3351UWZHMEs6eY/Y7i8m4+0NwP5h8RNBCF
+KSFS41Ee9rNAMCnQSHZv1vIzKeVYPmYnCVmL7X2kQb+gS6Rvq5sEGLLKMC5QtTwI
+rdkPGpx4xZirIyf8KANbt0sShwUDpiCSuOCtpze08jMzoHLG9Nv97cJQjb/BhiES
+hLL+YjfAUFjq0rQ38zFKLJ87QB9Jym05mY6IadGQLXVXAgMBAAGjUzBRMB0GA1Ud
+DgQWBBQjpowWjrql/Eo2EVjl29xcjuCgkTAfBgNVHSMEGDAWgBQjpowWjrql/Eo2
+EVjl29xcjuCgkTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAY
+44vqbaf6ewFrZC0f3Kk4A10lC6qjWkcDFfw+JE8nzt+4+xPqp1eWgZKF2rONyAv2
+nG41Xygt19ByancXLU44KB24LX8F1GV5Oo7CGBA+xtoSPc0JulXw9fGclZDC6XiR
+P/+vhGgCHicbfP2O+N00pOifrTtf2tmOT4iPXRRo4TxmPzuCd+ZJTlBhPlKCmICq
+yGdAiEo6HsSiP+M5qVlNx8s57MhQYk5TpgmI6FU4mO7zfDfSatFonlg+aDbrnaqJ
+v/+km02M+oB460GmKwsSTnThHZgLNCLiKqD8bdziiCQjx5u0GjLI6468o+Aehb8l
+l/x9vWTTk/QKq41X5hFk
+-----END CERTIFICATE-----
--- a/assets/certs/key.pem
+++ b/assets/certs/key.pem
@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCZMkBYD/pYLBv9
+MiyHTLRT24kQyPeJBtZqryibi1jkBT1ZgNl3yo5U6kjj/nYBU/oy7M4OFC0xyaJQ
+4wpvLHu7xzREqwT9N9WcDcxaahUiP8+PsjGyznPrtXa1ASzGAYMNvXyWWp3351UW
+ZHMEs6eY/Y7i8m4+0NwP5h8RNBCFKSFS41Ee9rNAMCnQSHZv1vIzKeVYPmYnCVmL
+7X2kQb+gS6Rvq5sEGLLKMC5QtTwIrdkPGpx4xZirIyf8KANbt0sShwUDpiCSuOCt
+pze08jMzoHLG9Nv97cJQjb/BhiEShLL+YjfAUFjq0rQ38zFKLJ87QB9Jym05mY6I
+adGQLXVXAgMBAAECggEARGCBBq1PBHbfoUH5TQSIAlvdEEBa9+602lZG7jIioVfT
+W7Uem5Ctuan+kcDcY9hbNsqqZ+9KgsvoJmlIGXoF2jjeE/4vUmRO9AHWoc5yk2Be
+4NjcxN3QMLdEfiLBnLlFCOd4CdX1ZxZ6TG3WRpV3a1pVIeeqHGB1sKT6Xd/atcwG
+RvpiXzu0SutGxVb6WE9r6hovZ4fVERCyCRczUGrUH5ICbxf6E7L4u8xjEYR4uEKK
+/8ZkDqrWdRASDAdPPMNqnHUEAho/WnxpNeb6B4lvvv2QWxIS9H1OikF/NzWPgVNS
+oPpvtJgjyo5xdgLm3zE4lcSPNVSrh1TBXuAn9TG4WQKBgQDScPFkUNBqjC5iPMof
+bqDHlhlptrHmiv9LC0lgjEDPgIEQfjLfdCugwDk32QyAcb5B60upDYeqCFDkfV/C
+T536qxevYPjPAjahLPHqMxkWpjvtY6NOTgbbcpVtblU2Fj8R8qbyPNADG31LicU9
+GVPtQ4YcVaMWCYbg5107+9dFWQKBgQC6XK+foKK+81RFdrqaNNgebTWTsANnBcZe
+xl0bj6oL5yY0IzroxHvgcNS7UMriWCu+K2xfkUBdMmxU773VN5JQ5k15ezjgtrvc
+8oAaEsxYP4su12JSTC/zsBANUgrNbFj8++qqKYWt2aQc2O/kbZ4MNfekIVFc8AjM
+2X9PxvxKLwKBgHXL7QO3TQLnVyt8VbQEjBFMzwriznB7i+4o8jkOKVU93IEr8zQr
+5iQElcLSR3I6uUJTALYvsaoXH5jXKVwujwL69LYiNQRDe+r6qqvrUHbiNJdsd8Rk
+XuhGGqj34tD04Pcd+h+MtO+YWqmHBBZwcA9XBeIkebbjPFH2kLT8AwN5AoGAYQy9
+hMJxnkE3hIkk+gNE/OtgeE20J+Vw/ZANkrnJEzPHyGUEW41e+W2oyvdzAFZsSTdx
+037f5ujIU58Z27x53NliRT4vS4693H0Iyws5EUfeIoGVuUflvODWKymraHjhCrXh
+6cV/0R5DAabTnsCbCr7b/MRBC8YQvyUQ0KnOXo8CgYBQYGpvJnSWyvsCjtb6apTP
+drjcBhVd0aSBpLGtDdtUCV4oLl9HPy+cLzcGaqckBqCwEq5DKruhMEf7on56bUMd
+m/3ItFk1TnhysAeJHb3zLqmJ9CKBitpqLlsOE7MEXVNmbTYeXU10Uo9yOfyt1i7T
+su+nT5VtyPkmF/l4wZl5+g==
+-----END PRIVATE KEY-----
--- a/changelog.md
+++ b/changelog.md
@ -0,0 +1,49 @@
+# Changelog
+
+## 2025-02-04 - 3.1.2 - fix(core)
+Refactor certificate handling across the project
+
+- Moved certificate keys and certs to the assets/certs directory.
+- Updated test utilities to load certificates from the central location.
+- Cleaned up redundant code and improved error logging regarding certificates.
+- Ensured correct handling of host header in ProxyRouter class.
+
+## 2025-02-03 - 3.1.1 - fix(workflow)
+Update Gitea workflow paths and dependencies
+
+- Updated registry paths for npmci image and repositories in Gitea workflow files.
+- Fixed dependency paths in package.json.
+- Completed adding typescript to the list of devDependencies.
+
+## 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
--- a/npmextra.json
+++ b/npmextra.json
@ -2,17 +2,33 @@
  "gitzone": {
    "projectType": "npm",
    "module": {
-      "githost": "gitlab.com",
+      "githost": "code.foss.global",
      "gitscope": "push.rocks",
      "gitrepo": "smartproxy",
      "description": "a proxy for handling high workloads of proxying",
      "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"
  }
 }
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "@push.rocks/smartproxy",
-  "version": "3.0.60",
+  "version": "3.1.2",
  "private": false,
  "description": "a proxy for handling high workloads of proxying",
  "main": "dist_ts/index.js",
@ -15,21 +15,22 @@
    "buildDocs": "tsdoc"
  },
  "devDependencies": {
-    "@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"
+    "@git.zone/tsbuild": "^2.1.66",
+    "@git.zone/tsrun": "^1.2.44",
+    "@git.zone/tstest": "^1.0.77",
+    "@push.rocks/tapbundle": "^5.5.6",
+    "@types/node": "^22.13.0",
+    "typescript": "^5.7.3"
  },
  "dependencies": {
-    "@push.rocks/lik": "^6.0.3",
+    "@push.rocks/lik": "^6.1.0",
    "@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"
+    "@push.rocks/smartpromise": "^4.2.2",
+    "@push.rocks/smartrequest": "^2.0.23",
+    "@push.rocks/smartstring": "^4.0.15",
+    "@tsclass/tsclass": "^4.4.0",
+    "@types/ws": "^8.5.14",
+    "ws": "^8.18.0"
  },
  "files": [
    "ts/**/*",
@ -45,5 +46,29 @@
  ],
  "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#readme",
+  "repository": {
+    "type": "git",
+    "url": "https://code.foss.global/push.rocks/smartproxy.git"
+  },
+  "bugs": {
+    "url": "https://code.foss.global/push.rocks/smartproxy/issues"
+  },
+  "pnpm": {
+    "overrides": {}
+  }
 }
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/readme.hints.md
+++ b/readme.hints.md
@ -0,0 +1 @@
+ 
--- a/readme.md
+++ b/readme.md
@ -1,39 +1,120 @@
 # @push.rocks/smartproxy
-a proxy for handling high workloads of proxying

-## Availabililty and Links
-* [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/)
+A proxy for handling high workloads of proxying.

-## Status for master
+## Install

-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)
+To install `@push.rocks/smartproxy`, run the following command in your project's root directory:
+
+```bash
+npm install @push.rocks/smartproxy --save
+```
+
+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 });

-## Legal
-> MIT licensed | **&copy;** [Task Venture Capital GmbH](https://task.vc)
-| 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
+];
+
+// 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.
--- a/test/cert.pem
+++ b/test/cert.pem
@ -1,27 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIIEljCCAn4CCQDY+ZbC9FASVjANBgkqhkiG9w0BAQsFADANMQswCQYDVQQGEwJE
-RTAeFw0xOTA5MjAxNjAxNDRaFw0yMDA5MTkxNjAxNDRaMA0xCzAJBgNVBAYTAkRF
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA4thf9JEK/epoXt8hFr8t
-pkRzmaEkgbSKoOga3uGXDLvdNf3BzSIxZ8pzRhZfUnutcmW1thdz3wre/pEJR7oN
-QsfixbLL8/oS5QeXKiUGX0Ssfdg4W0TsoLcRva+1AZsf38MfiUPhzh1/UW/rMywW
-asazQwRZdkkXb4nKJ2IFZx22qnAD4/5Sug+sfeKoFBF/rzI2yK7rognt7kW2LHv6
-rswHnZ1Z2P/gbhlZ/EhG9hFVRZwRLDscWKcuWcxkePDt2J1pDNqD6SYa6ZjGC3AE
-TJw5iEA1bLQ9YvjDNpVYcf6ZvcSilIFjSQu5cs9sUbHGeKTrS5HzfeJXh1PfJyL8
-X0Hu7UBSjfSudso3baE9FGiBFBW2cnXZKDZGtV8eq/qxPetOOgS09pVbNP6508WV
-BR+rz98/VDZLZqcbZ2UpOuz4+kAKmbYE9GplxKQZZO7wWEox7Mid/uUdcqEo4QKn
-no6ujOuzQzn5a2oOS0k5Hk3uHapNJWlW9YI3LHtfADpYH+6cOR+/c3JWBzQJ6AD7
-muvNzA9mWXeHqLxMMP4pkmb7otzZYrEkodUqJgAQxcYhGh6XsCPfJ/D9RN734OJc
-gleVXFI8Kz455HxCW19XNfz16k7T6kqhZ/6SOBbkxEuqg7oEthAP109ZZzgx4oDo
-hQsw24TjLkI4SPIc7nr60UUCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAu0+zrg0C
-mlSv4Yi24OwB7TBvx+WHesl1IilCUdTiiUMo3NumvsU9Dr3Jkd0jGqYI0eyH4gIt
-KrhAveXfEw7tAOEHiYicmAdIFtyzh++ZWb8mgbBeqij1MP/76Jv+cc0lUqpfRo/A
-qytAsPAILuyL1o1jh28JHcq+v+WYn/FEhjUlH6emhGKGlsAjhUPjzK8MEshNolhj
-t2UXw9WB5B2xWvrqlNMy0F3NAZBkZ/+k21HZo6FmVi+q6OEGcOo7wJt6wrH/lko9
-LxX96GC1JoN1Pfr2FoTKy1WHzrSfyGmDIUCrbaYQ58UuMOR+5eIPPdkf/030u5eX
-xXhF2fBujD57E2zQGh/l2MrOjamcSo0+wYhOqlX3WNdaKNAzPqloBnF6w7eqLYde
-h9He39ySmxjENwv3miOjEP1sBeMBSRfL/ckEonfK5uJgYA5nVMQ3ojUeDMZzLfFE
-Ue2WHt+uPyYk7mMZfOrK2uHzI2/Coqj7lbfRodFwj+fCArYBck2NZannDPKA6X8V
-TzJTbTCteOUUJTrcfZ0gGhGkF4nYLmX5OI+TPqrDJf0fZ+mzAEHzDDVXcBYpYRDr
-r8d9QwrK+WaqVi2ofbMfMByVF72jgeJNa4nxwT9bVbu/Q1T2Lt+YPb4pQ7yCoUgS
-JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
-----END CERTIFICATE-----
--- a/test/helpers/certificates.ts
+++ b/test/helpers/certificates.ts
@ -0,0 +1,37 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import { fileURLToPath } from 'url';
+import * as tls from 'tls';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export interface TestCertificates {
+  privateKey: string;
+  publicKey: string;
+}
+
+export function loadTestCertificates(): TestCertificates {
+  const certPath = path.join(__dirname, '..', '..', 'assets', 'certs', 'cert.pem');
+  const keyPath = path.join(__dirname, '..', '..', 'assets', 'certs', 'key.pem');
+
+  // Read certificates
+  const publicKey = fs.readFileSync(certPath, 'utf8');
+  const privateKey = fs.readFileSync(keyPath, 'utf8');
+
+  // Validate certificates
+  try {
+    // Try to create a secure context with the certificates
+    tls.createSecureContext({
+      cert: publicKey,
+      key: privateKey
+    });
+  } catch (error) {
+    throw new Error(`Invalid certificates: ${error.message}`);
+  }
+
+  return {
+    privateKey,
+    publicKey
+  };
+}
--- a/test/key.pem
+++ b/test/key.pem
@ -1,52 +0,0 @@
-----BEGIN PRIVATE KEY-----
-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
-2TkK01XDDJURK5Lhuvc7WrK2rSJ/fK+0GA==
-----END PRIVATE KEY-----
--- a/test/test.ts
+++ b/test/test.ts
@ -1,116 +1,379 @@
 import { expect, tap } from '@push.rocks/tapbundle';
 import * as smartproxy from '../ts/index.js';
+import { loadTestCertificates } from './helpers/certificates.js';
+import * as https from 'https';
+import * as http from 'http';
+import { WebSocket, WebSocketServer } from 'ws';

 let testProxy: smartproxy.NetworkProxy;
+let testServer: http.Server;
+let wsServer: WebSocketServer;
+let testCertificates: { privateKey: string; publicKey: string };

-tap.test('first test', async () => {
+// Helper function to make HTTPS requests
+async function makeHttpsRequest(
+  options: https.RequestOptions,
+): Promise<{ statusCode: number; headers: http.IncomingHttpHeaders; body: string }> {
+  return new Promise((resolve, reject) => {
+    const req = https.request(options, (res) => {
+      let data = '';
+      res.on('data', (chunk) => (data += chunk));
+      res.on('end', () =>
+        resolve({
+          statusCode: res.statusCode!,
+          headers: res.headers,
+          body: data,
+        }),
+      );
+    });
+    req.on('error', reject);
+    req.end();
+  });
+}
+
+// Setup test environment
+tap.test('setup test environment', async () => {
+  // Load and validate certificates
+  console.log('[TEST] Loading and validating certificates');
+  testCertificates = loadTestCertificates();
+  console.log('[TEST] Certificates loaded and validated');
+  // Create a test HTTP server
+  testServer = http.createServer((req, res) => {
+    console.log('[TEST SERVER] Received HTTP request:', {
+      url: req.url,
+      method: req.method,
+      headers: req.headers
+    });
+    res.writeHead(200, { 'Content-Type': 'text/plain' });
+    res.end('Hello from test server!');
+  });
+
+  // Handle WebSocket upgrade requests
+  testServer.on('upgrade', (request, socket, head) => {
+    console.log('[TEST SERVER] Received WebSocket upgrade request:', {
+      url: request.url,
+      method: request.method,
+      headers: {
+        host: request.headers.host,
+        upgrade: request.headers.upgrade,
+        connection: request.headers.connection,
+        'sec-websocket-key': request.headers['sec-websocket-key'],
+        'sec-websocket-version': request.headers['sec-websocket-version'],
+        'sec-websocket-protocol': request.headers['sec-websocket-protocol']
+      }
+    });
+
+    if (request.headers.upgrade?.toLowerCase() !== 'websocket') {
+      console.log('[TEST SERVER] Not a WebSocket upgrade request');
+      socket.destroy();
+      return;
+    }
+
+    console.log('[TEST SERVER] Handling WebSocket upgrade');
+    wsServer.handleUpgrade(request, socket, head, (ws) => {
+      console.log('[TEST SERVER] WebSocket connection upgraded');
+      wsServer.emit('connection', ws, request);
+    });
+  });
+
+  // Create a WebSocket server
+  console.log('[TEST SERVER] Creating WebSocket server');
+  wsServer = new WebSocketServer({
+    noServer: true,
+    perMessageDeflate: false,
+    clientTracking: true,
+    handleProtocols: () => 'echo-protocol'
+  });
+
+  wsServer.on('connection', (ws, request) => {
+    console.log('[TEST SERVER] WebSocket connection established:', {
+      url: request.url,
+      headers: {
+        host: request.headers.host,
+        upgrade: request.headers.upgrade,
+        connection: request.headers.connection,
+        'sec-websocket-key': request.headers['sec-websocket-key'],
+        'sec-websocket-version': request.headers['sec-websocket-version'],
+        'sec-websocket-protocol': request.headers['sec-websocket-protocol']
+      }
+    });
+
+    // Set up connection timeout
+    const connectionTimeout = setTimeout(() => {
+      console.error('[TEST SERVER] WebSocket connection timed out');
+      ws.terminate();
+    }, 5000);
+
+    // Clear timeout when connection is properly closed
+    const clearConnectionTimeout = () => {
+      clearTimeout(connectionTimeout);
+    };
+
+    ws.on('message', (message) => {
+      const msg = message.toString();
+      console.log('[TEST SERVER] Received message:', msg);
+      try {
+        const response = `Echo: ${msg}`;
+        console.log('[TEST SERVER] Sending response:', response);
+        ws.send(response);
+        // Clear timeout on successful message exchange
+        clearConnectionTimeout();
+      } catch (error) {
+        console.error('[TEST SERVER] Error sending message:', error);
+      }
+    });
+
+    ws.on('error', (error) => {
+      console.error('[TEST SERVER] WebSocket error:', error);
+      clearConnectionTimeout();
+    });
+
+    ws.on('close', (code, reason) => {
+      console.log('[TEST SERVER] WebSocket connection closed:', {
+        code,
+        reason: reason.toString(),
+        wasClean: code === 1000 || code === 1001
+      });
+      clearConnectionTimeout();
+    });
+
+    ws.on('ping', (data) => {
+      try {
+        console.log('[TEST SERVER] Received ping, sending pong');
+        ws.pong(data);
+      } catch (error) {
+        console.error('[TEST SERVER] Error sending pong:', error);
+      }
+    });
+
+    ws.on('pong', (data) => {
+      console.log('[TEST SERVER] Received pong');
+    });
+  });
+
+  wsServer.on('error', (error) => {
+    console.error('Test server: WebSocket server error:', error);
+  });
+
+  wsServer.on('headers', (headers) => {
+    console.log('Test server: WebSocket headers:', headers);
+  });
+
+  wsServer.on('close', () => {
+    console.log('Test server: WebSocket server closed');
+  });
+
+  await new Promise<void>((resolve) => testServer.listen(3000, resolve));
+  console.log('Test server listening on port 3000');
+});
+
+tap.test('should create proxy instance', async () => {
  testProxy = new smartproxy.NetworkProxy({
    port: 3001,
  });
-  expect(testProxy).toBeInstanceOf(smartproxy.NetworkProxy);
+  expect(testProxy).toEqual(testProxy); // Instance equality check
 });

-tap.test('should start the testproxy', async () => {
+tap.test('should start the proxy server', async () => {
+  console.log('[TEST] Starting the proxy server');
  await testProxy.start();
-});
+  console.log('[TEST] Proxy server started');

-tap.test('should supply reverse proxy config', async () => {
+  // Configure proxy with test certificates
  testProxy.updateProxyConfigs([
    {
      destinationIp: '127.0.0.1',
      destinationPort: '3000',
      hostName: 'push.rocks',
-      privateKey: `-----BEGIN PRIVATE KEY-----
-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
-2TkK01XDDJURK5Lhuvc7WrK2rSJ/fK+0GA==
-----END PRIVATE KEY-----
-    `,
-      publicKey: `-----BEGIN CERTIFICATE-----
-MIIEljCCAn4CCQDY+ZbC9FASVjANBgkqhkiG9w0BAQsFADANMQswCQYDVQQGEwJE
-RTAeFw0xOTA5MjAxNjAxNDRaFw0yMDA5MTkxNjAxNDRaMA0xCzAJBgNVBAYTAkRF
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA4thf9JEK/epoXt8hFr8t
-pkRzmaEkgbSKoOga3uGXDLvdNf3BzSIxZ8pzRhZfUnutcmW1thdz3wre/pEJR7oN
-QsfixbLL8/oS5QeXKiUGX0Ssfdg4W0TsoLcRva+1AZsf38MfiUPhzh1/UW/rMywW
-asazQwRZdkkXb4nKJ2IFZx22qnAD4/5Sug+sfeKoFBF/rzI2yK7rognt7kW2LHv6
-rswHnZ1Z2P/gbhlZ/EhG9hFVRZwRLDscWKcuWcxkePDt2J1pDNqD6SYa6ZjGC3AE
-TJw5iEA1bLQ9YvjDNpVYcf6ZvcSilIFjSQu5cs9sUbHGeKTrS5HzfeJXh1PfJyL8
-X0Hu7UBSjfSudso3baE9FGiBFBW2cnXZKDZGtV8eq/qxPetOOgS09pVbNP6508WV
-BR+rz98/VDZLZqcbZ2UpOuz4+kAKmbYE9GplxKQZZO7wWEox7Mid/uUdcqEo4QKn
-no6ujOuzQzn5a2oOS0k5Hk3uHapNJWlW9YI3LHtfADpYH+6cOR+/c3JWBzQJ6AD7
-muvNzA9mWXeHqLxMMP4pkmb7otzZYrEkodUqJgAQxcYhGh6XsCPfJ/D9RN734OJc
-gleVXFI8Kz455HxCW19XNfz16k7T6kqhZ/6SOBbkxEuqg7oEthAP109ZZzgx4oDo
-hQsw24TjLkI4SPIc7nr60UUCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAu0+zrg0C
-mlSv4Yi24OwB7TBvx+WHesl1IilCUdTiiUMo3NumvsU9Dr3Jkd0jGqYI0eyH4gIt
-KrhAveXfEw7tAOEHiYicmAdIFtyzh++ZWb8mgbBeqij1MP/76Jv+cc0lUqpfRo/A
-qytAsPAILuyL1o1jh28JHcq+v+WYn/FEhjUlH6emhGKGlsAjhUPjzK8MEshNolhj
-t2UXw9WB5B2xWvrqlNMy0F3NAZBkZ/+k21HZo6FmVi+q6OEGcOo7wJt6wrH/lko9
-LxX96GC1JoN1Pfr2FoTKy1WHzrSfyGmDIUCrbaYQ58UuMOR+5eIPPdkf/030u5eX
-xXhF2fBujD57E2zQGh/l2MrOjamcSo0+wYhOqlX3WNdaKNAzPqloBnF6w7eqLYde
-h9He39ySmxjENwv3miOjEP1sBeMBSRfL/ckEonfK5uJgYA5nVMQ3ojUeDMZzLfFE
-Ue2WHt+uPyYk7mMZfOrK2uHzI2/Coqj7lbfRodFwj+fCArYBck2NZannDPKA6X8V
-TzJTbTCteOUUJTrcfZ0gGhGkF4nYLmX5OI+TPqrDJf0fZ+mzAEHzDDVXcBYpYRDr
-r8d9QwrK+WaqVi2ofbMfMByVF72jgeJNa4nxwT9bVbu/Q1T2Lt+YPb4pQ7yCoUgS
-JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
-----END CERTIFICATE-----
-    `,
-    },
+      publicKey: testCertificates.publicKey,
+      privateKey: testCertificates.privateKey,
+    }
  ]);
+
+  console.log('[TEST] Proxy configuration updated');
 });

-tap.test('should wait for 60 seconds', async (tools) => {
-  await tools.delayFor(10000);
+tap.test('should route HTTPS requests based on host header', async () => {
+  const response = await makeHttpsRequest({
+    hostname: 'push.rocks',
+    port: 3001,
+    path: '/',
+    method: 'GET',
+    rejectUnauthorized: false,
+  });
+
+  expect(response.statusCode).toEqual(200);
+  expect(response.body).toEqual('Hello from test server!');
 });

-tap.test('should close the testproxy', async () => {
+tap.test('should handle unknown host headers', async () => {
+  const response = await makeHttpsRequest({
+    hostname: 'unknown.host',
+    port: 3001,
+    path: '/',
+    method: 'GET',
+    rejectUnauthorized: false,
+  }).catch((e) => e);
+
+  expect(response instanceof Error).toEqual(true);
+});
+
+tap.test('should support WebSocket connections', async () => {
+  console.log('\n[TEST] ====== WebSocket Test Started ======');
+  console.log('[TEST] Test server port:', 3000);
+  console.log('[TEST] Proxy server port:', 3001);
+  console.log('\n[TEST] Starting WebSocket test');
+
+  // First configure the proxy with test certificates
+  console.log('[TEST] Configuring proxy with test certificates');
+  testProxy.updateProxyConfigs([
+    {
+      destinationIp: '127.0.0.1',
+      destinationPort: '3000',
+      hostName: 'push.rocks',
+      publicKey: testCertificates.publicKey,
+      privateKey: testCertificates.privateKey,
+    }
+  ]);
+
+  return new Promise<void>((resolve, reject) => {
+    console.log('[TEST] Creating WebSocket client');
+
+    // Create WebSocket client with SSL/TLS options
+    const wsUrl = 'wss://push.rocks:3001';
+    console.log('[TEST] Creating WebSocket connection to:', wsUrl);
+    
+    const ws = new WebSocket(wsUrl, {
+      rejectUnauthorized: false, // Accept self-signed certificates
+      handshakeTimeout: 5000,
+      perMessageDeflate: false,
+      headers: {
+        'Host': 'push.rocks',
+        'Connection': 'Upgrade',
+        'Upgrade': 'websocket',
+        'Sec-WebSocket-Version': '13'
+      },
+      protocol: 'echo-protocol',
+      agent: new https.Agent({
+        rejectUnauthorized: false // Also needed for the underlying HTTPS connection
+      })
+    });
+
+    console.log('[TEST] WebSocket client created');
+
+    let resolved = false;
+    const cleanup = () => {
+      if (!resolved) {
+        resolved = true;
+        try {
+          console.log('[TEST] Cleaning up WebSocket connection');
+          ws.close();
+          resolve();
+        } catch (error) {
+          console.error('[TEST] Error during cleanup:', error);
+          reject(error);
+        }
+      }
+    };
+
+    const timeout = setTimeout(() => {
+      console.error('[TEST] WebSocket test timed out');
+      cleanup();
+      reject(new Error('WebSocket test timed out after 5 seconds'));
+    }, 5000);
+
+    // Connection establishment events
+    ws.on('upgrade', (response) => {
+      console.log('[TEST] WebSocket upgrade response received:', {
+        headers: response.headers,
+        statusCode: response.statusCode
+      });
+    });
+
+    ws.on('open', () => {
+      console.log('[TEST] WebSocket connection opened');
+      try {
+        console.log('[TEST] Sending test message');
+        ws.send('Hello WebSocket');
+      } catch (error) {
+        console.error('[TEST] Error sending message:', error);
+        cleanup();
+        reject(error);
+      }
+    });
+
+    ws.on('message', (message) => {
+      console.log('[TEST] Received message:', message.toString());
+      if (message.toString() === 'Hello WebSocket') {
+        console.log('[TEST] Message received correctly');
+        clearTimeout(timeout);
+        cleanup();
+      }
+    });
+
+    ws.on('error', (error) => {
+      console.error('[TEST] WebSocket error:', error);
+      cleanup();
+      reject(error);
+    });
+
+    ws.on('close', (code, reason) => {
+      console.log('[TEST] WebSocket connection closed:', {
+        code,
+        reason: reason.toString()
+      });
+      cleanup();
+    });
+  });
+});
+
+tap.test('should handle custom headers', async () => {
+  testProxy.addDefaultHeaders({
+    'X-Proxy-Header': 'test-value',
+  });
+
+  const response = await makeHttpsRequest({
+    hostname: 'push.rocks',
+    port: 3001,
+    path: '/',
+    method: 'GET',
+    rejectUnauthorized: false,
+  });
+
+  expect(response.headers['x-proxy-header']).toEqual('test-value');
+});
+
+tap.test('cleanup', async () => {
+  console.log('[TEST] Starting cleanup');
+
+  // Clean up all servers
+  console.log('[TEST] Terminating WebSocket clients');
+  wsServer.clients.forEach((client) => {
+    client.terminate();
+  });
+
+  console.log('[TEST] Closing WebSocket server');
+  await new Promise<void>((resolve) => wsServer.close(() => {
+    console.log('[TEST] WebSocket server closed');
+    resolve();
+  }));
+
+  console.log('[TEST] Closing test server');
+  await new Promise<void>((resolve) => testServer.close(() => {
+    console.log('[TEST] Test server closed');
+    resolve();
+  }));
+
+  console.log('[TEST] Stopping proxy');
  await testProxy.stop();
+  console.log('[TEST] Cleanup complete');
+});
+
+process.on('exit', () => {
+  console.log('[TEST] Shutting down test server');
+  testServer.close(() => console.log('[TEST] Test server shut down'));
+  wsServer.close(() => console.log('[TEST] WebSocket server shut down'));
+  testProxy.stop().then(() => console.log('[TEST] Proxy server stopped'));
 });

 tap.start();
--- a/ts/00_commitinfo_data.ts
+++ b/ts/00_commitinfo_data.ts
@ -1,8 +1,8 @@
 /**
- * autocreated commitinfo by @pushrocks/commitinfo
+ * autocreated commitinfo by @push.rocks/commitinfo
 */
 export const commitinfo = {
  name: '@push.rocks/smartproxy',
-  version: '3.0.60',
+  version: '3.1.2',
  description: 'a proxy for handling high workloads of proxying'
 }
--- a/ts/smartproxy.classes.networkproxy.ts
+++ b/ts/smartproxy.classes.networkproxy.ts
@ -1,10 +1,17 @@
 import * as plugins from './smartproxy.plugins.js';
 import { ProxyRouter } from './smartproxy.classes.router.js';
+import * as fs from 'fs';
+import * as path from 'path';
+import { fileURLToPath } from 'url';

 export interface INetworkProxyOptions {
  port: number;
 }

+interface WebSocketWithHeartbeat extends plugins.wsDefault {
+  lastPong: number;
+}
+
 export class NetworkProxy {
  // INSTANCE
  public options: INetworkProxyOptions;
@ -13,6 +20,8 @@ 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;
+  private defaultCertificates: { key: string; cert: string };

  public alreadyAddedReverseConfigs: {
    [hostName: string]: plugins.tsclass.network.IReverseProxyConfig;
@ -20,6 +29,18 @@ export class NetworkProxy {

  constructor(optionsArg: INetworkProxyOptions) {
    this.options = optionsArg;
+    const __dirname = path.dirname(fileURLToPath(import.meta.url));
+    const certPath = path.join(__dirname, '..', 'assets', 'certs');
+    
+    try {
+      this.defaultCertificates = {
+        key: fs.readFileSync(path.join(certPath, 'key.pem'), 'utf8'),
+        cert: fs.readFileSync(path.join(certPath, 'cert.pem'), 'utf8')
+      };
+    } catch (error) {
+      console.error('Error loading certificates:', error);
+      throw error;
+    }
  }

  /**
@ -27,94 +48,9 @@ export class NetworkProxy {
   */
  public async start() {
    this.httpsServer = plugins.https.createServer(
-      // ================
-      // 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-----
-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
-2TkK01XDDJURK5Lhuvc7WrK2rSJ/fK+0GA==
-----END PRIVATE KEY-----
-    `,
-        cert: `-----BEGIN CERTIFICATE-----
-MIIEljCCAn4CCQDY+ZbC9FASVjANBgkqhkiG9w0BAQsFADANMQswCQYDVQQGEwJE
-RTAeFw0xOTA5MjAxNjAxNDRaFw0yMDA5MTkxNjAxNDRaMA0xCzAJBgNVBAYTAkRF
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA4thf9JEK/epoXt8hFr8t
-pkRzmaEkgbSKoOga3uGXDLvdNf3BzSIxZ8pzRhZfUnutcmW1thdz3wre/pEJR7oN
-QsfixbLL8/oS5QeXKiUGX0Ssfdg4W0TsoLcRva+1AZsf38MfiUPhzh1/UW/rMywW
-asazQwRZdkkXb4nKJ2IFZx22qnAD4/5Sug+sfeKoFBF/rzI2yK7rognt7kW2LHv6
-rswHnZ1Z2P/gbhlZ/EhG9hFVRZwRLDscWKcuWcxkePDt2J1pDNqD6SYa6ZjGC3AE
-TJw5iEA1bLQ9YvjDNpVYcf6ZvcSilIFjSQu5cs9sUbHGeKTrS5HzfeJXh1PfJyL8
-X0Hu7UBSjfSudso3baE9FGiBFBW2cnXZKDZGtV8eq/qxPetOOgS09pVbNP6508WV
-BR+rz98/VDZLZqcbZ2UpOuz4+kAKmbYE9GplxKQZZO7wWEox7Mid/uUdcqEo4QKn
-no6ujOuzQzn5a2oOS0k5Hk3uHapNJWlW9YI3LHtfADpYH+6cOR+/c3JWBzQJ6AD7
-muvNzA9mWXeHqLxMMP4pkmb7otzZYrEkodUqJgAQxcYhGh6XsCPfJ/D9RN734OJc
-gleVXFI8Kz455HxCW19XNfz16k7T6kqhZ/6SOBbkxEuqg7oEthAP109ZZzgx4oDo
-hQsw24TjLkI4SPIc7nr60UUCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAu0+zrg0C
-mlSv4Yi24OwB7TBvx+WHesl1IilCUdTiiUMo3NumvsU9Dr3Jkd0jGqYI0eyH4gIt
-KrhAveXfEw7tAOEHiYicmAdIFtyzh++ZWb8mgbBeqij1MP/76Jv+cc0lUqpfRo/A
-qytAsPAILuyL1o1jh28JHcq+v+WYn/FEhjUlH6emhGKGlsAjhUPjzK8MEshNolhj
-t2UXw9WB5B2xWvrqlNMy0F3NAZBkZ/+k21HZo6FmVi+q6OEGcOo7wJt6wrH/lko9
-LxX96GC1JoN1Pfr2FoTKy1WHzrSfyGmDIUCrbaYQ58UuMOR+5eIPPdkf/030u5eX
-xXhF2fBujD57E2zQGh/l2MrOjamcSo0+wYhOqlX3WNdaKNAzPqloBnF6w7eqLYde
-h9He39ySmxjENwv3miOjEP1sBeMBSRfL/ckEonfK5uJgYA5nVMQ3ojUeDMZzLfFE
-Ue2WHt+uPyYk7mMZfOrK2uHzI2/Coqj7lbfRodFwj+fCArYBck2NZannDPKA6X8V
-TzJTbTCteOUUJTrcfZ0gGhGkF4nYLmX5OI+TPqrDJf0fZ+mzAEHzDDVXcBYpYRDr
-r8d9QwrK+WaqVi2ofbMfMByVF72jgeJNa4nxwT9bVbu/Q1T2Lt+YPb4pQ7yCoUgS
-JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
-----END CERTIFICATE-----
-    `,
+        key: this.defaultCertificates.key,
+        cert: this.defaultCertificates.cert
      },
      async (originRequest, originResponse) => {
        /**
@ -124,7 +60,7 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
        const endOriginReqRes = (
          statusArg: number = 404,
          messageArg: string = 'This route is not available on this server.',
-          headers: plugins.http.OutgoingHttpHeaders = {}
+          headers: plugins.http.OutgoingHttpHeaders = {},
        ) => {
          originResponse.writeHead(statusArg, messageArg);
          originResponse.end(messageArg);
@ -135,13 +71,13 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
        };

        console.log(
-          `got request: ${originRequest.headers.host}${plugins.url.parse(originRequest.url).path}`
+          `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.`
+            `${originRequest.headers.host} can't be routed properly. Terminating request.`,
          );
          endOriginReqRes();
          return;
@ -174,7 +110,7 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
            default:
              return endOriginReqRes(
                403,
-                'Forbidden: unsupported authentication method configured. Please report to the admin.'
+                'Forbidden: unsupported authentication method configured. Please report to the admin.',
              );
          }
        }
@ -186,76 +122,103 @@ 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 wsServer = new plugins.ws.WebSocketServer({ server: this.httpsServer });
+
+    // 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();
+        }
+        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: plugins.wsDefault, reqArg: plugins.http.IncomingMessage) => {
+      async (wsIncoming: WebSocketWithHeartbeat, reqArg: plugins.http.IncomingMessage) => {
        console.log(
-          `wss proxy: got connection for wsc for https://${reqArg.headers.host}${reqArg.url}`
+          `wss proxy: got connection for wsc for https://${reqArg.headers.host}${reqArg.url}`,
        );

+        wsIncoming.lastPong = Date.now();
+        wsIncoming.on('pong', () => {
+          wsIncoming.lastPong = Date.now();
+        });
+
        let wsOutgoing: plugins.wsDefault;

        const outGoingDeferred = plugins.smartpromise.defer();
@ -264,7 +227,7 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
          wsOutgoing = new plugins.wsDefault(
            `ws://${this.router.routeReq(reqArg).destinationIp}:${
              this.router.routeReq(reqArg).destinationPort
-            }${reqArg.url}`
+            }${reqArg.url}`,
          );
          console.log('wss proxy: initiated outgoing proxy');
          wsOutgoing.on('open', async () => {
@ -277,30 +240,42 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
        }

        wsIncoming.on('message', async (message, isBinary) => {
-          await outGoingDeferred.promise;
-          // console.log("client to upstream", message);
-          wsOutgoing.send(message, { binary: isBinary });
+          try {
+            await outGoingDeferred.promise;
+            wsOutgoing.send(message, { binary: isBinary });
+          } catch (error) {
+            console.error('Error sending message to wsOutgoing:', error);
+          }
        });

        wsOutgoing.on('message', async (message, isBinary) => {
-          // console.log("upstream to client", message);
-          wsIncoming.send(message, { binary: isBinary });
+          try {
+            wsIncoming.send(message, { binary: isBinary });
+          } catch (error) {
+            console.error('Error sending message to wsIncoming:', error);
+          }
        });
+
        const terminateWsOutgoing = () => {
-          wsOutgoing.terminate();
-          console.log('terminated outgoing ws.');
+          if (wsOutgoing) {
+            wsOutgoing.terminate();
+            console.log('terminated outgoing ws.');
+          }
        };
        wsIncoming.on('error', () => terminateWsOutgoing());
        wsIncoming.on('close', () => terminateWsOutgoing());

        const terminateWsIncoming = () => {
-          wsIncoming.terminate();
-          console.log('terminated incoming ws.');
+          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;

@ -330,7 +305,7 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=

    this.httpsServer.listen(this.options.port);
    console.log(
-      `NetworkProxy -> OK: now listening for new connections on port ${this.options.port}`
+      `NetworkProxy -> OK: now listening for new connections on port ${this.options.port}`,
    );
  }

@ -339,8 +314,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) {
@ -360,7 +333,6 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
        cert: hostCandidate.publicKey,
        key: hostCandidate.privateKey,
      });
-      this.httpsServer;
    }
  }

@ -379,5 +351,7 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
      socket.destroy();
    });
    await done.promise;
+    clearInterval(this.heartbeatInterval);
+    console.log('NetworkProxy -> OK: Server has been stopped and all connections closed.');
  }
 }
--- a/ts/smartproxy.classes.router.ts
+++ b/ts/smartproxy.classes.router.ts
@ -16,9 +16,18 @@ export class ProxyRouter {
   */
  public routeReq(req: plugins.http.IncomingMessage): plugins.tsclass.network.IReverseProxyConfig {
    const originalHost = req.headers.host;
+    if (!originalHost) {
+      console.error('No host header found in request');
+      return undefined;
+    }
+    // Strip port from host if present
+    const hostWithoutPort = originalHost.split(':')[0];
    const correspodingReverseProxyConfig = this.reverseProxyConfigs.find((reverseConfig) => {
-      return reverseConfig.hostName === originalHost;
+      return reverseConfig.hostName === hostWithoutPort;
    });
+    if (!correspodingReverseProxyConfig) {
+      console.error(`No config found for host: ${hostWithoutPort}`);
+    }
    return correspodingReverseProxyConfig;
  }
 }
--- a/ts/smartproxy.helpers.certificates.ts
+++ b/ts/smartproxy.helpers.certificates.ts
@ -0,0 +1,30 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+export interface ICertificates {
+  privateKey: string;
+  publicKey: string;
+}
+
+export function loadDefaultCertificates(): ICertificates {
+  try {
+    const certPath = path.join(__dirname, '..', 'assets', 'certs');
+    const privateKey = fs.readFileSync(path.join(certPath, 'key.pem'), 'utf8');
+    const publicKey = fs.readFileSync(path.join(certPath, 'cert.pem'), 'utf8');
+
+    if (!privateKey || !publicKey) {
+      throw new Error('Failed to load default certificates');
+    }
+
+    return {
+      privateKey,
+      publicKey
+    };
+  } catch (error) {
+    console.error('Error loading default certificates:', error);
+    throw error;
+  }
+}
--- a/tsconfig.json
+++ b/tsconfig.json
@ -3,9 +3,14 @@
    "experimentalDecorators": true,
    "useDefineForClassFields": false,
    "target": "ES2022",
-    "module": "ES2022",
-    "moduleResolution": "nodenext",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
    "esModuleInterop": true,
    "verbatimModuleSyntax": true,
-  }
-}
+    "baseUrl": ".",
+    "paths": {}
+  },
+  "exclude": [
+    "dist_*/**/*.d.ts"
+  ]
+}
Author	SHA1	Message	Date
Philipp Kunz	3e66debb01	3.1.2	2025-02-04 00:38:39 +01:00
Philipp Kunz	f1bb1702c1	fix(core): Refactor certificate handling across the project	2025-02-04 00:38:39 +01:00
Philipp Kunz	5abc0d8a14	3.1.1	2025-02-03 23:41:14 +01:00
Philipp Kunz	9150e8c5fc	fix(workflow): Update Gitea workflow paths and dependencies	2025-02-03 23:41:13 +01:00
Philipp Kunz	8e4d3b7565	3.1.0	2024-10-07 12:52:02 +02:00
Philipp Kunz	459ee7130f	feat(NetworkProxy): Introduce WebSocket heartbeat to maintain active connections in NetworkProxy	2024-10-07 12:52:01 +02:00
Philipp Kunz	ceede84774	3.0.61	2024-10-07 12:29:49 +02:00
Philipp Kunz	70bdf074a1	fix(networkproxy): Improve error handling for proxy requests	2024-10-07 12:29:49 +02:00
Philipp Kunz	3eb4b576a7	update description	2024-05-29 14:15:35 +02:00
Philipp Kunz	c1f2c64e8b	update tsconfig	2024-04-14 18:10:41 +02:00
Philipp Kunz	4ba943ee59	update tsconfig	2024-04-01 21:40:16 +02:00
Philipp Kunz	4c50e9a556	update npmextra.json: githost	2024-04-01 19:59:21 +02:00
Philipp Kunz	f2428412bb	update npmextra.json: githost	2024-03-30 21:48:21 +01:00