wapi-client 0.10.2 → 0.10.6

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

@@ -46,12 +46,19 @@ import {
 } from "./jsonrpc/jsonrpc.enums.browser.js";
 import { BaseClient } from "./base-client.browser.js";
 import { WapiClientType } from "../index.browser.js";
+import { ConfigError } from "../lib/errors.browser.js";
 import { getRandomHex } from "../lib/utils.browser.js";
-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) {
@@ -76,23 +83,40 @@ function createConnection(opts) {
     });
   }
   const connectId = getRandomHex();
-  const $connect = fetch(`${url}/api`, {
-    method: "POST",
-    headers: {
-      Authorization: `Bearer ${opts.jwt}`,
-      [REQ_HEADER_ID]: connectId
-    },
-    body: JSON.stringify({
-      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();
+    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 ConfigError("CONNECTION_TIMEOUT", {
+          timeout: connectionConfig.timeout
+        })
+      );
+    }, connectionConfig.timeout) : void 0;
+    fetch(`${url}/api`, {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${opts.jwt}`,
+        [REQ_HEADER_ID]: connectId
+      },
+      body: JSON.stringify({
+        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,
@@ -101,6 +125,8 @@ function createConnection(opts) {
   };
 }
 var HttpClient = class extends BaseClient {
+  // private _opts: WapiHttpConnectionOptions;
+  // private _connectionConfig: ConnectionConfig | undefined;
   constructor(connection, opts) {
     super(connection, WapiClientType.https, connection.$connect);
     this.host = opts.host;

package/dist/api/http-client.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;

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

@@ -1,4 +1,4 @@
-import { WapiHttpConnectionOptions } from './index';
+import { ConnectionConfig, WapiHttpConnectionOptions } from './index';
 import { JSONRPCRequest, JSONRPCResponse } from './jsonrpc/jsonrpc.enums';
 import { BaseClient } from './base-client';
 export interface HttpConnectionClient {
@@ -6,7 +6,7 @@ export interface HttpConnectionClient {
     onmessage: (response: JSONRPCResponse) => void;
     $connect: Promise<undefined>;
 }
-export declare function createHttpClient(opts: WapiHttpConnectionOptions): HttpClient;
+export declare function createHttpClient(opts: WapiHttpConnectionOptions, config?: ConnectionConfig): HttpClient;
 export declare class HttpClient extends BaseClient {
     protected _connection: HttpConnectionClient;
     constructor(connection: HttpConnectionClient, opts: WapiHttpConnectionOptions);

package/dist/api/http-client.js

@@ -46,12 +46,19 @@ import {
 } from "./jsonrpc/jsonrpc.enums";
 import { BaseClient } from "./base-client";
 import { WapiClientType } from "../index";
+import { ConfigError } from "../lib/errors";
 import { getRandomHex } from "../lib/utils";
-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) {
@@ -76,23 +83,40 @@ function createConnection(opts) {
     });
   }
   const connectId = getRandomHex();
-  const $connect = fetch(`${url}/api`, {
-    method: "POST",
-    headers: {
-      Authorization: `Bearer ${opts.jwt}`,
-      [REQ_HEADER_ID]: connectId
-    },
-    body: JSON.stringify({
-      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();
+    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 ConfigError("CONNECTION_TIMEOUT", {
+          timeout: connectionConfig.timeout
+        })
+      );
+    }, connectionConfig.timeout) : void 0;
+    fetch(`${url}/api`, {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${opts.jwt}`,
+        [REQ_HEADER_ID]: connectId
+      },
+      body: JSON.stringify({
+        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,
@@ -101,6 +125,8 @@ function createConnection(opts) {
   };
 }
 var HttpClient = class extends BaseClient {
+  // private _opts: WapiHttpConnectionOptions;
+  // private _connectionConfig: ConnectionConfig | undefined;
   constructor(connection, opts) {
     super(connection, WapiClientType.https, connection.$connect);
     this.host = opts.host;

package/dist/api/index.d.ts

@@ -14,6 +14,10 @@ export interface WapiHttpConnectionOptions {
     host: string;
     jwt: string;
 }
+export interface ConnectionConfig {
+    connectingTimeout?: number;
+    reconnectingTimeout?: number;
+}
 export { BaseClient, WsClient, HttpClient, createWsClient, createHttpClient };
 import JSONRPCRequestSchema from './jsonrpc/jsonrpc.request.schema.json';
 import JSONRPCResponseSchema from './jsonrpc/jsonrpc.response.schema.json';

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

@@ -56,11 +56,13 @@ var import_connection = require('./connection/connection.enums.cjs');
 var import__ = require('../index.cjs');
 var _a;
 var CLIENT_VERSION = (_a = window.WAPI_VERSION) != null ? _a : "";
-function createWsClient(opts) {
-  const initialConnection = createConnection(opts);
-  return new WsClient(initialConnection, opts);
+function createWsClient(opts, config) {
+  const initialConnection = createConnection(opts, {
+    timeout: config == null ? void 0 : config.connectingTimeout
+  });
+  return new WsClient(initialConnection, opts, config);
 }
-function createConnection(opts) {
+function createConnection(opts, connectionConfig) {
   var _a2;
   const config = Object.assign(
     {
@@ -109,10 +111,21 @@ function createConnection(opts) {
     }
     clean();
   }
+  (0, import_debug.debugLog)(
+    `createConnection>(message:setting up ws connection${(connectionConfig == null ? void 0 : connectionConfig.timeout) ? " with timeout " + connectionConfig.timeout : ""})`
+  );
+  const connectingTimeout = (connectionConfig == null ? void 0 : connectionConfig.timeout) ? setTimeout(() => {
+    clean(
+      new import_errors.ConfigError("CONNECTION_TIMEOUT", {
+        timeout: connectionConfig.timeout
+      })
+    );
+  }, connectionConfig.timeout) : void 0;
   function clean(err) {
     if (isCleaned) {
       return;
     }
+    clearTimeout(connectingTimeout);
     delete ws.onmessage;
     delete ws.onerror;
     delete ws.onclose;
@@ -134,11 +147,12 @@ function createConnection(opts) {
   };
 }
 var WsClient = class extends import_base_client.BaseClient {
-  constructor(initial, config) {
+  constructor(initial, opts, config) {
     super(initial.ws, import__.WapiClientType.ws, initial.$connect);
     this._tryToReconnect = true;
-    this._config = config;
-    this.host = config.host;
+    this._opts = opts;
+    this._connectionConfig = config;
+    this.host = opts.host;
     this.$connect.then((_id) => {
       this.socId = _id;
       return this._ready();
@@ -197,12 +211,14 @@ var WsClient = class extends import_base_client.BaseClient {
     nrOfAttempts != null ? nrOfAttempts : nrOfAttempts = window.WAPI_RECONNECT_ATTEMPTS && parseInt(window.WAPI_RECONNECT_ATTEMPTS) || 10;
     const maxWaitTime = window.WAPI_MAX_RECONNECT_WAIT && parseInt(window.WAPI_MAX_RECONNECT_WAIT) || 1e4;
     this.$connect = (() => __async(this, null, function* () {
-      var _a2, _b;
+      var _a2, _b, _c;
       let _id;
       for (let i = 0; i < nrOfAttempts + 1; i++) {
         try {
           (0, import_debug.debugLog)("Trying to connect, attempt:", i);
-          const { ws, $connect } = createConnection(this._config);
+          const { ws, $connect } = createConnection(this._opts, {
+            timeout: (_a2 = this._connectionConfig) == null ? void 0 : _a2.reconnectingTimeout
+          });
           _id = yield $connect;
           this.socId = _id;
           this._connection = ws;
@@ -213,7 +229,7 @@ var WsClient = class extends import_base_client.BaseClient {
           const outOfAttempts = i > nrOfAttempts - 1;
           if (isAuthError || outOfAttempts) {
             this._setErrored(err);
-            (_b = (_a2 = this.hooks).reconnectError) == null ? void 0 : _b.call(_a2, err);
+            (_c = (_b = this.hooks).reconnectError) == null ? void 0 : _c.call(_b, err);
             break;
           }
           yield (0, import_utils.wait)(Math.min(Math.pow(1.5, i) * 1e3, maxWaitTime));

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

@@ -24,7 +24,7 @@ var browser_default = WebSocket;
 
 // src/api/ws-client.ts
 import { debugLog } from "../lib/debug.browser.js";
-import { AuthenticationError, ERROR_GROUPS } from "../lib/errors.browser.js";
+import { AuthenticationError, ConfigError, ERROR_GROUPS } from "../lib/errors.browser.js";
 import { getConnectionParams, wait } from "../lib/utils.browser.js";
 import { BaseClient } from "./base-client.browser.js";
 import {
@@ -34,11 +34,13 @@ import {
 import { WapiClientType } from "../index.browser.js";
 var _a;
 var CLIENT_VERSION = (_a = window.WAPI_VERSION) != null ? _a : "";
-function createWsClient(opts) {
-  const initialConnection = createConnection(opts);
-  return new WsClient(initialConnection, opts);
+function createWsClient(opts, config) {
+  const initialConnection = createConnection(opts, {
+    timeout: config == null ? void 0 : config.connectingTimeout
+  });
+  return new WsClient(initialConnection, opts, config);
 }
-function createConnection(opts) {
+function createConnection(opts, connectionConfig) {
   var _a2;
   const config = Object.assign(
     {
@@ -87,10 +89,21 @@ function createConnection(opts) {
     }
     clean();
   }
+  debugLog(
+    `createConnection>(message:setting up ws connection${(connectionConfig == null ? void 0 : connectionConfig.timeout) ? " with timeout " + connectionConfig.timeout : ""})`
+  );
+  const connectingTimeout = (connectionConfig == null ? void 0 : connectionConfig.timeout) ? setTimeout(() => {
+    clean(
+      new ConfigError("CONNECTION_TIMEOUT", {
+        timeout: connectionConfig.timeout
+      })
+    );
+  }, connectionConfig.timeout) : void 0;
   function clean(err) {
     if (isCleaned) {
       return;
     }
+    clearTimeout(connectingTimeout);
     delete ws.onmessage;
     delete ws.onerror;
     delete ws.onclose;
@@ -112,11 +125,12 @@ function createConnection(opts) {
   };
 }
 var WsClient = class extends BaseClient {
-  constructor(initial, config) {
+  constructor(initial, opts, config) {
     super(initial.ws, WapiClientType.ws, initial.$connect);
     this._tryToReconnect = true;
-    this._config = config;
-    this.host = config.host;
+    this._opts = opts;
+    this._connectionConfig = config;
+    this.host = opts.host;
     this.$connect.then((_id) => {
       this.socId = _id;
       return this._ready();
@@ -175,12 +189,14 @@ var WsClient = class extends BaseClient {
     nrOfAttempts != null ? nrOfAttempts : nrOfAttempts = window.WAPI_RECONNECT_ATTEMPTS && parseInt(window.WAPI_RECONNECT_ATTEMPTS) || 10;
     const maxWaitTime = window.WAPI_MAX_RECONNECT_WAIT && parseInt(window.WAPI_MAX_RECONNECT_WAIT) || 1e4;
     this.$connect = (() => __async(this, null, function* () {
-      var _a2, _b;
+      var _a2, _b, _c;
       let _id;
       for (let i = 0; i < nrOfAttempts + 1; i++) {
         try {
           debugLog("Trying to connect, attempt:", i);
-          const { ws, $connect } = createConnection(this._config);
+          const { ws, $connect } = createConnection(this._opts, {
+            timeout: (_a2 = this._connectionConfig) == null ? void 0 : _a2.reconnectingTimeout
+          });
           _id = yield $connect;
           this.socId = _id;
           this._connection = ws;
@@ -191,7 +207,7 @@ var WsClient = class extends BaseClient {
           const outOfAttempts = i > nrOfAttempts - 1;
           if (isAuthError || outOfAttempts) {
             this._setErrored(err);
-            (_b = (_a2 = this.hooks).reconnectError) == null ? void 0 : _b.call(_a2, err);
+            (_c = (_b = this.hooks).reconnectError) == null ? void 0 : _c.call(_b, err);
             break;
           }
           yield wait(Math.min(Math.pow(1.5, i) * 1e3, maxWaitTime));

package/dist/api/ws-client.cjs

@@ -61,12 +61,14 @@ var import_base_client = require('./base-client.cjs');
 var import_connection = require('./connection/connection.enums.cjs');
 var import__ = require('../index.cjs');
 var _a;
-var CLIENT_VERSION = (_a = '0.10.2') != null ? _a : "";
-function createWsClient(opts) {
-  const initialConnection = createConnection(opts);
-  return new WsClient(initialConnection, opts);
+var CLIENT_VERSION = (_a = '0.10.6') != null ? _a : "";
+function createWsClient(opts, config) {
+  const initialConnection = createConnection(opts, {
+    timeout: config == null ? void 0 : config.connectingTimeout
+  });
+  return new WsClient(initialConnection, opts, config);
 }
-function createConnection(opts) {
+function createConnection(opts, connectionConfig) {
   var _a2;
   const config = Object.assign(
     {
@@ -115,10 +117,21 @@ function createConnection(opts) {
     }
     clean();
   }
+  (0, import_debug.debugLog)(
+    `createConnection>(message:setting up ws connection${(connectionConfig == null ? void 0 : connectionConfig.timeout) ? " with timeout " + connectionConfig.timeout : ""})`
+  );
+  const connectingTimeout = (connectionConfig == null ? void 0 : connectionConfig.timeout) ? setTimeout(() => {
+    clean(
+      new import_errors.ConfigError("CONNECTION_TIMEOUT", {
+        timeout: connectionConfig.timeout
+      })
+    );
+  }, connectionConfig.timeout) : void 0;
   function clean(err) {
     if (isCleaned) {
       return;
     }
+    clearTimeout(connectingTimeout);
     delete ws.onmessage;
     delete ws.onerror;
     delete ws.onclose;
@@ -140,11 +153,12 @@ function createConnection(opts) {
   };
 }
 var WsClient = class extends import_base_client.BaseClient {
-  constructor(initial, config) {
+  constructor(initial, opts, config) {
     super(initial.ws, import__.WapiClientType.ws, initial.$connect);
     this._tryToReconnect = true;
-    this._config = config;
-    this.host = config.host;
+    this._opts = opts;
+    this._connectionConfig = config;
+    this.host = opts.host;
     this.$connect.then((_id) => {
       this.socId = _id;
       return this._ready();
@@ -203,12 +217,14 @@ var WsClient = class extends import_base_client.BaseClient {
     nrOfAttempts != null ? nrOfAttempts : nrOfAttempts = process.env.WAPI_RECONNECT_ATTEMPTS && parseInt(process.env.WAPI_RECONNECT_ATTEMPTS) || 10;
     const maxWaitTime = process.env.WAPI_MAX_RECONNECT_WAIT && parseInt(process.env.WAPI_MAX_RECONNECT_WAIT) || 1e4;
     this.$connect = (() => __async(this, null, function* () {
-      var _a2, _b;
+      var _a2, _b, _c;
       let _id;
       for (let i = 0; i < nrOfAttempts + 1; i++) {
         try {
           (0, import_debug.debugLog)("Trying to connect, attempt:", i);
-          const { ws, $connect } = createConnection(this._config);
+          const { ws, $connect } = createConnection(this._opts, {
+            timeout: (_a2 = this._connectionConfig) == null ? void 0 : _a2.reconnectingTimeout
+          });
           _id = yield $connect;
           this.socId = _id;
           this._connection = ws;
@@ -219,7 +235,7 @@ var WsClient = class extends import_base_client.BaseClient {
           const outOfAttempts = i > nrOfAttempts - 1;
           if (isAuthError || outOfAttempts) {
             this._setErrored(err);
-            (_b = (_a2 = this.hooks).reconnectError) == null ? void 0 : _b.call(_a2, err);
+            (_c = (_b = this.hooks).reconnectError) == null ? void 0 : _c.call(_b, err);
             break;
           }
           yield (0, import_utils.wait)(Math.min(Math.pow(1.5, i) * 1e3, maxWaitTime));

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

@@ -2,8 +2,8 @@ import WebSocket from 'modern-isomorphic-ws';
 import { AuthenticationError } from '../lib/errors';
 import { BaseClient, ISocketId } from './base-client';
 import { JSONRPCRequest, JSONRPCResponse } from './jsonrpc/jsonrpc.enums';
-import { WapiConnectionOptions } from './index';
-export declare function createWsClient(opts: WapiConnectionOptions): WsClient;
+import { ConnectionConfig, WapiConnectionOptions } from './index';
+export declare function createWsClient(opts: WapiConnectionOptions, config?: ConnectionConfig): WsClient;
 interface ConnectionWPromise {
     ws: WebSocket;
     $connect: Promise<ISocketId>;
@@ -14,10 +14,11 @@ export interface EWapiConnectionOptions extends WapiConnectionOptions {
 }
 export declare class WsClient extends BaseClient {
     private _pingTimeout;
-    private _config;
+    private _opts;
+    private _connectionConfig;
     private _tryToReconnect;
     protected _connection: WebSocket;
-    constructor(initial: ConnectionWPromise, config: WapiConnectionOptions);
+    constructor(initial: ConnectionWPromise, opts: WapiConnectionOptions, config?: ConnectionConfig);
     protected _setErrored(err: Error | AuthenticationError): void;
     private _ready;
     protected _reconnect(nrOfAttempts?: number | undefined): void;