From fa04732241be38ee1528140e0feca962ed2ccc9d Mon Sep 17 00:00:00 2001
From: Phil Kunz <gitlab@philkunz.com>
Date: Wed, 3 Feb 2021 11:19:56 +0000
Subject: [PATCH] fix(core): update

---
 package-lock.json                    |  6 +++---
 package.json                         |  2 +-
 ts/smartproxy.classes.proxyworker.ts | 15 ++++++++-------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ff77b89..e421398 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11438,9 +11438,9 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "ws": {
-      "version": "7.4.2",
-      "resolved": "https://verdaccio.lossless.one/ws/-/ws-7.4.2.tgz",
-      "integrity": "sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA=="
+      "version": "7.4.3",
+      "resolved": "https://verdaccio.lossless.one/ws/-/ws-7.4.3.tgz",
+      "integrity": "sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA=="
     },
     "xml-js": {
       "version": "1.6.11",
diff --git a/package.json b/package.json
index 5560e44..3ea5bdc 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "@pushrocks/smartsystem": "^2.0.9",
     "@tsclass/tsclass": "^3.0.29",
     "@types/ws": "^7.4.0",
-    "ws": "^7.4.2"
+    "ws": "^7.4.3"
   },
   "files": [
     "ts/**/*",
diff --git a/ts/smartproxy.classes.proxyworker.ts b/ts/smartproxy.classes.proxyworker.ts
index cb27074..a1c586e 100644
--- a/ts/smartproxy.classes.proxyworker.ts
+++ b/ts/smartproxy.classes.proxyworker.ts
@@ -228,21 +228,22 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
     this.httpsServer.on('connection', (connection: plugins.net.Socket) => {
       connection.setTimeout(120000);
       this.socketMap.add(connection);
-      connection.on('close', () => {
+      const cleanupConnection = (connectionArg: plugins.net.Socket) => {
+        connectionArg.removeAllListeners();
         this.socketMap.remove(connection);
         connection.destroy();
+      }
+      connection.on('close', () => {
+        cleanupConnection(connection);
       });
       connection.on('error', () => {
-        this.socketMap.remove(connection);
-        connection.destroy();
+        cleanupConnection(connection);
       });
       connection.on('end', () => {
-        this.socketMap.remove(connection);
-        connection.destroy();
+        cleanupConnection(connection);
       });
       connection.on('timeout', () => {
-        this.socketMap.remove(connection);
-        connection.destroy();
+        cleanupConnection(connection);
       });
     });