@push.rocks/smartproxy 3.0.58 → 3.0.61

package/ts/smartproxy.classes.networkproxy.ts

@@ -129,16 +129,20 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
           originResponse.writeHead(statusArg, messageArg);
           originResponse.end(messageArg);
           if (originRequest.socket !== originResponse.socket) {
-            console.log('hey, something is strange.')
+            console.log('hey, something is strange.');
           }
           originResponse.destroy();
         };
 
-        console.log(`got request: ${originRequest.headers.host}${plugins.url.parse(originRequest.url).path}`);
+        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.`);
+          console.log(
+            `${originRequest.headers.host} can't be routed properly. Terminating request.`
+          );
           endOriginReqRes();
           return;
         }
@@ -182,114 +186,140 @@ 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
+            (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]);
+          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');
         }
-        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  });
-    wsServer.on('connection', async (wsIncoming: plugins.wsDefault, reqArg: plugins.http.IncomingMessage) => {
-      console.log(`wss proxy: got connection for wsc for https://${reqArg.headers.host}${reqArg.url}`);
-      
-      let wsOutgoing: plugins.wsDefault;
+    const wsServer = new plugins.ws.WebSocketServer({ server: this.httpsServer });
+    wsServer.on(
+      'connection',
+      async (wsIncoming: plugins.wsDefault, reqArg: plugins.http.IncomingMessage) => {
+        console.log(
+          `wss proxy: got connection for wsc for https://${reqArg.headers.host}${reqArg.url}`
+        );
 
-      const outGoingDeferred = 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}`);
-        console.log('wss proxy: initiated outgoing proxy');
-        wsOutgoing.on('open', async () => {
-          outGoingDeferred.resolve();
-        })
-      } catch (err) {
-        console.log(err);
-        wsIncoming.terminate();
-        return;
-      }
+        const outGoingDeferred = plugins.smartpromise.defer();
 
-      wsIncoming.on("message", async (message, isBinary) => {
-        await outGoingDeferred.promise;
-        // console.log("client to upstream", message);
-        wsOutgoing.send(message, { binary: isBinary });
-      });
-    
-      wsOutgoing.on("message", async (message, isBinary) => {
-        // console.log("upstream to client", message);
-        wsIncoming.send(message, { binary: isBinary });
-      });
-      const terminateWsOutgoing = () => {
-        wsOutgoing.terminate();
-        console.log('terminated outgoing ws.');
-      }
-      wsIncoming.on("error", () => terminateWsOutgoing());
-      wsIncoming.on("close", () => terminateWsOutgoing());
+        try {
+          wsOutgoing = new plugins.wsDefault(
+            `ws://${this.router.routeReq(reqArg).destinationIp}:${
+              this.router.routeReq(reqArg).destinationPort
+            }${reqArg.url}`
+          );
+          console.log('wss proxy: initiated outgoing proxy');
+          wsOutgoing.on('open', async () => {
+            outGoingDeferred.resolve();
+          });
+        } catch (err) {
+          console.log(err);
+          wsIncoming.terminate();
+          return;
+        }
 
-      const terminateWsIncoming = () => {
-        wsIncoming.terminate();
-        console.log('terminated incoming ws.');
+        wsIncoming.on('message', async (message, 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) => {
+          try {
+            wsIncoming.send(message, { binary: isBinary });
+          } catch (error) {
+            console.error('Error sending message to wsIncoming:', error);
+          }
+        });
+
+        const terminateWsOutgoing = () => {
+          if (wsOutgoing) {
+            wsOutgoing.terminate();
+            console.log('terminated outgoing ws.');
+          }
+        };
+        wsIncoming.on('error', () => terminateWsOutgoing());
+        wsIncoming.on('close', () => terminateWsOutgoing());
+
+        const terminateWsIncoming = () => {
+          if (wsIncoming) {
+            wsIncoming.terminate();
+            console.log('terminated incoming ws.');
+          }
+        };
+        wsOutgoing.on('error', () => terminateWsIncoming());
+        wsOutgoing.on('close', () => terminateWsIncoming());
+
+        
       }
-      wsOutgoing.on("error", () => terminateWsIncoming());
-      wsOutgoing.on("close", () => terminateWsIncoming());
+    );
 
-    });
     this.httpsServer.keepAliveTimeout = 600 * 1000;
     this.httpsServer.headersTimeout = 600 * 1000;
 
@@ -314,7 +344,7 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
       });
       connection.on('timeout', () => {
         cleanupConnection();
-      })
+      });
     });
 
     this.httpsServer.listen(this.options.port);
@@ -349,7 +379,6 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
         cert: hostCandidate.publicKey,
         key: hostCandidate.privateKey,
       });
-      this.httpsServer;
     }
   }
 
@@ -368,5 +397,6 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
       socket.destroy();
     });
     await done.promise;
+    console.log('NetworkProxy -> OK: Server has been stopped and all connections closed.');
   }
-}
+}

package/ts/smartproxy.classes.sslredirect.ts

@@ -29,4 +29,4 @@ export class SslRedirect {
     });
     await done.promise;
   }
-}
+}

package/ts/smartproxy.plugins.ts

@@ -12,11 +12,11 @@ import * as tsclass from '@tsclass/tsclass';
 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';
+import * as lik from '@push.rocks/lik';
+import * as smartdelay from '@push.rocks/smartdelay';
+import * as smartpromise from '@push.rocks/smartpromise';
+import * as smartrequest from '@push.rocks/smartrequest';
+import * as smartstring from '@push.rocks/smartstring';
 
 export { lik, smartdelay, smartrequest, smartpromise, smartstring };