@slavmak2486/bx24ts 1.2.19 → 1.2.20

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

@@ -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);
         }
     }
@@ -246,12 +246,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 +300,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 +474,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

@@ -8,65 +8,6 @@ const axios_1 = __importDefault(require("axios"));
 const callResult_1 = require("../callResult");
 const lodash_1 = require("lodash");
 class baseBX24 {
-    getHttpString(value, prefix = '') {
-        if (value instanceof Date) {
-            return prefix + '=' + encodeURIComponent(value.toISOString());
-        }
-        else if (typeof value == 'object') {
-            const resultObj = [];
-            for (const field in value) {
-                resultObj.push(this.getHttpString(value[field], prefix + `${prefix != '' ? '[' : ""}${field}${prefix != '' ? ']' : ''}`));
-            }
-            return resultObj.join('&');
-        }
-        else if (prefix != '') {
-            return encodeURIComponent(prefix) + '=' + encodeURIComponent(value);
-        }
-        return encodeURIComponent(value);
-    }
-    setTimeoutCall(ms) {
-        this.timeoutCall = ms;
-    }
-    clearTimeoutCall() {
-        this.timeoutCall = 0;
-    }
-    isFunction(item) {
-        return item === null ? false : (typeof (item) == "function" || item instanceof Function);
-    }
-    addEvent(event, handler) {
-        this.arrEvents.push({
-            event: event,
-            handler: handler
-        });
-    }
-    emitEvent(event, params) {
-        const arrHandler = this.arrEvents.filter(el => { return el.event == event; });
-        for (const idx in arrHandler) {
-            setTimeout(() => {
-                var _a;
-                if (!((_a = arrHandler[idx]) === null || _a === void 0 ? void 0 : _a.handler))
-                    return;
-                arrHandler[idx].handler.call(this, params);
-            }, 10);
-        }
-    }
-    uniqid() {
-        const charsList = '0123456789abcdefghijklmnopqrstuvwxyz';
-        let s = '';
-        for (let i = 0; i < 32; i++)
-            s += charsList[Math.round(Math.random() * (charsList.length - 1))];
-        return s;
-    }
-    setCallback(cb) {
-        const cbId = this.uniqid();
-        if (cb) {
-            this.cbArray.push({ uid: cbId, cb: cb });
-        }
-        return cbId;
-    }
-    doInit() {
-        this.emitEvent('init', this);
-    }
     constructor() {
         this.cbArray = [];
         this.AUTH_CONNECTOR = "";
@@ -156,6 +97,65 @@ class baseBX24 {
         this.DOMAIN = "";
         this.PROTOCOL = 1;
     }
+    getHttpString(value, prefix = '') {
+        if (value instanceof Date) {
+            return prefix + '=' + encodeURIComponent(value.toISOString());
+        }
+        else if (typeof value == 'object') {
+            const resultObj = [];
+            for (const field in value) {
+                resultObj.push(this.getHttpString(value[field], prefix + `${prefix != '' ? '[' : ""}${field}${prefix != '' ? ']' : ''}`));
+            }
+            return resultObj.join('&');
+        }
+        else if (prefix != '') {
+            return encodeURIComponent(prefix) + '=' + encodeURIComponent(value);
+        }
+        return encodeURIComponent(value);
+    }
+    setTimeoutCall(ms) {
+        this.timeoutCall = ms;
+    }
+    clearTimeoutCall() {
+        this.timeoutCall = 0;
+    }
+    isFunction(item) {
+        return item === null ? false : (typeof (item) == "function" || item instanceof Function);
+    }
+    addEvent(event, handler) {
+        this.arrEvents.push({
+            event: event,
+            handler: handler
+        });
+    }
+    emitEvent(event, params) {
+        const arrHandler = this.arrEvents.filter(el => { return el.event == event; });
+        for (const idx in arrHandler) {
+            setTimeout(() => {
+                var _a;
+                if (!((_a = arrHandler[idx]) === null || _a === void 0 ? void 0 : _a.handler))
+                    return;
+                arrHandler[idx].handler.call(this, params);
+            }, 10);
+        }
+    }
+    uniqid() {
+        const charsList = '0123456789abcdefghijklmnopqrstuvwxyz';
+        let s = '';
+        for (let i = 0; i < 32; i++)
+            s += charsList[Math.round(Math.random() * (charsList.length - 1))];
+        return s;
+    }
+    setCallback(cb) {
+        const cbId = this.uniqid();
+        if (cb) {
+            this.cbArray.push({ uid: cbId, cb: cb });
+        }
+        return cbId;
+    }
+    doInit() {
+        this.emitEvent('init', this);
+    }
     utilReady() {
         if (document.readyState === "complete") {
             return this.runReady();
@@ -214,12 +214,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 +265,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 +407,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.20",
     "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';