3.0.54

.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.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartproxy",
-  "version": "3.0.4",
+  "version": "3.0.54",
   "private": false,
   "description": "a proxy for handling high workloads of proxying",
   "main": "dist_ts/index.js",
@@ -11,21 +11,23 @@
   "scripts": {
     "test": "(tstest test/)",
     "build": "(tsbuild --web --allowimplicitany)",
-    "format": "(gitzone format)"
+    "format": "(gitzone format)",
+    "buildDocs": "tsdoc"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.63",
+    "@gitzone/tsbuild": "^2.1.65",
-    "@gitzone/tstest": "^1.0.72",
+    "@gitzone/tsrun": "^1.2.39",
+    "@gitzone/tstest": "^1.0.73",
     "@pushrocks/tapbundle": "^5.0.4",
-    "@types/node": "^18.6.2"
+    "@types/node": "^18.7.8"
   },
   "dependencies": {
     "@pushrocks/lik": "^6.0.0",
-    "@pushrocks/smartnetwork": "^3.0.0",
+    "@pushrocks/smartdelay": "^2.0.13",
     "@pushrocks/smartpromise": "^3.1.7",
-    "@pushrocks/smartrequest": "^2.0.0",
+    "@pushrocks/smartrequest": "^2.0.10",
     "@pushrocks/smartstring": "^4.0.2",
-    "@tsclass/tsclass": "^4.0.17",
+    "@tsclass/tsclass": "^4.0.19",
     "@types/ws": "^8.5.3",
     "ws": "^8.8.1"
   },

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.54',
   description: 'a proxy for handling high workloads of proxying'
 }

ts/index.ts

@@ -1,2 +1,3 @@
-export * from './smartproxy.classes.networkproxy.js'
+export * from './smartproxy.classes.networkproxy.js';
 export * from './smartproxy.portproxy.js';
