wapi-client 0.15.8 → 0.16.0-beta.1

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

@@ -657,17 +657,22 @@ function createConnection(opts, connectionConfig) {
       (0, import_debug.debugLog)(`http_createConnection>message(body:$0)`, body);
     });
   }
-  function send(body, jwt) {
+  function getHeaders(id) {
+    return __spreadValues(__spreadValues(__spreadValues(__spreadValues({
+      "content-type": "application/json"
+    }, id ? { [REQ_HEADER_ID]: id } : {}), (connectionConfig == null ? void 0 : connectionConfig.connectionName) ? { [REQ_CONN_NAME]: connectionConfig == null ? void 0 : connectionConfig.connectionName } : {}), "jwt" in opts ? {
+      Authorization: `Bearer ${opts.jwt}`
+    } : {}), "apikey" in opts ? {
+      Authorization: `Basic ${(0, import_utils.getBasicAuth)(opts)}`
+    } : {});
+  }
+  function send(body) {
     return __async(this, null, function* () {
       const jsonBody = JSON.parse(body);
       const res = yield (0, import_cross_fetch.default)(`${url}/api`, {
         keepalive: true,
         method: "POST",
-        headers: __spreadValues({
-          Authorization: `Bearer ${jwt}`,
-          "content-type": "application/json",
-          [REQ_HEADER_ID]: jsonBody == null ? void 0 : jsonBody.id
-        }, (connectionConfig == null ? void 0 : connectionConfig.connectionName) ? { [REQ_CONN_NAME]: connectionConfig == null ? void 0 : connectionConfig.connectionName } : {}),
+        headers: getHeaders(jsonBody == null ? void 0 : jsonBody.id),
         body
       });
       const responseBody = yield res.json();
@@ -693,11 +698,7 @@ function createConnection(opts, connectionConfig) {
     }, connectionConfig.timeout) : void 0;
     (0, import_cross_fetch.default)(`${url}/api`, {
       method: "POST",
-      headers: __spreadValues({
-        Authorization: `Bearer ${opts.jwt}`,
-        "content-type": "application/json",
-        [REQ_HEADER_ID]: connectId
-      }, (connectionConfig == null ? void 0 : connectionConfig.connectionName) ? { [REQ_CONN_NAME]: connectionConfig == null ? void 0 : connectionConfig.connectionName } : {}),
+      headers: getHeaders(connectId),
       body: JSON.stringify({
         jsonrpc: import_jsonrpc_enums.JSONRPC.version,
         method: "authenticationCheck",
@@ -727,7 +728,6 @@ var HttpClient = class extends import_base_client.BaseClient {
     var _a;
     super(connection, import_wapi_client.WapiClientType.https, connection.$connect);
     this.host = opts.host;
-    this.jwt = opts.jwt;
     (_a = this.$connect) == null ? void 0 : _a.then(() => {
       this._ready();
     }).catch((err) => {
@@ -736,7 +736,7 @@ var HttpClient = class extends import_base_client.BaseClient {
   }
   _send(input) {
     (0, import_debug.debugLog)("send()", input);
-    this._connection.send(JSON.stringify(input), this.jwt);
+    this._connection.send(JSON.stringify(input));
   }
   _ready() {
     this._setConnected(true);

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

@@ -625,7 +625,7 @@ import {
 import { BaseClient } from "./base-client.browser.js";
 import { WapiClientType } from "../wapi-client.browser.js";
 import { ConfigError } from "../lib/errors.browser.js";
-import { getRandomHex } from "../lib/utils.browser.js";
+import { getBasicAuth, getRandomHex } from "../lib/utils.browser.js";
 function createHttpClient(opts, config) {
   const initialConnection = createConnection(opts, {
     timeout: config == null ? void 0 : config.connectingTimeout,
@@ -647,17 +647,22 @@ function createConnection(opts, connectionConfig) {
       debugLog(`http_createConnection>message(body:$0)`, body);
     });
   }
-  function send(body, jwt) {
+  function getHeaders(id) {
+    return __spreadValues(__spreadValues(__spreadValues(__spreadValues({
+      "content-type": "application/json"
+    }, id ? { [REQ_HEADER_ID]: id } : {}), (connectionConfig == null ? void 0 : connectionConfig.connectionName) ? { [REQ_CONN_NAME]: connectionConfig == null ? void 0 : connectionConfig.connectionName } : {}), "jwt" in opts ? {
+      Authorization: `Bearer ${opts.jwt}`
+    } : {}), "apikey" in opts ? {
+      Authorization: `Basic ${getBasicAuth(opts)}`
+    } : {});
+  }
+  function send(body) {
     return __async(this, null, function* () {
       const jsonBody = JSON.parse(body);
       const res = yield (0, import_cross_fetch.default)(`${url}/api`, {
         keepalive: true,
         method: "POST",
-        headers: __spreadValues({
-          Authorization: `Bearer ${jwt}`,
-          "content-type": "application/json",
-          [REQ_HEADER_ID]: jsonBody == null ? void 0 : jsonBody.id
-        }, (connectionConfig == null ? void 0 : connectionConfig.connectionName) ? { [REQ_CONN_NAME]: connectionConfig == null ? void 0 : connectionConfig.connectionName } : {}),
+        headers: getHeaders(jsonBody == null ? void 0 : jsonBody.id),
         body
       });
       const responseBody = yield res.json();
@@ -683,11 +688,7 @@ function createConnection(opts, connectionConfig) {
     }, connectionConfig.timeout) : void 0;
     (0, import_cross_fetch.default)(`${url}/api`, {
       method: "POST",
-      headers: __spreadValues({
-        Authorization: `Bearer ${opts.jwt}`,
-        "content-type": "application/json",
-        [REQ_HEADER_ID]: connectId
-      }, (connectionConfig == null ? void 0 : connectionConfig.connectionName) ? { [REQ_CONN_NAME]: connectionConfig == null ? void 0 : connectionConfig.connectionName } : {}),
+      headers: getHeaders(connectId),
       body: JSON.stringify({
         jsonrpc: JSONRPC.version,
         method: "authenticationCheck",
@@ -717,7 +718,6 @@ var HttpClient = class extends BaseClient {
     var _a;
     super(connection, WapiClientType.https, connection.$connect);
     this.host = opts.host;
-    this.jwt = opts.jwt;
     (_a = this.$connect) == null ? void 0 : _a.then(() => {
       this._ready();
     }).catch((err) => {
@@ -726,7 +726,7 @@ var HttpClient = class extends BaseClient {
   }
   _send(input) {
     debugLog("send()", input);
-    this._connection.send(JSON.stringify(input), this.jwt);
+    this._connection.send(JSON.stringify(input));
   }
   _ready() {
     this._setConnected(true);

package/dist/api/http-client.cjs

@@ -99,17 +99,22 @@ function createConnection(opts, connectionConfig) {
       (0, import_debug.debugLog)(`http_createConnection>message(body:$0)`, body);
     });
   }
-  function send(body, jwt) {
+  function getHeaders(id) {
+    return __spreadValues(__spreadValues(__spreadValues(__spreadValues({
+      "content-type": "application/json"
+    }, id ? { [REQ_HEADER_ID]: id } : {}), (connectionConfig == null ? void 0 : connectionConfig.connectionName) ? { [REQ_CONN_NAME]: connectionConfig == null ? void 0 : connectionConfig.connectionName } : {}), "jwt" in opts ? {
+      Authorization: `Bearer ${opts.jwt}`
+    } : {}), "apikey" in opts ? {
+      Authorization: `Basic ${(0, import_utils.getBasicAuth)(opts)}`
+    } : {});
+  }
+  function send(body) {
     return __async(this, null, function* () {
       const jsonBody = JSON.parse(body);
       const res = yield (0, import_cross_fetch.default)(`${url}/api`, {
         keepalive: true,
         method: "POST",
-        headers: __spreadValues({
-          Authorization: `Bearer ${jwt}`,
-          "content-type": "application/json",
-          [REQ_HEADER_ID]: jsonBody == null ? void 0 : jsonBody.id
-        }, (connectionConfig == null ? void 0 : connectionConfig.connectionName) ? { [REQ_CONN_NAME]: connectionConfig == null ? void 0 : connectionConfig.connectionName } : {}),
+        headers: getHeaders(jsonBody == null ? void 0 : jsonBody.id),
         body
       });
       const responseBody = yield res.json();
@@ -135,11 +140,7 @@ function createConnection(opts, connectionConfig) {
     }, connectionConfig.timeout) : void 0;
     (0, import_cross_fetch.default)(`${url}/api`, {
       method: "POST",
-      headers: __spreadValues({
-        Authorization: `Bearer ${opts.jwt}`,
-        "content-type": "application/json",
-        [REQ_HEADER_ID]: connectId
-      }, (connectionConfig == null ? void 0 : connectionConfig.connectionName) ? { [REQ_CONN_NAME]: connectionConfig == null ? void 0 : connectionConfig.connectionName } : {}),
+      headers: getHeaders(connectId),
       body: JSON.stringify({
         jsonrpc: import_jsonrpc_enums.JSONRPC.version,
         method: "authenticationCheck",
@@ -169,7 +170,6 @@ var HttpClient = class extends import_base_client.BaseClient {
     var _a;
     super(connection, import_wapi_client.WapiClientType.https, connection.$connect);
     this.host = opts.host;
-    this.jwt = opts.jwt;
     (_a = this.$connect) == null ? void 0 : _a.then(() => {
       this._ready();
     }).catch((err) => {
@@ -178,7 +178,7 @@ var HttpClient = class extends import_base_client.BaseClient {
   }
   _send(input) {
     (0, import_debug.debugLog)("send()", input);
-    this._connection.send(JSON.stringify(input), this.jwt);
+    this._connection.send(JSON.stringify(input));
   }
   _ready() {
     this._setConnected(true);

package/dist/api/http-client.js

@@ -47,7 +47,7 @@ import {
 import { BaseClient } from "./base-client.js";
 import { WapiClientType } from "../wapi-client.js";
 import { ConfigError } from "../lib/errors.js";
-import { getRandomHex } from "../lib/utils.js";
+import { getBasicAuth, getRandomHex } from "../lib/utils.js";
 function createHttpClient(opts, config) {
   const initialConnection = createConnection(opts, {
     timeout: config == null ? void 0 : config.connectingTimeout,
@@ -69,17 +69,22 @@ function createConnection(opts, connectionConfig) {
       debugLog(`http_createConnection>message(body:$0)`, body);
     });
   }
-  function send(body, jwt) {
+  function getHeaders(id) {
+    return __spreadValues(__spreadValues(__spreadValues(__spreadValues({
+      "content-type": "application/json"
+    }, id ? { [REQ_HEADER_ID]: id } : {}), (connectionConfig == null ? void 0 : connectionConfig.connectionName) ? { [REQ_CONN_NAME]: connectionConfig == null ? void 0 : connectionConfig.connectionName } : {}), "jwt" in opts ? {
+      Authorization: `Bearer ${opts.jwt}`
+    } : {}), "apikey" in opts ? {
+      Authorization: `Basic ${getBasicAuth(opts)}`
+    } : {});
+  }
+  function send(body) {
     return __async(this, null, function* () {
       const jsonBody = JSON.parse(body);
       const res = yield fetch(`${url}/api`, {
         keepalive: true,
         method: "POST",
-        headers: __spreadValues({
-          Authorization: `Bearer ${jwt}`,
-          "content-type": "application/json",
-          [REQ_HEADER_ID]: jsonBody == null ? void 0 : jsonBody.id
-        }, (connectionConfig == null ? void 0 : connectionConfig.connectionName) ? { [REQ_CONN_NAME]: connectionConfig == null ? void 0 : connectionConfig.connectionName } : {}),
+        headers: getHeaders(jsonBody == null ? void 0 : jsonBody.id),
         body
       });
       const responseBody = yield res.json();
@@ -105,11 +110,7 @@ function createConnection(opts, connectionConfig) {
     }, connectionConfig.timeout) : void 0;
     fetch(`${url}/api`, {
       method: "POST",
-      headers: __spreadValues({
-        Authorization: `Bearer ${opts.jwt}`,
-        "content-type": "application/json",
-        [REQ_HEADER_ID]: connectId
-      }, (connectionConfig == null ? void 0 : connectionConfig.connectionName) ? { [REQ_CONN_NAME]: connectionConfig == null ? void 0 : connectionConfig.connectionName } : {}),
+      headers: getHeaders(connectId),
       body: JSON.stringify({
         jsonrpc: JSONRPC.version,
         method: "authenticationCheck",
@@ -139,7 +140,6 @@ var HttpClient = class extends BaseClient {
     var _a;
     super(connection, WapiClientType.https, connection.$connect);
     this.host = opts.host;
-    this.jwt = opts.jwt;
     (_a = this.$connect) == null ? void 0 : _a.then(() => {
       this._ready();
     }).catch((err) => {
@@ -148,7 +148,7 @@ var HttpClient = class extends BaseClient {
   }
   _send(input) {
     debugLog("send()", input);
-    this._connection.send(JSON.stringify(input), this.jwt);
+    this._connection.send(JSON.stringify(input));
   }
   _ready() {
     this._setConnected(true);

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

@@ -73,7 +73,8 @@ var import_wapi_client = require("../wapi-client.browser.cjs");
 var import_env = require("../lib/env.browser.cjs");
 function createWsClient(opts, config) {
   const initialConnection = createConnection(opts, {
-    timeout: config == null ? void 0 : config.connectingTimeout
+    timeout: config == null ? void 0 : config.connectingTimeout,
+    connectionName: config == null ? void 0 : config.connectionName
   });
   return new WsClient(initialConnection, opts, config);
 }
@@ -170,7 +171,6 @@ var WsClient = class extends import_base_client.BaseClient {
   constructor(initial, opts, config) {
     var _a;
     super(initial.ws, import_wapi_client.WapiClientType.ws, initial.$connect);
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     __publicField(this, "_pingTimeout");
     __publicField(this, "_opts");
     __publicField(this, "_connectionConfig");

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

@@ -56,7 +56,8 @@ import { WapiClientType } from "../wapi-client.browser.js";
 import { CLIENT_VERSION, getEnvConfig } from "../lib/env.browser.js";
 function createWsClient(opts, config) {
   const initialConnection = createConnection(opts, {
-    timeout: config == null ? void 0 : config.connectingTimeout
+    timeout: config == null ? void 0 : config.connectingTimeout,
+    connectionName: config == null ? void 0 : config.connectionName
   });
   return new WsClient(initialConnection, opts, config);
 }
@@ -153,7 +154,6 @@ var WsClient = class extends BaseClient {
   constructor(initial, opts, config) {
     var _a;
     super(initial.ws, WapiClientType.ws, initial.$connect);
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     __publicField(this, "_pingTimeout");
     __publicField(this, "_opts");
     __publicField(this, "_connectionConfig");

package/dist/api/ws-client.cjs

@@ -79,7 +79,8 @@ var import_wapi_client =  require("../wapi-client.cjs");
 var import_env =  require("../lib/env.cjs");
 function createWsClient(opts, config) {
   const initialConnection = createConnection(opts, {
-    timeout: config == null ? void 0 : config.connectingTimeout
+    timeout: config == null ? void 0 : config.connectingTimeout,
+    connectionName: config == null ? void 0 : config.connectionName
   });
   return new WsClient(initialConnection, opts, config);
 }
@@ -176,7 +177,6 @@ var WsClient = class extends import_base_client.BaseClient {
   constructor(initial, opts, config) {
     var _a;
     super(initial.ws, import_wapi_client.WapiClientType.ws, initial.$connect);
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     __publicField(this, "_pingTimeout");
     __publicField(this, "_opts");
     __publicField(this, "_connectionConfig");

package/dist/api/ws-client.js

@@ -54,7 +54,8 @@ import { WapiClientType } from "../wapi-client.js";
 import { CLIENT_VERSION, getEnvConfig } from "../lib/env.js";
 function createWsClient(opts, config) {
   const initialConnection = createConnection(opts, {
-    timeout: config == null ? void 0 : config.connectingTimeout
+    timeout: config == null ? void 0 : config.connectingTimeout,
+    connectionName: config == null ? void 0 : config.connectionName
   });
   return new WsClient(initialConnection, opts, config);
 }
@@ -151,7 +152,6 @@ var WsClient = class extends BaseClient {
   constructor(initial, opts, config) {
     var _a;
     super(initial.ws, WapiClientType.ws, initial.$connect);
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     __publicField(this, "_pingTimeout");
     __publicField(this, "_opts");
     __publicField(this, "_connectionConfig");

package/dist/client-options.schema.zod.browser.cjs

@@ -22,32 +22,27 @@ var client_options_schema_zod_exports = {};
 __export(client_options_schema_zod_exports, {
   clientOptionsSchema: () => clientOptionsSchema,
   clientTypeSchema: () => clientTypeSchema,
-  httpsClientOptionsSchema: () => httpsClientOptionsSchema,
-  httpsConnectionSchema: () => httpsConnectionSchema,
-  wsClientOptionsSchema: () => wsClientOptionsSchema,
-  wsConnectionSchema: () => wsConnectionSchema
+  connectionSchema: () => connectionSchema,
+  credsConnectionSchema: () => credsConnectionSchema,
+  jwtConnectionSchema: () => jwtConnectionSchema
 });
 module.exports = __toCommonJS(client_options_schema_zod_exports);
 var import_zod = require("./lib/zod.browser.cjs");
 var clientTypeSchema = import_zod.z.enum(["ws", "https"]);
-var wsConnectionSchema = import_zod.z.looseObject({
+var credsConnectionSchema = import_zod.z.looseObject({
   host: import_zod.z.string().describe("URL of the API"),
   apikey: import_zod.z.string().describe("API key for the client"),
   apisecret: import_zod.z.string().describe("API secret for the client")
 });
-var wsClientOptionsSchema = import_zod.z.object({
-  client: import_zod.z.literal("ws"),
-  connection: wsConnectionSchema
-});
-var httpsConnectionSchema = import_zod.z.looseObject({
+var jwtConnectionSchema = import_zod.z.looseObject({
   host: import_zod.z.string().describe("URL of the API"),
   jwt: import_zod.z.string().describe("Auth token for calling api")
 });
-var httpsClientOptionsSchema = import_zod.z.object({
-  client: import_zod.z.literal("https"),
-  connection: httpsConnectionSchema
-});
-var clientOptionsSchema = import_zod.z.discriminatedUnion("client", [
-  wsClientOptionsSchema,
-  httpsClientOptionsSchema
+var connectionSchema = import_zod.z.union([
+  jwtConnectionSchema,
+  credsConnectionSchema
 ]);
+var clientOptionsSchema = import_zod.z.object({
+  client: clientTypeSchema,
+  connection: connectionSchema
+});

package/dist/client-options.schema.zod.browser.js

@@ -1,32 +1,27 @@
 // src/client-options.schema.zod.ts
 import { z } from "./lib/zod.browser.js";
 var clientTypeSchema = z.enum(["ws", "https"]);
-var wsConnectionSchema = z.looseObject({
+var credsConnectionSchema = z.looseObject({
   host: z.string().describe("URL of the API"),
   apikey: z.string().describe("API key for the client"),
   apisecret: z.string().describe("API secret for the client")
 });
-var wsClientOptionsSchema = z.object({
-  client: z.literal("ws"),
-  connection: wsConnectionSchema
-});
-var httpsConnectionSchema = z.looseObject({
+var jwtConnectionSchema = z.looseObject({
   host: z.string().describe("URL of the API"),
   jwt: z.string().describe("Auth token for calling api")
 });
-var httpsClientOptionsSchema = z.object({
-  client: z.literal("https"),
-  connection: httpsConnectionSchema
-});
-var clientOptionsSchema = z.discriminatedUnion("client", [
-  wsClientOptionsSchema,
-  httpsClientOptionsSchema
+var connectionSchema = z.union([
+  jwtConnectionSchema,
+  credsConnectionSchema
 ]);
+var clientOptionsSchema = z.object({
+  client: clientTypeSchema,
+  connection: connectionSchema
+});
 export {
   clientOptionsSchema,
   clientTypeSchema,
-  httpsClientOptionsSchema,
-  httpsConnectionSchema,
-  wsClientOptionsSchema,
-  wsConnectionSchema
+  connectionSchema,
+  credsConnectionSchema,
+  jwtConnectionSchema
 };

package/dist/client-options.schema.zod.cjs

@@ -22,41 +22,35 @@ var client_options_schema_zod_exports = {};
 __export(client_options_schema_zod_exports, {
   clientOptionsSchema: () => clientOptionsSchema,
   clientTypeSchema: () => clientTypeSchema,
-  httpsClientOptionsSchema: () => httpsClientOptionsSchema,
-  httpsConnectionSchema: () => httpsConnectionSchema,
-  wsClientOptionsSchema: () => wsClientOptionsSchema,
-  wsConnectionSchema: () => wsConnectionSchema
+  connectionSchema: () => connectionSchema,
+  credsConnectionSchema: () => credsConnectionSchema,
+  jwtConnectionSchema: () => jwtConnectionSchema
 });
 module.exports = __toCommonJS(client_options_schema_zod_exports);
 var import_zod =  require("./lib/zod.cjs");
 var clientTypeSchema = import_zod.z.enum(["ws", "https"]);
-var wsConnectionSchema = import_zod.z.looseObject({
+var credsConnectionSchema = import_zod.z.looseObject({
   host: import_zod.z.string().describe("URL of the API"),
   apikey: import_zod.z.string().describe("API key for the client"),
   apisecret: import_zod.z.string().describe("API secret for the client")
 });
-var wsClientOptionsSchema = import_zod.z.object({
-  client: import_zod.z.literal("ws"),
-  connection: wsConnectionSchema
-});
-var httpsConnectionSchema = import_zod.z.looseObject({
+var jwtConnectionSchema = import_zod.z.looseObject({
   host: import_zod.z.string().describe("URL of the API"),
   jwt: import_zod.z.string().describe("Auth token for calling api")
 });
-var httpsClientOptionsSchema = import_zod.z.object({
-  client: import_zod.z.literal("https"),
-  connection: httpsConnectionSchema
-});
-var clientOptionsSchema = import_zod.z.discriminatedUnion("client", [
-  wsClientOptionsSchema,
-  httpsClientOptionsSchema
+var connectionSchema = import_zod.z.union([
+  jwtConnectionSchema,
+  credsConnectionSchema
 ]);
+var clientOptionsSchema = import_zod.z.object({
+  client: clientTypeSchema,
+  connection: connectionSchema
+});
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   clientOptionsSchema,
   clientTypeSchema,
-  httpsClientOptionsSchema,
-  httpsConnectionSchema,
-  wsClientOptionsSchema,
-  wsConnectionSchema
+  connectionSchema,
+  credsConnectionSchema,
+  jwtConnectionSchema
 });

package/dist/client-options.schema.zod.js

@@ -1,32 +1,27 @@
 // src/client-options.schema.zod.ts
 import { z } from "./lib/zod.js";
 var clientTypeSchema = z.enum(["ws", "https"]);
-var wsConnectionSchema = z.looseObject({
+var credsConnectionSchema = z.looseObject({
   host: z.string().describe("URL of the API"),
   apikey: z.string().describe("API key for the client"),
   apisecret: z.string().describe("API secret for the client")
 });
-var wsClientOptionsSchema = z.object({
-  client: z.literal("ws"),
-  connection: wsConnectionSchema
-});
-var httpsConnectionSchema = z.looseObject({
+var jwtConnectionSchema = z.looseObject({
   host: z.string().describe("URL of the API"),
   jwt: z.string().describe("Auth token for calling api")
 });
-var httpsClientOptionsSchema = z.object({
-  client: z.literal("https"),
-  connection: httpsConnectionSchema
-});
-var clientOptionsSchema = z.discriminatedUnion("client", [
-  wsClientOptionsSchema,
-  httpsClientOptionsSchema
+var connectionSchema = z.union([
+  jwtConnectionSchema,
+  credsConnectionSchema
 ]);
+var clientOptionsSchema = z.object({
+  client: clientTypeSchema,
+  connection: connectionSchema
+});
 export {
   clientOptionsSchema,
   clientTypeSchema,
-  httpsClientOptionsSchema,
-  httpsConnectionSchema,
-  wsClientOptionsSchema,
-  wsConnectionSchema
+  connectionSchema,
+  credsConnectionSchema,
+  jwtConnectionSchema
 };

package/dist/client.browser.cjs

@@ -123,7 +123,7 @@ var Client = class {
     this.api = _apiClient;
     this.$connect = _apiClient.$connect;
     if (initialConf) {
-      this.configure(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues({}, initialConf.token && { token: initialConf.token }), initialConf.sendingTimeout && {
+      this.configure(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues({}, initialConf.token && { token: initialConf.token }), initialConf.sendingTimeout && {
         sendingTimeout: initialConf.sendingTimeout
       }), initialConf.connectingTimeout && {
         connectingTimeout: initialConf.connectingTimeout
@@ -133,6 +133,8 @@ var Client = class {
         connectionName: initialConf.connectionName
       }), initialConf.httpSkipInitialAuthConnection && {
         httpSkipInitialAuthConnection: initialConf.httpSkipInitialAuthConnection
+      }), initialConf.requestTimeout && {
+        requestTimeout: initialConf.requestTimeout
       }));
     }
   }
@@ -190,7 +192,10 @@ var Client = class {
    *
    * wapiClient.configure({
    *  token: 'EURO',
-   *  timeout: 45000,
+   *  connectingTimeout: 45000,
+   *  reconnectingTimeout: 45000,
+   *  sendingTimeout: 10000,
+   *  requestTimeout: 120000,
    *  hooks: {
    *    disconnect: () => {}
    *  },
@@ -206,7 +211,12 @@ var Client = class {
         error: `Must be a string|number, '${newConf.token}' provided`
       });
     }
-    ["sendingTimeout", "connectingTimeout", "reconnectingTimeout"].forEach((t) => {
+    [
+      "sendingTimeout",
+      "connectingTimeout",
+      "reconnectingTimeout",
+      "requestTimeout"
+    ].forEach((t) => {
       if (newConf[t] && typeof newConf[t] !== "number") {
         throw new import_errors.ConfigError("CONFIG_INVALID", {
           field: t,
@@ -217,9 +227,12 @@ var Client = class {
     const hooks = newConf.hooks;
     delete newConf.hooks;
     this.config = __spreadValues(__spreadValues({}, this.config), newConf);
-    if (this.config.sendingTimeout) {
+    if ("sendingTimeout" in this.config) {
       this.api.sendingTimeout = this.config.sendingTimeout;
     }
+    if ("requestTimeout" in this.config) {
+      this.api.requestTimeout = this.config.requestTimeout;
+    }
     if (hooks) {
       for (const [hookName, value] of Object.entries(hooks)) {
         this.setHook(hookName, value);
@@ -2182,7 +2195,8 @@ var Client = class {
 function createClientWithWS(opts, config) {
   const wsClient = (0, import_api.createWsClient)(opts, {
     connectingTimeout: config == null ? void 0 : config.connectingTimeout,
-    reconnectingTimeout: config == null ? void 0 : config.reconnectingTimeout
+    reconnectingTimeout: config == null ? void 0 : config.reconnectingTimeout,
+    connectionName: config == null ? void 0 : config.connectionName
   });
   return new Client(wsClient, config);
 }

package/dist/client.browser.js

@@ -103,7 +103,7 @@ var Client = class {
     this.api = _apiClient;
     this.$connect = _apiClient.$connect;
     if (initialConf) {
-      this.configure(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues({}, initialConf.token && { token: initialConf.token }), initialConf.sendingTimeout && {
+      this.configure(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues({}, initialConf.token && { token: initialConf.token }), initialConf.sendingTimeout && {
         sendingTimeout: initialConf.sendingTimeout
       }), initialConf.connectingTimeout && {
         connectingTimeout: initialConf.connectingTimeout
@@ -113,6 +113,8 @@ var Client = class {
         connectionName: initialConf.connectionName
       }), initialConf.httpSkipInitialAuthConnection && {
         httpSkipInitialAuthConnection: initialConf.httpSkipInitialAuthConnection
+      }), initialConf.requestTimeout && {
+        requestTimeout: initialConf.requestTimeout
       }));
     }
   }
@@ -170,7 +172,10 @@ var Client = class {
    *
    * wapiClient.configure({
    *  token: 'EURO',
-   *  timeout: 45000,
+   *  connectingTimeout: 45000,
+   *  reconnectingTimeout: 45000,
+   *  sendingTimeout: 10000,
+   *  requestTimeout: 120000,
    *  hooks: {
    *    disconnect: () => {}
    *  },
@@ -186,7 +191,12 @@ var Client = class {
         error: `Must be a string|number, '${newConf.token}' provided`
       });
     }
-    ["sendingTimeout", "connectingTimeout", "reconnectingTimeout"].forEach((t) => {
+    [
+      "sendingTimeout",
+      "connectingTimeout",
+      "reconnectingTimeout",
+      "requestTimeout"
+    ].forEach((t) => {
       if (newConf[t] && typeof newConf[t] !== "number") {
         throw new ConfigError("CONFIG_INVALID", {
           field: t,
@@ -197,9 +207,12 @@ var Client = class {
     const hooks = newConf.hooks;
     delete newConf.hooks;
     this.config = __spreadValues(__spreadValues({}, this.config), newConf);
-    if (this.config.sendingTimeout) {
+    if ("sendingTimeout" in this.config) {
       this.api.sendingTimeout = this.config.sendingTimeout;
     }
+    if ("requestTimeout" in this.config) {
+      this.api.requestTimeout = this.config.requestTimeout;
+    }
     if (hooks) {
       for (const [hookName, value] of Object.entries(hooks)) {
         this.setHook(hookName, value);
@@ -2162,7 +2175,8 @@ var Client = class {
 function createClientWithWS(opts, config) {
   const wsClient = createWsClient(opts, {
     connectingTimeout: config == null ? void 0 : config.connectingTimeout,
-    reconnectingTimeout: config == null ? void 0 : config.reconnectingTimeout
+    reconnectingTimeout: config == null ? void 0 : config.reconnectingTimeout,
+    connectionName: config == null ? void 0 : config.connectionName
   });
   return new Client(wsClient, config);
 }