wapi-client 0.10.2 → 0.10.6

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

@@ -83,7 +83,7 @@ var BaseClient = class {
     );
     this._requests = /* @__PURE__ */ new Map();
     this._error = false;
-    this._sending = /* @__PURE__ */ new Set();
+    this._sending = /* @__PURE__ */ new Map();
     this.type = connectionType;
     this._connection = connection;
     this.connectionType = connectionType;
@@ -135,7 +135,7 @@ var BaseClient = class {
     this.socId = void 0;
   }
   _handleMessage(incoming) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     if (this.hooks.message) {
       this.hooks.message(incoming);
     }
@@ -161,6 +161,7 @@ var BaseClient = class {
       return;
     }
     if (responseMessage.result === import_jsonrpc.JSONRPC.acknowledgement) {
+      clearTimeout((_a = this._sending.get(responseMessage.id)) == null ? void 0 : _a.timeout);
       this._sending.delete(responseMessage.id);
       return;
     }
@@ -178,16 +179,16 @@ var BaseClient = class {
       requestInfo.error(responseMessage.error);
     }
     const message = responseMessage;
-    if (((_a = message.result) == null ? void 0 : _a.type) === import_jsonrpc.JSONRPC.streamPause && "pause" in requestInfo) {
+    if (((_b = message.result) == null ? void 0 : _b.type) === import_jsonrpc.JSONRPC.streamPause && "pause" in requestInfo) {
       requestInfo.pause();
       return;
     }
-    if (((_b = message.result) == null ? void 0 : _b.type) === import_jsonrpc.JSONRPC.streamResume && "resume" in requestInfo) {
+    if (((_c = message.result) == null ? void 0 : _c.type) === import_jsonrpc.JSONRPC.streamResume && "resume" in requestInfo) {
       requestInfo.resume();
       return;
     }
     const { stream, start } = requestInfo;
-    if (((_c = message.result) == null ? void 0 : _c.type) === import_jsonrpc.JSONRPC.streamChunk) {
+    if (((_d = message.result) == null ? void 0 : _d.type) === import_jsonrpc.JSONRPC.streamChunk) {
       stream.push(message.result);
       return;
     }
@@ -212,6 +213,19 @@ var BaseClient = class {
     }
     return this._sendRaw(name, inputCopy);
   }
+  _setSending(jsonRpcMessage, stream) {
+    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.JSONRPC.version,
@@ -236,7 +250,7 @@ var BaseClient = class {
         stream,
         start: Date.now()
       });
-      this._sending.add(jsonRpcMessage.id);
+      this._setSending(jsonRpcMessage, stream);
       this._send(jsonRpcMessage);
     }));
   }
@@ -245,6 +259,7 @@ var BaseClient = class {
     const streamId = (0, import_utils.getRandomHex)();
     let _error;
     const sendToStream = ({
+      stream,
       method,
       params
     }) => {
@@ -259,7 +274,7 @@ var BaseClient = class {
         }, params),
         id: (0, import_utils.getRandomHex)()
       };