+export * from './smartproxy.classes.sslredirect.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[] = [];
@@ -117,36 +116,46 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
 -----END CERTIFICATE-----
     `,
       },
-      async (req, res) => {
+      async (originRequest, originResponse) => {
-        console.log('got request');
-        const destinationConfig = this.router.routeReq(req);
-
         /**
          * endRequest function
          * can be used to prematurely end a request
          */
-        const endRequest = (
+        const endOriginReqRes = (
           statusArg: number = 404,
           messageArg: string = 'This route is not available on this server.',
           headers: plugins.http.OutgoingHttpHeaders = {}
         ) => {
-          res.writeHead(statusArg, messageArg);
+          originResponse.writeHead(statusArg, messageArg);
-          res.end(messageArg);
+          originResponse.end(messageArg);
+          if (originRequest.socket !== originResponse.socket) {
+            console.log('hey, something is strange.')
+          }
+          originResponse.destroy();
         };
 
+        console.log(`got request: ${originRequest.headers.host}${plugins.url.parse(originRequest.url).path}`);
+        const destinationConfig = this.router.routeReq(originRequest);
+
+        if (!destinationConfig) {
+          console.log(`${originRequest.headers.host} can't be routed properly. Terminating request.`);
+          endOriginReqRes();
+          return;
+        }
+
         // authentication
         if (destinationConfig.authentication) {
           const authInfo = destinationConfig.authentication;
           switch (authInfo.type) {
             case 'Basic':
-              const authHeader = req.headers.authorization;
+              const authHeader = originRequest.headers.authorization;
               if (authHeader) {
                 if (!authHeader.includes('Basic ')) {
-                  return endRequest(401, 'Authentication required', {
+                  return endOriginReqRes(401, 'Authentication required', {
                     'WWW-Authenticate': 'Basic realm="Access to the staging site", charset="UTF-8"',
                   });
                 }
-                const authStringBase64 = req.headers.authorization.replace('Basic ', '');
+                const authStringBase64 = originRequest.headers.authorization.replace('Basic ', '');
                 const authString: string = plugins.smartstring.base64.decode(authStringBase64);
                 const userPassArray = authString.split(':');
                 const user = userPassArray[0];
@@ -154,12 +163,12 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
                 if (user === authInfo.user && pass === authInfo.pass) {
                   console.log('request successfully authenticated');
                 } else {
-                  return endRequest(403, 'Forbidden: Wrong credentials');
+                  return endOriginReqRes(403, 'Forbidden: Wrong credentials');
                 }
               }
               break;
             default:
-              return endRequest(
+              return endOriginReqRes(
                 403,
                 'Forbidden: unsupported authentication method configured. Please report to the admin.'
               );
@@ -168,96 +177,112 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
 
         let destinationUrl: string;
         if (destinationConfig) {
-          destinationUrl = `http://${destinationConfig.destinationIp}:${destinationConfig.destinationPort}${req.url}`;
+          destinationUrl = `http://${destinationConfig.destinationIp}:${destinationConfig.destinationPort}${originRequest.url}`;
         } else {
-          return endRequest();
+          return endOriginReqRes();
         }
         console.log(destinationUrl);
-        const response = await plugins.smartrequest.request(
+        const proxyResponse = await plugins.smartrequest.request(
           destinationUrl,
           {
-            method: req.method,
+            method: originRequest.method,
-            headers: req.headers,
+            headers: {
+              ...originRequest.headers,
+              'X-Forwarded-Host': originRequest.headers.host,
+              'X-Forwarded-Proto': 'https'
+            },
             keepAlive: true,
           },
           true, // lets make this streaming
-          (request) => {
+          (proxyRequest) => {
-            req.on('data', (data) => {
+            originRequest.on('data', (data) => {
-              request.write(data);
+              proxyRequest.write(data);
             });
-            req.on('end', (data) => {
+            originRequest.on('end', (data) => {
-              request.end();
+              proxyRequest.end();
             });
+            originRequest.on('error', () => {
+              proxyRequest.end();
+            });
+            originRequest.on('close', () => {
+              proxyRequest.end();
+            });
+            originRequest.on('timeout', () => {
+              proxyRequest.end();
+              originRequest.destroy();
+            });
+            proxyRequest.on('error', () => {
+              endOriginReqRes();
+            })
           }
         );
-        res.statusCode = response.statusCode;
+        originResponse.statusCode = proxyResponse.statusCode;
-        console.log(response.statusCode);
+        console.log(proxyResponse.statusCode);
         for (const defaultHeader of Object.keys(this.defaultHeaders)) {
-          res.setHeader(defaultHeader, this.defaultHeaders[defaultHeader]);
+          originResponse.setHeader(defaultHeader, this.defaultHeaders[defaultHeader]);
         }
-        for (const header of Object.keys(response.headers)) {
+        for (const header of Object.keys(proxyResponse.headers)) {
-          res.setHeader(header, response.headers[header]);
+          originResponse.setHeader(header, proxyResponse.headers[header]);
         }
-        response.on('data', (data) => {
+        proxyResponse.on('data', (data) => {
-          res.write(data);
+          originResponse.write(data);
         });
-        response.on('end', () => {
+        proxyResponse.on('end', () => {
-          res.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 });
+    const wsServer = new plugins.ws.WebSocketServer({ server: this.httpsServer  });
-    wss.on('connection', (ws: plugins.wsDefault) => {
+    wsServer.on('connection', async (wsIncoming: plugins.wsDefault, reqArg: plugins.http.IncomingMessage) => {
-      console.log('got connection for wsc');
+      console.log(`wss: got connection for wsc for https://${reqArg.headers.host}${reqArg.url}`);
-      const wscConnected = plugins.smartpromise.defer();
+      
+      let wsOutgoing: plugins.wsDefault;
+      try {
+        wsOutgoing = new plugins.wsDefault(`ws://${this.router.routeReq(reqArg).destinationIp}:${this.router.routeReq(reqArg).destinationPort}${reqArg.url}`);
+      } catch (err) {
+        console.log(err);
+        wsIncoming.terminate();
+        return;
+      }
 
-      const wsc = new plugins.wsDefault(this.router.routeWs(ws), {
+      wsIncoming.on("message", (message, isBinary) => {
-        headers: {
+        console.log("client to upstream", message);
-          Host: ws.url,
+        wsOutgoing.send(message, { binary: isBinary });
-        },
       });
-      wsc.on('open', () => {
+    
-        wscConnected.resolve();
+      wsOutgoing.on("message", (message, isBinary) => {
+        console.log("upstream to client", message);
+        wsIncoming.send(message, { binary: isBinary });
       });
+      wsIncoming.on("error", () => wsOutgoing.terminate());
+      wsOutgoing.on("error", () => wsIncoming.terminate());
+      wsIncoming.on("close", () => wsOutgoing.terminate());
+      wsOutgoing.on("close", () => wsIncoming.terminate());
 
-      ws.on('message', async (message) => {
-        await wscConnected.promise;
-        wsc.emit('message', message);
-      });
-      wsc.on('message', (message) => {
-        ws.emit('message', message);
-      });
-
-      // handle closing
-      const cleanUp = () => {
-        ws.removeAllListeners();
-        ws.close();
-        ws.terminate();
-        wsc.removeAllListeners();
-        wsc.close();
-        wsc.terminate();
-      };
-
-      ws.on('close', (message) => {
-        cleanUp();
-      });
-      wsc.on('close', (message) => {
-        cleanUp();
-      });
     });
-    this.httpsServer.keepAliveTimeout = 61000;
+    this.httpsServer.keepAliveTimeout = 600 * 1000;
-    this.httpsServer.headersTimeout = 65000; 
+    this.httpsServer.headersTimeout = 600 * 1000;
 
     this.httpsServer.on('connection', (connection: plugins.net.Socket) => {
-      connection.setTimeout(120000);
       this.socketMap.add(connection);
+      console.log(`added connection. now ${this.socketMap.getArray().length} sockets connected.`);
       const cleanupConnection = () => {
         if (this.socketMap.checkForObject(connection)) {
           this.socketMap.remove(connection);
-          connection.end();
+          console.log(`removed connection. ${this.socketMap.getArray().length} sockets remaining.`);
-          connection.removeAllListeners();
           connection.destroy();
         }
       };
@@ -272,14 +297,17 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
       });
       connection.on('timeout', () => {
         cleanupConnection();
-      });
+      })
     });
 
     this.httpsServer.listen(this.options.port);
-    console.log(`ProxyWorker -> OK: now listening for new connections on port ${this.options.port}`);
+    console.log(
+      `NetworkProxy -> OK: now listening for new connections on port ${this.options.port}`
+    );
   }
 
   public async updateProxyConfigs(proxyConfigsArg: plugins.tsclass.network.IReverseProxyConfig[]) {
+    console.log(`got new proxy configs`);
     this.proxyConfigs = proxyConfigsArg;
     this.router.setNewProxyConfigs(proxyConfigsArg);
     for (const hostCandidate of this.proxyConfigs) {
@@ -306,13 +334,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.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

@@ -0,0 +1,32 @@
+import * as plugins from './smartproxy.plugins.js';
+
+export class SslRedirect {
+  httpServer: plugins.http.Server;
+  port: number;
+  constructor(portArg: number) {
+    this.port = portArg;
+  }
+
+  public async start() {
+    this.httpServer = plugins.http.createServer((request, response) => {
+      const requestUrl = new URL(request.url, `http://${request.headers.host}`);
+      const completeUrlWithoutProtocol = `${requestUrl.host}${requestUrl.pathname}${requestUrl.search}`;
+      const redirectUrl = `https://${completeUrlWithoutProtocol}`;
+      console.log(`Got http request for http://${completeUrlWithoutProtocol}`);
+      console.log(`Redirecting to ${redirectUrl}`);
+      response.writeHead(302, {
+        Location: redirectUrl,
+      });
+      response.end();
+    });
+    this.httpServer.listen(this.port);
+  }
+
+  public async stop() {
+    const done = plugins.smartpromise.defer();
+    this.httpServer.close(() => {
+      done.resolve();
+    });
+    await done.promise;
+  }
+}

ts/smartproxy.plugins.ts

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

ts/smartproxy.portproxy.ts

@@ -1,30 +1,17 @@
 import * as plugins from './smartproxy.plugins.js';
 import * as net from 'net';
-let netServer: plugins.net.Server;
-let httpServer: plugins.http.Server;
 
 export class PortProxy {
+  netServer: plugins.net.Server;
   fromPort: number;
   toPort: number;
 
   constructor(fromPortArg: number, toPortArg: number) {
     this.fromPort = fromPortArg;
-    this.toPort = toPortArg
+    this.toPort = toPortArg;
   }
 
-  public async start () {
+  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,8 +21,8 @@ export class PortProxy {
       to.unpipe();
       from.destroy();
       to.destroy();
-    }
+    };
-    netServer = net
+    this.netServer = net
       .createServer((from) => {
         const to = net.createConnection({
           host: 'localhost',
@@ -64,10 +51,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}`);
@@ -75,11 +62,9 @@ export class PortProxy {
 
   public async stop() {
     const done = plugins.smartpromise.defer();
-    httpServer.close(() => {
+    this.netServer.close(() => {
-      netServer.close(() => {
+      done.resolve();
-        done.resolve();
-      });
     });
     await done.promise;
   }
-};
+}