3.0.49

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartproxy",
-  "version": "3.0.42",
+  "version": "3.0.49",
   "private": false,
   "description": "a proxy for handling high workloads of proxying",
   "main": "dist_ts/index.js",

ts/00_commitinfo_data.ts

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

ts/smartproxy.classes.networkproxy.ts

@@ -246,15 +246,21 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
 
     // Enable websockets
     const wss = new plugins.ws.WebSocketServer({ server: this.httpsServer  });
-    wss.on('connection', (ws: plugins.wsDefault, reqArg) => {
-      console.log(`got connection for wsc for ${reqArg.url}`);
+    wss.on('connection', (ws: plugins.wsDefault, reqArg: plugins.http.IncomingMessage) => {
+      console.log(`got connection for wsc for https://${reqArg.headers.host}${reqArg.url}`);
       let wscConnectedDeferred: plugins.smartpromise.Deferred<plugins.wsDefault>;
 
       ws.on('message', async (message) => {
         if (!wscConnectedDeferred) {
           wscConnectedDeferred = plugins.smartpromise.defer();
-          const parsedUrl = plugins.url.parse(reqArg.url);
-          const wsc = new plugins.wsDefault(`${this.router.routeWs(reqArg)}${parsedUrl.path}`);
+          let wsc;
+          try {
+            wsc = new plugins.wsDefault(`ws://${this.router.routeReq(reqArg).destinationIp}:${this.router.routeReq(reqArg).destinationPort}${reqArg.url}`);
+          } catch (err) {
+            console.log(err);
+            ws.terminate();
+            return;
+          }
     
           wsc.on('open', () => {
             wscConnectedDeferred.resolve(wsc);

ts/smartproxy.classes.router.ts

@@ -21,12 +21,4 @@ export class ProxyRouter {
     });
     return correspodingReverseProxyConfig;
   }
-
-  public routeWs(wsReq: plugins.http.IncomingMessage) {
-    const originalHost = plugins.url.parse(wsReq.url).host;
-    const correspodingReverseProxyConfig = this.reverseProxyConfigs.find((reverseConfig) => {
-      return reverseConfig.hostName === originalHost;
-    });
-    return correspodingReverseProxyConfig.destinationIp;
-  }
 }