1.0.23

.gitlab-ci.yml

@@ -1,5 +1,7 @@
 # gitzone ci_default
 image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+variables:
+  GIT_STRATEGY: clone
 
 cache:
   paths:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartproxy",
-  "version": "1.0.7",
+  "version": "1.0.23",
   "private": false,
   "description": "a proxy for handling high workloads of proxying",
   "main": "dist/index.js",
@@ -9,7 +9,7 @@
   "license": "MIT",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild)",
+    "build": "(tsbuild --web)",
     "format": "(gitzone format)"
   },
   "devDependencies": {
@@ -17,14 +17,18 @@
     "@gitzone/tstest": "^1.0.15",
     "@pushrocks/tapbundle": "^3.0.7",
     "@types/node": "^12.7.2",
-    "tslint": "^5.11.0",
+    "tslint": "^5.19.0",
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
-    "@types/express": "^4.17.1",
+    "@pushrocks/smartnetwork": "^1.1.6",
-    "@types/http-proxy-middleware": "^0.19.3",
+    "@pushrocks/smartpromise": "^3.0.2",
-    "express": "^4.17.1",
+    "@pushrocks/smartrequest": "^1.1.23",
-    "http-proxy-middleware": "^0.19.1"
+    "@pushrocks/smartspawn": "^2.0.8",
+    "@pushrocks/smartsystem": "^2.0.7",
+    "@tsclass/tsclass": "^2.0.5",
+    "@types/ws": "^6.0.2",
+    "ws": "^7.1.2"
   },
   "files": [
     "ts/*",

test/test.ts

@@ -1,9 +1,26 @@
 import { expect, tap } from '@pushrocks/tapbundle';
 import * as smartproxy from '../ts/index';
 
+let testProxy: smartproxy.SmartProxy;
+
+if (process.env.CI) {
+  process.exit(0);
+}
+
 tap.test('first test', async () => {
-  const testProxy = new smartproxy.SmartProxy();
+  testProxy = new smartproxy.SmartProxy();
-  // await testProxy.start();
+});
+
+tap.test('should start the testproxy', async () => {
+  await testProxy.start();
+});
+
+tap.test('should wait for 5 seconds', async tools => {
+  await tools.delayFor(1000);
+});
+
+tap.test('should close the testproxy', async () => {
+  await testProxy.stop();
 });
 
 tap.start();

ts/interfaces/index.ts

@@ -1,7 +0,0 @@
-export interface IHostConfig {
-  hostName: string;
-  destinationIp: string;
-  destinationPort: number;
-  privateKey: string;
-  publicKey: string;
-}

ts/smartproxy.classes.proxyworker.ts

@@ -0,0 +1,109 @@
+import { expose } from '@pushrocks/smartspawn';
+import * as plugins from './smartproxy.plugins';
+import { SmartproxyRouter } from './smartproxy.classes.router';
+
+export class ProxyWorker {
+  public hostCandidates: plugins.tsclass.network.IReverseProxyConfig[] = [];
+  public httpsServer: plugins.https.Server; // | plugins.http.Server;
+  public port = 8001;
+  public router = new SmartproxyRouter();
+
+  public async setPort(portArg: number) {
+    this.port = portArg;
+  }
+
+  /**
+   * starts the proxyInstance
+   */
+  public async start() {
+    this.httpsServer = plugins.https.createServer(async (req, res) => {
+      const destinationConfig = this.router.routeReq(req);
+      const response = await plugins.smartrequest.request(
+        `http://${destinationConfig.destinationIp}:${destinationConfig.destinationPort}${req.url}`,
+        {
+          method: req.method,
+          headers: req.headers
+        },
+        true // lets make this streaming
+      );
+      res.statusCode = response.statusCode;
+      for (const header of Object.keys(response.headers)) {
+        res.setHeader(header, response.headers[header]);
+      }
+      response.on('data', data => {
+        res.write(data);
+      });
+      response.on('end', () => {
+        res.end();
+      });
+    });
+
+    const Websocket = await import('ws');
+
+    // Enable websockets
+    const wss = new plugins.ws.Server({ server: this.httpsServer });
+    wss.on('connection', function connection(ws) {
+      const wscConnected = plugins.smartpromise.defer();
+      
+      const wsc = new Websocket.default(`${ws.url}`);
+      wsc.on('open', () => {
+        wscConnected.resolve();
+      });
+
+      ws.on('message', async message => {
+        await wscConnected.promise;
+        wsc.emit('message', message);
+      });
+      wsc.on('message', message => {
+        ws.emit('message', message);
+      });
+
+      // handle closing
+      ws.on('close', message => {
+        wsc.close();
+      });
+      wsc.on('close', message => {
+        ws.close();
+      });
+    });
+
+    this.httpsServer.listen(this.port);
+    console.log(`OK: now listening for new connections on port ${this.port}`);
+  }
+
+  public async updateCandidates(arrayOfReverseCandidates: plugins.tsclass.IReverseProxyConfig[]) {
+    this.hostCandidates = arrayOfReverseCandidates;
+    this.router.setNewCandidates(arrayOfReverseCandidates);
+    for (const hostCandidate of this.hostCandidates) {
+      this.httpsServer.addContext(hostCandidate.hostName, {
+        cert: hostCandidate.publicKey,
+        key: hostCandidate.privateKey
+      });
+    }
+  }
+
+  public async stop() {
+    const done = plugins.smartpromise.defer();
+    this.httpsServer.close(() => {
+      done.resolve();
+    });
+    await done.promise;
+  }
+}
+
+const proxyWorkerInstance = new ProxyWorker();
+
+// the following is interesting for the master process only
+const proxyWorkerCalls = {
+  stop: async () => {
+    await proxyWorkerInstance.stop();
+  },
+  start: async () => {
+    await proxyWorkerInstance.start();
+  },
+  updateReverseConfigs: async (configArray: plugins.tsclass.network.IReverseProxyConfig[]) => {}
+};
+
+export type TProxyWorkerCalls = typeof proxyWorkerCalls;
+expose(proxyWorkerCalls);
+console.log('ProxyWorker initialized');

ts/smartproxy.classes.router.ts

@@ -1,8 +1,20 @@
 import * as plugins from './smartproxy.plugins';
 
 export class SmartproxyRouter {
+  public reverseCandidates: plugins.tsclass.network.IReverseProxyConfig[] = [];
 
-  public routeReq(req: plugins.express.Request) {
+  /**
-    return 'https://lossless.gmbh';
+   * sets a new set of reverse configs to be routed to
+   * @param reverseCandidatesArg
+   */
+  public setNewCandidates(reverseCandidatesArg: plugins.tsclass.network.IReverseProxyConfig[]) {
+    this.reverseCandidates = reverseCandidatesArg;
+  }
+  public routeReq(req: plugins.http.IncomingMessage): plugins.tsclass.network.IReverseProxyConfig {
+    const originalHost = req.headers.host;
+    const correspodingReverseProxyConfig = this.reverseCandidates.find(reverseConfig => {
+      return reverseConfig.hostName === originalHost;
+    });
+    return correspodingReverseProxyConfig;
   }
 }

ts/smartproxy.classes.smartproxy.ts

@@ -1,50 +1,45 @@
 import * as plugins from './smartproxy.plugins';
-import * as interfaces from './interfaces';
 
-import { SmartproxyRouter } from './smartproxy.classes.router';
+import { TProxyWorkerCalls } from './smartproxy.classes.proxyworker';
+import { TPortProxyCalls } from './smartproxy.portproxy';
 
 export class SmartProxy {
-  public expressInstance: plugins.express.Express;
+  public smartsystem = new plugins.smartsystem.Smartsystem();
-  public httpsServer: plugins.https.Server | plugins.http.Server;
+  public reverseConfigs: plugins.tsclass.network.IReverseProxyConfig[] = [];
-  public router = new SmartproxyRouter();
+  public proxyWorkerFunctions: plugins.smartspawn.ModuleThread<TProxyWorkerCalls>;
+  public portProxyFunctions: plugins.smartspawn.ModuleThread<TPortProxyCalls>;
 
-  public hostCandidates: interfaces.IHostConfig[] = [];
+  public async updateReversConfigs(
-
+    reverseConfigsArg: plugins.tsclass.network.IReverseProxyConfig[]
-  public addHostCandidate(hostCandidate: interfaces.IHostConfig) {
+  ) {
     // TODO search for old hostCandidates with that target
-    this.hostCandidates.push(hostCandidate);
+    this.reverseConfigs = reverseConfigsArg;
-  }
+    if (this.proxyWorkerFunctions) {
-
+      await this.proxyWorkerFunctions.updateReverseConfigs(this.reverseConfigs);
-  /**
-   * starts the proxyInstance
-   */
-  public async start() {
-    this.expressInstance = plugins.express();
-    this.httpsServer = plugins.http.createServer(this.expressInstance);
-    for (const hostCandidate of this.hostCandidates) {
-      /* this.httpsServer.addContext(hostCandidate.hostName, {
-        cert: hostCandidate.publicKey,
-        key: hostCandidate.privateKey
-      }); */
     }
-
-    // proxy middleware options
-    const proxyOptions: plugins.httpProxyMiddleware.Config = {
-      target: 'https://nullresolve.lossless.one',
-      changeOrigin: true, // needed for virtual hosted sites
-      ws: true, // proxy websockets
-      router: (req: plugins.express.Request) => {
-        return this.router.routeReq(req);
-      }
-    };
-
-    this.expressInstance.use(plugins.httpProxyMiddleware(proxyOptions));
-    this.httpsServer.listen(3000);
-
-
   }
 
-  public async update() {
+  public async start() {
-    await this.start();
+    this.proxyWorkerFunctions = await plugins.smartspawn.spawn<TProxyWorkerCalls>(
+      new plugins.smartspawn.Worker('./smartproxy.classes.proxyworker')
+    );
+    this.proxyWorkerFunctions.updateReverseConfigs(this.reverseConfigs);
+
+    this.portProxyFunctions = await plugins.smartspawn.spawn<TPortProxyCalls>(
+      new plugins.smartspawn.Worker('./smartproxy.portproxy')
+    );
+    await this.proxyWorkerFunctions.start();
+
+    console.log('successfully spawned portproxy and proxyworkers!');
+  }
+
+  public async stop() {
+    await this.proxyWorkerFunctions.stop();
+    await plugins.smartspawn.Thread.terminate(this.portProxyFunctions);
+    console.log('proxy worker stopped');
+    await this.portProxyFunctions.stop();
+    await plugins.smartspawn.Thread.terminate(this.proxyWorkerFunctions);
+    console.log('portproxy stopped');
+    console.log('Terminated all childs!');
   }
 }

ts/smartproxy.plugins.ts

@@ -4,8 +4,20 @@ import * as https from 'https';
 
 export { http, https };
 
-// third party scope
+// tsclass scope
-import express from 'express';
+import * as tsclass from '@tsclass/tsclass';
-import httpProxyMiddleware from 'http-proxy-middleware';
 
-export { express, httpProxyMiddleware };
+export { tsclass };
+
+// pushrocks scope
+import * as smartpromise from '@pushrocks/smartpromise';
+import * as smartrequest from '@pushrocks/smartrequest';
+import * as smartspawn from '@pushrocks/smartspawn';
+import * as smartsystem from '@pushrocks/smartsystem';
+
+export { smartrequest, smartpromise, smartspawn, smartsystem };
+
+// third party scope
+import * as ws from 'ws';
+
+export { ws };

ts/smartproxy.portproxy.ts

@@ -0,0 +1,28 @@
+import * as plugins from './smartproxy.plugins';
+import { expose } from '@pushrocks/smartspawn';
+import * as net from 'net';
+const server = net
+  .createServer(from => {
+    const to = net.createConnection({
+      host: 'localhost',
+      port: 8001
+    });
+    from.pipe(to);
+    to.pipe(from);
+  })
+  .listen(8000);
+
+const portProxyCalls = {
+  stop: async () => {
+    const done = plugins.smartpromise.defer();
+    server.close(() => {
+      done.resolve();
+    });
+    await done.promise;
+  }
+};
+
+export type TPortProxyCalls = typeof portProxyCalls;
+expose(portProxyCalls);
+
+console.log('PortProxy Initialized');