-      this._sending.add(streamMessage.id);
+      this._setSending(streamMessage, stream);
       this._send(streamMessage);
     };
     const sendErrorToStream = (stream, error) => {
@@ -267,6 +282,7 @@ var BaseClient = class {
         return;
       }
       sendToStream({
+        stream,
         method: "streamError",
         params: {
           error
@@ -343,6 +359,7 @@ var BaseClient = class {
               return;
             }
             sendToStream({
+              stream,
               method: "streamData",
               params: {
                 data: chunk
@@ -357,6 +374,7 @@ var BaseClient = class {
               timeout = null;
             }
             sendToStream({
+              stream,
               method: "streamError",
               params: {
                 error
@@ -374,13 +392,14 @@ var BaseClient = class {
               timeout = null;
             }
             sendToStream({
+              stream,
               method: "streamEnd",
               params: {}
             });
           });
         }
       });
-      this._sending.add(streamStartMessage.id);
+      this._setSending(streamStartMessage, stream);
       this._send(streamStartMessage);
     }), inputStream);
   }

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

@@ -37,7 +37,7 @@ var __async = (__this, __arguments, generator) => {
 
 // src/api/base-client.ts
 import { debugLog } from "../lib/debug.browser.js";
-import { StreamError, ValidationError } from "../lib/errors.browser.js";
+import { ConfigError, StreamError, ValidationError } from "../lib/errors.browser.js";
 import { StreamPromise } from "../lib/stream-promise.browser.js";
 import { StreamPromiseInput } from "../lib/stream-promise-input.browser.js";
 import {
@@ -70,7 +70,7 @@ var BaseClient = class {
     );
     this._requests = /* @__PURE__ */ new Map();
     this._error = false;
-    this._sending = /* @__PURE__ */ new Set();
+    this._sending = /* @__PURE__ */ new Map();
     this.type = connectionType;
     this._connection = connection;
     this.connectionType = connectionType;
@@ -122,7 +122,7 @@ var BaseClient = class {
     this.socId = void 0;
   }
   _handleMessage(incoming) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     if (this.hooks.message) {
       this.hooks.message(incoming);
     }
@@ -148,6 +148,7 @@ var BaseClient = class {
       return;
     }
     if (responseMessage.result === JSONRPC.acknowledgement) {
+      clearTimeout((_a = this._sending.get(responseMessage.id)) == null ? void 0 : _a.timeout);
       this._sending.delete(responseMessage.id);
       return;
     }
@@ -165,16 +166,16 @@ var BaseClient = class {
       requestInfo.error(responseMessage.error);
     }
     const message = responseMessage;
-    if (((_a = message.result) == null ? void 0 : _a.type) === JSONRPC.streamPause && "pause" in requestInfo) {
+    if (((_b = message.result) == null ? void 0 : _b.type) === JSONRPC.streamPause && "pause" in requestInfo) {
       requestInfo.pause();
       return;
     }
-    if (((_b = message.result) == null ? void 0 : _b.type) === JSONRPC.streamResume && "resume" in requestInfo) {
+    if (((_c = message.result) == null ? void 0 : _c.type) === JSONRPC.streamResume && "resume" in requestInfo) {
       requestInfo.resume();
       return;
     }
     const { stream, start } = requestInfo;
-    if (((_c = message.result) == null ? void 0 : _c.type) === JSONRPC.streamChunk) {
+    if (((_d = message.result) == null ? void 0 : _d.type) === JSONRPC.streamChunk) {
       stream.push(message.result);
       return;
     }
@@ -199,6 +200,19 @@ var BaseClient = class {
     }
     return this._sendRaw(name, inputCopy);
   }
+  _setSending(jsonRpcMessage, stream) {
+    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,
@@ -223,7 +237,7 @@ var BaseClient = class {
         stream,
         start: Date.now()
       });
-      this._sending.add(jsonRpcMessage.id);
+      this._setSending(jsonRpcMessage, stream);
       this._send(jsonRpcMessage);
     }));
   }
@@ -232,6 +246,7 @@ var BaseClient = class {
     const streamId = getRandomHex();
     let _error;
     const sendToStream = ({
+      stream,
       method,
       params
     }) => {
@@ -246,7 +261,7 @@ var BaseClient = class {
         }, params),
         id: getRandomHex()
       };
-      this._sending.add(streamMessage.id);
+      this._setSending(streamMessage, stream);
       this._send(streamMessage);
     };
     const sendErrorToStream = (stream, error) => {
@@ -254,6 +269,7 @@ var BaseClient = class {
         return;
       }
       sendToStream({
+        stream,
         method: "streamError",
         params: {
           error
@@ -330,6 +346,7 @@ var BaseClient = class {
               return;
             }
             sendToStream({
+              stream,
               method: "streamData",
               params: {
                 data: chunk
@@ -344,6 +361,7 @@ var BaseClient = class {
               timeout = null;
             }
             sendToStream({
+              stream,
               method: "streamError",
               params: {
                 error
@@ -361,13 +379,14 @@ var BaseClient = class {
               timeout = null;
             }
             sendToStream({
+              stream,
               method: "streamEnd",
               params: {}
             });
           });
         }
       });
-      this._sending.add(streamStartMessage.id);
+      this._setSending(streamStartMessage, stream);
       this._send(streamStartMessage);
     }), inputStream);
   }

package/dist/api/base-client.cjs

@@ -83,7 +83,7 @@ var BaseClient = class {
     );
     this._requests = /* @__PURE__ */ new Map();
     this._error = false;
-    this._sending = /* @__PURE__ */ new Set();
+    this._sending = /* @__PURE__ */ new Map();
     this.type = connectionType;
     this._connection = connection;
     this.connectionType = connectionType;
@@ -135,7 +135,7 @@ var BaseClient = class {
     this.socId = void 0;
   }
   _handleMessage(incoming) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     if (this.hooks.message) {
       this.hooks.message(incoming);
     }
@@ -161,6 +161,7 @@ var BaseClient = class {
       return;
     }
     if (responseMessage.result === import_jsonrpc.JSONRPC.acknowledgement) {
+      clearTimeout((_a = this._sending.get(responseMessage.id)) == null ? void 0 : _a.timeout);
       this._sending.delete(responseMessage.id);
       return;
     }
@@ -178,16 +179,16 @@ var BaseClient = class {
       requestInfo.error(responseMessage.error);
     }
     const message = responseMessage;
-    if (((_a = message.result) == null ? void 0 : _a.type) === import_jsonrpc.JSONRPC.streamPause && "pause" in requestInfo) {
+    if (((_b = message.result) == null ? void 0 : _b.type) === import_jsonrpc.JSONRPC.streamPause && "pause" in requestInfo) {
       requestInfo.pause();
       return;
     }
-    if (((_b = message.result) == null ? void 0 : _b.type) === import_jsonrpc.JSONRPC.streamResume && "resume" in requestInfo) {
+    if (((_c = message.result) == null ? void 0 : _c.type) === import_jsonrpc.JSONRPC.streamResume && "resume" in requestInfo) {
       requestInfo.resume();
       return;
     }
     const { stream, start } = requestInfo;
-    if (((_c = message.result) == null ? void 0 : _c.type) === import_jsonrpc.JSONRPC.streamChunk) {
+    if (((_d = message.result) == null ? void 0 : _d.type) === import_jsonrpc.JSONRPC.streamChunk) {
       stream.push(message.result);
       return;
     }
@@ -212,6 +213,19 @@ var BaseClient = class {
     }
     return this._sendRaw(name, inputCopy);
   }
+  _setSending(jsonRpcMessage, stream) {
+    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.JSONRPC.version,
@@ -236,7 +250,7 @@ var BaseClient = class {
         stream,
         start: Date.now()
       });
-      this._sending.add(jsonRpcMessage.id);
+      this._setSending(jsonRpcMessage, stream);
       this._send(jsonRpcMessage);
     }));
   }
