wapi-client 0.12.5-beta.0 → 0.12.5-beta.2

package/dist/api/index.cjs

@@ -1,3 +1,4 @@
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;

package/dist/api/jsonrpc/jsonrpc.enums.browser.cjs

@@ -1,3 +1,4 @@
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;

package/dist/api/jsonrpc/jsonrpc.enums.cjs

@@ -1,3 +1,4 @@
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;

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

@@ -1,3 +1,4 @@
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -68,9 +69,8 @@ var import_errors = require('../lib/errors.cjs');
 var import_utils = require('../lib/utils.cjs');
 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 = window.WAPI_VERSION) != null ? _a : "";
+var import_wapi_client = require('../wapi-client.cjs');
+var import_env = require('../lib/env.cjs');
 function createWsClient(opts, config) {
   const initialConnection = createConnection(opts, {
     timeout: config == null ? void 0 : config.connectingTimeout
@@ -78,11 +78,11 @@ function createWsClient(opts, config) {
   return new WsClient(initialConnection, opts, config);
 }
 function createConnection(opts, connectionConfig) {
-  var _a2;
+  var _a;
   const config = __spreadValues({
-    rejectUnauthorized: (_a2 = opts.rejectUnauthorized) != null ? _a2 : true,
+    rejectUnauthorized: (_a = opts.rejectUnauthorized) != null ? _a : true,
     connectionName: connectionConfig == null ? void 0 : connectionConfig.connectionName,
-    clientVersion: CLIENT_VERSION
+    clientVersion: import_env.CLIENT_VERSION
   }, opts);
   const params = (0, import_utils.getConnectionParams)(config);
   const ws = new browser_default(...params);
@@ -164,8 +164,8 @@ function createConnection(opts, connectionConfig) {
 }
 var WsClient = class extends import_base_client.BaseClient {
   constructor(initial, opts, config) {
-    var _a2;
-    super(initial.ws, import__.WapiClientType.ws, initial.$connect);
+    var _a;
+    super(initial.ws, import_wapi_client.WapiClientType.ws, initial.$connect);
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     __publicField(this, "_pingTimeout");
     __publicField(this, "_opts");
@@ -174,7 +174,7 @@ var WsClient = class extends import_base_client.BaseClient {
     this._opts = opts;
     this._connectionConfig = config;
     this.host = opts.host;
-    (_a2 = this.$connect) == null ? void 0 : _a2.then((_id) => {
+    (_a = this.$connect) == null ? void 0 : _a.then((_id) => {
       this.socId = _id;
       return this._ready();
     }).catch((err) => {
@@ -229,16 +229,16 @@ var WsClient = class extends import_base_client.BaseClient {
       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;
+    nrOfAttempts != null ? nrOfAttempts : nrOfAttempts = (0, import_env.getEnvConfig)("WAPI_RECONNECT_ATTEMPTS", 10);
+    const maxWaitTime = (0, import_env.getEnvConfig)("WAPI_MAX_RECONNECT_WAIT", 1e4);
     this.$connect = (() => __async(this, null, function* () {
-      var _a2, _b, _c;
+      var _a, _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._opts, {
-            timeout: (_a2 = this._connectionConfig) == null ? void 0 : _a2.reconnectingTimeout
+            timeout: (_a = this._connectionConfig) == null ? void 0 : _a.reconnectingTimeout
           });
           _id = yield $connect;
           this.socId = _id;
@@ -246,7 +246,7 @@ var WsClient = class extends import_base_client.BaseClient {
           this._ready();
           break;
         } catch (err) {
-          const isAuthError = err.code === import_errors.ERROR_GROUPS.AUTH.ERRORS.AUTHENTICATION_ERROR.code;
+          const isAuthError = err && typeof err === "object" && "code" in err && err.code === import_errors.ERROR_GROUPS.AUTH.ERRORS.AUTHENTICATION_ERROR.code;
           const outOfAttempts = i > nrOfAttempts - 1;
           if (isAuthError || outOfAttempts) {
             this._setErrored(err);

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

@@ -48,9 +48,8 @@ import {
   ConnectionStatus,
   SocketStatuses
 } from "./connection/connection.enums.browser.js";
-import { WapiClientType } from "../index.browser.js";
-var _a;
-var CLIENT_VERSION = (_a = window.WAPI_VERSION) != null ? _a : "";
+import { WapiClientType } from "../wapi-client.browser.js";
+import { CLIENT_VERSION, getEnvConfig } from "../lib/env.browser.js";
 function createWsClient(opts, config) {
   const initialConnection = createConnection(opts, {
     timeout: config == null ? void 0 : config.connectingTimeout
@@ -58,9 +57,9 @@ function createWsClient(opts, config) {
   return new WsClient(initialConnection, opts, config);
 }
 function createConnection(opts, connectionConfig) {
-  var _a2;
+  var _a;
   const config = __spreadValues({
-    rejectUnauthorized: (_a2 = opts.rejectUnauthorized) != null ? _a2 : true,
+    rejectUnauthorized: (_a = opts.rejectUnauthorized) != null ? _a : true,
     connectionName: connectionConfig == null ? void 0 : connectionConfig.connectionName,
     clientVersion: CLIENT_VERSION
   }, opts);
@@ -144,7 +143,7 @@ function createConnection(opts, connectionConfig) {
 }
 var WsClient = class extends BaseClient {
   constructor(initial, opts, config) {
-    var _a2;
+    var _a;
     super(initial.ws, WapiClientType.ws, initial.$connect);
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     __publicField(this, "_pingTimeout");
@@ -154,7 +153,7 @@ var WsClient = class extends BaseClient {
     this._opts = opts;
     this._connectionConfig = config;
     this.host = opts.host;
-    (_a2 = this.$connect) == null ? void 0 : _a2.then((_id) => {
+    (_a = this.$connect) == null ? void 0 : _a.then((_id) => {
       this.socId = _id;
       return this._ready();
     }).catch((err) => {
@@ -209,16 +208,16 @@ var WsClient = class extends BaseClient {
       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;
+    nrOfAttempts != null ? nrOfAttempts : nrOfAttempts = getEnvConfig("WAPI_RECONNECT_ATTEMPTS", 10);
+    const maxWaitTime = getEnvConfig("WAPI_MAX_RECONNECT_WAIT", 1e4);
     this.$connect = (() => __async(this, null, function* () {
-      var _a2, _b, _c;
+      var _a, _b, _c;
       let _id;
       for (let i = 0; i < nrOfAttempts + 1; i++) {
         try {
           debugLog("Trying to connect, attempt:", i);
           const { ws, $connect } = createConnection(this._opts, {
-            timeout: (_a2 = this._connectionConfig) == null ? void 0 : _a2.reconnectingTimeout
+            timeout: (_a = this._connectionConfig) == null ? void 0 : _a.reconnectingTimeout
           });
           _id = yield $connect;
           this.socId = _id;
@@ -226,7 +225,7 @@ var WsClient = class extends BaseClient {
           this._ready();
           break;
         } catch (err) {
-          const isAuthError = err.code === ERROR_GROUPS.AUTH.ERRORS.AUTHENTICATION_ERROR.code;
+          const isAuthError = err && typeof err === "object" && "code" in err && err.code === ERROR_GROUPS.AUTH.ERRORS.AUTHENTICATION_ERROR.code;
           const outOfAttempts = i > nrOfAttempts - 1;
           if (isAuthError || outOfAttempts) {
             this._setErrored(err);

package/dist/api/ws-client.cjs

@@ -1,3 +1,4 @@
+"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -74,9 +75,8 @@ var import_errors = require('../lib/errors.cjs');
 var import_utils = require('../lib/utils.cjs');
 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.12.5-beta.0') != null ? _a : "";
+var import_wapi_client = require('../wapi-client.cjs');
+var import_env = require('../lib/env.cjs');
 function createWsClient(opts, config) {
   const initialConnection = createConnection(opts, {
     timeout: config == null ? void 0 : config.connectingTimeout
@@ -84,11 +84,11 @@ function createWsClient(opts, config) {
   return new WsClient(initialConnection, opts, config);
 }
 function createConnection(opts, connectionConfig) {
-  var _a2;
+  var _a;
   const config = __spreadValues({
-    rejectUnauthorized: (_a2 = opts.rejectUnauthorized) != null ? _a2 : true,
+    rejectUnauthorized: (_a = opts.rejectUnauthorized) != null ? _a : true,
     connectionName: connectionConfig == null ? void 0 : connectionConfig.connectionName,
-    clientVersion: CLIENT_VERSION
+    clientVersion: import_env.CLIENT_VERSION
   }, opts);
   const params = (0, import_utils.getConnectionParams)(config);
   const ws = new import_modern_isomorphic_ws.default(...params);
@@ -170,8 +170,8 @@ function createConnection(opts, connectionConfig) {
 }
 var WsClient = class extends import_base_client.BaseClient {
   constructor(initial, opts, config) {
-    var _a2;
-    super(initial.ws, import__.WapiClientType.ws, initial.$connect);
+    var _a;
+    super(initial.ws, import_wapi_client.WapiClientType.ws, initial.$connect);
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     __publicField(this, "_pingTimeout");
     __publicField(this, "_opts");
@@ -180,7 +180,7 @@ var WsClient = class extends import_base_client.BaseClient {
     this._opts = opts;
     this._connectionConfig = config;
     this.host = opts.host;
-    (_a2 = this.$connect) == null ? void 0 : _a2.then((_id) => {
+    (_a = this.$connect) == null ? void 0 : _a.then((_id) => {
       this.socId = _id;
       return this._ready();
     }).catch((err) => {
@@ -235,16 +235,16 @@ var WsClient = class extends import_base_client.BaseClient {
       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;
+    nrOfAttempts != null ? nrOfAttempts : nrOfAttempts = (0, import_env.getEnvConfig)("WAPI_RECONNECT_ATTEMPTS", 10);
+    const maxWaitTime = (0, import_env.getEnvConfig)("WAPI_MAX_RECONNECT_WAIT", 1e4);
     this.$connect = (() => __async(this, null, function* () {
-      var _a2, _b, _c;
+      var _a, _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._opts, {
-            timeout: (_a2 = this._connectionConfig) == null ? void 0 : _a2.reconnectingTimeout
+            timeout: (_a = this._connectionConfig) == null ? void 0 : _a.reconnectingTimeout
           });
           _id = yield $connect;
           this.socId = _id;
@@ -252,7 +252,7 @@ var WsClient = class extends import_base_client.BaseClient {
           this._ready();
           break;
         } catch (err) {
-          const isAuthError = err.code === import_errors.ERROR_GROUPS.AUTH.ERRORS.AUTHENTICATION_ERROR.code;
+          const isAuthError = err && typeof err === "object" && "code" in err && err.code === import_errors.ERROR_GROUPS.AUTH.ERRORS.AUTHENTICATION_ERROR.code;
           const outOfAttempts = i > nrOfAttempts - 1;
           if (isAuthError || outOfAttempts) {
             this._setErrored(err);

package/dist/api/ws-client.js

@@ -46,9 +46,8 @@ import {
   ConnectionStatus,
   SocketStatuses
 } from "./connection/connection.enums";
-import { WapiClientType } from "../index";
-var _a;
-var CLIENT_VERSION = (_a = '0.12.5-beta.0') != null ? _a : "";
+import { WapiClientType } from "../wapi-client";
+import { CLIENT_VERSION, getEnvConfig } from "../lib/env";
 function createWsClient(opts, config) {
   const initialConnection = createConnection(opts, {
     timeout: config == null ? void 0 : config.connectingTimeout
@@ -56,9 +55,9 @@ function createWsClient(opts, config) {
   return new WsClient(initialConnection, opts, config);
 }
 function createConnection(opts, connectionConfig) {
-  var _a2;
+  var _a;
   const config = __spreadValues({
-    rejectUnauthorized: (_a2 = opts.rejectUnauthorized) != null ? _a2 : true,
+    rejectUnauthorized: (_a = opts.rejectUnauthorized) != null ? _a : true,
     connectionName: connectionConfig == null ? void 0 : connectionConfig.connectionName,
     clientVersion: CLIENT_VERSION
   }, opts);
@@ -142,7 +141,7 @@ function createConnection(opts, connectionConfig) {
 }
 var WsClient = class extends BaseClient {
   constructor(initial, opts, config) {
-    var _a2;
+    var _a;
     super(initial.ws, WapiClientType.ws, initial.$connect);
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     __publicField(this, "_pingTimeout");
@@ -152,7 +151,7 @@ var WsClient = class extends BaseClient {
     this._opts = opts;
     this._connectionConfig = config;
     this.host = opts.host;
-    (_a2 = this.$connect) == null ? void 0 : _a2.then((_id) => {
+    (_a = this.$connect) == null ? void 0 : _a.then((_id) => {
       this.socId = _id;
       return this._ready();
     }).catch((err) => {
@@ -207,16 +206,16 @@ var WsClient = class extends BaseClient {
       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;
+    nrOfAttempts != null ? nrOfAttempts : nrOfAttempts = getEnvConfig("WAPI_RECONNECT_ATTEMPTS", 10);
+    const maxWaitTime = getEnvConfig("WAPI_MAX_RECONNECT_WAIT", 1e4);
     this.$connect = (() => __async(this, null, function* () {
-      var _a2, _b, _c;
+      var _a, _b, _c;
       let _id;
       for (let i = 0; i < nrOfAttempts + 1; i++) {
         try {
           debugLog("Trying to connect, attempt:", i);
           const { ws, $connect } = createConnection(this._opts, {
-            timeout: (_a2 = this._connectionConfig) == null ? void 0 : _a2.reconnectingTimeout
+            timeout: (_a = this._connectionConfig) == null ? void 0 : _a.reconnectingTimeout
           });
           _id = yield $connect;
           this.socId = _id;
@@ -224,7 +223,7 @@ var WsClient = class extends BaseClient {
           this._ready();
           break;
         } catch (err) {
-          const isAuthError = err.code === ERROR_GROUPS.AUTH.ERRORS.AUTHENTICATION_ERROR.code;
+          const isAuthError = err && typeof err === "object" && "code" in err && err.code === ERROR_GROUPS.AUTH.ERRORS.AUTHENTICATION_ERROR.code;
           const outOfAttempts = i > nrOfAttempts - 1;
           if (isAuthError || outOfAttempts) {
             this._setErrored(err);

package/dist/client-options.schema.zod.browser.cjs

@@ -1,3 +1,4 @@
+"use strict";
 var __defProp = Object.defineProperty;
 var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;

package/dist/client-options.schema.zod.cjs

@@ -1,3 +1,4 @@
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;

package/dist/client.browser.cjs

@@ -1,3 +1,4 @@
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -62,8 +63,7 @@ module.exports = __toCommonJS(client_exports);
 var import_api = require('./api/index.cjs');
 var import_errors = require('./lib/errors.cjs');
 var import_fns = require('./fns/index.cjs');
-var _a;
-var CLIENT_VERSION = (_a = window.WAPI_VERSION) != null ? _a : "";
+var import_env = require('./lib/env.cjs');
 var Client = class {
   /**
    * @internal
@@ -118,7 +118,7 @@ var Client = class {
    * ```
    */
   version() {
-    return CLIENT_VERSION;
+    return import_env.CLIENT_VERSION;
   }
   /**
    * Set a hook function
@@ -1435,15 +1435,8 @@ var Client = class {
    *   {
    *     model: 'Transfer',
    *     aggregator: 'count',
-   *     groups: [
-   *       {
-   *         type: 'period',
-   *         field: {
-   *           period: 'month',
-   *           timezone: 'Europe/Tallinn',
-   *         },
-   *       },
-   *     ],
+   *     group: 'month',
+   *     timezone: 'Europe/Tallinn',
    *     filter: {
    *       end_time: new Date(
    *         `${new Date().getFullYear() + 1}-01-01`,

package/dist/client.browser.js

@@ -43,8 +43,7 @@ import {
 } from "./api/index.browser.js";
 import { ConfigError } from "./lib/errors.browser.js";
 import { ClientFunctions } from "./fns/index.browser.js";
-var _a;
-var CLIENT_VERSION = (_a = window.WAPI_VERSION) != null ? _a : "";
+import { CLIENT_VERSION } from "./lib/env.browser.js";
 var Client = class {
   /**
    * @internal
@@ -1416,15 +1415,8 @@ var Client = class {
    *   {
    *     model: 'Transfer',
    *     aggregator: 'count',
-   *     groups: [
-   *       {
-   *         type: 'period',
-   *         field: {
-   *           period: 'month',
-   *           timezone: 'Europe/Tallinn',
-   *         },
-   *       },
-   *     ],
+   *     group: 'month',
+   *     timezone: 'Europe/Tallinn',
    *     filter: {
    *       end_time: new Date(
    *         `${new Date().getFullYear() + 1}-01-01`,

package/dist/client.cjs

@@ -1,3 +1,4 @@
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -62,8 +63,7 @@ module.exports = __toCommonJS(client_exports);
 var import_api = require('./api/index.cjs');
 var import_errors = require('./lib/errors.cjs');
 var import_fns = require('./fns/index.cjs');
-var _a;
-var CLIENT_VERSION = (_a = '0.12.5-beta.0') != null ? _a : "";
+var import_env = require('./lib/env.cjs');
 var Client = class {
   /**
    * @internal
@@ -118,7 +118,7 @@ var Client = class {
    * ```
    */
   version() {
-    return CLIENT_VERSION;
+    return import_env.CLIENT_VERSION;
   }
   /**
    * Set a hook function
@@ -1435,15 +1435,8 @@ var Client = class {
    *   {
    *     model: 'Transfer',
    *     aggregator: 'count',
-   *     groups: [
-   *       {
-   *         type: 'period',
-   *         field: {
-   *           period: 'month',
-   *           timezone: 'Europe/Tallinn',
-   *         },
-   *       },
-   *     ],
+   *     group: 'month',
+   *     timezone: 'Europe/Tallinn',
    *     filter: {
    *       end_time: new Date(
    *         `${new Date().getFullYear() + 1}-01-01`,