@bitrix24/b24jssdk 0.1.3 → 0.1.5

package/dist/commonjs/index.cjs

@@ -1,5 +1,5 @@
 /**
- * @version @bitrix24/b24jssdk v0.1.3
+ * @version @bitrix24/b24jssdk v0.1.5
  * @copyright (c) 2024 Bitrix24
  * @licence MIT
  * @links https://github.com/bitrix24/b24jssdk - GitHub
@@ -9,7 +9,20 @@
 
 const luxon = require('luxon');
 const axios = require('axios');
-const qs = require('qs');
+const qs = require('qs-esm');
+
+function _interopNamespaceDefault(e) {
+	const n = Object.create(null);
+	if (e) {
+		for (const k in e) {
+			n[k] = e[k];
+		}
+	}
+	n.default = e;
+	return n;
+}
+
+const qs__namespace = /*#__PURE__*/_interopNamespaceDefault(qs);
 
 var LoggerType = /* @__PURE__ */ ((LoggerType2) => {
   LoggerType2["desktop"] = "desktop";
@@ -1326,7 +1339,10 @@ class Http {
   #restrictionManager;
   #requestIdGenerator;
   _logger = null;
+  _loggerSystem = null;
   #logTag = "";
+  #isClientSideWarning = false;
+  #clientSideWarningMessage = "";
   constructor(baseURL, authActions, options) {
     this.#clientAxios = axios.create({
       baseURL,
@@ -1336,6 +1352,7 @@ class Http {
     this.#restrictionManager = new RestrictionManager();
     this.#requestIdGenerator = new DefaultRequestIdGenerator();
   }
+  // region Logger ////
   setLogger(logger) {
     this._logger = logger;
     this.#restrictionManager.setLogger(this.getLogger());
@@ -1354,18 +1371,38 @@ class Http {
     }
     return this._logger;
   }
+  getSystemLogger() {
+    if (null === this._loggerSystem) {
+      this._loggerSystem = LoggerBrowser.build(`SystemLogger`);
+      this._loggerSystem.setConfig({
+        [LoggerType.desktop]: false,
+        [LoggerType.log]: false,
+        [LoggerType.info]: true,
+        [LoggerType.warn]: true,
+        [LoggerType.error]: true,
+        [LoggerType.trace]: false
+      });
+    }
+    return this._loggerSystem;
+  }
+  // endregion ////
+  // region RestrictionManager ////
   setRestrictionManagerParams(params) {
     this.#restrictionManager.params = params;
   }
   getRestrictionManagerParams() {
     return this.#restrictionManager.params;
   }
+  // endregion ////
+  // region LogTag ////
   setLogTag(logTag) {
     this.#logTag = logTag;
   }
   clearLogTag() {
     this.#logTag = "";
   }
+  // endregion ////
+  // region Actions Call ////
   async batch(calls, isHaltOnError = true) {
     const isArrayMode = Array.isArray(calls);
     const cmd = isArrayMode ? [] : {};
@@ -1382,7 +1419,7 @@ class Http {
       }
       if (method) {
         cnt++;
-        const data = method + "?" + qs.stringify(params);
+        const data = method + "?" + qs__namespace.stringify(params);
         if (isArrayMode || Array.isArray(cmd)) {
           cmd.push(data);
         } else {
@@ -1430,7 +1467,7 @@ class Http {
             },
             {
               method: q[0] || "",
-              params: qs.parse(q[1] || ""),
+              params: qs__namespace.parse(q[1] || ""),
               start: 0
             },
             response.getStatus()
@@ -1454,7 +1491,7 @@ class Http {
           status: 0,
           answerError: {
             error: result2.getErrorMessages().join("; "),
-            errorDescription: `batch ${result2.getQuery().method}: ${qs.stringify(result2.getQuery().params, { encode: false })}`
+            errorDescription: `batch ${result2.getQuery().method}: ${qs__namespace.stringify(result2.getQuery().params, { encode: false })}`
           },
           cause: result2.getErrors().next().value
         });
@@ -1507,6 +1544,9 @@ class Http {
       authData = await this.#authActions.refreshAuth();
     }
     await this.#restrictionManager.check();
+    if (this.#isClientSideWarning && !this.isServerSide() && Type.isStringFilled(this.#clientSideWarningMessage)) {
+      this.getSystemLogger().warn(this.#clientSideWarningMessage);
+    }
     return this.#clientAxios.post(
       this.#prepareMethod(method),
       this.#prepareParams(authData, params, start)
@@ -1590,6 +1630,8 @@ class Http {
       return Promise.resolve(result);
     });
   }
+  // endregion ////
+  // region Prepare ////
   /**
    * Processes function parameters and adds authorization
    *
@@ -1605,7 +1647,7 @@ class Http {
       result.logTag = this.#logTag;
     }
     result[this.#requestIdGenerator.getQueryStringParameterName()] = this.#requestIdGenerator.getRequestId();
-    result[this.#requestIdGenerator.getQueryStringSdkParameterName()] = "0.1.3";
+    result[this.#requestIdGenerator.getQueryStringSdkParameterName()] = "0.1.5";
     if (!!result.data && !!result.data.start) {
       delete result.data.start;
     }
@@ -1624,6 +1666,24 @@ class Http {
   #prepareMethod(method) {
     return `${encodeURIComponent(method)}.json`;
   }
+  /**
+   * @inheritDoc
+   */
+  setClientSideWarning(value, message) {
+    this.#isClientSideWarning = value;
+    this.#clientSideWarningMessage = message;
+  }
+  // endregion ////
+  // region Tools ////
+  /**
+   * Tests whether the code is executed on the client side
+   * @return {boolean}
+   * @protected
+   */
+  isServerSide() {
+    return Type.isUndefined(window);
+  }
+  // endregion ////
 }
 
 class AbstractB24 {
@@ -2678,6 +2738,10 @@ class B24Hook extends AbstractB24 {
       this.#authHookManager,
       this._getHttpOptions()
     );
+    this._http.setClientSideWarning(
+      true,
+      "It is not safe to use hook requests on the client side"
+    );
     this._isInit = true;
   }
   setLogger(logger) {
@@ -2688,6 +2752,12 @@ class B24Hook extends AbstractB24 {
     return this.#authHookManager;
   }
   // region Core ////
+  /**
+   * Disables warning about client-side query execution
+   */
+  offClientSideWarning() {
+    this.getHttpClient().setClientSideWarning(false, "");
+  }
   // endregion ////
   // region Get ////
   /**