@@ -245,6 +259,7 @@ var BaseClient = class {
     const streamId = (0, import_utils.getRandomHex)();
     let _error;
     const sendToStream = ({
+      stream,
       method,
       params
     }) => {
@@ -259,7 +274,7 @@ var BaseClient = class {
         }, params),
         id: (0, import_utils.getRandomHex)()
       };
-      this._sending.add(streamMessage.id);
+      this._setSending(streamMessage, stream);
       this._send(streamMessage);
     };
     const sendErrorToStream = (stream, error) => {
@@ -267,6 +282,7 @@ var BaseClient = class {
         return;
       }
       sendToStream({
+        stream,
         method: "streamError",
         params: {
           error
@@ -343,6 +359,7 @@ var BaseClient = class {
               return;
             }
             sendToStream({
+              stream,
               method: "streamData",
               params: {
                 data: chunk
@@ -357,6 +374,7 @@ var BaseClient = class {
               timeout = null;
             }
             sendToStream({
+              stream,
               method: "streamError",
               params: {
                 error
@@ -374,13 +392,14 @@ var BaseClient = class {
               timeout = null;
             }
             sendToStream({
+              stream,
               method: "streamEnd",
               params: {}
             });
           });
         }
       });
-      this._sending.add(streamStartMessage.id);
+      this._setSending(streamStartMessage, stream);
       this._send(streamStartMessage);
     }), inputStream);
   }

package/dist/api/base-client.d.ts

@@ -70,14 +70,17 @@ export declare class BaseClient {
     protected _connection: WebSocket | HttpConnectionClient;
     $connect: Promise<ISocketId> | Promise<undefined> | undefined;
     connectionType: WapiClientType;
-    host: string;
     protected jwt: string;
+    host: string;
     isConnected: boolean;
     socId: undefined | string;
     hooks: ClientHooks;
     private _requests;
     private _error;
-    protected _sending: Set<string | number>;
+    protected _sending: Map<string | number, {
+        timeout?: ReturnType<typeof setTimeout>;
+    }>;
+    sendingTimeout: number | undefined;
     constructor(connection: WebSocket | HttpConnectionClient, connectionType: WapiClientType, $connect?: Promise<ISocketId>);
     protected _setConnected(value: boolean): void;
     protected _setErrored(err: Error): void;
@@ -88,6 +91,7 @@ export declare class BaseClient {
     protected _connectionLost(): void;
     protected _handleMessage(incoming: JSONRPCResponse | JSONRPCRequest): void;
     private _sendTransaction;
+    private _setSending;
     _sendRaw<Input, Output>(method: string, params: Input): StreamPromise<Output>;
     private _streamTransaction;
     /**

package/dist/api/base-client.js

@@ -37,7 +37,7 @@ var __async = (__this, __arguments, generator) => {
 
 // src/api/base-client.ts
 import { debugLog } from "../lib/debug";
-import { StreamError, ValidationError } from "../lib/errors";
+import { ConfigError, StreamError, ValidationError } from "../lib/errors";
 import { StreamPromise } from "../lib/stream-promise";
 import { StreamPromiseInput } from "../lib/stream-promise-input";
 import {
@@ -70,7 +70,7 @@ var BaseClient = class {
     );
     this._requests = /* @__PURE__ */ new Map();
     this._error = false;
-    this._sending = /* @__PURE__ */ new Set();
+    this._sending = /* @__PURE__ */ new Map();
     this.type = connectionType;
     this._connection = connection;
     this.connectionType = connectionType;
@@ -122,7 +122,7 @@ var BaseClient = class {
     this.socId = void 0;
   }
   _handleMessage(incoming) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     if (this.hooks.message) {
       this.hooks.message(incoming);
     }
@@ -148,6 +148,7 @@ var BaseClient = class {
       return;
     }
     if (responseMessage.result === JSONRPC.acknowledgement) {
+      clearTimeout((_a = this._sending.get(responseMessage.id)) == null ? void 0 : _a.timeout);
       this._sending.delete(responseMessage.id);
       return;
     }
@@ -165,16 +166,16 @@ var BaseClient = class {
       requestInfo.error(responseMessage.error);
     }
     const message = responseMessage;
-    if (((_a = message.result) == null ? void 0 : _a.type) === JSONRPC.streamPause && "pause" in requestInfo) {
+    if (((_b = message.result) == null ? void 0 : _b.type) === JSONRPC.streamPause && "pause" in requestInfo) {
       requestInfo.pause();
       return;
     }
-    if (((_b = message.result) == null ? void 0 : _b.type) === JSONRPC.streamResume && "resume" in requestInfo) {
+    if (((_c = message.result) == null ? void 0 : _c.type) === JSONRPC.streamResume && "resume" in requestInfo) {
       requestInfo.resume();
       return;
     }
     const { stream, start } = requestInfo;
-    if (((_c = message.result) == null ? void 0 : _c.type) === JSONRPC.streamChunk) {
+    if (((_d = message.result) == null ? void 0 : _d.type) === JSONRPC.streamChunk) {
       stream.push(message.result);
       return;
     }
@@ -199,6 +200,19 @@ var BaseClient = class {
     }
     return this._sendRaw(name, inputCopy);
   }
+  _setSending(jsonRpcMessage, stream) {
+    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,
@@ -223,7 +237,7 @@ var BaseClient = class {
         stream,
         start: Date.now()
       });
-      this._sending.add(jsonRpcMessage.id);
+      this._setSending(jsonRpcMessage, stream);
       this._send(jsonRpcMessage);
     }));
   }
@@ -232,6 +246,7 @@ var BaseClient = class {
     const streamId = getRandomHex();
     let _error;
     const sendToStream = ({
+      stream,
       method,
       params
     }) => {
@@ -246,7 +261,7 @@ var BaseClient = class {
         }, params),
         id: getRandomHex()
       };
-      this._sending.add(streamMessage.id);
+      this._setSending(streamMessage, stream);
       this._send(streamMessage);
     };
     const sendErrorToStream = (stream, error) => {
@@ -254,6 +269,7 @@ var BaseClient = class {
         return;
       }
       sendToStream({
+        stream,
         method: "streamError",
         params: {
           error
@@ -330,6 +346,7 @@ var BaseClient = class {
               return;
             }
             sendToStream({
+              stream,
               method: "streamData",
               params: {
                 data: chunk
@@ -344,6 +361,7 @@ var BaseClient = class {
               timeout = null;
             }
             sendToStream({
+              stream,
               method: "streamError",
               params: {
                 error
@@ -361,13 +379,14 @@ var BaseClient = class {
               timeout = null;
             }
             sendToStream({
+              stream,
               method: "streamEnd",
               params: {}
             });
           });
         }
       });
-      this._sending.add(streamStartMessage.id);
+      this._setSending(streamStartMessage, stream);
       this._send(streamStartMessage);
     }), inputStream);
   }

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

@@ -65,12 +65,19 @@ var import_debug = require('../lib/debug.cjs');
 var import_jsonrpc = require('./jsonrpc/jsonrpc.enums.cjs');
 var import_base_client = require('./base-client.cjs');
 var import__ = require('../index.cjs');
+var import_errors = require('../lib/errors.cjs');
 var import_utils = require('../lib/utils.cjs');
-function createHttpClient(opts) {
-  const initialConnection = createConnection(opts);
-  return new HttpClient(initialConnection, opts);
+function createHttpClient(opts, config) {
+  const initialConnection = createConnection(opts, {
+    timeout: config == null ? void 0 : config.connectingTimeout
+  });
+  return new HttpClient(
+    initialConnection,
+    opts
+    /* config */
+  );
 }
-function createConnection(opts) {
+function createConnection(opts, connectionConfig) {
   const url = opts.host.replace(/^wss:/, "https:");
   const REQ_HEADER_ID = "x-wapi-req-id";
   function onmessage(body) {
@@ -95,23 +102,40 @@ function createConnection(opts) {
     });
   }
   const connectId = (0, import_utils.getRandomHex)();
-  const $connect = (0, import_fetch.fetch)(`${url}/api`, {
-    method: "POST",
-    headers: {
-      Authorization: `Bearer ${opts.jwt}`,
-      [REQ_HEADER_ID]: connectId
-    },
-    body: JSON.stringify({
-      jsonrpc: import_jsonrpc.JSONRPC.version,
-      method: "authenticationCheck",
-      params: {},
-      id: connectId
-    })
-  }).then((res) => res.json()).then((res) => {
-    if (res.error) {
-      throw new Error(res.error.message);
-    }
-    return;
+  const $connect = new Promise((resolve, reject) => {
+    const controller = new AbortController();
+    (0, import_debug.debugLog)(
+      `createConnection(sending http auth request${(connectionConfig == null ? void 0 : connectionConfig.timeout) ? " with timeout " + connectionConfig.timeout : ""})`
+    );
+    const connectingTimeout = (connectionConfig == null ? void 0 : connectionConfig.timeout) ? setTimeout(() => {
+      controller.abort();
+      reject(
+        new import_errors.ConfigError("CONNECTION_TIMEOUT", {
+          timeout: connectionConfig.timeout
+        })
+      );
+    }, connectionConfig.timeout) : void 0;
+    (0, import_fetch.fetch)(`${url}/api`, {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${opts.jwt}`,
+        [REQ_HEADER_ID]: connectId
+      },
+      body: JSON.stringify({
+        jsonrpc: import_jsonrpc.JSONRPC.version,
+        method: "authenticationCheck",
+        params: {},
+        id: connectId
+      }),
+      signal: controller.signal
+    }).then((res) => res.json()).then((res) => {
+      clearTimeout(connectingTimeout);
+      if (res.error) {
+        throw new Error(res.error.message);
+      }
+      resolve(void 0);
+      return;
+    }).catch(reject);
   });
   return {
     send,
@@ -120,6 +144,8 @@ function createConnection(opts) {
   };
 }
 var HttpClient = class extends import_base_client.BaseClient {
+  // private _opts: WapiHttpConnectionOptions;
+  // private _connectionConfig: ConnectionConfig | undefined;
   constructor(connection, opts) {
     super(connection, import__.WapiClientType.https, connection.$connect);
     this.host = opts.host;