wapi-client 0.9.6 → 0.10.2

package/dist/api/base-client.js

@@ -48,7 +48,7 @@ import {
   JSONRPC
 } from "./jsonrpc/jsonrpc.enums";
 import { WapiClientType } from "../index";
-import { APIFunctions, APIValidators } from "../txs/index";
+import { APIFunctions, APIValidators } from "../txs";
 import {
   isImportActionsTxOptions,
   isImportActionsTxInput
@@ -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() {
@@ -195,10 +197,13 @@ var BaseClient = class {
     if (!isValid) {
       throw error;
     }
+    return this._sendRaw(name, inputCopy);
+  }
+  _sendRaw(method, params) {
     const jsonRpcMessage = {
       jsonrpc: JSONRPC.version,
-      method: name,
-      params: inputCopy,
+      method,
+      params,
       id: getRandomHex()
     };
     if (this.hooks.preflight && this.hooks.preflight(jsonRpcMessage) === false) {
@@ -206,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()
@@ -272,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 })
@@ -381,7 +392,7 @@ var BaseClient = class {
    *
    */
   authenticationCheck(input) {
-    return this._sendTransaction(APIFunctions.authenticationCheck, input);
+    return this._sendTransaction(APIFunctions.authenticationCheck, input != null ? input : {});
   }
   /**
    *
@@ -456,7 +467,7 @@ var BaseClient = class {
    *
    */
   createTransferGroup(input) {
-    return this._sendTransaction(APIFunctions.createTransferGroup, input);
+    return this._sendTransaction(APIFunctions.createTransferGroup, input != null ? input : {});
   }
   /**
    *
@@ -490,15 +501,48 @@ var BaseClient = class {
   }
   /**
    *
-   * @param {ExportDatabaseTxInput} input
-   * @returns {StreamPromise<ExportDatabaseTxOutput>}
+   * @param {ExportBalanceHistoryTxInput} input
+   * @returns {StreamPromise<ExportBalanceHistoryTxOutput>}
    *
    */
-  exportDatabase(input) {
-    return this._sendTransaction(
-      APIFunctions.exportDatabase,
-      input
-    );
+  exportBalanceHistory(input) {
+    return this._sendTransaction(APIFunctions.exportBalanceHistory, input);
+  }
+  /**
+   *
+   * @param {ExportTokenManyTxInput} input
+   * @returns {StreamPromise<ExportTokenManyTxOutput>}
+   *
+   */
+  exportTokenMany(input) {
+    return this._sendTransaction(APIFunctions.exportTokenMany, input != null ? input : {});
+  }
+  /**
+   *
+   * @param {ExportTransferGroupManyTxInput} input
+   * @returns {StreamPromise<ExportTransferGroupManyTxOutput>}
+   *
+   */
+  exportTransferGroupMany(input) {
+    return this._sendTransaction(APIFunctions.exportTransferGroupMany, input != null ? input : {});
+  }
+  /**
+   *
+   * @param {ExportTransferManyTxInput} input
+   * @returns {StreamPromise<ExportTransferManyTxOutput>}
+   *
+   */
+  exportTransferMany(input) {
+    return this._sendTransaction(APIFunctions.exportTransferMany, input != null ? input : {});
+  }
+  /**
+   *
+   * @param {ExportWalletManyTxInput} input
+   * @returns {StreamPromise<ExportWalletManyTxOutput>}
+   *
+   */
+  exportWalletMany(input) {
+    return this._sendTransaction(APIFunctions.exportWalletMany, input != null ? input : {});
   }
   /**
    *
@@ -507,7 +551,7 @@ var BaseClient = class {
    *
    */
   findBalanceMany(input) {
-    return this._sendTransaction(APIFunctions.findBalanceMany, input);
+    return this._sendTransaction(APIFunctions.findBalanceMany, input != null ? input : {});
   }
   /**
    *
@@ -518,7 +562,7 @@ var BaseClient = class {
   findTokenMany(input) {
     return this._sendTransaction(
       APIFunctions.findTokenMany,
-      input
+      input != null ? input : {}
     );
   }
   /**
@@ -528,7 +572,7 @@ var BaseClient = class {
    *
    */
   findTransferGroupMany(input) {
-    return this._sendTransaction(APIFunctions.findTransferGroupMany, input);
+    return this._sendTransaction(APIFunctions.findTransferGroupMany, input != null ? input : {});
   }
   /**
    *
@@ -537,7 +581,7 @@ var BaseClient = class {
    *
    */
   findTransferMany(input) {
-    return this._sendTransaction(APIFunctions.findTransferMany, input);
+    return this._sendTransaction(APIFunctions.findTransferMany, input != null ? input : {});
   }
   /**
    *
@@ -548,7 +592,7 @@ var BaseClient = class {
   findWalletMany(input) {
     return this._sendTransaction(
       APIFunctions.findWalletMany,
-      input
+      input != null ? input : {}
     );
   }
   /**
@@ -583,21 +627,15 @@ var BaseClient = class {
   }
   /**
    *
-   * @param {GetDatabaseExportProgressTxInput} input
-   * @returns {StreamPromise<GetDatabaseExportProgressTxOutput>}
+   * @param {GetExportTxInput} input
+   * @returns {StreamPromise<GetExportTxOutput>}
    *
    */
-  getDatabaseExportProgress(input) {
-    return this._sendTransaction(APIFunctions.getDatabaseExportProgress, input);
-  }
-  /**
-   *
-   * @param {GetDatabaseImportProgressTxInput} input
-   * @returns {StreamPromise<GetDatabaseImportProgressTxOutput>}
-   *
-   */
-  getDatabaseImportProgress(input) {
-    return this._sendTransaction(APIFunctions.getDatabaseImportProgress, input);
+  getExport(input) {
+    return this._sendTransaction(
+      APIFunctions.getExport,
+      input
+    );
   }
   /**
    *
@@ -608,7 +646,7 @@ var BaseClient = class {
   getFlags(input) {
     return this._sendTransaction(
       APIFunctions.getFlags,
-      input
+      input != null ? input : {}
     );
   }
   /**
@@ -620,7 +658,7 @@ var BaseClient = class {
   getStatistics(input) {
     return this._sendTransaction(
       APIFunctions.getStatistics,
-      input
+      input != null ? input : {}
     );
   }
   /**
@@ -733,35 +771,14 @@ var BaseClient = class {
   }
   /**
    *
-   * @param {ImportDatabaseTxInput} input
-   * @returns {StreamPromise<ImportDatabaseTxOutput>}
-   *
-   */
-  importDatabase(input) {
-    return this._sendTransaction(
-      APIFunctions.importDatabase,
-      input
-    );
-  }
-  /**
-   *
-   * @param {ListDatabaseExportsTxInput} input
-   * @returns {StreamPromise<ListDatabaseExportsTxOutput>}
+   * @param {ListExportManyTxInput} input
+   * @returns {StreamPromise<ListExportManyTxOutput>}
    *
    */
-  listDatabaseExports(input) {
-    return this._sendTransaction(APIFunctions.listDatabaseExports, input);
-  }
-  /**
-   *
-   * @param {QueryTxInput} input
-   * @returns {StreamPromise<QueryTxOutput>}
-   *
-   */
-  query(input) {
+  listExportMany(input) {
     return this._sendTransaction(
-      APIFunctions.query,
-      input
+      APIFunctions.listExportMany,
+      input != null ? input : {}
     );
   }
   /**
@@ -773,7 +790,7 @@ var BaseClient = class {
   queryLogs(input) {
     return this._sendTransaction(
       APIFunctions.queryLogs,
-      input
+      input != null ? input : {}
     );
   }
   /**
@@ -785,7 +802,7 @@ var BaseClient = class {
   resetDatabase(input) {
     return this._sendTransaction(
       APIFunctions.resetDatabase,
-      input
+      input != null ? input : {}
     );
   }
   /**
@@ -843,7 +860,7 @@ var BaseClient = class {
    *
    */
   startTransaction(input) {
-    return this._sendTransaction(APIFunctions.startTransaction, input);
+    return this._sendTransaction(APIFunctions.startTransaction, input != null ? input : {});
   }
   /**
    *

package/dist/api/connection/connection.enums.d.ts

@@ -5,15 +5,3 @@ export declare enum SocketStatuses {
     authError = 4030,
     genericError = 4500
 }
-export interface ConnectionOpts {
-    user: string;
-    password: string;
-    userW: string;
-    passwordW: string;
-    userR: string;
-    passwordR: string;
-    database: string;
-    migrateVersion: string;
-    http: boolean;
-    connectionTimeout?: number;
-}

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

@@ -8,7 +8,7 @@ export interface HttpConnectionClient {
 }
 export declare function createHttpClient(opts: WapiHttpConnectionOptions): HttpClient;
 export declare class HttpClient extends BaseClient {
-    _connection: HttpConnectionClient;
+    protected _connection: HttpConnectionClient;
     constructor(connection: HttpConnectionClient, opts: WapiHttpConnectionOptions);
     protected _send(input: JSONRPCRequest | JSONRPCResponse): void;
     private _ready;

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.9.6') != null ? _a : "";
+var CLIENT_VERSION = (_a = '0.10.2') != 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

@@ -16,11 +16,11 @@ export declare class WsClient extends BaseClient {
     private _pingTimeout;
     private _config;
     private _tryToReconnect;
-    _connection: WebSocket;
+    protected _connection: WebSocket;
     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.9.6') != null ? _a : "";
+var CLIENT_VERSION = (_a = '0.10.2') != 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));
         }