wapi-client 0.15.5 → 0.16.0-beta.1

package/dist/api/base-client.browser.cjs

@@ -91,6 +91,7 @@ var BaseClient = class {
     __publicField(this, "_error", false);
     __publicField(this, "_sending", /* @__PURE__ */ new Map());
     __publicField(this, "sendingTimeout");
+    __publicField(this, "requestTimeout", 12e4);
     this.type = connectionType;
     this._connection = connection;
     this.connectionType = connectionType;
@@ -132,18 +133,50 @@ var BaseClient = class {
   // Will fire this in case we lose connection
   // This is so we can terminate ongoing requests
   _connectionLost() {
-    this._requests.forEach((responseObject, key) => {
-      if ("stream" in responseObject) {
-        responseObject.stream.destroy(
-          new import_errors.StreamError("CONNECTION_LOST", { method: "connectionLost" })
-        );
-      }
-      this._requests.delete(key);
+    this._requests.forEach((requestInfo) => {
+      this._fireConnectionLost(requestInfo);
     });
     this.socId = void 0;
   }
+  _completeRequest(request, error) {
+    const key = request.message.id;
+    if (key === null) {
+      throw new Error("JSONRPCMessage.id should not be null");
+    }
+    if (error) {
+      if ("error" in request) {
+        request.error(error);
+      } else if ("stream" in request) {
+        request.stream.destroy(error);
+      }
+    } else if (!request.stream.destroyed) {
+      request.stream.push(null);
+    }
+    clearTimeout(request.requestTimeout);
+    clearTimeout(request.sendingTimeout);
+    this._requests.delete(key);
+    this._sending.delete(key);
+  }
+  _fireConnectionLost(requestInfo) {
+    const error = new import_errors.StreamError("CONNECTION_LOST", {
+      method: "connectionLost"
+    });
+    return this._completeRequest(requestInfo, error);
+  }
+  _fireSendingTimeout(requestInfo) {
+    const error = new import_errors.ConfigError("SENDING_TIMEOUT", {
+      timeout: this.sendingTimeout
+    });
+    return this._completeRequest(requestInfo, error);
+  }
+  _fireRequestTimeout(requestInfo) {
+    const error = new import_errors.ConfigError("REQUEST_TIMEOUT", {
+      timeout: this.requestTimeout
+    });
+    return this._completeRequest(requestInfo, error);
+  }
   _handleMessage(incoming) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     if (this.hooks.message) {
       this.hooks.message(incoming);
     }
@@ -168,16 +201,16 @@ var BaseClient = class {
       (0, import_debug.debugLog)("Unexpected JSONRPCResponse", incoming);
       return;
     }
-    if (responseMessage.result === import_jsonrpc_enums.JSONRPC.acknowledgement) {
-      clearTimeout((_a = this._sending.get(responseMessage.id)) == null ? void 0 : _a.timeout);
-      this._sending.delete(responseMessage.id);
-      return;
-    }
     const requestInfo = this._requests.get(responseMessage.id);
     if (!requestInfo) {
       (0, import_debug.debugLog)("No Request found for incoming", incoming);
       return;
     }
+    if (responseMessage.result === import_jsonrpc_enums.JSONRPC.acknowledgement) {
+      clearTimeout(requestInfo.requestTimeout);
+      delete requestInfo.requestTimeout;
+      return;
+    }
     if ("handle" in requestInfo) {
       requestInfo.handle(responseMessage);
       delete requestInfo.handle;
@@ -187,26 +220,21 @@ var BaseClient = class {
       requestInfo.error(responseMessage.error);
     }
     const message = responseMessage;
-    if (((_b = message.result) == null ? void 0 : _b.type) === import_jsonrpc_enums.JSONRPC.streamPause && "pause" in requestInfo) {
+    if (((_a = message.result) == null ? void 0 : _a.type) === import_jsonrpc_enums.JSONRPC.streamPause && "pause" in requestInfo) {
       requestInfo.pause();
       return;
     }
-    if (((_c = message.result) == null ? void 0 : _c.type) === import_jsonrpc_enums.JSONRPC.streamResume && "resume" in requestInfo) {
+    if (((_b = message.result) == null ? void 0 : _b.type) === import_jsonrpc_enums.JSONRPC.streamResume && "resume" in requestInfo) {
       requestInfo.resume();
       return;
     }
     const { stream, start } = requestInfo;
-    if (((_d = message.result) == null ? void 0 : _d.type) === import_jsonrpc_enums.JSONRPC.streamChunk) {
+    if (((_c = message.result) == null ? void 0 : _c.type) === import_jsonrpc_enums.JSONRPC.streamChunk) {
       stream.push(message.result);
       return;
     }
     stream.push(message);
-    if (!stream.destroyed) {
-      stream.push(null);
-    }
-    if (message.id) {
-      this._requests.delete(message.id);
-    }
+    this._completeRequest(requestInfo);
     if (this.connectionType === import_wapi_client.WapiClientType.ws) {
       this._send({
         jsonrpc: import_jsonrpc_enums.JSONRPC.version,
@@ -224,22 +252,6 @@ var BaseClient = class {
   //   const inputCopy = APIValidators[name](input);
   //   return this._sendRaw<Input, Output>(name, inputCopy as Input);
   // }
-  _setSending(jsonRpcMessage, stream) {
-    if (jsonRpcMessage.id === null) {
-      throw new Error("JSONRPCMessage should not be null");
-    }
-    this._sending.set(jsonRpcMessage.id, __spreadValues({}, this.sendingTimeout && {
-      timeout: setTimeout(() => {
-        this._sending.delete(jsonRpcMessage.id);
-        stream.push({
-          error: new import_errors.ConfigError("SENDING_TIMEOUT", {
-            timeout: this.sendingTimeout
-          }).toJSON()
-        });
-        this._requests.delete(jsonRpcMessage.id);
-      }, this.sendingTimeout)
-    }));
-  }
   _sendRaw(method, params) {
     const jsonRpcMessage = {
       jsonrpc: import_jsonrpc_enums.JSONRPC.version,
@@ -260,11 +272,20 @@ var BaseClient = class {
       if (this._error) {
         throw this._error;
       }
-      this._requests.set(jsonRpcMessage.id, {
+      const outboundRequest = __spreadValues(__spreadValues({
         stream,
-        start: Date.now()
+        start: Date.now(),
+        message: jsonRpcMessage
+      }, this.sendingTimeout && {
+        sendingTimeout: setTimeout(() => {
+          this._fireSendingTimeout(outboundRequest);
+        }, this.sendingTimeout)
+      }), this.requestTimeout && {
+        requestTimeout: setTimeout(() => {
+          this._fireRequestTimeout(outboundRequest);
+        }, this.requestTimeout)
       });
-      this._setSending(jsonRpcMessage, stream);
+      this._requests.set(jsonRpcMessage.id, outboundRequest);
       this._send(jsonRpcMessage);
     }));
   }

package/dist/api/base-client.browser.js

@@ -72,6 +72,7 @@ var BaseClient = class {
     __publicField(this, "_error", false);
     __publicField(this, "_sending", /* @__PURE__ */ new Map());
     __publicField(this, "sendingTimeout");
+    __publicField(this, "requestTimeout", 12e4);
     this.type = connectionType;
     this._connection = connection;
     this.connectionType = connectionType;
@@ -113,18 +114,50 @@ var BaseClient = class {
   // Will fire this in case we lose connection
   // This is so we can terminate ongoing requests
   _connectionLost() {
-    this._requests.forEach((responseObject, key) => {
-      if ("stream" in responseObject) {
-        responseObject.stream.destroy(
-          new StreamError("CONNECTION_LOST", { method: "connectionLost" })
-        );
-      }
-      this._requests.delete(key);
+    this._requests.forEach((requestInfo) => {
+      this._fireConnectionLost(requestInfo);
     });
     this.socId = void 0;
   }
+  _completeRequest(request, error) {
+    const key = request.message.id;
+    if (key === null) {
+      throw new Error("JSONRPCMessage.id should not be null");
+    }
+    if (error) {
+      if ("error" in request) {
+        request.error(error);
+      } else if ("stream" in request) {
+        request.stream.destroy(error);
+      }
+    } else if (!request.stream.destroyed) {
+      request.stream.push(null);
+    }
+    clearTimeout(request.requestTimeout);
+    clearTimeout(request.sendingTimeout);
+    this._requests.delete(key);
+    this._sending.delete(key);
+  }
+  _fireConnectionLost(requestInfo) {
+    const error = new StreamError("CONNECTION_LOST", {
+      method: "connectionLost"
+    });
+    return this._completeRequest(requestInfo, error);
+  }
+  _fireSendingTimeout(requestInfo) {
+    const error = new ConfigError("SENDING_TIMEOUT", {
+      timeout: this.sendingTimeout
+    });
+    return this._completeRequest(requestInfo, error);
+  }
+  _fireRequestTimeout(requestInfo) {
+    const error = new ConfigError("REQUEST_TIMEOUT", {
+      timeout: this.requestTimeout
+    });
+    return this._completeRequest(requestInfo, error);
+  }
   _handleMessage(incoming) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     if (this.hooks.message) {
       this.hooks.message(incoming);
     }
@@ -149,16 +182,16 @@ var BaseClient = class {
       debugLog("Unexpected JSONRPCResponse", incoming);
       return;
     }
-    if (responseMessage.result === JSONRPC.acknowledgement) {
-      clearTimeout((_a = this._sending.get(responseMessage.id)) == null ? void 0 : _a.timeout);
-      this._sending.delete(responseMessage.id);
-      return;
-    }
     const requestInfo = this._requests.get(responseMessage.id);
     if (!requestInfo) {
       debugLog("No Request found for incoming", incoming);
       return;
     }
+    if (responseMessage.result === JSONRPC.acknowledgement) {
+      clearTimeout(requestInfo.requestTimeout);
+      delete requestInfo.requestTimeout;
+      return;
+    }
     if ("handle" in requestInfo) {
       requestInfo.handle(responseMessage);
       delete requestInfo.handle;
@@ -168,26 +201,21 @@ var BaseClient = class {
       requestInfo.error(responseMessage.error);
     }
     const message = responseMessage;
-    if (((_b = message.result) == null ? void 0 : _b.type) === JSONRPC.streamPause && "pause" in requestInfo) {
+    if (((_a = message.result) == null ? void 0 : _a.type) === JSONRPC.streamPause && "pause" in requestInfo) {
       requestInfo.pause();
       return;
     }
-    if (((_c = message.result) == null ? void 0 : _c.type) === JSONRPC.streamResume && "resume" in requestInfo) {
+    if (((_b = message.result) == null ? void 0 : _b.type) === JSONRPC.streamResume && "resume" in requestInfo) {
       requestInfo.resume();
       return;
     }
     const { stream, start } = requestInfo;
-    if (((_d = message.result) == null ? void 0 : _d.type) === JSONRPC.streamChunk) {
+    if (((_c = message.result) == null ? void 0 : _c.type) === JSONRPC.streamChunk) {
       stream.push(message.result);
       return;
     }
     stream.push(message);
-    if (!stream.destroyed) {
-      stream.push(null);
-    }
-    if (message.id) {
-      this._requests.delete(message.id);
-    }
+    this._completeRequest(requestInfo);
     if (this.connectionType === WapiClientType.ws) {
       this._send({
         jsonrpc: JSONRPC.version,
@@ -205,22 +233,6 @@ var BaseClient = class {
   //   const inputCopy = APIValidators[name](input);
   //   return this._sendRaw<Input, Output>(name, inputCopy as Input);
   // }
-  _setSending(jsonRpcMessage, stream) {
-    if (jsonRpcMessage.id === null) {
-      throw new Error("JSONRPCMessage should not be null");
-    }
-    this._sending.set(jsonRpcMessage.id, __spreadValues({}, this.sendingTimeout && {
-      timeout: setTimeout(() => {
-        this._sending.delete(jsonRpcMessage.id);
-        stream.push({
-          error: new ConfigError("SENDING_TIMEOUT", {
-            timeout: this.sendingTimeout
-          }).toJSON()
-        });
-        this._requests.delete(jsonRpcMessage.id);
-      }, this.sendingTimeout)
-    }));
-  }
   _sendRaw(method, params) {
     const jsonRpcMessage = {
       jsonrpc: JSONRPC.version,
@@ -241,11 +253,20 @@ var BaseClient = class {
       if (this._error) {
         throw this._error;
       }
-      this._requests.set(jsonRpcMessage.id, {
+      const outboundRequest = __spreadValues(__spreadValues({
         stream,
-        start: Date.now()
+        start: Date.now(),
+        message: jsonRpcMessage
+      }, this.sendingTimeout && {
+        sendingTimeout: setTimeout(() => {
+          this._fireSendingTimeout(outboundRequest);
+        }, this.sendingTimeout)
+      }), this.requestTimeout && {
+        requestTimeout: setTimeout(() => {
+          this._fireRequestTimeout(outboundRequest);
+        }, this.requestTimeout)
       });
-      this._setSending(jsonRpcMessage, stream);
+      this._requests.set(jsonRpcMessage.id, outboundRequest);
       this._send(jsonRpcMessage);
     }));
   }

package/dist/api/base-client.cjs

@@ -91,6 +91,7 @@ var BaseClient = class {
     __publicField(this, "_error", false);
     __publicField(this, "_sending", /* @__PURE__ */ new Map());
     __publicField(this, "sendingTimeout");
+    __publicField(this, "requestTimeout", 12e4);
     this.type = connectionType;
     this._connection = connection;
     this.connectionType = connectionType;
@@ -132,18 +133,50 @@ var BaseClient = class {
   // Will fire this in case we lose connection
   // This is so we can terminate ongoing requests
   _connectionLost() {
-    this._requests.forEach((responseObject, key) => {
-      if ("stream" in responseObject) {
-        responseObject.stream.destroy(
-          new import_errors.StreamError("CONNECTION_LOST", { method: "connectionLost" })
-        );
-      }
-      this._requests.delete(key);
+    this._requests.forEach((requestInfo) => {
+      this._fireConnectionLost(requestInfo);
     });
     this.socId = void 0;
   }
+  _completeRequest(request, error) {
+    const key = request.message.id;
+    if (key === null) {
+      throw new Error("JSONRPCMessage.id should not be null");
+    }
+    if (error) {
+      if ("error" in request) {
+        request.error(error);
+      } else if ("stream" in request) {
+        request.stream.destroy(error);
+      }
+    } else if (!request.stream.destroyed) {
+      request.stream.push(null);
+    }
+    clearTimeout(request.requestTimeout);
+    clearTimeout(request.sendingTimeout);
+    this._requests.delete(key);
+    this._sending.delete(key);
+  }
+  _fireConnectionLost(requestInfo) {
+    const error = new import_errors.StreamError("CONNECTION_LOST", {
+      method: "connectionLost"
+    });
+    return this._completeRequest(requestInfo, error);
+  }
+  _fireSendingTimeout(requestInfo) {
+    const error = new import_errors.ConfigError("SENDING_TIMEOUT", {
+      timeout: this.sendingTimeout
+    });
+    return this._completeRequest(requestInfo, error);
+  }
+  _fireRequestTimeout(requestInfo) {
+    const error = new import_errors.ConfigError("REQUEST_TIMEOUT", {
+      timeout: this.requestTimeout
+    });
+    return this._completeRequest(requestInfo, error);
+  }
   _handleMessage(incoming) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     if (this.hooks.message) {
       this.hooks.message(incoming);
     }
@@ -168,16 +201,16 @@ var BaseClient = class {
       (0, import_debug.debugLog)("Unexpected JSONRPCResponse", incoming);
       return;
     }
-    if (responseMessage.result === import_jsonrpc_enums.JSONRPC.acknowledgement) {
-      clearTimeout((_a = this._sending.get(responseMessage.id)) == null ? void 0 : _a.timeout);
-      this._sending.delete(responseMessage.id);
-      return;
-    }
     const requestInfo = this._requests.get(responseMessage.id);
     if (!requestInfo) {
       (0, import_debug.debugLog)("No Request found for incoming", incoming);
       return;
     }
+    if (responseMessage.result === import_jsonrpc_enums.JSONRPC.acknowledgement) {
+      clearTimeout(requestInfo.requestTimeout);
+      delete requestInfo.requestTimeout;
+      return;
+    }
     if ("handle" in requestInfo) {
       requestInfo.handle(responseMessage);
       delete requestInfo.handle;
@@ -187,26 +220,21 @@ var BaseClient = class {
       requestInfo.error(responseMessage.error);
     }
     const message = responseMessage;
-    if (((_b = message.result) == null ? void 0 : _b.type) === import_jsonrpc_enums.JSONRPC.streamPause && "pause" in requestInfo) {
+    if (((_a = message.result) == null ? void 0 : _a.type) === import_jsonrpc_enums.JSONRPC.streamPause && "pause" in requestInfo) {
       requestInfo.pause();
       return;
     }
-    if (((_c = message.result) == null ? void 0 : _c.type) === import_jsonrpc_enums.JSONRPC.streamResume && "resume" in requestInfo) {
+    if (((_b = message.result) == null ? void 0 : _b.type) === import_jsonrpc_enums.JSONRPC.streamResume && "resume" in requestInfo) {
       requestInfo.resume();
       return;
     }
     const { stream, start } = requestInfo;
-    if (((_d = message.result) == null ? void 0 : _d.type) === import_jsonrpc_enums.JSONRPC.streamChunk) {
+    if (((_c = message.result) == null ? void 0 : _c.type) === import_jsonrpc_enums.JSONRPC.streamChunk) {
       stream.push(message.result);
       return;
     }
     stream.push(message);
-    if (!stream.destroyed) {
-      stream.push(null);
-    }
-    if (message.id) {
-      this._requests.delete(message.id);
-    }
+    this._completeRequest(requestInfo);
     if (this.connectionType === import_wapi_client.WapiClientType.ws) {
       this._send({
         jsonrpc: import_jsonrpc_enums.JSONRPC.version,
@@ -224,22 +252,6 @@ var BaseClient = class {
   //   const inputCopy = APIValidators[name](input);
   //   return this._sendRaw<Input, Output>(name, inputCopy as Input);
   // }
-  _setSending(jsonRpcMessage, stream) {
-    if (jsonRpcMessage.id === null) {
-      throw new Error("JSONRPCMessage should not be null");
-    }
-    this._sending.set(jsonRpcMessage.id, __spreadValues({}, this.sendingTimeout && {
-      timeout: setTimeout(() => {
-        this._sending.delete(jsonRpcMessage.id);
-        stream.push({
-          error: new import_errors.ConfigError("SENDING_TIMEOUT", {
-            timeout: this.sendingTimeout
-          }).toJSON()
-        });
-        this._requests.delete(jsonRpcMessage.id);
-      }, this.sendingTimeout)
-    }));
-  }
   _sendRaw(method, params) {
     const jsonRpcMessage = {
       jsonrpc: import_jsonrpc_enums.JSONRPC.version,
@@ -260,11 +272,20 @@ var BaseClient = class {
       if (this._error) {
         throw this._error;
       }
-      this._requests.set(jsonRpcMessage.id, {
+      const outboundRequest = __spreadValues(__spreadValues({
         stream,
-        start: Date.now()
+        start: Date.now(),
+        message: jsonRpcMessage
+      }, this.sendingTimeout && {
+        sendingTimeout: setTimeout(() => {
+          this._fireSendingTimeout(outboundRequest);
+        }, this.sendingTimeout)
+      }), this.requestTimeout && {
+        requestTimeout: setTimeout(() => {
+          this._fireRequestTimeout(outboundRequest);
+        }, this.requestTimeout)
       });
-      this._setSending(jsonRpcMessage, stream);
+      this._requests.set(jsonRpcMessage.id, outboundRequest);
       this._send(jsonRpcMessage);
     }));
   }

package/dist/api/base-client.js

@@ -72,6 +72,7 @@ var BaseClient = class {
     __publicField(this, "_error", false);
     __publicField(this, "_sending", /* @__PURE__ */ new Map());
     __publicField(this, "sendingTimeout");
+    __publicField(this, "requestTimeout", 12e4);
     this.type = connectionType;
     this._connection = connection;
     this.connectionType = connectionType;
@@ -113,18 +114,50 @@ var BaseClient = class {
   // Will fire this in case we lose connection
   // This is so we can terminate ongoing requests
   _connectionLost() {
-    this._requests.forEach((responseObject, key) => {
-      if ("stream" in responseObject) {
-        responseObject.stream.destroy(
-          new StreamError("CONNECTION_LOST", { method: "connectionLost" })
-        );
-      }
-      this._requests.delete(key);
+    this._requests.forEach((requestInfo) => {
+      this._fireConnectionLost(requestInfo);
     });
     this.socId = void 0;
   }
+  _completeRequest(request, error) {
+    const key = request.message.id;
+    if (key === null) {
+      throw new Error("JSONRPCMessage.id should not be null");
+    }
+    if (error) {
+      if ("error" in request) {
+        request.error(error);
+      } else if ("stream" in request) {
+        request.stream.destroy(error);
+      }
+    } else if (!request.stream.destroyed) {
+      request.stream.push(null);
+    }
+    clearTimeout(request.requestTimeout);
+    clearTimeout(request.sendingTimeout);
+    this._requests.delete(key);
+    this._sending.delete(key);
+  }
+  _fireConnectionLost(requestInfo) {
+    const error = new StreamError("CONNECTION_LOST", {
+      method: "connectionLost"
+    });
+    return this._completeRequest(requestInfo, error);
+  }
+  _fireSendingTimeout(requestInfo) {
+    const error = new ConfigError("SENDING_TIMEOUT", {
+      timeout: this.sendingTimeout
+    });
+    return this._completeRequest(requestInfo, error);
+  }
+  _fireRequestTimeout(requestInfo) {
+    const error = new ConfigError("REQUEST_TIMEOUT", {
+      timeout: this.requestTimeout
+    });
+    return this._completeRequest(requestInfo, error);
+  }
   _handleMessage(incoming) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     if (this.hooks.message) {
       this.hooks.message(incoming);
     }
@@ -149,16 +182,16 @@ var BaseClient = class {
       debugLog("Unexpected JSONRPCResponse", incoming);
       return;
     }
-    if (responseMessage.result === JSONRPC.acknowledgement) {
-      clearTimeout((_a = this._sending.get(responseMessage.id)) == null ? void 0 : _a.timeout);
-      this._sending.delete(responseMessage.id);
-      return;
-    }
     const requestInfo = this._requests.get(responseMessage.id);
     if (!requestInfo) {
       debugLog("No Request found for incoming", incoming);
       return;
     }
+    if (responseMessage.result === JSONRPC.acknowledgement) {
+      clearTimeout(requestInfo.requestTimeout);
+      delete requestInfo.requestTimeout;
+      return;
+    }
     if ("handle" in requestInfo) {
       requestInfo.handle(responseMessage);
       delete requestInfo.handle;
@@ -168,26 +201,21 @@ var BaseClient = class {
       requestInfo.error(responseMessage.error);
     }
     const message = responseMessage;
-    if (((_b = message.result) == null ? void 0 : _b.type) === JSONRPC.streamPause && "pause" in requestInfo) {
+    if (((_a = message.result) == null ? void 0 : _a.type) === JSONRPC.streamPause && "pause" in requestInfo) {
       requestInfo.pause();
       return;
     }
-    if (((_c = message.result) == null ? void 0 : _c.type) === JSONRPC.streamResume && "resume" in requestInfo) {
+    if (((_b = message.result) == null ? void 0 : _b.type) === JSONRPC.streamResume && "resume" in requestInfo) {
       requestInfo.resume();
       return;
     }
     const { stream, start } = requestInfo;
-    if (((_d = message.result) == null ? void 0 : _d.type) === JSONRPC.streamChunk) {
+    if (((_c = message.result) == null ? void 0 : _c.type) === JSONRPC.streamChunk) {
       stream.push(message.result);
       return;
     }
     stream.push(message);
-    if (!stream.destroyed) {
-      stream.push(null);
-    }
-    if (message.id) {
-      this._requests.delete(message.id);
-    }
+    this._completeRequest(requestInfo);
     if (this.connectionType === WapiClientType.ws) {
       this._send({
         jsonrpc: JSONRPC.version,
@@ -205,22 +233,6 @@ var BaseClient = class {
   //   const inputCopy = APIValidators[name](input);
   //   return this._sendRaw<Input, Output>(name, inputCopy as Input);
   // }
-  _setSending(jsonRpcMessage, stream) {
-    if (jsonRpcMessage.id === null) {
-      throw new Error("JSONRPCMessage should not be null");
-    }
-    this._sending.set(jsonRpcMessage.id, __spreadValues({}, this.sendingTimeout && {
-      timeout: setTimeout(() => {
-        this._sending.delete(jsonRpcMessage.id);
-        stream.push({
-          error: new ConfigError("SENDING_TIMEOUT", {
-            timeout: this.sendingTimeout
-          }).toJSON()
-        });
-        this._requests.delete(jsonRpcMessage.id);
-      }, this.sendingTimeout)
-    }));
-  }
   _sendRaw(method, params) {
     const jsonRpcMessage = {
       jsonrpc: JSONRPC.version,
@@ -241,11 +253,20 @@ var BaseClient = class {
       if (this._error) {
         throw this._error;
       }
-      this._requests.set(jsonRpcMessage.id, {
+      const outboundRequest = __spreadValues(__spreadValues({
         stream,
-        start: Date.now()
+        start: Date.now(),
+        message: jsonRpcMessage
+      }, this.sendingTimeout && {
+        sendingTimeout: setTimeout(() => {
+          this._fireSendingTimeout(outboundRequest);
+        }, this.sendingTimeout)
+      }), this.requestTimeout && {
+        requestTimeout: setTimeout(() => {
+          this._fireRequestTimeout(outboundRequest);
+        }, this.requestTimeout)
       });
-      this._setSending(jsonRpcMessage, stream);
+      this._requests.set(jsonRpcMessage.id, outboundRequest);
       this._send(jsonRpcMessage);
     }));
   }