wapi-client 0.10.2 → 0.10.6

package/dist/api/ws-client.js

@@ -22,7 +22,7 @@ var __async = (__this, __arguments, generator) => {
 // src/api/ws-client.ts
 import WebSocket from "modern-isomorphic-ws";
 import { debugLog } from "../lib/debug";
-import { AuthenticationError, ERROR_GROUPS } from "../lib/errors";
+import { AuthenticationError, ConfigError, ERROR_GROUPS } from "../lib/errors";
 import { getConnectionParams, wait } from "../lib/utils";
 import { BaseClient } from "./base-client";
 import {
@@ -31,12 +31,14 @@ import {
 } from "./connection/connection.enums";
 import { WapiClientType } from "../index";
 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(
     {
@@ -85,10 +87,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;
@@ -110,11 +123,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();
@@ -173,12 +187,14 @@ var WsClient = class extends 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 {
           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;
@@ -189,7 +205,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/client.browser.cjs

@@ -1,7 +1,5 @@
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
@@ -18,7 +16,6 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -76,16 +73,13 @@ var Client = class {
     this.api = _apiClient;
     this.$connect = _apiClient.$connect;
     if (initialConf) {
-      if (initialConf.token) {
-        this.config = __spreadProps(__spreadValues({}, this.config), {
-          token: initialConf.token
-        });
-      }
-      if (initialConf.hooks) {
-        for (const [hookName, value] of Object.entries(initialConf.hooks)) {
-          this.setHook(hookName, value);
-        }
-      }
+      this.configure(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues({}, initialConf.token && { token: initialConf.token }), initialConf.sendingTimeout && {
+        sendingTimeout: initialConf.sendingTimeout
+      }), initialConf.connectingTimeout && {
+        connectingTimeout: initialConf.connectingTimeout
+      }), initialConf.reconnectingTimeout && {
+        reconnectingTimeout: initialConf.reconnectingTimeout
+      }), initialConf.hooks && { hooks: initialConf.hooks }));
     }
   }
   /**
@@ -135,13 +129,14 @@ var Client = class {
     return this;
   }
   /**
-   * Overwrite client configuration (default token, hooks)
+   * Overwrite client configuration (default token, default timeout, hooks)
    *
    *
    * ```javascript
    *
    * wapiClient.configure({
    *  token: 'EURO',
+   *  timeout: 45000,
    *  hooks: {
    *    disconnect: () => {}
    *  },
@@ -151,7 +146,33 @@ var Client = class {
    * @param {ClientConfig} newConf
    */
   configure(newConf) {
+    if (newConf.token && typeof newConf.token !== "string" && typeof newConf.token !== "number") {
+      throw new import_errors.ConfigError("CONFIG_INVALID", {
+        field: "token",
+        error: `Must be a string|number, '${newConf.token}' provided`
+      });
+    }
+    ["sendingTimeout", "connectingTimeout", "reconnectingTimeout"].forEach(
+      (t) => {
+        if (newConf[t] && typeof newConf[t] !== "number") {
+          throw new import_errors.ConfigError("CONFIG_INVALID", {
+            field: t,
+            error: `Must be a number, '${newConf[t]}' provided`
+          });
+        }
+      }
+    );
+    const hooks = newConf.hooks;
+    delete newConf.hooks;
     this.config = __spreadValues(__spreadValues({}, this.config), newConf);
+    if (this.config.sendingTimeout) {
+      this.api.sendingTimeout = this.config.sendingTimeout;
+    }
+    if (hooks) {
+      for (const [hookName, value] of Object.entries(hooks)) {
+        this.setHook(hookName, value);
+      }
+    }
     return this;
   }
   /**
@@ -778,6 +799,49 @@ var Client = class {
   /**
    *
    *
+   * ```javascript
+   *
+   * // setup
+   * await wapiClient.createDeposit(
+   *   {
+   *     wallet: 'newWallet',
+   *     amount: 10,
+   *     status: 'pending',
+   *     identifier: 'depositUSD',
+   *     token: 'USD',
+   *   },
+   *   {
+   *     create_wallet_if_not_exists: true,
+   *   },
+   * );
+   * await wapiClient.updateTransfer({
+   *   transfer: 'depositUSD',
+   *   status: 'finished',
+   * });
+   *
+   * const result = await wapiClient.exportBalanceHistory(
+   *   {
+   *     wallet: 'newWallet',
+   *     token: 'USD',
+   *   },
+   *   {
+   *     limit: 0,
+   *     select: [
+   *       'transfer_identifier',
+   *       'pending_amount',
+   *       'finished_amount',
+   *       'pending_amount_from',
+   *       'pending_amount_to',
+   *       'amount',
+   *     ],
+   *     offset: 0,
+   *     order: 'desc',
+   *     tracking_id: 'mylogId',
+   *     // transaction_id: Transaction.identifier, // created transaction identifier
+   *   },
+   * );
+   *
+   * ```
    *
    * @param {ExportBalanceHistoryFnInput} input
    * @param {ExportBalanceHistoryFnOptions} [options]
@@ -1299,8 +1363,11 @@ var Client = class {
    * ```javascript
    *
    * const result = await wapiClient.listExports(
-   *   {},
    *   {
+   *     type: 'transfers',
+   *   },
+   *   {
+   *     order_by: 'created_at desc',
    *     tracking_id: 'myLogId',
    *   },
    * );
@@ -1741,10 +1808,16 @@ var Client = class {
   // CLIENTFNDEFS
 };
 function createClientWithWS(opts, config) {
-  const wsClient = (0, import_api.createWsClient)(opts);
+  const wsClient = (0, import_api.createWsClient)(opts, {
+    connectingTimeout: config == null ? void 0 : config.connectingTimeout,
+    reconnectingTimeout: config == null ? void 0 : config.reconnectingTimeout
+  });
   return new Client(wsClient, config);
 }
 function createClientWithHttp(opts, config) {
-  const httpClient = (0, import_api.createHttpClient)(opts);
+  const httpClient = (0, import_api.createHttpClient)(opts, {
+    connectingTimeout: config == null ? void 0 : config.connectingTimeout,
+    reconnectingTimeout: config == null ? void 0 : config.reconnectingTimeout
+  });
   return new Client(httpClient, config);
 }

package/dist/client.browser.js

@@ -1,6 +1,4 @@
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
@@ -16,7 +14,6 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -43,7 +40,7 @@ import {
   createHttpClient,
   createWsClient
 } from "./api/index.browser.js";
-import { ValidationError } from "./lib/errors.browser.js";
+import { ConfigError, ValidationError } from "./lib/errors.browser.js";
 import { ClientFunctions } from "./fns/index.browser.js";
 import {
   isImportDataFnOptions,
@@ -60,16 +57,13 @@ var Client = class {
     this.api = _apiClient;
     this.$connect = _apiClient.$connect;
     if (initialConf) {
-      if (initialConf.token) {
-        this.config = __spreadProps(__spreadValues({}, this.config), {
-          token: initialConf.token
-        });
-      }
-      if (initialConf.hooks) {
-        for (const [hookName, value] of Object.entries(initialConf.hooks)) {
-          this.setHook(hookName, value);
-        }
-      }
+      this.configure(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues({}, initialConf.token && { token: initialConf.token }), initialConf.sendingTimeout && {
+        sendingTimeout: initialConf.sendingTimeout
+      }), initialConf.connectingTimeout && {
+        connectingTimeout: initialConf.connectingTimeout
+      }), initialConf.reconnectingTimeout && {
+        reconnectingTimeout: initialConf.reconnectingTimeout
+      }), initialConf.hooks && { hooks: initialConf.hooks }));
     }
   }
   /**
@@ -119,13 +113,14 @@ var Client = class {
     return this;
   }
   /**
-   * Overwrite client configuration (default token, hooks)
+   * Overwrite client configuration (default token, default timeout, hooks)
    *
    *
    * ```javascript
    *
    * wapiClient.configure({
    *  token: 'EURO',
+   *  timeout: 45000,
    *  hooks: {
    *    disconnect: () => {}
    *  },
@@ -135,7 +130,33 @@ var Client = class {
    * @param {ClientConfig} newConf
    */
   configure(newConf) {
+    if (newConf.token && typeof newConf.token !== "string" && typeof newConf.token !== "number") {
+      throw new ConfigError("CONFIG_INVALID", {
+        field: "token",
+        error: `Must be a string|number, '${newConf.token}' provided`
+      });
+    }
+    ["sendingTimeout", "connectingTimeout", "reconnectingTimeout"].forEach(
+      (t) => {
+        if (newConf[t] && typeof newConf[t] !== "number") {
+          throw new ConfigError("CONFIG_INVALID", {
+            field: t,
+            error: `Must be a number, '${newConf[t]}' provided`
+          });
+        }
+      }
+    );
+    const hooks = newConf.hooks;
+    delete newConf.hooks;
     this.config = __spreadValues(__spreadValues({}, this.config), newConf);
+    if (this.config.sendingTimeout) {
+      this.api.sendingTimeout = this.config.sendingTimeout;
+    }
+    if (hooks) {
+      for (const [hookName, value] of Object.entries(hooks)) {
+        this.setHook(hookName, value);
+      }
+    }
     return this;
   }
   /**
@@ -762,6 +783,49 @@ var Client = class {
   /**
    *
    *
+   * ```javascript
+   *
+   * // setup
+   * await wapiClient.createDeposit(
+   *   {
+   *     wallet: 'newWallet',
+   *     amount: 10,
+   *     status: 'pending',
+   *     identifier: 'depositUSD',
+   *     token: 'USD',
+   *   },
+   *   {
+   *     create_wallet_if_not_exists: true,
+   *   },
+   * );
+   * await wapiClient.updateTransfer({
+   *   transfer: 'depositUSD',
+   *   status: 'finished',
+   * });
+   *
+   * const result = await wapiClient.exportBalanceHistory(
+   *   {
+   *     wallet: 'newWallet',
+   *     token: 'USD',
+   *   },
+   *   {
+   *     limit: 0,
+   *     select: [
+   *       'transfer_identifier',
+   *       'pending_amount',
+   *       'finished_amount',
+   *       'pending_amount_from',
+   *       'pending_amount_to',
+   *       'amount',
+   *     ],
+   *     offset: 0,
+   *     order: 'desc',
+   *     tracking_id: 'mylogId',
+   *     // transaction_id: Transaction.identifier, // created transaction identifier
+   *   },
+   * );
+   *
+   * ```
    *
    * @param {ExportBalanceHistoryFnInput} input
    * @param {ExportBalanceHistoryFnOptions} [options]
@@ -1283,8 +1347,11 @@ var Client = class {
    * ```javascript
    *
    * const result = await wapiClient.listExports(
-   *   {},
    *   {
+   *     type: 'transfers',
+   *   },
+   *   {
+   *     order_by: 'created_at desc',
    *     tracking_id: 'myLogId',
    *   },
    * );
@@ -1725,11 +1792,17 @@ var Client = class {
   // CLIENTFNDEFS
 };
 function createClientWithWS(opts, config) {
-  const wsClient = createWsClient(opts);
+  const wsClient = createWsClient(opts, {
+    connectingTimeout: config == null ? void 0 : config.connectingTimeout,
+    reconnectingTimeout: config == null ? void 0 : config.reconnectingTimeout
+  });
   return new Client(wsClient, config);
 }
 function createClientWithHttp(opts, config) {
-  const httpClient = createHttpClient(opts);
+  const httpClient = createHttpClient(opts, {
+    connectingTimeout: config == null ? void 0 : config.connectingTimeout,
+    reconnectingTimeout: config == null ? void 0 : config.reconnectingTimeout
+  });
   return new Client(httpClient, config);
 }
 export {

package/dist/client.cjs

@@ -1,7 +1,5 @@
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
@@ -18,7 +16,6 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -66,7 +63,7 @@ var import_errors = require('./lib/errors.cjs');
 var import_fns = require('./fns/index.cjs');
 var import_import_data = require('./fns/import-data/import-data.guards.cjs');
 var _a;
-var CLIENT_VERSION = (_a = '0.10.2') != null ? _a : "";
+var CLIENT_VERSION = (_a = '0.10.6') != null ? _a : "";
 var Client = class {
   /**
    * @internal
@@ -76,16 +73,13 @@ var Client = class {
     this.api = _apiClient;
     this.$connect = _apiClient.$connect;
     if (initialConf) {
-      if (initialConf.token) {
-        this.config = __spreadProps(__spreadValues({}, this.config), {
-          token: initialConf.token
-        });
-      }
-      if (initialConf.hooks) {
-        for (const [hookName, value] of Object.entries(initialConf.hooks)) {
-          this.setHook(hookName, value);
-        }
-      }
+      this.configure(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues({}, initialConf.token && { token: initialConf.token }), initialConf.sendingTimeout && {
+        sendingTimeout: initialConf.sendingTimeout
+      }), initialConf.connectingTimeout && {
+        connectingTimeout: initialConf.connectingTimeout
+      }), initialConf.reconnectingTimeout && {
+        reconnectingTimeout: initialConf.reconnectingTimeout
+      }), initialConf.hooks && { hooks: initialConf.hooks }));
     }
   }
   /**
@@ -135,13 +129,14 @@ var Client = class {
     return this;
   }
   /**
-   * Overwrite client configuration (default token, hooks)
+   * Overwrite client configuration (default token, default timeout, hooks)
    *
    *
    * ```javascript
    *
    * wapiClient.configure({
    *  token: 'EURO',
+   *  timeout: 45000,
    *  hooks: {
    *    disconnect: () => {}
    *  },
@@ -151,7 +146,33 @@ var Client = class {
    * @param {ClientConfig} newConf
    */
   configure(newConf) {
+    if (newConf.token && typeof newConf.token !== "string" && typeof newConf.token !== "number") {
+      throw new import_errors.ConfigError("CONFIG_INVALID", {
+        field: "token",
+        error: `Must be a string|number, '${newConf.token}' provided`
+      });
+    }
+    ["sendingTimeout", "connectingTimeout", "reconnectingTimeout"].forEach(
+      (t) => {
+        if (newConf[t] && typeof newConf[t] !== "number") {
+          throw new import_errors.ConfigError("CONFIG_INVALID", {
+            field: t,
+            error: `Must be a number, '${newConf[t]}' provided`
+          });
+        }
+      }
+    );
+    const hooks = newConf.hooks;
+    delete newConf.hooks;
     this.config = __spreadValues(__spreadValues({}, this.config), newConf);
+    if (this.config.sendingTimeout) {
+      this.api.sendingTimeout = this.config.sendingTimeout;
+    }
+    if (hooks) {
+      for (const [hookName, value] of Object.entries(hooks)) {
+        this.setHook(hookName, value);
+      }
+    }
     return this;
   }
   /**
@@ -778,6 +799,49 @@ var Client = class {
   /**
    *
    *
+   * ```javascript
+   *
+   * // setup
+   * await wapiClient.createDeposit(
+   *   {
+   *     wallet: 'newWallet',
+   *     amount: 10,
+   *     status: 'pending',
+   *     identifier: 'depositUSD',
+   *     token: 'USD',
+   *   },
+   *   {
+   *     create_wallet_if_not_exists: true,
+   *   },
+   * );
+   * await wapiClient.updateTransfer({
+   *   transfer: 'depositUSD',
+   *   status: 'finished',
+   * });
+   *
+   * const result = await wapiClient.exportBalanceHistory(
+   *   {
+   *     wallet: 'newWallet',
+   *     token: 'USD',
+   *   },
+   *   {
+   *     limit: 0,
+   *     select: [
+   *       'transfer_identifier',
+   *       'pending_amount',
+   *       'finished_amount',
+   *       'pending_amount_from',
+   *       'pending_amount_to',
+   *       'amount',
+   *     ],
+   *     offset: 0,
+   *     order: 'desc',
+   *     tracking_id: 'mylogId',
+   *     // transaction_id: Transaction.identifier, // created transaction identifier
+   *   },
+   * );
+   *
+   * ```
    *
    * @param {ExportBalanceHistoryFnInput} input
    * @param {ExportBalanceHistoryFnOptions} [options]
@@ -1299,8 +1363,11 @@ var Client = class {
    * ```javascript
    *
    * const result = await wapiClient.listExports(
-   *   {},
    *   {
+   *     type: 'transfers',
+   *   },
+   *   {
+   *     order_by: 'created_at desc',
    *     tracking_id: 'myLogId',
    *   },
    * );
@@ -1741,11 +1808,17 @@ var Client = class {
   // CLIENTFNDEFS
 };
 function createClientWithWS(opts, config) {
-  const wsClient = (0, import_api.createWsClient)(opts);
+  const wsClient = (0, import_api.createWsClient)(opts, {
+    connectingTimeout: config == null ? void 0 : config.connectingTimeout,
+    reconnectingTimeout: config == null ? void 0 : config.reconnectingTimeout
+  });
   return new Client(wsClient, config);
 }
 function createClientWithHttp(opts, config) {
-  const httpClient = (0, import_api.createHttpClient)(opts);
+  const httpClient = (0, import_api.createHttpClient)(opts, {
+    connectingTimeout: config == null ? void 0 : config.connectingTimeout,
+    reconnectingTimeout: config == null ? void 0 : config.reconnectingTimeout
+  });
   return new Client(httpClient, config);
 }
 // Annotate the CommonJS export names for ESM import in node: