@bitrix24/b24jssdk 0.1.7 → 0.2.0

package/dist/commonjs/index.cjs

@@ -1,5 +1,5 @@
 /**
- * @version @bitrix24/b24jssdk v0.1.7
+ * @version @bitrix24/b24jssdk v0.2.0
  * @copyright (c) 2025 Bitrix24
  * @licence MIT
  * @links https://github.com/bitrix24/b24jssdk - GitHub
@@ -679,7 +679,6 @@ class TextManager {
       return str;
     }
     const matches = str.match(
-      // eslint-disable-next-line
       /[A-Z]{2,}(?=[A-Z][a-z]+[0-9]*|\b)|[A-Z]?[a-z]+[0-9]*|[A-Z]|[0-9]+/g
     );
     if (!matches) {
@@ -1048,75 +1047,42 @@ var RpcMethod = /* @__PURE__ */ ((RpcMethod2) => {
 })(RpcMethod || {});
 
 class Result {
-  _errorCollection;
+  _errors;
   _data;
-  constructor() {
-    this._errorCollection = /* @__PURE__ */ new Set();
-    this._data = null;
+  constructor(data) {
+    this._errors = /* @__PURE__ */ new Map();
+    this._data = data ?? null;
   }
-  /**
-   * Getter for the `isSuccess` property.
-   * Checks if the `_errorCollection` is empty to determine success.
-   *
-   * @returns Whether the operation resulted in success (no errors).
-   */
   get isSuccess() {
-    return this._errorCollection.size === 0;
+    return this._errors.size === 0;
+  }
+  get errors() {
+    return this._errors;
   }
-  /**
-   * Sets the data associated with the result.
-   *
-   * @param data The data to be stored in the result.
-   * @returns The current Result object for chaining methods.
-   */
   setData(data) {
     this._data = data;
     return this;
   }
-  /**
-   * Retrieves the data associated with the result.
-   *
-   * @returns The data stored in the result, if any.
-   */
   getData() {
     return this._data;
   }
-  /**
-   * Adds an error message or Error object to the result.
-   *
-   * @param error The error message or Error object to be added.
-   * @returns The current Result object for chaining methods.
-   */
-  addError(error) {
-    if (error instanceof Error) {
-      this._errorCollection.add(error);
-    } else {
-      this._errorCollection.add(new Error(error.toString()));
-    }
+  addError(error, key) {
+    const errorKey = key ?? Text.getUuidRfc4122();
+    const errorObj = typeof error === "string" ? new Error(error) : error;
+    this._errors.set(errorKey, errorObj);
     return this;
   }
-  /**
-   * Adds multiple errors to the result in a single call.
-   *
-   * @param errors An array of errors or strings that will be converted to errors.
-   * @returns The current Result object for chaining methods.
-   */
   addErrors(errors) {
     for (const error of errors) {
-      if (error instanceof Error) {
-        this._errorCollection.add(error);
-      } else {
-        this._errorCollection.add(new Error(error.toString()));
-      }
+      this.addError(error);
     }
     return this;
   }
-  /**
-   * Retrieves an iterator for the errors collected in the result.
-   * @returns An iterator over the stored Error objects.
-   */
   getErrors() {
-    return this._errorCollection.values();
+    return this._errors.values();
+  }
+  hasError(key) {
+    return this._errors.has(key);
   }
   /**
    * Retrieves an array of error messages from the collected errors.
@@ -1125,7 +1091,7 @@ class Result {
    *          contains the message of a corresponding error object.
    */
   getErrorMessages() {
-    return [...this.getErrors()].map((error) => error.message);
+    return Array.from(this._errors.values(), (e) => e.message);
   }
   /**
    * Converts the Result object to a string.
@@ -1133,36 +1099,168 @@ class Result {
    * @returns {string} Returns a string representation of the result operation
    */
   toString() {
-    if (this.isSuccess) {
-      return `Result (success): data: ${JSON.stringify(this._data)}`;
+    const status = this.isSuccess ? "success" : "failure";
+    const data = this.safeStringify(this._data);
+    return this.isSuccess ? `Result(${status}): ${data}` : `Result(${status}): ${data}
+Errors: ${this.getErrorMessages().join(", ")}`;
+  }
+  safeStringify(data) {
+    try {
+      return JSON.stringify(data, this.replacer, 2);
+    } catch {
+      return "[Unable to serialize data]";
+    }
+  }
+  replacer(_, value) {
+    if (value instanceof Error) {
+      return {
+        name: value.name,
+        message: value.message,
+        stack: value.stack
+      };
     }
-    return `Result (failure): errors: ${this.getErrorMessages().join(", ")}`;
+    return value;
+  }
+  // Static constructors
+  static ok(data) {
+    return new Result(data);
+  }
+  static fail(error, key) {
+    return new Result().addError(error, key);
   }
 }
 
 class AjaxError extends Error {
-  cause;
+  code;
   _status;
-  _answerError;
-  constructor(params) {
-    const message = `${params.answerError.error}${params.answerError.errorDescription ? ": " + params.answerError.errorDescription : ""}`;
+  requestInfo;
+  timestamp;
+  originalError;
+  // override cause: null | Error
+  // private _status: number
+  // private _answerError: AnswerError
+  constructor(details) {
+    const message = AjaxError.formatErrorMessage(details);
     super(message);
-    this.cause = params.cause || null;
-    this.name = this.constructor.name;
-    this._status = params.status;
-    this._answerError = params.answerError;
-  }
+    this.name = "AjaxError";
+    this.code = details.code;
+    this._status = details.status;
+    this.requestInfo = details.requestInfo;
+    this.originalError = details.originalError;
+    this.timestamp = /* @__PURE__ */ new Date();
+    this.cleanErrorStack();
+  }
+  // constructor(params: AjaxErrorParams) {
+  //   const message = `${ params.answerError.error }${
+  //     params.answerError.errorDescription
+  //       ? ': ' + params.answerError.errorDescription
+  //       : ''
+  //   }`
+  //
+  //   super(message)
+  //   this.cause = params.cause || null
+  //   this.name = this.constructor.name
+  //
+  //   this._status = params.status
+  //   this._answerError = params.answerError
+  // }
+  /**
+   * @deprecated
+   */
   get answerError() {
-    return this._answerError;
+    return {
+      error: this.message,
+      errorDescription: ""
+    };
   }
   get status() {
     return this._status;
   }
+  /**
+   * @deprecated
+   */
   set status(status) {
     this._status = status;
   }
+  /**
+   * Creates AjaxError from HTTP response
+   */
+  static fromResponse(response) {
+    return new AjaxError({
+      code: response.data?.error || "unknown_error",
+      description: response.data?.error_description,
+      status: response.status,
+      requestInfo: {
+        method: response.config?.method?.toUpperCase(),
+        url: response.config?.url,
+        params: response.config?.params
+      }
+    });
+  }
+  /**
+   * Creates AjaxError from exception
+   */
+  static fromException(error, context) {
+    if (error instanceof AjaxError) return error;
+    return new AjaxError({
+      code: context?.code || "internal_error",
+      status: context?.status || 500,
+      description: error instanceof Error ? error.message : String(error),
+      requestInfo: context?.requestInfo,
+      originalError: error
+    });
+  }
+  /**
+   * Serializes error for logging and debugging
+   */
+  toJSON() {
+    return {
+      name: this.name,
+      code: this.code,
+      message: this.message,
+      status: this._status,
+      timestamp: this.timestamp.toISOString(),
+      requestInfo: this.requestInfo,
+      stack: this.stack
+    };
+  }
+  // override toString(): string {
+  //   return `${ this.answerError.error }${
+  //     this.answerError.errorDescription
+  //       ? ': ' + this.answerError.errorDescription
+  //       : ''
+  //   } (${ this.status })`
+  // }
+  /**
+   * Formats error information for human-readable output
+   */
   toString() {
-    return `${this.answerError.error}${this.answerError.errorDescription ? ": " + this.answerError.errorDescription : ""} (${this.status})`;
+    let output = `[${this.name}] ${this.code} (${this._status}): ${this.message}`;
+    if (this.requestInfo) {
+      output += `
+Request: ${this.requestInfo.method} ${this.requestInfo.url}`;
+    }
+    if (this.stack) {
+      output += `
+Stack trace:
+${this.stack}`;
+    }
+    return output;
+  }
+  static formatErrorMessage(details) {
+    const parts = [details.code];
+    if (details.description) {
+      parts.push(`- ${details.description}`);
+    }
+    if (details.requestInfo?.method && details.requestInfo.url) {
+      parts.push(`(on ${details.requestInfo.method} ${details.requestInfo.url})`);
+    }
+    return parts.join(" ");
+  }
+  cleanErrorStack() {
+    if (typeof this.stack === "string") {
+      this.stack = this.stack.split("\n").filter((line) => !line.includes("AjaxError.constructor")).join("\n");
+    }
   }
 }
 
@@ -1170,31 +1268,48 @@ class AjaxResult extends Result {
   _status;
   _query;
   _data;
-  constructor(answer, query, status) {
+  constructor(options) {
     super();
-    this._data = answer;
-    this._query = structuredClone(query);
-    this._status = status;
-    if (typeof this._data.error !== "undefined") {
-      const error = typeof this._data.error === "string" ? this._data : this._data.error;
-      this.addError(
-        new AjaxError({
-          status: this._status,
-          answerError: {
-            error: error.error || "",
-            errorDescription: error.error_description || ""
-          }
-        })
-      );
-    }
-  }
-  // @ts-ignore
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  setData(data) {
-    throw new Error("AjaxResult not support setData()");
+    this._data = Object.freeze(options.answer);
+    this._query = Object.freeze(structuredClone(options.query));
+    this._status = options.status;
+    this.#processErrors();
+  }
+  #processErrors() {
+    const { error } = this._data;
+    if (!error) return;
+    const errorParams = this.#normalizeError(error);
+    this.addError(this.#createAjaxError(errorParams), "base-error");
+  }
+  #normalizeError(error) {
+    return typeof error === "string" ? { code: error, description: this._data.error_description || "" } : { code: error.error, description: error.error_description || "" };
+  }
+  #createAjaxError(params) {
+    return new AjaxError({
+      code: String(this._status),
+      description: params.description,
+      status: this._status,
+      requestInfo: {
+        method: this._query.method,
+        // url: '?',
+        params: this._query.params
+      }
+      // request:
+    });
   }
   getData() {
-    return this._data;
+    return Object.freeze({
+      result: this._data.result,
+      next: this._data.next,
+      total: this._data.total,
+      time: this._data.time
+    });
+  }
+  /**
+   * Alias for isMore
+   */
+  hasMore() {
+    return this.isMore();
   }
   isMore() {
     return Type.isNumber(this._data?.next);
@@ -1208,16 +1323,35 @@ class AjaxResult extends Result {
   getQuery() {
     return this._query;
   }
-  async getNext(http) {
-    if (this.isMore() && this.isSuccess) {
-      this._query.start = Number.parseInt(this._data?.next);
-      return http.call(
-        this._query.method,
-        this._query.params,
-        this._query.start
-      );
+  /**
+   * Alias for getNext
+   * @param http
+   */
+  async fetchNext(http) {
+    const data = await this.getNext(http);
+    if (data === false) {
+      return null;
     }
-    return Promise.resolve(false);
+    return data;
+  }
+  async getNext(http) {
+    if (!this.isMore() || !this.isSuccess) return false;
+    const nextPageQuery = this.#buildNextPageQuery();
+    return http.call(
+      nextPageQuery.method,
+      nextPageQuery.params,
+      nextPageQuery.start
+    );
+  }
+  #buildNextPageQuery() {
+    return {
+      ...this._query,
+      start: Text.toInteger(this._data.next)
+    };
+  }
+  // Immutable API
+  setData() {
+    throw new ReferenceError("AjaxResult does not allow data modification");
   }
 }
 
@@ -1404,33 +1538,37 @@ class Http {
   // endregion ////
   // region Actions Call ////
   async batch(calls, isHaltOnError = true) {
-    const isArrayMode = Array.isArray(calls);
-    const cmd = isArrayMode ? [] : {};
+    if (Array.isArray(calls)) {
+      return this.#batchAsArray(
+        calls,
+        isHaltOnError
+      );
+    }
+    return this.#batchAsObject(
+      calls,
+      isHaltOnError
+    );
+  }
+  async #batchAsObject(calls, isHaltOnError = true) {
+    const cmd = {};
     let cnt = 0;
     const processRow = (row, index) => {
       let method = null;
       let params = null;
-      if (Array.isArray(row)) {
-        method = row[0];
-        params = row[1];
-      } else if (row.method) {
-        method = row.method;
-        params = row.params;
+      if (row.method) {
+        method = row.method ?? null;
+        params = row?.params ?? null;
+      } else if (Array.isArray(row) && row.length > 0) {
+        method = row[0] ?? null;
+        params = row[1] ?? null;
       }
       if (method) {
         cnt++;
-        const data = method + "?" + qs__namespace.stringify(params);
-        if (isArrayMode || Array.isArray(cmd)) {
-          cmd.push(data);
-        } else {
-          cmd[index] = data;
-        }
+        cmd[index] = method + "?" + qs__namespace.stringify(params);
       }
     };
-    if (isArrayMode) {
-      for (const [index, item] of calls.entries()) processRow(item, index);
-    } else {
-      for (const [index, item] of Object.entries(calls)) processRow(item, index);
+    for (const [index, row] of Object.entries(calls)) {
+      processRow(row, index);
     }
     if (cnt < 1) {
       return Promise.resolve(new Result());
@@ -1440,7 +1578,7 @@ class Http {
       cmd
     }).then((response) => {
       const responseResult = response.getData().result;
-      const results = isArrayMode ? [] : {};
+      const results = {};
       const processResponse = (row, index) => {
         if (
           // @ts-ignore
@@ -1448,8 +1586,8 @@ class Http {
           typeof responseResult.result_error[index] !== "undefined"
         ) {
           const q = row.split("?");
-          const data = new AjaxResult(
-            {
+          results[index] = new AjaxResult({
+            answer: {
               // @ts-ignore
               result: Type.isUndefined(responseResult.result[index]) ? (
                 // @ts-ignore
@@ -1463,67 +1601,154 @@ class Http {
               // @ts-ignore
               total: responseResult.result_total[index],
               // @ts-ignore
-              next: responseResult.result_next[index]
+              next: responseResult.result_next[index],
+              // @todo test this ////
+              // @ts-ignore
+              time: responseResult.result_time[index]
             },
-            {
+            query: {
               method: q[0] || "",
               params: qs__namespace.parse(q[1] || ""),
               start: 0
             },
-            response.getStatus()
-          );
-          if (isArrayMode || Array.isArray(results)) {
-            results.push(data);
-          } else {
-            results[index] = data;
-          }
+            status: response.getStatus()
+          });
         }
       };
-      if (Array.isArray(cmd)) {
-        for (const [index, item] of cmd.entries()) processResponse(item, index);
-      } else {
-        for (const [index, item] of Object.entries(cmd))
-          processResponse(item, index);
+      for (const [index, row] of Object.entries(cmd)) {
+        processResponse(row, index);
       }
-      let dataResult;
+      const dataResult = {};
       const initError = (result2) => {
+        if (result2.hasError("base-error")) {
+          return result2.errors.get("base-error");
+        }
         return new AjaxError({
+          code: "0",
+          description: result2.getErrorMessages().join("; "),
           status: 0,
-          answerError: {
-            error: result2.getErrorMessages().join("; "),
-            errorDescription: `batch ${result2.getQuery().method}: ${qs__namespace.stringify(result2.getQuery().params, { encode: false })}`
+          requestInfo: {
+            method: result2.getQuery().method,
+            params: result2.getQuery().params
           },
-          cause: result2.getErrors().next().value
+          originalError: result2.getErrors().next().value
         });
       };
       const result = new Result();
-      if (isArrayMode || Array.isArray(results)) {
-        dataResult = [];
-        for (const data of results) {
-          if (data.getStatus() !== 200 || !data.isSuccess) {
-            const error = initError(data);
-            if (!isHaltOnError && !data.isSuccess) {
-              result.addError(error);
-              continue;
-            }
-            return Promise.reject(error);
+      for (const key of Object.keys(results)) {
+        const data = results[key];
+        if (data.getStatus() !== 200 || !data.isSuccess) {
+          const error = initError(data);
+          if (!isHaltOnError && !data.isSuccess) {
+            result.addError(error, key);
+            continue;
           }
-          dataResult.push(data.getData().result);
+          return Promise.reject(error);
         }
-      } else {
-        dataResult = {};
-        for (const key of Object.keys(results)) {
-          const data = results[key];
-          if (data.getStatus() !== 200 || !data.isSuccess) {
-            const error = initError(data);
-            if (!isHaltOnError && !data.isSuccess) {
-              result.addError(error);
-              continue;
-            }
-            return Promise.reject(error);
+        dataResult[key] = data.getData().result;
+      }
+      result.setData(dataResult);
+      return Promise.resolve(result);
+    });
+  }
+  async #batchAsArray(calls, isHaltOnError = true) {
+    const cmd = [];
+    let cnt = 0;
+    const processRow = (row) => {
+      let method = null;
+      let params = null;
+      if (row.method) {
+        method = row.method ?? null;
+        params = row?.params ?? null;
+      } else if (Array.isArray(row) && row.length > 0) {
+        method = row[0] ?? null;
+        params = row[1] ?? null;
+      }
+      if (method) {
+        cnt++;
+        const data = method + "?" + qs__namespace.stringify(params);
+        cmd.push(data);
+      }
+    };
+    for (const [_, row] of calls.entries()) {
+      processRow(row);
+    }
+    if (cnt < 1) {
+      return Promise.resolve(new Result());
+    }
+    return this.call("batch", {
+      halt: isHaltOnError ? 1 : 0,
+      cmd
+    }).then((response) => {
+      const responseResult = response.getData().result;
+      const results = [];
+      const processResponse = (row, index) => {
+        if (
+          // @ts-ignore
+          typeof responseResult.result[index] !== "undefined" || // @ts-ignore
+          typeof responseResult.result_error[index] !== "undefined"
+        ) {
+          const q = row.split("?");
+          const data = new AjaxResult({
+            answer: {
+              // @ts-ignore
+              result: Type.isUndefined(responseResult.result[index]) ? (
+                // @ts-ignore
+                {}
+              ) : (
+                // @ts-ignore
+                responseResult.result[index]
+              ),
+              // @ts-ignore
+              error: responseResult?.result_error[index] || void 0,
+              // @ts-ignore
+              total: responseResult.result_total[index],
+              // @ts-ignore
+              next: responseResult.result_next[index],
+              // @todo test this ////
+              // @ts-ignore
+              time: responseResult.result_time[index]
+            },
+            query: {
+              method: q[0] || "",
+              params: qs__namespace.parse(q[1] || ""),
+              start: 0
+            },
+            status: response.getStatus()
+          });
+          results.push(data);
+        }
+      };
+      for (const [index, row] of cmd.entries()) {
+        processResponse(row, index);
+      }
+      const dataResult = [];
+      const initError = (result2) => {
+        if (result2.hasError("base-error")) {
+          return result2.errors.get("base-error");
+        }
+        return new AjaxError({
+          code: "0",
+          description: result2.getErrorMessages().join("; "),
+          status: 0,
+          requestInfo: {
+            method: result2.getQuery().method,
+            params: result2.getQuery().params
+          },
+          originalError: result2.getErrors().next().value
+        });
+      };
+      const result = new Result();
+      for (const data of results) {
+        if (data.getStatus() !== 200 || !data.isSuccess) {
+          const error = initError(data);
+          if (!isHaltOnError && !data.isSuccess) {
+            result.addError(error);
+            continue;
           }
-          dataResult[key] = data.getData().result;
+          return Promise.reject(error);
         }
+        dataResult.push(data.getData().result);
       }
       result.setData(dataResult);
       return Promise.resolve(result);
@@ -1571,9 +1796,14 @@ class Http {
           };
         }
         const problemError = new AjaxError({
+          code: String(answerError.error),
+          description: answerError.errorDescription,
           status: error_.response?.status || 0,
-          answerError,
-          cause: error_
+          requestInfo: {
+            method,
+            params
+          },
+          originalError: error_
         });
         if (problemError.status === 401 && ["expired_token", "invalid_token"].includes(
           problemError.answerError.error
@@ -1607,9 +1837,14 @@ class Http {
                 };
               }
               const problemError2 = new AjaxError({
-                status: error__.response?.status || 0,
-                answerError: answerError2,
-                cause: error__
+                code: String(answerError2.error),
+                description: answerError2.errorDescription,
+                status: error_.response?.status || 0,
+                requestInfo: {
+                  method,
+                  params
+                },
+                originalError: error__
               });
               return Promise.reject(problemError2);
             }
@@ -1618,15 +1853,15 @@ class Http {
         return Promise.reject(problemError);
       }
     ).then((response) => {
-      const result = new AjaxResult(
-        response.payload,
-        {
+      const result = new AjaxResult({
+        answer: response.payload,
+        query: {
           method,
           params,
           start
         },
-        response.status
-      );
+        status: response.status
+      });
       return Promise.resolve(result);
     });
   }
@@ -1647,7 +1882,7 @@ class Http {
       result.logTag = this.#logTag;
     }
     result[this.#requestIdGenerator.getQueryStringParameterName()] = this.#requestIdGenerator.getRequestId();
-    result[this.#requestIdGenerator.getQueryStringSdkParameterName()] = "0.1.7";
+    result[this.#requestIdGenerator.getQueryStringSdkParameterName()] = "0.2.0";
     if (!!result.data && !!result.data.start) {
       delete result.data.start;
     }
@@ -11619,7 +11854,7 @@ class PullClient {
     }
     if (message.extra.server_time_unix) {
       message.extra.server_time_ago = (Date.now() - message.extra.server_time_unix * 1e3) / 1e3 - (this._config?.server.timeShift || 0);
-      message.extra.server_time_ago = message.extra.server_time_ago > 0 ? message.extra.server_time_ago : 0;
+      message.extra.server_time_ago = Math.max(message.extra.server_time_ago, 0);
     }
     this.logMessage(message);
     try {
@@ -12685,7 +12920,7 @@ Data string: ${pullEvent}
   }
   trimDuplicates() {
     if (this._session.lastMessageIds.length > MAX_IDS_TO_STORE) {
-      this._session.lastMessageIds = this._session.lastMessageIds.slice(-MAX_IDS_TO_STORE);
+      this._session.lastMessageIds = this._session.lastMessageIds.slice(-10);
     }
   }
   // endregion ////
@@ -12763,19 +12998,19 @@ Data string: ${pullEvent}
    * @deprecated
    */
   /*/
-  	getRestClientOptions()
-  	{
-  		let result = {};
+    getRestClientOptions()
+    {
+      let result = {};
   
-  		if (this.guestMode && this.guestUserId !== 0)
-  		{
-  			result.queryParams = {
-  				pull_guest_id: this.guestUserId
-  			}
-  		}
-  		return result;
-  	}
-  	//*/
+      if (this.guestMode && this.guestUserId !== 0)
+      {
+        result.queryParams = {
+          pull_guest_id: this.guestUserId
+        }
+      }
+      return result;
+    }
+    //*/
   // endregion ////
 }