diff --git a/build-ts/lib/client.js b/build-ts/lib/client.js index 9ab05dd..2467b5c 100644 --- a/build-ts/lib/client.js +++ b/build-ts/lib/client.js @@ -86,7 +86,7 @@ export default class CommonClient extends EventEmitter { this.queue[rpc_id] = { promise: [resolve, reject] }; if (timeout) { this.queue[rpc_id].timeout = setTimeout(() => { - this.queue[rpc_id] = null; + delete this.queue[rpc_id]; reject(new Error("reply timeout")); }, timeout); } @@ -235,7 +235,7 @@ export default class CommonClient extends EventEmitter { this.queue[message.id].promise[1](message.error); else this.queue[message.id].promise[0](message.result); - this.queue[message.id] = null; + delete this.queue[message.id]; }); this.socket.addEventListener("error", (error) => this.emit("error", error)); this.socket.addEventListener("close", ({ code, reason }) => { diff --git a/dist/index.browser-bundle.js b/dist/index.browser-bundle.js index 97de1fc..3262fe5 100644 --- a/dist/index.browser-bundle.js +++ b/dist/index.browser-bundle.js @@ -228,7 +228,7 @@ var CommonClient = /*#__PURE__*/function (_EventEmitter) { if (timeout) { _this2.queue[rpc_id].timeout = setTimeout(function () { - _this2.queue[rpc_id] = null; + delete _this2.queue[rpc_id]; reject(new Error("reply timeout")); }, timeout); } @@ -514,7 +514,7 @@ var CommonClient = /*#__PURE__*/function (_EventEmitter) { if ("error" in message === "result" in message) _this4.queue[message.id].promise[1](new Error("Server response malformed. Response must include either \"result\"" + " or \"error\", but not both.")); if (_this4.queue[message.id].timeout) clearTimeout(_this4.queue[message.id].timeout); if (message.error) _this4.queue[message.id].promise[1](message.error);else _this4.queue[message.id].promise[0](message.result); - _this4.queue[message.id] = null; + delete _this4.queue[message.id]; }); this.socket.addEventListener("error", function (error) { return _this4.emit("error", error); diff --git a/dist/lib/client.js b/dist/lib/client.js index eb81310..f07ce1d 100644 --- a/dist/lib/client.js +++ b/dist/lib/client.js @@ -168,7 +168,7 @@ var CommonClient = /*#__PURE__*/function (_EventEmitter) { if (timeout) { _this2.queue[rpc_id].timeout = setTimeout(function () { - _this2.queue[rpc_id] = null; + delete _this2.queue[rpc_id]; reject(new Error("reply timeout")); }, timeout); } @@ -454,7 +454,7 @@ var CommonClient = /*#__PURE__*/function (_EventEmitter) { if ("error" in message === "result" in message) _this4.queue[message.id].promise[1](new Error("Server response malformed. Response must include either \"result\"" + " or \"error\", but not both.")); if (_this4.queue[message.id].timeout) clearTimeout(_this4.queue[message.id].timeout); if (message.error) _this4.queue[message.id].promise[1](message.error);else _this4.queue[message.id].promise[0](message.result); - _this4.queue[message.id] = null; + delete _this4.queue[message.id]; }); this.socket.addEventListener("error", function (error) { return _this4.emit("error", error); diff --git a/package-lock.json b/package-lock.json index 973ef26..283387e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,7 +5,8 @@ "requires": true, "packages": { "": { - "version": "7.4.13", + "name": "rpc-websockets", + "version": "7.4.15", "license": "LGPL-3.0-only", "dependencies": { "@babel/runtime": "^7.11.2", @@ -3422,6 +3423,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.1.tgz", "integrity": "sha512-xowrxvpxojqkagPcWRQVXZl0YXhRhAtBEIq3VoER1NH5Mw1n1o0ojdspp+GS2J//2gCVyrzQDApQ4unGF+QOoA==", + "hasInstallScript": true, "optional": true, "dependencies": { "node-gyp-build": "~3.7.0" @@ -8950,6 +8952,7 @@ "version": "5.0.2", "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.2.tgz", "integrity": "sha512-SwV++i2gTD5qh2XqaPzBnNX88N6HdyhQrNNRykvcS0QKvItV9u3vPEJr+X5Hhfb1JC0r0e1alL0iB09rY8+nmw==", + "hasInstallScript": true, "optional": true, "dependencies": { "node-gyp-build": "~3.7.0" diff --git a/src/lib/client.ts b/src/lib/client.ts index f5fefc8..cb1fb08 100644 --- a/src/lib/client.ts +++ b/src/lib/client.ts @@ -166,7 +166,7 @@ export default class CommonClient extends EventEmitter { this.queue[rpc_id].timeout = setTimeout(() => { - this.queue[rpc_id] = null + delete this.queue[rpc_id] reject(new Error("reply timeout")) }, timeout) } @@ -363,7 +363,7 @@ export default class CommonClient extends EventEmitter else this.queue[message.id].promise[0](message.result) - this.queue[message.id] = null + delete this.queue[message.id] }) this.socket.addEventListener("error", (error) => this.emit("error", error))