Merge pull request #23 from journeyapps/fix_for_multiple_connections

Fix for multiple connections

Author: EspressoTrip-v2

.changeset/quiet-melons-chew.md

@@ -0,0 +1,5 @@
+---
+'@journeyapps/https-proxy-socket': patch
+---
+
+Fixed socket timeout and use mongo driver existing socket

.changeset/vast-memes-repair.md

@@ -0,0 +1,5 @@
+---
+'@journeyapps/https-proxy-socket': patch
+---
+
+Mongo hack fix, multi socket closure

.github/workflows/release.yml

@@ -45,15 +45,15 @@ jobs:
       - name: Build
         run: pnpm build
 
-#      - name: Create Release Pull Request or Publish to npm
-#        id: changesets
-#        uses: changesets/action@v1
-#        if: ${{ github.event_name == 'push' }}
-#        with:
-#          version: pnpm ci:version
-#          publish: pnpm ci:publish
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Create Release Pull Request or Publish to npm
+        id: changesets
+        uses: changesets/action@v1
+        if: ${{ github.event_name == 'push' }}
+        with:
+          version: pnpm ci:version
+          publish: pnpm ci:publish
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Dev publish
         if: ${{ github.event_name == 'workflow_dispatch' }}

src/HttpsProxySocket.ts

@@ -87,7 +87,7 @@ export class HttpsProxySocket {
     let buffersLength = 0;
 
     function read() {
-      var b = socket.read();
+      const b = socket.read();
       if (b) {
         ondata(b);
       } else {

src/mongoPatch.ts

@@ -8,22 +8,41 @@ interface Config {
   /** The journey apps cc egress proxy domain */
   proxy: string;
 }
+
 /**
  *  The patch should be called before instantiating the MongoClient
  *  @param config - The configuration for the proxy
  */
 export function useProxyForMongo(config: Config) {
-  let socket: tls.TLSSocket;
+  let sockets: tls.TLSSocket[] = [];
   socks.SocksClient.createConnection = async (options, callback) => {
-    const proxy = new HttpsProxySocket(`https://${config.proxy}`, { auth: config.auth });
-    return new Promise(async (resolve, reject) => {
-      socket = await proxy.connect({ host: options.destination.host, port: options.destination.port });
-      resolve({
-        socket,
-      });
+    const socket = await new HttpsProxySocket({ socket: options.existing_socket }, { auth: config.auth }).connect({
+      host: options.destination.host,
+      port: options.destination.port,
+    });
+
+    socket.on('timeout', () => {
+      console.error('Socket timeout');
     });
+    sockets.push(socket);
+    return {
+      socket,
+    };
   };
   return {
-    close: () => socket?.end(),
+    close: async () => {
+      await Promise.all(
+        sockets.map(
+          (socket) =>
+            new Promise<void>((resolve) => {
+              socket.once('close', () => {
+                resolve();
+              });
+              socket.destroySoon();
+            }),
+        ),
+      );
+      sockets = [];
+    },
   };
 }