From 5ef32633d8494253204d3a10712d99860026ff0e Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Tue, 19 Apr 2022 20:38:42 -0700 Subject: [PATCH] Server exception fix in IP-KVM mini router. --- meshipkvm.js | 6 ++---- package.json | 18 ++++++++++++++++-- translate/translate.json | 2 +- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/meshipkvm.js b/meshipkvm.js index e9801191..2623eb90 100644 --- a/meshipkvm.js +++ b/meshipkvm.js @@ -1000,10 +1000,8 @@ function CreateMiniRouter(parent, nodeid, targetHost, targetPort) { delete tcpSockets[tcpSocket]; try { tcpSocket.end(); } catch (ex) { console.log(ex); } if (tcpSocket.relaySocket) { try { tcpSocket.relaySocket.close(); } catch (ex) { console.log(ex); } } - if (tcpSocket) { - delete tcpSocket.relaySocket.tcpSocket; - delete tcpSocket.relaySocket; - } + try { delete tcpSocket.relaySocket.tcpSocket; } catch (ex) { } + try { delete tcpSocket.relaySocket; } catch (ex) { } } } diff --git a/package.json b/package.json index 1489695c..fc371103 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,8 @@ "sample-config-advanced.json" ], "dependencies": { + "@yetzt/nedb": "^1.8.0", + "archiver": "^4.0.2", "body-parser": "^1.19.0", "cbor": "~5.2.0", "compression": "^1.7.4", @@ -43,13 +45,25 @@ "express": "^4.17.0", "express-handlebars": "^5.3.5", "express-ws": "^4.0.0", + "html-minifier": "^4.0.0", + "image-size": "^1.0.1", "ipcheck": "^0.1.0", + "jsdom": "^19.0.0", + "loadavg-windows": "^1.1.1", + "minify-js": "^0.0.4", "minimist": "^1.2.5", "multiparty": "^4.2.1", - "@yetzt/nedb": "^1.8.0", "node-forge": "^1.0.0", + "node-rdpjs-2": "^0.3.5", + "node-windows": "^0.1.4", + "otplib": "^10.2.3", + "pg": "^8.7.1", + "pgtools": "^0.3.2", + "ssh2": "^1.9.0", + "web-push": "^3.4.5", "ws": "^5.2.3", - "yauzl": "^2.10.0" + "yauzl": "^2.10.0", + "yubikeyotp": "^0.2.0" }, "engines": { "node": ">=10.0.0" diff --git a/translate/translate.json b/translate/translate.json index 40484b95..736bc7a5 100644 --- a/translate/translate.json +++ b/translate/translate.json @@ -74826,4 +74826,4 @@ ] } ] -} +} \ No newline at end of file