wapi-client 0.10.0 → 0.10.4

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

@@ -90,28 +90,30 @@ var BaseClient = class {
     this.$connect = $connect;
   }
   _setConnected(value) {
-    this.isConnected = value;
-    if (this.isConnected && this._error !== false) {
+    this.$connect = void 0;
+    if (value && this._error !== false) {
       this._error = false;
     }
-    if (this.isConnected && this.hooks.connected) {
+    if (!this.isConnected && value && this.hooks.connected) {
       this.hooks.connected(this.socId);
     }
-    if (!this.isConnected && this.hooks.disconnected) {
+    if (this.isConnected && !value && this.hooks.disconnected) {
       this.hooks.disconnected();
     }
+    this.isConnected = value;
   }
   _setErrored(err) {
     this._error = err;
-    if (this.isConnected) {
-      this._setConnected(false);
-    }
+    this._setConnected(false);
+  }
+  _clearError() {
+    this._error = void 0;
   }
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   _send(input) {
     throw new Error("This method must be implemented by child class");
   }
-  _reconnect() {
+  _reconnect(nrOfAttempts) {
     throw new Error("This method must be implemented by child class");
   }
   close() {
@@ -222,11 +224,14 @@ var BaseClient = class {
     }
     return new import_stream_promise.StreamPromise((stream) => __async(this, null, function* () {
       if (this._error) {
-        this._reconnect();
+        this._reconnect(5);
       }
       if (!this.isConnected) {
         yield this.$connect;
       }
+      if (this._error) {
+        throw this._error;
+      }
       this._requests.set(jsonRpcMessage.id, {
         stream,
         start: Date.now()
@@ -288,11 +293,14 @@ var BaseClient = class {
     }
     return new import_stream_promise_input.StreamPromiseInput((stream) => __async(this, null, function* () {
       if (this._error) {
-        this._reconnect();
+        this._reconnect(5);
       }
       if (!this.isConnected) {
         yield this.$connect;
       }
+      if (this._error) {
+        throw this._error;
+      }
       let timeout = setTimeout(() => {
         stream.push({
           error: new import_errors.StreamError("INPUT_STREAM_TIMEOUT", { streamId })

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

@@ -77,28 +77,30 @@ var BaseClient = class {
     this.$connect = $connect;
   }
   _setConnected(value) {
-    this.isConnected = value;
-    if (this.isConnected && this._error !== false) {
+    this.$connect = void 0;
+    if (value && this._error !== false) {
       this._error = false;
     }
-    if (this.isConnected && this.hooks.connected) {
+    if (!this.isConnected && value && this.hooks.connected) {
       this.hooks.connected(this.socId);
     }
-    if (!this.isConnected && this.hooks.disconnected) {
+    if (this.isConnected && !value && this.hooks.disconnected) {
       this.hooks.disconnected();
     }
+    this.isConnected = value;
   }
   _setErrored(err) {
     this._error = err;
-    if (this.isConnected) {
-      this._setConnected(false);
-    }
+    this._setConnected(false);
+  }
+  _clearError() {
+    this._error = void 0;
   }
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   _send(input) {
     throw new Error("This method must be implemented by child class");
   }
-  _reconnect() {
+  _reconnect(nrOfAttempts) {
     throw new Error("This method must be implemented by child class");
   }
   close() {
@@ -209,11 +211,14 @@ var BaseClient = class {
     }
     return new StreamPromise((stream) => __async(this, null, function* () {
       if (this._error) {
-        this._reconnect();
+        this._reconnect(5);
       }
       if (!this.isConnected) {
         yield this.$connect;
       }
+      if (this._error) {
+        throw this._error;
+      }
       this._requests.set(jsonRpcMessage.id, {
         stream,
         start: Date.now()
@@ -275,11 +280,14 @@ var BaseClient = class {
     }
     return new StreamPromiseInput((stream) => __async(this, null, function* () {
       if (this._error) {
-        this._reconnect();
+        this._reconnect(5);
       }
       if (!this.isConnected) {
         yield this.$connect;
       }
+      if (this._error) {
+        throw this._error;
+      }
       let timeout = setTimeout(() => {
         stream.push({
           error: new StreamError("INPUT_STREAM_TIMEOUT", { streamId })

package/dist/api/base-client.cjs

@@ -90,28 +90,30 @@ var BaseClient = class {
     this.$connect = $connect;
   }
   _setConnected(value) {
-    this.isConnected = value;
-    if (this.isConnected && this._error !== false) {
+    this.$connect = void 0;
+    if (value && this._error !== false) {
       this._error = false;
     }
-    if (this.isConnected && this.hooks.connected) {
+    if (!this.isConnected && value && this.hooks.connected) {
       this.hooks.connected(this.socId);
     }
-    if (!this.isConnected && this.hooks.disconnected) {
+    if (this.isConnected && !value && this.hooks.disconnected) {
       this.hooks.disconnected();
     }
+    this.isConnected = value;
   }
   _setErrored(err) {
     this._error = err;
-    if (this.isConnected) {
-      this._setConnected(false);
-    }
+    this._setConnected(false);
+  }
+  _clearError() {
+    this._error = void 0;
   }
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   _send(input) {
     throw new Error("This method must be implemented by child class");
   }
-  _reconnect() {
+  _reconnect(nrOfAttempts) {
     throw new Error("This method must be implemented by child class");
   }
   close() {
@@ -222,11 +224,14 @@ var BaseClient = class {
     }
     return new import_stream_promise.StreamPromise((stream) => __async(this, null, function* () {
       if (this._error) {
-        this._reconnect();
+        this._reconnect(5);
       }
       if (!this.isConnected) {
         yield this.$connect;
       }
+      if (this._error) {
+        throw this._error;
+      }
       this._requests.set(jsonRpcMessage.id, {
         stream,
         start: Date.now()
@@ -288,11 +293,14 @@ var BaseClient = class {
     }
     return new import_stream_promise_input.StreamPromiseInput((stream) => __async(this, null, function* () {
       if (this._error) {
-        this._reconnect();
+        this._reconnect(5);
       }
       if (!this.isConnected) {
         yield this.$connect;
       }
+      if (this._error) {
+        throw this._error;
+      }
       let timeout = setTimeout(() => {
         stream.push({
           error: new import_errors.StreamError("INPUT_STREAM_TIMEOUT", { streamId })

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

@@ -60,6 +60,7 @@ export interface ClientHooks {
     connected?: (socId: undefined | string) => void;
     disconnected?: () => void;
     reconnect?: () => void | boolean;
+    reconnectError?: (err: Error) => void;
     preflight?: (msg: JSONRPCRequest) => void | boolean;
     message?: (msg: JSONRPCResponse) => void;
 }
@@ -80,8 +81,9 @@ export declare class BaseClient {
     constructor(connection: WebSocket | HttpConnectionClient, connectionType: WapiClientType, $connect?: Promise<ISocketId>);
     protected _setConnected(value: boolean): void;
     protected _setErrored(err: Error): void;
+    protected _clearError(): void;
     protected _send(input: JSONRPCRequest | JSONRPCResponse): void;
-    protected _reconnect(): void;
+    protected _reconnect(nrOfAttempts?: number | undefined): void;
     close(): Promise<void>;
     protected _connectionLost(): void;
     protected _handleMessage(incoming: JSONRPCResponse | JSONRPCRequest): void;

package/dist/api/base-client.js

@@ -77,28 +77,30 @@ var BaseClient = class {
     this.$connect = $connect;
   }
   _setConnected(value) {
-    this.isConnected = value;
-    if (this.isConnected && this._error !== false) {
+    this.$connect = void 0;
+    if (value && this._error !== false) {
       this._error = false;
     }
-    if (this.isConnected && this.hooks.connected) {
+    if (!this.isConnected && value && this.hooks.connected) {
       this.hooks.connected(this.socId);
     }
-    if (!this.isConnected && this.hooks.disconnected) {
+    if (this.isConnected && !value && this.hooks.disconnected) {
       this.hooks.disconnected();
     }
+    this.isConnected = value;
   }
   _setErrored(err) {
     this._error = err;
-    if (this.isConnected) {
-      this._setConnected(false);
-    }
+    this._setConnected(false);
+  }
+  _clearError() {
+    this._error = void 0;
   }
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   _send(input) {
     throw new Error("This method must be implemented by child class");
   }
-  _reconnect() {
+  _reconnect(nrOfAttempts) {
     throw new Error("This method must be implemented by child class");
   }
   close() {
@@ -209,11 +211,14 @@ var BaseClient = class {
     }
     return new StreamPromise((stream) => __async(this, null, function* () {
       if (this._error) {
-        this._reconnect();
+        this._reconnect(5);
       }
       if (!this.isConnected) {
         yield this.$connect;
       }
+      if (this._error) {
+        throw this._error;
+      }
       this._requests.set(jsonRpcMessage.id, {
         stream,
         start: Date.now()
@@ -275,11 +280,14 @@ var BaseClient = class {
     }
     return new StreamPromiseInput((stream) => __async(this, null, function* () {
       if (this._error) {
-        this._reconnect();
+        this._reconnect(5);
       }
       if (!this.isConnected) {
         yield this.$connect;
       }
+      if (this._error) {
+        throw this._error;
+      }
       let timeout = setTimeout(() => {
         stream.push({
           error: new StreamError("INPUT_STREAM_TIMEOUT", { streamId })

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

@@ -180,18 +180,24 @@ var WsClient = class extends import_base_client.BaseClient {
     };
     this._heartbeat();
   }
-  _reconnect() {
+  _reconnect(nrOfAttempts) {
     (0, import_debug.debugLog)("reconnect(),tryToReconnect:", this._tryToReconnect);
     if (!this._tryToReconnect) {
       return;
     }
-    if (this.hooks.reconnect && !this.hooks.reconnect()) {
+    if (this.hooks.reconnect && this.hooks.reconnect() === false) {
       (0, import_debug.debugLog)("reconnect hook returned false");
       return;
     }
-    const nrOfAttempts = window.WAPI_RECONNECT_ATTEMPTS && parseInt(window.WAPI_RECONNECT_ATTEMPTS) || 10;
+    if (this.$connect) {
+      (0, import_debug.debugLog)("already connecting");
+      return;
+    }
+    super._clearError();
+    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;
       let _id;
       for (let i = 0; i < nrOfAttempts + 1; i++) {
         try {
@@ -203,11 +209,12 @@ var WsClient = class extends import_base_client.BaseClient {
           this._ready();
           break;
         } catch (err) {
-          if (err.code === import_errors.ERROR_GROUPS.AUTH.ERRORS.AUTHENTICATION_ERROR.code) {
-            throw err;
-          }
-          if (i > nrOfAttempts - 1) {
-            throw err;
+          const isAuthError = err.code === import_errors.ERROR_GROUPS.AUTH.ERRORS.AUTHENTICATION_ERROR.code;
+          const outOfAttempts = i > nrOfAttempts - 1;
+          if (isAuthError || outOfAttempts) {
+            this._setErrored(err);
+            (_b = (_a2 = this.hooks).reconnectError) == null ? void 0 : _b.call(_a2, err);
+            break;
           }
           yield (0, import_utils.wait)(Math.min(Math.pow(1.5, i) * 1e3, maxWaitTime));
         }

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

@@ -158,18 +158,24 @@ var WsClient = class extends BaseClient {
     };
     this._heartbeat();
   }
-  _reconnect() {
+  _reconnect(nrOfAttempts) {
     debugLog("reconnect(),tryToReconnect:", this._tryToReconnect);
     if (!this._tryToReconnect) {
       return;
     }
-    if (this.hooks.reconnect && !this.hooks.reconnect()) {
+    if (this.hooks.reconnect && this.hooks.reconnect() === false) {
       debugLog("reconnect hook returned false");
       return;
     }
-    const nrOfAttempts = window.WAPI_RECONNECT_ATTEMPTS && parseInt(window.WAPI_RECONNECT_ATTEMPTS) || 10;
+    if (this.$connect) {
+      debugLog("already connecting");
+      return;
+    }
+    super._clearError();
+    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;
       let _id;
       for (let i = 0; i < nrOfAttempts + 1; i++) {
         try {
@@ -181,11 +187,12 @@ var WsClient = class extends BaseClient {
           this._ready();
           break;
         } catch (err) {
-          if (err.code === ERROR_GROUPS.AUTH.ERRORS.AUTHENTICATION_ERROR.code) {
-            throw err;
-          }
-          if (i > nrOfAttempts - 1) {
-            throw err;
+          const isAuthError = err.code === ERROR_GROUPS.AUTH.ERRORS.AUTHENTICATION_ERROR.code;
+          const outOfAttempts = i > nrOfAttempts - 1;
+          if (isAuthError || outOfAttempts) {
+            this._setErrored(err);
+            (_b = (_a2 = this.hooks).reconnectError) == null ? void 0 : _b.call(_a2, err);
+            break;
           }
           yield wait(Math.min(Math.pow(1.5, i) * 1e3, maxWaitTime));
         }

package/dist/api/ws-client.cjs

@@ -61,7 +61,7 @@ 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.0') != null ? _a : "";
+var CLIENT_VERSION = (_a = '0.10.4') != null ? _a : "";
 function createWsClient(opts) {
   const initialConnection = createConnection(opts);
   return new WsClient(initialConnection, opts);
@@ -186,18 +186,24 @@ var WsClient = class extends import_base_client.BaseClient {
     };
     this._heartbeat();
   }
-  _reconnect() {
+  _reconnect(nrOfAttempts) {
     (0, import_debug.debugLog)("reconnect(),tryToReconnect:", this._tryToReconnect);
     if (!this._tryToReconnect) {
       return;
     }
-    if (this.hooks.reconnect && !this.hooks.reconnect()) {
+    if (this.hooks.reconnect && this.hooks.reconnect() === false) {
       (0, import_debug.debugLog)("reconnect hook returned false");
       return;
     }
-    const nrOfAttempts = process.env.WAPI_RECONNECT_ATTEMPTS && parseInt(process.env.WAPI_RECONNECT_ATTEMPTS) || 10;
+    if (this.$connect) {
+      (0, import_debug.debugLog)("already connecting");
+      return;
+    }
+    super._clearError();
+    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;
       let _id;
       for (let i = 0; i < nrOfAttempts + 1; i++) {
         try {
@@ -209,11 +215,12 @@ var WsClient = class extends import_base_client.BaseClient {
           this._ready();
           break;
         } catch (err) {
-          if (err.code === import_errors.ERROR_GROUPS.AUTH.ERRORS.AUTHENTICATION_ERROR.code) {
-            throw err;
-          }
-          if (i > nrOfAttempts - 1) {
-            throw err;
+          const isAuthError = err.code === import_errors.ERROR_GROUPS.AUTH.ERRORS.AUTHENTICATION_ERROR.code;
+          const outOfAttempts = i > nrOfAttempts - 1;
+          if (isAuthError || outOfAttempts) {
+            this._setErrored(err);
+            (_b = (_a2 = this.hooks).reconnectError) == null ? void 0 : _b.call(_a2, err);
+            break;
           }
           yield (0, import_utils.wait)(Math.min(Math.pow(1.5, i) * 1e3, maxWaitTime));
         }

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

@@ -20,7 +20,7 @@ export declare class WsClient extends BaseClient {
     constructor(initial: ConnectionWPromise, config: WapiConnectionOptions);
     protected _setErrored(err: Error | AuthenticationError): void;
     private _ready;
-    protected _reconnect(): void;
+    protected _reconnect(nrOfAttempts?: number | undefined): void;
     private _heartbeat;
     protected _send(input: JSONRPCRequest | JSONRPCResponse): void;
     close(): Promise<void>;

package/dist/api/ws-client.js

@@ -31,7 +31,7 @@ import {
 } from "./connection/connection.enums";
 import { WapiClientType } from "../index";
 var _a;
-var CLIENT_VERSION = (_a = '0.10.0') != null ? _a : "";
+var CLIENT_VERSION = (_a = '0.10.4') != null ? _a : "";
 function createWsClient(opts) {
   const initialConnection = createConnection(opts);
   return new WsClient(initialConnection, opts);
@@ -156,18 +156,24 @@ var WsClient = class extends BaseClient {
     };
     this._heartbeat();
   }
-  _reconnect() {
+  _reconnect(nrOfAttempts) {
     debugLog("reconnect(),tryToReconnect:", this._tryToReconnect);
     if (!this._tryToReconnect) {
       return;
     }
-    if (this.hooks.reconnect && !this.hooks.reconnect()) {
+    if (this.hooks.reconnect && this.hooks.reconnect() === false) {
       debugLog("reconnect hook returned false");
       return;
     }
-    const nrOfAttempts = process.env.WAPI_RECONNECT_ATTEMPTS && parseInt(process.env.WAPI_RECONNECT_ATTEMPTS) || 10;
+    if (this.$connect) {
+      debugLog("already connecting");
+      return;
+    }
+    super._clearError();
+    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;
       let _id;
       for (let i = 0; i < nrOfAttempts + 1; i++) {
         try {
@@ -179,11 +185,12 @@ var WsClient = class extends BaseClient {
           this._ready();
           break;
         } catch (err) {
-          if (err.code === ERROR_GROUPS.AUTH.ERRORS.AUTHENTICATION_ERROR.code) {
-            throw err;
-          }
-          if (i > nrOfAttempts - 1) {
-            throw err;
+          const isAuthError = err.code === ERROR_GROUPS.AUTH.ERRORS.AUTHENTICATION_ERROR.code;
+          const outOfAttempts = i > nrOfAttempts - 1;
+          if (isAuthError || outOfAttempts) {
+            this._setErrored(err);
+            (_b = (_a2 = this.hooks).reconnectError) == null ? void 0 : _b.call(_a2, err);
+            break;
           }
           yield wait(Math.min(Math.pow(1.5, i) * 1e3, maxWaitTime));
         }

package/dist/client.browser.cjs

@@ -778,6 +778,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]

package/dist/client.browser.js

@@ -762,6 +762,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]

package/dist/client.cjs

@@ -66,7 +66,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.0') != null ? _a : "";
+var CLIENT_VERSION = (_a = '0.10.4') != null ? _a : "";
 var Client = class {
   /**
    * @internal
@@ -778,6 +778,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]