@slavmak2486/bx24ts 1.2.15 → 1.2.16

package/BX24Dev.ts

@@ -43,7 +43,9 @@ export class BX24Dev extends BX24Server{
                 this.doInit();
             })
             .catch((error:Error)=>{
+              if (this.logger){
                 this.logger.error(error);
+              }
             });
         }
         else{            

package/BX24Hook.ts

@@ -1,11 +1,11 @@
 import { baseBX24 } from "./base/BX24";
-import { logger } from "./types/authBaseServe";
+import { Logger } from "./types/authBaseServe";
 import { getAuth } from "./types/getAuth";
 
 export class Bx24Hook extends baseBX24{
     declare url:string;
 
-    logger=console;
+    logger:Logger|null=null;
 
     constructor(url:string){
         super();
@@ -14,28 +14,36 @@ export class Bx24Hook extends baseBX24{
     }
 
     refreshAuth(cb?: ((params: any) => void) | undefined): void {
+      if (this.logger){
         this.logger?.log('Dont use refresh auth for Bx24Hook');
-        if (cb) cb(this.getAuth());
+      }
+      if (cb) cb(this.getAuth());
     }
 
     refreshAuthAsync(): Promise<getAuth> {
         return new Promise(reject=>{
+          if (this.logger){
             this.logger?.log('Dont use refresh auth for Bx24Hook');
-            reject({
-                access_token:'',
-                domain:this.url,
-                expires_in:0,
-                member_id:'',
-                refresh_token:''
-            });
+          }  
+          reject({
+              access_token:'',
+              domain:this.url,
+              expires_in:0,
+              member_id:'',
+              refresh_token:''
+          });
         });
     }
 
     runCallback(e: MessageEvent<any>): void {
+      if (this.logger){
         this.logger?.log('Dont use runCallback for Bx24Hook', e);
+      }
     }
 
     sendMessage(cmd: string, params: any, cb?: ((params: any) => void) | undefined): void {
+      if (this.logger){
         this.logger?.log('Dont use sendMessage for Bx24Hook', [cmd, params, cb]);
+      }
     }
 }

package/BX24Server.ts

@@ -1,5 +1,5 @@
 import { baseBX24 } from "./base/BX24";
-import { AuthBaseServe, logger } from "./types/authBaseServe";
+import { AuthBaseServe, Logger } from "./types/authBaseServe";
 import {getAuth} from './types/getAuth';
 import { CallResult } from "./callResult";
 import { BitrixEvent } from "./types/bitrixEvent";
@@ -7,7 +7,7 @@ import { BitrixEvent } from "./types/bitrixEvent";
 
 export class BX24Server extends baseBX24{
 
-    logger:logger=console;
+    logger:Logger|null=null;
 
     constructor(param: AuthBaseServe){
         super();
@@ -142,7 +142,9 @@ export class BX24Server extends baseBX24{
     }
 
     runCallback(e:MessageEvent){
+      if (this.logger){
         this.logger.debug('callBack not allowed in server!', e);
+      }
     }
 
     onRefresh(cb:(params:getAuth)=>void){
@@ -155,7 +157,7 @@ export class BX24Server extends baseBX24{
             if (cb) cb(newAuth);
         })
         .catch(err=>{
-            throw new Error(String(err));
+            if (cb) cb(err);
         });
     }
 
@@ -192,11 +194,13 @@ export class BX24Server extends baseBX24{
 
 
     sendMessage(cmd: string, params: any, cb?: CallableFunction): void {
+      if (this.logger){
         this.logger.log('sendMessage',{
             cmd:cmd,
             params:params,
             cb:cb
         });
-        if (cb) cb();
+      }
+      if (cb) cb();
     }
 }

package/base/BX24.ts

@@ -4,7 +4,7 @@ import { eventElement } from "../types/eventElement";
 import axios, { AxiosError, AxiosRequestConfig, AxiosResponse } from 'axios';
 import { CallResult } from "../callResult";
 import {cloneDeep, get as __get} from 'lodash'
-import { logger } from "../types/authBaseServe";
+import { Logger } from "../types/authBaseServe";
 import { getAuth } from "../types/getAuth";
 
 // проблемы декларирования методов HTMLElement
@@ -54,7 +54,7 @@ export abstract class baseBX24{
     
     arrEvents:eventElement[]=[];
 
-    logger:logger|null=null;
+    logger:Logger|null=null;
 
     isReadyVal=false; //check
 

package/dist/BX24Dev.js

@@ -79,7 +79,9 @@ class BX24Dev extends BX24Server_1.BX24Server {
                 this.doInit();
             })
                 .catch((error) => {
-                this.logger.error(error);
+                if (this.logger) {
+                    this.logger.error(error);
+                }
             });
         }
         else {

package/dist/BX24Hook.js

@@ -5,20 +5,24 @@ const BX24_1 = require("./base/BX24");
 class Bx24Hook extends BX24_1.baseBX24 {
     constructor(url) {
         super();
-        this.logger = console;
+        this.logger = null;
         this.AUTH_EXPIRES = new Date().getTime() + 365 * 24 * 60 * 60 * 1000;
         this.url = url;
     }
     refreshAuth(cb) {
         var _a;
-        (_a = this.logger) === null || _a === void 0 ? void 0 : _a.log('Dont use refresh auth for Bx24Hook');
+        if (this.logger) {
+            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.log('Dont use refresh auth for Bx24Hook');
+        }
         if (cb)
             cb(this.getAuth());
     }
     refreshAuthAsync() {
         return new Promise(reject => {
             var _a;
-            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.log('Dont use refresh auth for Bx24Hook');
+            if (this.logger) {
+                (_a = this.logger) === null || _a === void 0 ? void 0 : _a.log('Dont use refresh auth for Bx24Hook');
+            }
             reject({
                 access_token: '',
                 domain: this.url,
@@ -30,11 +34,15 @@ class Bx24Hook extends BX24_1.baseBX24 {
     }
     runCallback(e) {
         var _a;
-        (_a = this.logger) === null || _a === void 0 ? void 0 : _a.log('Dont use runCallback for Bx24Hook', e);
+        if (this.logger) {
+            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.log('Dont use runCallback for Bx24Hook', e);
+        }
     }
     sendMessage(cmd, params, cb) {
         var _a;
-        (_a = this.logger) === null || _a === void 0 ? void 0 : _a.log('Dont use sendMessage for Bx24Hook', [cmd, params, cb]);
+        if (this.logger) {
+            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.log('Dont use sendMessage for Bx24Hook', [cmd, params, cb]);
+        }
     }
 }
 exports.Bx24Hook = Bx24Hook;

package/dist/BX24Server.js

@@ -7,7 +7,7 @@ class BX24Server extends BX24_1.baseBX24 {
     constructor(param) {
         var _a;
         super();
-        this.logger = console;
+        this.logger = null;
         if (param.auth_connector)
             this.AUTH_CONNECTOR = param.auth_connector;
         if (param.logger)
@@ -107,7 +107,9 @@ class BX24Server extends BX24_1.baseBX24 {
         return result;
     }
     runCallback(e) {
-        this.logger.debug('callBack not allowed in server!', e);
+        if (this.logger) {
+            this.logger.debug('callBack not allowed in server!', e);
+        }
     }
     onRefresh(cb) {
         this.addEvent('refreshAuth', cb);
@@ -119,7 +121,8 @@ class BX24Server extends BX24_1.baseBX24 {
                 cb(newAuth);
         })
             .catch(err => {
-            throw new Error(String(err));
+            if (cb)
+                cb(err);
         });
     }
     refreshAuthAsync() {
@@ -152,11 +155,13 @@ class BX24Server extends BX24_1.baseBX24 {
         });
     }
     sendMessage(cmd, params, cb) {
-        this.logger.log('sendMessage', {
-            cmd: cmd,
-            params: params,
-            cb: cb
-        });
+        if (this.logger) {
+            this.logger.log('sendMessage', {
+                cmd: cmd,
+                params: params,
+                cb: cb
+            });
+        }
         if (cb)
             cb();
     }

package/package.json

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

package/types/authBaseServe.ts

@@ -1,4 +1,4 @@
-export interface logger{
+export interface Logger{
     log(message: any, ...optionalParams: any[]): any;
     error(message: any, ...optionalParams: any[]): any;
     warn(message: any, ...optionalParams: any[]): any;
@@ -17,5 +17,5 @@ export interface AuthBaseServe{
     app?:number;
     isAdmin?:boolean;
     auth_connector?:string;
-    logger?:logger
+    logger?:Logger
 }