@slavmak2486/bx24ts 1.2.19 → 1.2.21

package/BX24Server.ts

@@ -159,6 +159,7 @@ export class BX24Server extends baseBX24{
         })
         .catch(err=>{
             if (cb) cb(err);
+            else throw new Error(String(err));
         });
     }
 

package/BatchHelper.ts

@@ -26,7 +26,7 @@ export class BatchHelper{
                     if (!dependencies[parent]) {
                         dependencies[parent] = [];
                     }
-                    dependencies[parent].push(key);
+                    dependencies[parent]!.push(key);
                 })
             }
         }
@@ -66,8 +66,9 @@ export class BatchHelper{
 
             for(const dep of deps){
                 alradyInBatch.push(dep);
-                if (!obj[dep]) continue;
-                currentChunk[dep] = obj[dep];
+                const depValue = obj[dep];
+                if (!depValue) continue;
+                currentChunk[dep] = depValue;
                 currentSize++;
             }
 

package/base/BX24.ts

@@ -1,7 +1,7 @@
 import { type batchCmdElement } from "../types/batchElement";
 import  {type eventElement } from "../types/eventElement";
 
-import axios, { AxiosError, type AxiosRequestConfig, type AxiosResponse } from 'axios';
+import axios, { AxiosError, type AxiosRequestConfig } from 'axios';
 import { CallResult } from "../callResult";
 import {cloneDeep, get as __get} from 'lodash'
 import { type Logger } from "../types/authBaseServe";
@@ -99,7 +99,7 @@ export abstract class baseBX24{
         for (const idx in arrHandler){
             setTimeout(()=>{
               if (!arrHandler[idx]?.handler) return;
-              arrHandler[idx].handler.call(this, params);
+              arrHandler[idx]!.handler.call(this, params);
             }, 10);
         }
     }
@@ -222,11 +222,7 @@ export abstract class baseBX24{
     abstract refreshAuth(cb?:(params:any)=>void):void;
     abstract refreshAuthAsync():Promise<getAuth>;
 
-    protected callSuccess(xhr:AxiosResponse):boolean{
-        return typeof xhr.status=='undefined' || (xhr.status >= 200 && xhr.status < 300) || xhr.status === 304 || xhr.status >= 400 && xhr.status < 500 || xhr.status === 1223 || xhr.status === 0;
-    }
-
-    protected call(url:string, config:{
+    public call(url:string, config:{
         method:string,
         data:any,
         callback?:(params: any)=>void
@@ -246,12 +242,24 @@ export abstract class baseBX24{
             if (this.AUTH_CONNECTOR&&!params.auth_connector){
                 params.auth_connector=this.AUTH_CONNECTOR;
             }
-            const options:AxiosRequestConfig = {
-                method: 'POST',
-                headers: { 'content-type': 'application/x-www-form-urlencoded' },
-                data: this.getHttpString(params),
-                url:url
-            };
+            let options:AxiosRequestConfig;
+            
+            if (config.method.startsWith('api/')){
+                options=options={
+                    method: 'POST',
+                    headers: { 'content-type': 'application/json' },
+                    data: JSON.stringify(params),
+                    url:url
+                };
+            }
+            else{
+                options={
+                    method: 'POST',
+                    headers: { 'content-type': 'application/x-www-form-urlencoded' },
+                    data: this.getHttpString(params),
+                    url:url
+                };
+            } 
 
             if (this.timeoutCall){
                 options.timeout=this.timeoutCall;
@@ -288,15 +296,11 @@ export abstract class baseBX24{
 		: false;
     }
 
-    // callBatch(cmd:batchCmdElement, haltOnError?:boolean):Promise<{[key:string|number]:CallResult}>;
-    // callBatch(cmd:batchCmdElement, cb:(params:{[key:string|number]:CallResult})=>void|boolean, haltOnError?:boolean):void;
-    // callBatch(cmd:batchCmdElement, haltOnError?:boolean):Promise<{[key:string|number]:CallResult}>;
-    // callBatch(cmd:batchCmdElement, cb:(params:{[key:string|number]:CallResult})=>void|boolean, haltOnError?:boolean):void;
-    // callBatch(
-    //         cmd:batchCmdElement, 
-    //         cb?:((params:{[key:string|number]:CallResult})=>void)|boolean, 
-    //         haltOnError=false):void|Promise<{[key:string|number]:CallResult
-    //         }>
+    public setProxyUrl(url:string){
+        if (!url.startsWith('http')) throw new Error('URL INCORRECT. HOT HAVE PROTOCOL');
+        this.url=`${url}/`
+    }
+
     callBatch<T extends batchCmdElement>(cmd:T, haltOnError?:boolean):Promise<{[key in keyof T]:CallResult}>
     callBatch<T extends batchCmdElement>(cmd:T, cb:(params:{[key in keyof T]:CallResult})=>void):void
     callBatch<T extends batchCmdElement>(cmd:T, cb:(params:{[key in keyof T]:CallResult})=>void, haltOnError:boolean):void
@@ -466,7 +470,8 @@ export abstract class baseBX24{
     callMethod(method:string, params:any):Promise<CallResult>;
     callMethod(method:string, params:any, cb?:(params:CallResult)=>void):void;
     callMethod(method:string, params:any, cb?:(params:CallResult)=>void):void|Promise<CallResult>{
-        const url=this.url?`${this.url}${method}.json`:`http${this.PROTOCOL?'s':''}://${this.DOMAIN}${this.PATH}/${method}.json`;
+        const methodToCall=method.startsWith('api/')?method:`${method}.json`;
+        const url=this.url?`${this.url}${methodToCall}`:`http${this.PROTOCOL?'s':''}://${this.DOMAIN}${this.PATH}/${methodToCall}`;
 
         if (!cb){
             if (this.AUTH_EXPIRES<(new Date()).valueOf()){

package/dist/BX24Server.js

@@ -124,6 +124,8 @@ class BX24Server extends BX24_1.baseBX24 {
             .catch(err => {
             if (cb)
                 cb(err);
+            else
+                throw new Error(String(err));
         });
     }
     refreshAuthAsync() {

package/dist/BatchHelper.js

@@ -60,9 +60,10 @@ class BatchHelper {
             const deps = dependencies[key] || [];
             for (const dep of deps) {
                 alradyInBatch.push(dep);
-                if (!obj[dep])
+                const depValue = obj[dep];
+                if (!depValue)
                     continue;
-                currentChunk[dep] = obj[dep];
+                currentChunk[dep] = depValue;
                 currentSize++;
             }
             currentSize++;

package/dist/base/BX24.js

@@ -198,9 +198,6 @@ class baseBX24 {
         }
         return;
     }
-    callSuccess(xhr) {
-        return typeof xhr.status == 'undefined' || (xhr.status >= 200 && xhr.status < 300) || xhr.status === 304 || xhr.status >= 400 && xhr.status < 500 || xhr.status === 1223 || xhr.status === 0;
-    }
     call(url, config) {
         if (this.logger) {
             this.logger.log(`Вызов: ${url}`, {
@@ -214,12 +211,23 @@ class baseBX24 {
             if (this.AUTH_CONNECTOR && !params.auth_connector) {
                 params.auth_connector = this.AUTH_CONNECTOR;
             }
-            const options = {
-                method: 'POST',
-                headers: { 'content-type': 'application/x-www-form-urlencoded' },
-                data: this.getHttpString(params),
-                url: url
-            };
+            let options;
+            if (config.method.startsWith('api/')) {
+                options = options = {
+                    method: 'POST',
+                    headers: { 'content-type': 'application/json' },
+                    data: JSON.stringify(params),
+                    url: url
+                };
+            }
+            else {
+                options = {
+                    method: 'POST',
+                    headers: { 'content-type': 'application/x-www-form-urlencoded' },
+                    data: this.getHttpString(params),
+                    url: url
+                };
+            }
             if (this.timeoutCall) {
                 options.timeout = this.timeoutCall;
             }
@@ -254,6 +262,11 @@ class baseBX24 {
             ? { access_token: this.AUTH_ID, refresh_token: this.REFRESH_ID, expires_in: this.AUTH_EXPIRES, domain: this.DOMAIN, member_id: this.MEMBER_ID }
             : false;
     }
+    setProxyUrl(url) {
+        if (!url.startsWith('http'))
+            throw new Error('URL INCORRECT. HOT HAVE PROTOCOL');
+        this.url = `${url}/`;
+    }
     callBatch(cmd, cb, haltOnError = false) {
         const startCb = cb;
         const startHaltOnError = haltOnError;
@@ -391,7 +404,8 @@ class baseBX24 {
         return result;
     }
     callMethod(method, params, cb) {
-        const url = this.url ? `${this.url}${method}.json` : `http${this.PROTOCOL ? 's' : ''}://${this.DOMAIN}${this.PATH}/${method}.json`;
+        const methodToCall = method.startsWith('api/') ? method : `${method}.json`;
+        const url = this.url ? `${this.url}${methodToCall}` : `http${this.PROTOCOL ? 's' : ''}://${this.DOMAIN}${this.PATH}/${methodToCall}`;
         if (!cb) {
             if (this.AUTH_EXPIRES < (new Date()).valueOf()) {
                 return new Promise((resolve, reject) => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@slavmak2486/bx24ts",
-    "version": "1.2.19",
+    "version": "1.2.21",
     "description": "Library for bitrix24",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",

package/tests/batchHelper.test.ts

@@ -82,21 +82,23 @@ test('real test', async ()=>{
 
     const batchRaw=helper.getArrBatches()[0];
 
+    if (!batchRaw) return;
+
     const result=await bx24.callBatch(batchRaw);
     for (const request in result){
         switch (request) {
             case 'getDeals':
-                expect(result[request].data()).toEqual(batch.result.result.getDeals);
-                expect(result[request].total()).toEqual(batch.result.result_total.getDeals);
-                expect(result[request].error()).toBeUndefined();
+                expect(result[request]!.data()).toEqual(batch.result.result.getDeals);
+                expect(result[request]!.total()).toEqual(batch.result.result_total.getDeals);
+                expect(result[request]!.error()).toBeUndefined();
                 break;
             case 'getLeads':
-                expect(result[request].data()).toEqual(leadList.result);
-                expect(result[request].total()).toEqual(leadList.total);
-                expect(result[request].error()).toBeUndefined();
+                expect(result[request]!.data()).toEqual(leadList.result);
+                expect(result[request]!.total()).toEqual(leadList.total);
+                expect(result[request]!.error()).toBeUndefined();
                 break;
             case 'getByID':{
-                expect(result[request].error()).toEqual({
+                expect(result[request]!.error()).toEqual({
                     status: 200,
                     ex: { error: '', error_description: 'Not found' }
                 });

package/tests/callMethod.test.ts

@@ -1,4 +1,3 @@
-import {BX24Server} from '../index';
 import axios from 'axios';
 import MockAdapter from "axios-mock-adapter";
 import dealList from './mocks/dealList'

package/tests/callMethodCb.test.ts

@@ -1,4 +1,3 @@
-import {BX24Server} from '../index';
 import axios from 'axios';
 import MockAdapter from "axios-mock-adapter";
 import dealList from './mocks/dealList';