3.0.6

.gitlab-ci.yml

@@ -12,20 +12,12 @@ stages:
   - release
   - metadata
 
+before_script:
+  - npm install -g @shipzone/npmci
+
 # ====================
 # security stage
 # ====================
-mirror:
-  stage: security
-  script:
-    - npmci git mirror
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
 auditProductionDependencies:
   image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
@@ -36,6 +28,7 @@ auditProductionDependencies:
     - 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
@@ -96,10 +89,9 @@ codequality:
   only:
     - tags
   script:
-    - npmci command npm install -g tslint typescript
+    - npmci command npm install -g typescript
     - npmci npm prepare
     - npmci npm install
-    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
     - lossless
     - docker
@@ -119,11 +111,10 @@ trigger:
 pages:
   stage: metadata
   script:
-    - npmci node install lts
+    - npmci node install stable 
-    - npmci command npm install -g @gitzone/tsdoc
     - npmci npm prepare
     - npmci npm install
-    - npmci command tsdoc
+    - npmci command npm run buildDocs
   tags:
     - lossless
     - docker

.vscode/launch.json

@@ -2,28 +2,10 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "current file",
+      "command": "npm test",
-      "type": "node",
+      "name": "Run npm test",
       "request": "launch",
-      "args": [
+      "type": "node-terminal"
-        "${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"
     }
   ]
 }

npmextra.json

@@ -5,7 +5,7 @@
       "githost": "gitlab.com",
       "gitscope": "pushrocks",
       "gitrepo": "smartproxy",
-      "shortDescription": "a proxy for handling high workloads of proxying",
+      "description": "a proxy for handling high workloads of proxying",
       "npmPackagename": "@pushrocks/smartproxy",
       "license": "MIT",
       "projectDomain": "push.rocks"

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@pushrocks/smartproxy",
-  "version": "3.0.4",
+  "version": "3.0.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@pushrocks/smartproxy",
-      "version": "3.0.4",
+      "version": "3.0.6",
       "license": "MIT",
       "dependencies": {
         "@pushrocks/lik": "^6.0.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartproxy",
-  "version": "3.0.4",
+  "version": "3.0.6",
   "private": false,
   "description": "a proxy for handling high workloads of proxying",
   "main": "dist_ts/index.js",
@@ -11,7 +11,8 @@
   "scripts": {
     "test": "(tstest test/)",
     "build": "(tsbuild --web --allowimplicitany)",
-    "format": "(gitzone format)"
+    "format": "(gitzone format)",
+    "buildDocs": "tsdoc"
   },
   "devDependencies": {
     "@gitzone/tsbuild": "^2.1.63",

test/test.ts

@@ -5,7 +5,7 @@ let testProxy: smartproxy.NetworkProxy;
 
 tap.test('first test', async () => {
   testProxy = new smartproxy.NetworkProxy({
-    port: 3001
+    port: 3001,
   });
   expect(testProxy).toBeInstanceOf(smartproxy.NetworkProxy);
 });

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@pushrocks/smartproxy',
-  version: '3.0.4',
+  version: '3.0.6',
   description: 'a proxy for handling high workloads of proxying'
 }

ts/index.ts

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

ts/smartproxy.classes.networkproxy.ts

@@ -6,7 +6,6 @@ export interface INetworkProxyOptions {
 }
 
 export class NetworkProxy {
-
   // INSTANCE
   public options: INetworkProxyOptions;
   public proxyConfigs: plugins.tsclass.network.IReverseProxyConfig[] = [];
@@ -276,7 +275,9 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
     });
 
     this.httpsServer.listen(this.options.port);
-    console.log(`ProxyWorker -> OK: now listening for new connections on port ${this.options.port}`);
+    console.log(
+      `ProxyWorker -> OK: now listening for new connections on port ${this.options.port}`
+    );
   }
 
   public async updateProxyConfigs(proxyConfigsArg: plugins.tsclass.network.IReverseProxyConfig[]) {
@@ -306,13 +307,9 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
       });
       this.httpsServer;
     }
-    /* this.httpsServer.close();
-    this.httpsServer.listen(this.port); */
   }
 
-  public async addDefaultHeaders(headersArg: {
+  public async addDefaultHeaders(headersArg: { [key: string]: string }) {
-    [key: string]: string;
-  }) {
     for (const headerKey of Object.keys(headersArg)) {
       this.defaultHeaders[headerKey] = headersArg[headerKey];
     }

ts/smartproxy.portproxy.ts

@@ -9,22 +9,10 @@ export class PortProxy {
 
   constructor(fromPortArg: number, toPortArg: number) {
     this.fromPort = fromPortArg;
-    this.toPort = toPortArg
+    this.toPort = toPortArg;
   }
 
   public async start() {
-    httpServer = plugins.http.createServer((request, response) => {
-      const requestUrl = new URL(request.url, `http://${request.headers.host}`);
-      const completeUrlWithoutProtocol = `${requestUrl.host}${requestUrl.pathname}${requestUrl.search}`;
-      const redirectUrl = `https://${completeUrlWithoutProtocol}`;
-      console.log(`Got http request for http://${completeUrlWithoutProtocol}`);
-      console.log(`Redirecting to ${redirectUrl}`);
-      response.writeHead(302, {
-        Location: redirectUrl,
-      });
-      response.end();
-    });
-    httpServer.listen(this.fromPort);
     const cleanUpSockets = (from: plugins.net.Socket, to: plugins.net.Socket) => {
       from.end();
       to.end();
@@ -34,7 +22,7 @@ export class PortProxy {
       to.unpipe();
       from.destroy();
       to.destroy();
-    }
+    };
     netServer = net
       .createServer((from) => {
         const to = net.createConnection({
@@ -64,10 +52,10 @@ export class PortProxy {
         });
         from.on('end', () => {
           cleanUpSockets(from, to);
-        })
+        });
         to.on('end', () => {
           cleanUpSockets(from, to);
-        })
+        });
       })
       .listen(this.fromPort);
     console.log(`PortProxy -> OK: Now listening on port ${this.fromPort}`);
@@ -82,4 +70,4 @@ export class PortProxy {
     });
     await done.promise;
   }
-};
+}