wapi-client 0.15.8 → 0.16.0-beta.1

package/dist/client.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.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);
 }

package/dist/lib/env.browser.cjs

@@ -24,7 +24,7 @@ __export(env_exports, {
   getEnvConfig: () => getEnvConfig
 });
 module.exports = __toCommonJS(env_exports);
-var CLIENT_VERSION = "0.15.8";
+var CLIENT_VERSION = "0.16.0-beta.1";
 function getEnvConfig(key, defaultValue) {
   const val = getVariable(key);
   if (val === void 0) {

package/dist/lib/env.browser.js

@@ -1,5 +1,5 @@
 // src/lib/env.ts
-var CLIENT_VERSION = "0.15.8";
+var CLIENT_VERSION = "0.16.0-beta.1";
 function getEnvConfig(key, defaultValue) {
   const val = getVariable(key);
   if (val === void 0) {

package/dist/lib/env.cjs

@@ -24,7 +24,7 @@ __export(env_exports, {
   getEnvConfig: () => getEnvConfig
 });
 module.exports = __toCommonJS(env_exports);
-var CLIENT_VERSION = "0.15.8";
+var CLIENT_VERSION = "0.16.0-beta.1";
 function getEnvConfig(key, defaultValue) {
   const val = getVariable(key);
   if (val === void 0) {

package/dist/lib/env.js

@@ -1,5 +1,5 @@
 // src/lib/env.ts
-var CLIENT_VERSION = "0.15.8";
+var CLIENT_VERSION = "0.16.0-beta.1";
 function getEnvConfig(key, defaultValue) {
   const val = getVariable(key);
   if (val === void 0) {

package/dist/lib/errors.browser.cjs

@@ -553,6 +553,11 @@ var ERROR_GROUPS = {
         message: "SENDING_TIMEOUT",
         description: "Unable to get ack from server in specified time"
       },
+      REQUEST_TIMEOUT: {
+        code: -15006,
+        message: "REQUEST_TIMEOUT",
+        description: "Unable to get a response from server in specified time"
+      },
       CONFIG_INVALID: {
         code: -15100,
         message: "CONFIG_INVALID",

package/dist/lib/errors.browser.js

@@ -515,6 +515,11 @@ var ERROR_GROUPS = {
         message: "SENDING_TIMEOUT",
         description: "Unable to get ack from server in specified time"
       },
+      REQUEST_TIMEOUT: {
+        code: -15006,
+        message: "REQUEST_TIMEOUT",
+        description: "Unable to get a response from server in specified time"
+      },
       CONFIG_INVALID: {
         code: -15100,
         message: "CONFIG_INVALID",

package/dist/lib/errors.cjs

@@ -553,6 +553,11 @@ var ERROR_GROUPS = {
         message: "SENDING_TIMEOUT",
         description: "Unable to get ack from server in specified time"
       },
+      REQUEST_TIMEOUT: {
+        code: -15006,
+        message: "REQUEST_TIMEOUT",
+        description: "Unable to get a response from server in specified time"
+      },
       CONFIG_INVALID: {
         code: -15100,
         message: "CONFIG_INVALID",

package/dist/lib/errors.js

@@ -515,6 +515,11 @@ var ERROR_GROUPS = {
         message: "SENDING_TIMEOUT",
         description: "Unable to get ack from server in specified time"
       },
+      REQUEST_TIMEOUT: {
+        code: -15006,
+        message: "REQUEST_TIMEOUT",
+        description: "Unable to get a response from server in specified time"
+      },
       CONFIG_INVALID: {
         code: -15100,
         message: "CONFIG_INVALID",

package/dist/lib/utils.browser.cjs

@@ -50,6 +50,7 @@ __export(utils_exports, {
   convertToNumber: () => convertToNumber,
   convertToString: () => convertToString,
   copyObject: () => copyObject,
+  getBasicAuth: () => getBasicAuth,
   getConnectionParams: () => getConnectionParams,
   getConnectionUrl: () => getConnectionUrl,
   getIdentifier: () => getIdentifier,
@@ -212,13 +213,18 @@ function toQueryString(obj) {
 }
 function getConnectionUrl(config) {
   const url = config.host.replace(/^https:/, "wss:");
-  return url + "?" + toQueryString({
-    apikey: config.apikey,
-    apisecret: config.apisecret,
+  return url + "?" + toQueryString(__spreadValues(__spreadValues({
     db: config.database,
     clientVersion: config.clientVersion,
     connectionName: config.connectionName
-  });
+  }, "jwt" in config ? { jwt: config.jwt } : {}), "apikey" in config ? { apikey: config.apikey, apisecret: config.apisecret } : {}));
+}
+function getBasicAuth({
+  apikey,
+  apisecret,
+  database
+}) {
+  return btoa(`${database != null ? database : ""}:${apikey}:${apisecret}`);
 }
 function getConnectionParams(config) {
   if (typeof window === "undefined") {

package/dist/lib/utils.browser.js

@@ -174,13 +174,18 @@ function toQueryString(obj) {
 }
 function getConnectionUrl(config) {
   const url = config.host.replace(/^https:/, "wss:");
-  return url + "?" + toQueryString({
-    apikey: config.apikey,
-    apisecret: config.apisecret,
+  return url + "?" + toQueryString(__spreadValues(__spreadValues({
     db: config.database,
     clientVersion: config.clientVersion,
     connectionName: config.connectionName
-  });
+  }, "jwt" in config ? { jwt: config.jwt } : {}), "apikey" in config ? { apikey: config.apikey, apisecret: config.apisecret } : {}));
+}
+function getBasicAuth({
+  apikey,
+  apisecret,
+  database
+}) {
+  return btoa(`${database != null ? database : ""}:${apikey}:${apisecret}`);
 }
 function getConnectionParams(config) {
   if (typeof window === "undefined") {
@@ -282,6 +287,7 @@ export {
   convertToNumber,
   convertToString,
   copyObject,
+  getBasicAuth,
   getConnectionParams,
   getConnectionUrl,
   getIdentifier,

package/dist/lib/utils.cjs

@@ -50,6 +50,7 @@ __export(utils_exports, {
   convertToNumber: () => convertToNumber,
   convertToString: () => convertToString,
   copyObject: () => copyObject,
+  getBasicAuth: () => getBasicAuth,
   getConnectionParams: () => getConnectionParams,
   getConnectionUrl: () => getConnectionUrl,
   getIdentifier: () => getIdentifier,
@@ -211,13 +212,18 @@ function toQueryString(obj) {
 }
 function getConnectionUrl(config) {
   const url = config.host.replace(/^https:/, "wss:");
-  return url + "?" + toQueryString({
-    apikey: config.apikey,
-    apisecret: config.apisecret,
+  return url + "?" + toQueryString(__spreadValues(__spreadValues({
     db: config.database,
     clientVersion: config.clientVersion,
     connectionName: config.connectionName
-  });
+  }, "jwt" in config ? { jwt: config.jwt } : {}), "apikey" in config ? { apikey: config.apikey, apisecret: config.apisecret } : {}));
+}
+function getBasicAuth({
+  apikey,
+  apisecret,
+  database
+}) {
+  return btoa(`${database != null ? database : ""}:${apikey}:${apisecret}`);
 }
 function getConnectionParams(config) {
   if (typeof window === "undefined") {
@@ -320,6 +326,7 @@ function isDateTime(str) {
   convertToNumber,
   convertToString,
   copyObject,
+  getBasicAuth,
   getConnectionParams,
   getConnectionUrl,
   getIdentifier,

package/dist/lib/utils.js

@@ -173,13 +173,18 @@ function toQueryString(obj) {
 }
 function getConnectionUrl(config) {
   const url = config.host.replace(/^https:/, "wss:");
-  return url + "?" + toQueryString({
-    apikey: config.apikey,
-    apisecret: config.apisecret,
+  return url + "?" + toQueryString(__spreadValues(__spreadValues({
     db: config.database,
     clientVersion: config.clientVersion,
     connectionName: config.connectionName
-  });
+  }, "jwt" in config ? { jwt: config.jwt } : {}), "apikey" in config ? { apikey: config.apikey, apisecret: config.apisecret } : {}));
+}
+function getBasicAuth({
+  apikey,
+  apisecret,
+  database
+}) {
+  return btoa(`${database != null ? database : ""}:${apikey}:${apisecret}`);
 }
 function getConnectionParams(config) {
   if (typeof window === "undefined") {
@@ -281,6 +286,7 @@ export {
   convertToNumber,
   convertToString,
   copyObject,
+  getBasicAuth,
   getConnectionParams,
   getConnectionUrl,
   getIdentifier,

package/dist/types/wapi-client.d.ts

@@ -224,6 +224,7 @@ declare module "wapi-client/lib/errors" {
                 TRANSACTION_TIMEOUT: ErrorSpec;
                 CONNECTION_TIMEOUT: ErrorSpec;
                 SENDING_TIMEOUT: ErrorSpec;
+                REQUEST_TIMEOUT: ErrorSpec;
                 CONFIG_INVALID: ErrorSpec;
             };
         };
@@ -322,6 +323,7 @@ declare module "wapi-client/lib/errors" {
         TRANSACTION_TIMEOUT: ErrorSpec;
         CONNECTION_TIMEOUT: ErrorSpec;
         SENDING_TIMEOUT: ErrorSpec;
+        REQUEST_TIMEOUT: ErrorSpec;
         CONFIG_INVALID: ErrorSpec;
         AUTHENTICATION_ERROR: ErrorSpec;
         AUTHORIZATION_ERROR: ErrorSpec;
@@ -418,6 +420,7 @@ declare module "wapi-client/lib/errors" {
         TRANSACTION_TIMEOUT: "TRANSACTION_TIMEOUT";
         CONNECTION_TIMEOUT: "CONNECTION_TIMEOUT";
         SENDING_TIMEOUT: "SENDING_TIMEOUT";
+        REQUEST_TIMEOUT: "REQUEST_TIMEOUT";
         CONFIG_INVALID: "CONFIG_INVALID";
         AUTHENTICATION_ERROR: "AUTHENTICATION_ERROR";
         AUTHORIZATION_ERROR: "AUTHORIZATION_ERROR";
@@ -1566,6 +1569,11 @@ declare module "wapi-client/lib/utils" {
         [key: string]: string | undefined;
     }): string;
     export function getConnectionUrl(config: EWapiConnectionOptions): string;
+    export function getBasicAuth({ apikey, apisecret, database, }: {
+        apikey: string;
+        apisecret: string;
+        database?: string;
+    }): string;
     export function getConnectionParams(config: EWapiConnectionOptions): [string, {
         rejectUnauthorized: boolean;
     }?];
@@ -1666,18 +1674,18 @@ declare module "wapi-client/lib/stream-promise" {
     }
 }
 declare module "wapi-client/api/http-client" {
-    import { ConnectionConfig, WapiHttpConnectionOptions } from "wapi-client/api/index";
+    import { ConnectionConfig, WapiConnectionOptions } from "wapi-client/api/index";
     import { JSONRPCRequest, JSONRPCResponse } from "wapi-client/api/jsonrpc/jsonrpc.enums";
     import { BaseClient } from "wapi-client/api/base-client";
     export interface HttpConnectionClient {
-        send: (data: string, jwt: string) => void;
+        send: (data: string) => void;
         onmessage: (response: JSONRPCResponse) => void;
         $connect: Promise<undefined>;
     }
-    export function createHttpClient(opts: WapiHttpConnectionOptions, config?: ConnectionConfig): HttpClient;
+    export function createHttpClient(opts: WapiConnectionOptions, config?: ConnectionConfig): HttpClient;
     export class HttpClient extends BaseClient {
         protected _connection: HttpConnectionClient;
-        constructor(connection: HttpConnectionClient, opts: WapiHttpConnectionOptions);
+        constructor(connection: HttpConnectionClient, opts: WapiConnectionOptions);
         protected _send(input: JSONRPCRequest | JSONRPCResponse): void;
         private _ready;
         close(): Promise<void>;
@@ -26075,9 +26083,11 @@ declare module "wapi-client/txs/update-wallet/update-wallet.enums" {
     export type UpdateWalletTxOutput = z.infer<typeof updateWalletTxOutputSchema>;
 }
 declare module "wapi-client/api/base-client" {
+    import { WAPIError } from "wapi-client/lib/errors";
     import WebSocket from 'modern-isomorphic-ws';
     import { StreamPromise } from "wapi-client/lib/stream-promise";
-    import { JSONRPCRequest, JSONRPCResponse } from "wapi-client/api/jsonrpc/jsonrpc.enums";
+    import { ReadStream } from "wapi-client/lib/streams";
+    import { IJSONRPCError, JSONRPCRequest, JSONRPCResponse } from "wapi-client/api/jsonrpc/jsonrpc.enums";
     import { WapiClientType } from "wapi-client";
     import { HttpConnectionClient } from "wapi-client/api/http-client";
     import { ValuesOf } from "wapi-client/lib/ts-utils";
@@ -26144,6 +26154,19 @@ declare module "wapi-client/api/base-client" {
         message?: (msg: JSONRPCResponse) => void;
     }
     export type ISocketId = string | undefined;
+    type BaseRequest = {
+        stream: ReadStream;
+        start: number;
+        message: JSONRPCRequest;
+        sendingTimeout?: ReturnType<typeof setTimeout>;
+        requestTimeout?: ReturnType<typeof setTimeout>;
+    };
+    type OutboundRequest = BaseRequest | (BaseRequest & {
+        handle?: (result: JSONRPCResponse) => void;
+        error: (err: IJSONRPCError) => void;
+        pause: () => void;
+        resume: () => void;
+    });
     export class BaseClient {
         type: ValuesOf<typeof WapiClientType>;
         protected _connection: WebSocket | HttpConnectionClient;
@@ -26160,6 +26183,7 @@ declare module "wapi-client/api/base-client" {
             timeout?: ReturnType<typeof setTimeout>;
         }>;
         sendingTimeout: number | undefined;
+        requestTimeout: number | undefined;
         constructor(connection: WebSocket | HttpConnectionClient, connectionType: ValuesOf<typeof WapiClientType>, $connect?: Promise<ISocketId>);
         protected _setConnected(value: boolean): void;
         protected _setErrored(err: Error): void;
@@ -26168,8 +26192,11 @@ declare module "wapi-client/api/base-client" {
         protected _reconnect(nrOfAttempts?: number | undefined): void;
         close(): Promise<void>;
         protected _connectionLost(): void;
+        protected _completeRequest(request: OutboundRequest, error?: WAPIError): void;
+        protected _fireConnectionLost(requestInfo: OutboundRequest): void;
+        protected _fireSendingTimeout(requestInfo: OutboundRequest): void;
+        protected _fireRequestTimeout(requestInfo: OutboundRequest): void;
         protected _handleMessage(incoming: JSONRPCResponse | JSONRPCRequest): void;
-        private _setSending;
         _sendRaw<Input, Output>(method: string, params: Input): StreamPromise<Output>;
         /**
          *
@@ -26571,11 +26598,11 @@ declare module "wapi-client/api/ws-client" {
         ws: WebSocket;
         $connect: Promise<ISocketId>;
     }
-    export interface EWapiConnectionOptions extends WapiConnectionOptions {
+    export type EWapiConnectionOptions = WapiConnectionOptions & {
         rejectUnauthorized: boolean;
         clientVersion: string;
         connectionName?: string;
-    }
+    };
     export class WsClient extends BaseClient {
         private _pingTimeout;
         private _opts;
@@ -26597,16 +26624,19 @@ declare module "wapi-client/api/index" {
     import { BaseClient } from "wapi-client/api/base-client";
     import { WsClient } from "wapi-client/api/ws-client";
     import { HttpClient } from "wapi-client/api/http-client";
-    export interface WapiConnectionOptions {
-        host: string;
-        database?: string;
+    export type WapiConnectionOptions = WapiCredsConnectionOptions | WapiJWTConnectionOptions;
+    export interface WapiCredsConnectionOptions {
         apikey: string;
         apisecret: string;
+        host: string;
+        database?: string;
         rejectUnauthorized?: boolean;
     }
-    export interface WapiHttpConnectionOptions {
-        host: string;
+    export interface WapiJWTConnectionOptions {
         jwt: string;
+        host: string;
+        database?: string;
+        rejectUnauthorized?: boolean;
     }
     export interface ConnectionConfig {
         connectingTimeout?: number;
@@ -31774,7 +31804,7 @@ declare module "wapi-client/fns/update-wallet/update-wallet" {
     export function updateWallet(options: ClientFunctionOptions, input: UpdateWalletFnInput, fnOptions?: UpdateWalletFnOptions): StreamPromise<UpdateWalletFnOutput>;
 }
 declare module "client.js" {
-    import { WapiConnectionOptions, WapiHttpConnectionOptions, WsClient, HttpClient, ConnectionConfig } from "wapi-client/api/index";
+    import { WapiConnectionOptions, WsClient, HttpClient, ConnectionConfig } from "wapi-client/api/index";
     import { ClientHooks, ISocketId } from "wapi-client/api/base-client";
     import { StreamPromise } from "wapi-client/lib/stream-promise";
     import { AggregateTransfersFnInput, AggregateTransfersFnOptions } from "wapi-client/fns/aggregate-transfers/aggregate-transfers.enums";
@@ -31824,6 +31854,7 @@ declare module "client.js" {
         token?: number | string;
         hooks?: ClientHooks;
         sendingTimeout?: number;
+        requestTimeout?: number;
     }
     export class Client {
         /**
@@ -31881,7 +31912,10 @@ declare module "client.js" {
          *
          * wapiClient.configure({
          *  token: 'EURO',
-         *  timeout: 45000,
+         *  connectingTimeout: 45000,
+         *  reconnectingTimeout: 45000,
+         *  sendingTimeout: 10000,
+         *  requestTimeout: 120000,
          *  hooks: {
          *    disconnect: () => {}
          *  },
@@ -31900,7 +31934,8 @@ declare module "client.js" {
          * ```
          */
         getConfig(key: 'httpSkipInitialAuthConnection'): boolean | undefined;
-        getConfig(key: keyof Omit<ClientConfig, 'hooks' | 'httpSkipInitialAuthConnection'>): number | string | undefined;
+        getConfig(key: 'connectingTimeout' | 'reconnectingTimeout' | 'sendingTimeout' | 'requestTimeout'): number | undefined;
+        getConfig(key: 'token'): number | string | undefined;
         /**
          *
          *  Aggregate Transfers using either a simple filter or queryBuilder
@@ -36610,7 +36645,7 @@ declare module "client.js" {
         updateWallet(input: UpdateWalletFnInput, options?: UpdateWalletFnOptions): StreamPromise<UpdateWalletFnOutput>;
     }
     export function createClientWithWS(opts: WapiConnectionOptions, config?: ClientConfig): Client;
-    export function createClientWithHttp(opts: WapiHttpConnectionOptions, config?: ClientConfig): Client;
+    export function createClientWithHttp(opts: WapiConnectionOptions, config?: ClientConfig): Client;
 }
 declare module "client-options.schema.zod.js" {
     import { z } from "wapi-client/lib/zod";
@@ -36618,44 +36653,37 @@ declare module "client-options.schema.zod.js" {
         ws: "ws";
         https: "https";
     }>;
-    export const wsConnectionSchema: z.ZodObject<{
+    export const credsConnectionSchema: z.ZodObject<{
         host: z.ZodString;
         apikey: z.ZodString;
         apisecret: z.ZodString;
     }, z.core.$loose>;
-    export const wsClientOptionsSchema: z.ZodObject<{
-        client: z.ZodLiteral<"ws">;
-        connection: z.ZodObject<{
-            host: z.ZodString;
-            apikey: z.ZodString;
-            apisecret: z.ZodString;
-        }, z.core.$loose>;
-    }, z.core.$strip>;
-    export const httpsConnectionSchema: z.ZodObject<{
+    export const jwtConnectionSchema: z.ZodObject<{
         host: z.ZodString;
         jwt: z.ZodString;
     }, z.core.$loose>;
-    export const httpsClientOptionsSchema: z.ZodObject<{
-        client: z.ZodLiteral<"https">;
-        connection: z.ZodObject<{
+    export const connectionSchema: z.ZodUnion<readonly [z.ZodObject<{
+        host: z.ZodString;
+        jwt: z.ZodString;
+    }, z.core.$loose>, z.ZodObject<{
+        host: z.ZodString;
+        apikey: z.ZodString;
+        apisecret: z.ZodString;
+    }, z.core.$loose>]>;
+    export const clientOptionsSchema: z.ZodObject<{
+        client: z.ZodEnum<{
+            ws: "ws";
+            https: "https";
+        }>;
+        connection: z.ZodUnion<readonly [z.ZodObject<{
             host: z.ZodString;
             jwt: z.ZodString;
-        }, z.core.$loose>;
-    }, z.core.$strip>;
-    export const clientOptionsSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
-        client: z.ZodLiteral<"ws">;
-        connection: z.ZodObject<{
+        }, z.core.$loose>, z.ZodObject<{
             host: z.ZodString;
             apikey: z.ZodString;
             apisecret: z.ZodString;
-        }, z.core.$loose>;
-    }, z.core.$strip>, z.ZodObject<{
-        client: z.ZodLiteral<"https">;
-        connection: z.ZodObject<{
-            host: z.ZodString;
-            jwt: z.ZodString;
-        }, z.core.$loose>;
-    }, z.core.$strip>], "client">;
+        }, z.core.$loose>]>;
+    }, z.core.$strip>;
 }
 declare module "wapi-client/lib/polyfill" {
     export function initPolyfills(): void;
@@ -36886,7 +36914,7 @@ declare module "wapi-client/fns/fn-types" {
     export * from "wapi-client/fns/update-wallet/update-wallet.enums";
 }
 declare module "wapi-client" {
-    import { WapiConnectionOptions, WapiHttpConnectionOptions } from "wapi-client/api/index";
+    import { WapiConnectionOptions } from "wapi-client/api/index";
     import { Client, ClientConfig } from "client.js";
     import { ERROR_MESSAGES as ErrorMessage, ERROR_TYPES as ErrorType, ERROR_DESCRIPTIONS as ErrorDescription, ERRORS as Errors } from "wapi-client/lib/errors";
     import { getIdentifier } from "wapi-client/lib/utils";
@@ -36895,17 +36923,11 @@ declare module "wapi-client" {
         readonly ws: "ws";
         readonly https: "https";
     };
-    export interface WapiClientWsOptions {
-        client?: 'ws';
+    export interface WapiClientOptions {
+        client?: 'ws' | 'https';
         connection: WapiConnectionOptions;
         config?: ClientConfig;
     }
-    export interface WapiClientHttpOptions {
-        client: 'https';
-        connection: WapiHttpConnectionOptions;
-        config?: ClientConfig;
-    }
-    export type WapiClientOptions = WapiClientWsOptions | WapiClientHttpOptions;
     /**
      *
      * Create a WAPI Client
@@ -36962,6 +36984,9 @@ declare module "wapi-client" {
      *     // NB! erroring on this timeout does not mean the command is not executed
      *     // as the command might have gotten through, but return ACK did not
      *     sendingTimeout: 60000;
+     *     // how long to wait for a request to finish
+     *     // NB! erroring on this timeout does not mean the command is not executed
+     *     requestTimeout: 120000;
      *   }
      * });
      * // this direct wait for connect is not required
@@ -37077,6 +37102,7 @@ declare module "wapi-client" {
             TRANSACTION_TIMEOUT: "TRANSACTION_TIMEOUT";
             CONNECTION_TIMEOUT: "CONNECTION_TIMEOUT";
             SENDING_TIMEOUT: "SENDING_TIMEOUT";
+            REQUEST_TIMEOUT: "REQUEST_TIMEOUT";
             CONFIG_INVALID: "CONFIG_INVALID";
             AUTHENTICATION_ERROR: "AUTHENTICATION_ERROR";
             AUTHORIZATION_ERROR: "AUTHORIZATION_ERROR";
@@ -37180,6 +37206,7 @@ declare module "wapi-client" {
             TRANSACTION_TIMEOUT: import("wapi-client/lib/errors").ErrorSpec;
             CONNECTION_TIMEOUT: import("wapi-client/lib/errors").ErrorSpec;
             SENDING_TIMEOUT: import("wapi-client/lib/errors").ErrorSpec;
+            REQUEST_TIMEOUT: import("wapi-client/lib/errors").ErrorSpec;
             CONFIG_INVALID: import("wapi-client/lib/errors").ErrorSpec;
             AUTHENTICATION_ERROR: import("wapi-client/lib/errors").ErrorSpec;
             AUTHORIZATION_ERROR: import("wapi-client/lib/errors").ErrorSpec;