test

Author: EspressoTrip-v2

src/HttpsProxySocket.ts

@@ -3,9 +3,9 @@ import { createProxyAgent } from './createProxyAgent';
 import { setServername } from './utils/setServername';
 import { parseOptions } from './utils/parseOptions';
 
-// import { debug as nodeDebug } from 'util';
-//
-// const debug = nodeDebug('https-proxy');
+import { debug as nodeDebug } from 'util';
+
+const debug = nodeDebug('https-proxy');
 
 export interface HttpsProxyConfig extends tls.ConnectionOptions {
   headers?: { [key: string]: string };
@@ -38,7 +38,7 @@ export class HttpsProxySocket {
     if (!options) {
       throw new Error('an HTTP(S) proxy server `host` and `port` must be specified!');
     }
-    console.log('creating new HttpsProxyAgent instance: %o', sanitizedOptions);
+    debug('creating new HttpsProxyAgent instance: %o', sanitizedOptions);
 
     this.proxyConfig = proxyConfig || {};
     this.proxy = sanitizedOptions as tls.ConnectionOptions;
@@ -104,11 +104,11 @@ export class HttpsProxySocket {
     }
 
     function onclose(err: any) {
-      console.log('onclose had error %o', err);
+      debug('onclose had error %o', err);
     }
 
     function onend() {
-      console.log('onend');
+      debug('onend');
     }
 
     function onerror(err: any) {
@@ -129,7 +129,7 @@ export class HttpsProxySocket {
 
       if (str.indexOf(END_OF_HEADERS) < 0) {
         // keep buffering
-        console.log('have not received end of HTTP headers yet...');
+        debug('have not received end of HTTP headers yet...');
         if (socket.readable) {
           read();
         } else {
@@ -140,7 +140,7 @@ export class HttpsProxySocket {
 
       const firstLine = str.substring(0, str.indexOf('\r\n'));
       const statusCode = parseInt(firstLine.split(' ')[1], 10);
-      console.log('got proxy server response: %o', firstLine);
+      debug('got proxy server response: %o', firstLine);
 
       if (200 == statusCode) {
         // 200 Connected status code!

src/mongoPatch.ts

@@ -15,9 +15,15 @@ interface Config {
  */
 export function useProxyForMongo(config: Config) {
   const sockets: tls.TLSSocket[] = [];
-  let proxy: HttpsProxySocket | undefined = new HttpsProxySocket(`https://${config.proxy}`, { auth: config.auth });
+  const proxy: HttpsProxySocket = new HttpsProxySocket(`https://${config.proxy}`, { auth: config.auth });
   socks.SocksClient.createConnection = async (options, callback) => {
-    const socket = await proxy!.connect({ host: options.destination.host, port: options.destination.port });
+    const socket = await proxy.connect({ host: options.destination.host, port: options.destination.port });
+
+    socket.on('error', (err) => {
+      if (err) {
+        console.error('MongoDB connection socket error:', err);
+      }
+    });
     sockets.push(socket);
     return {
       socket,
@@ -32,13 +38,14 @@ export function useProxyForMongo(config: Config) {
             new Promise<void>((resolve) => {
               socket.once('close', () => {
                 count++;
+                socket.removeAllListeners();
+                socket.destroySoon();
                 resolve();
               });
               socket.end();
             }),
         ),
       );
-      proxy = undefined;
       if (count === sockets.length) {
         console.log(`Closed ${sockets.length} MongoDB connection sockets`);
       }