@bitrix24/b24jssdk 0.2.3 → 0.4.0

package/dist/esm/index.d.mts

@@ -2825,9 +2825,6 @@ declare class PullClient implements ConnectorParent {
     private _debug;
     private _connectionAttempt;
     private _connectionType;
-    private _reconnectTimeout;
-    private _restartTimeout;
-    private _restoreWebSocketTimeout;
     private _skipStorageInit;
     private _skipCheckRevision;
     private _subscribers;
@@ -2846,6 +2843,9 @@ declare class PullClient implements ConnectorParent {
     /**
      * @depricate
      */
+    private _reconnectTimeout;
+    private _restartTimeout;
+    private _restoreWebSocketTimeout;
     private _checkInterval;
     private _offlineTimeout;
     private _watchUpdateTimeout;

package/dist/esm/index.d.ts

@@ -2825,9 +2825,6 @@ declare class PullClient implements ConnectorParent {
     private _debug;
     private _connectionAttempt;
     private _connectionType;
-    private _reconnectTimeout;
-    private _restartTimeout;
-    private _restoreWebSocketTimeout;
     private _skipStorageInit;
     private _skipCheckRevision;
     private _subscribers;
@@ -2846,6 +2843,9 @@ declare class PullClient implements ConnectorParent {
     /**
      * @depricate
      */
+    private _reconnectTimeout;
+    private _restartTimeout;
+    private _restoreWebSocketTimeout;
     private _checkInterval;
     private _offlineTimeout;
     private _watchUpdateTimeout;

package/dist/esm/index.mjs

@@ -1,11 +1,12 @@
 /**
- * @version @bitrix24/b24jssdk v0.2.3
+ * @version @bitrix24/b24jssdk v0.4.0
  * @copyright (c) 2025 Bitrix24
  * @licence MIT
  * @links https://github.com/bitrix24/b24jssdk - GitHub
  * @links https://bitrix24.github.io/b24jssdk/ - Documentation
  */
 import { DateTime } from 'luxon';
+import { randomFillSync } from 'node:crypto';
 import axios, { AxiosError } from 'axios';
 import * as qs from 'qs-esm';
 
@@ -508,8 +509,36 @@ function isArrayOfArray(item) {
 }
 
 const _state = {};
-let getRandomValues;
-const randoms8 = new Uint8Array(16);
+const isBrowser = typeof window !== "undefined";
+function initRng() {
+  try {
+    const rnds8Pool = new Uint8Array(256);
+    let poolPtr = rnds8Pool.length;
+    return {
+      rng: () => {
+        if (poolPtr > rnds8Pool.length - 16) {
+          randomFillSync(rnds8Pool);
+          poolPtr = 0;
+        }
+        return rnds8Pool.slice(poolPtr, poolPtr += 16);
+      }
+    };
+  } catch {
+    throw new Error("Node.js crypto module not available");
+  }
+}
+function initRngBrowser() {
+  const crypto = window.crypto || window.msCrypto;
+  if (!crypto?.getRandomValues) {
+    throw new Error("Web Crypto API not available");
+  }
+  return {
+    rng: () => {
+      const rnds8 = new Uint8Array(16);
+      return crypto.getRandomValues(rnds8);
+    }
+  };
+}
 const byteToHex = [];
 for (let i = 0; i < 256; ++i) {
   byteToHex.push((i + 256).toString(16).slice(1));
@@ -556,17 +585,19 @@ function v7Bytes(randoms, msecs, seq, buf, offset = 0) {
 function unsafeStringify(arr, offset = 0) {
   return (byteToHex[arr[offset]] + byteToHex[arr[offset + 1]] + byteToHex[arr[offset + 2]] + byteToHex[arr[offset + 3]] + "-" + byteToHex[arr[offset + 4]] + byteToHex[arr[offset + 5]] + "-" + byteToHex[arr[offset + 6]] + byteToHex[arr[offset + 7]] + "-" + byteToHex[arr[offset + 8]] + byteToHex[arr[offset + 9]] + "-" + byteToHex[arr[offset + 10]] + byteToHex[arr[offset + 11]] + byteToHex[arr[offset + 12]] + byteToHex[arr[offset + 13]] + byteToHex[arr[offset + 14]] + byteToHex[arr[offset + 15]]).toLowerCase();
 }
-function uuidv7() {
+function uuidv7Node() {
   const buf = void 0;
   const offset = void 0;
+  let rngFunction;
   const now = Date.now();
-  if (!getRandomValues) {
-    if (typeof crypto === "undefined" || !crypto.getRandomValues) {
-      throw new Error("crypto.getRandomValues() not supported.");
-    }
-    getRandomValues = crypto.getRandomValues.bind(crypto);
+  if (isBrowser) {
+    const { rng } = initRngBrowser();
+    rngFunction = rng;
+  } else {
+    const { rng } = initRng();
+    rngFunction = rng;
   }
-  const randoms = getRandomValues(randoms8);
+  const randoms = rngFunction();
   updateV7State(_state, now, randoms);
   const bytes = v7Bytes(
     randoms,
@@ -618,7 +649,7 @@ class TextManager {
    * @return {string}
    */
   getUuidRfc4122() {
-    return uuidv7();
+    return uuidv7Node();
   }
   /**
    * Encodes all unsafe entities
@@ -1498,13 +1529,17 @@ class RestrictionManager {
 
 const DEFAULT_REQUEST_ID_HEADER_FIELD_NAME = "X-Request-ID";
 const DEFAULT_QUERY_STRING_PARAMETER_NAME = "bx24_request_id";
-const DEFAULT_QUERY_STRING_SDK_PARAMETER_NAME = "bx24_sdk_ver";
+const DEFAULT_QUERY_STRING_SDK_VER_PARAMETER_NAME = "bx24_sdk_ver";
+const DEFAULT_QUERY_STRING_SDK_TYPE_PARAMETER_NAME = "bx24_sdk_type";
 class DefaultRequestIdGenerator {
   getQueryStringParameterName() {
     return DEFAULT_QUERY_STRING_PARAMETER_NAME;
   }
   getQueryStringSdkParameterName() {
-    return DEFAULT_QUERY_STRING_SDK_PARAMETER_NAME;
+    return DEFAULT_QUERY_STRING_SDK_VER_PARAMETER_NAME;
+  }
+  getQueryStringSdkTypeParameterName() {
+    return DEFAULT_QUERY_STRING_SDK_TYPE_PARAMETER_NAME;
   }
   generate() {
     return Text.getUuidRfc4122();
@@ -1529,7 +1564,7 @@ class Http {
   #clientSideWarningMessage = "";
   constructor(baseURL, authActions, options) {
     const defaultHeaders = {
-      // 'X-Sdk': 'b24-js-sdk-v-0.2.3'
+      // 'X-Sdk': 'b24-js-sdk-v-0.4.0'
     };
     this.#clientAxios = axios.create({
       baseURL,
@@ -1938,8 +1973,6 @@ class Http {
     if (this.#logTag.length > 0) {
       result.logTag = this.#logTag;
     }
-    result[this.#requestIdGenerator.getQueryStringParameterName()] = this.#requestIdGenerator.getRequestId();
-    result[this.#requestIdGenerator.getQueryStringSdkParameterName()] = "0.2.3";
     if (!!result.data && !!result.data.start) {
       delete result.data.start;
     }
@@ -1956,7 +1989,13 @@ class Http {
    * @private
    */
   #prepareMethod(method) {
-    return `${encodeURIComponent(method)}.json`;
+    const baseUrl = `${encodeURIComponent(method)}.json`;
+    const queryParams = new URLSearchParams({
+      [this.#requestIdGenerator.getQueryStringParameterName()]: this.#requestIdGenerator.getRequestId(),
+      [this.#requestIdGenerator.getQueryStringSdkParameterName()]: "0.4.0",
+      [this.#requestIdGenerator.getQueryStringSdkTypeParameterName()]: "b24-js-sdk"
+    });
+    return `${baseUrl}?${queryParams.toString()}`;
   }
   /**
    * @inheritDoc
@@ -11073,9 +11112,6 @@ class PullClient {
   _debug = false;
   _connectionAttempt = 0;
   _connectionType = ConnectionType.WebSocket;
-  _reconnectTimeout = null;
-  _restartTimeout = null;
-  _restoreWebSocketTimeout = null;
   _skipStorageInit;
   _skipCheckRevision;
   _subscribers = {};
@@ -11107,6 +11143,9 @@ class PullClient {
    */
   // private _notificationPopup: null = null
   // timers ////
+  _reconnectTimeout = null;
+  _restartTimeout = null;
+  _restoreWebSocketTimeout = null;
   _checkInterval = null;
   _offlineTimeout = null;
   _watchUpdateTimeout = null;
@@ -12402,7 +12441,7 @@ class PullClient {
       return;
     }
     this._restoreWebSocketTimeout = setTimeout(() => {
-      this._restoreWebSocketTimeout = 0;
+      this._restoreWebSocketTimeout = null;
       this.restoreWebSocketConnection();
     }, RESTORE_WEBSOCKET_TIMEOUT * 1e3);
   }