@slavmak2486/bx24ts 1.1.24 → 1.1.26

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/BX24Server.ts +30 -21
  2. package/base/BX24.ts +5 -10
  3. package/dist/BX24Server.js +36 -26
  4. package/dist/base/BX24.js +5 -10
  5. package/package.json +1 -1
package/BX24Server.ts CHANGED
@@ -36,28 +36,37 @@ export class BX24Server extends baseBX24{
36
36
 
37
37
  getOfflineEvents(debug=false, clear=true, authConnector=''):Promise<CallResult>{
38
38
  return new Promise((resolve)=>{
39
- if (debug){
40
- this.callMethod('event.offline.list', {auth_connector:authConnector}, ress=>{
41
- if (ress.error()){
42
- this.logger.error(ress.error(), new Error(ress.error()));
43
- }
44
- if (!ress.answer) ress.answer={};
45
- if (!ress.answer.result) ress.answer.result={};
46
- ress.answer.result={events:this.formatEvents(ress?.answer?.result||[])};
47
- resolve(ress);
48
- });
49
- }
50
- else{
51
- this.callMethod('event.offline.get', {clear:clear?1:0, auth_connector:authConnector}, ress=>{
52
- if (ress.error()){
53
- this.logger.error(ress.error(), new Error(ress.error()));
54
- }
55
- if (!ress.answer) ress.answer={};
56
- if (!ress.answer.result) ress.answer.result={};
57
- ress.answer.result.events=this.formatEvents(ress?.answer?.result?.events||[]);
58
- resolve(ress);
59
- })
39
+ try {
40
+ if (debug){
41
+ this.callMethod('event.offline.list', {auth_connector:authConnector}, ress=>{
42
+ if (ress.error()){
43
+ this.logger.error(ress.error(), new Error(ress.error()));
44
+ }
45
+ if (!ress.answer) ress.answer={};
46
+ if (!ress.answer.result) ress.answer.result={};
47
+ ress.answer.result={events:this.formatEvents(ress?.answer?.result||[])};
48
+ resolve(ress);
49
+ });
50
+ }
51
+ else{
52
+ this.callMethod('event.offline.get', {clear:clear?1:0, auth_connector:authConnector}, ress=>{
53
+ if (ress.error()){
54
+ this.logger.error(ress.error(), new Error(ress.error()));
55
+ }
56
+ if (!ress.answer) ress.answer={};
57
+ if (!ress.answer.result) ress.answer.result={};
58
+ ress.answer.result.events=this.formatEvents(ress?.answer?.result?.events||[]);
59
+ resolve(ress);
60
+ })
61
+ }
62
+ } catch (err) {
63
+ const result=new CallResult({error_description:String(err)}, {
64
+ data:[debug?{auth_connector:authConnector}:{clear:clear?1:0, auth_connector:authConnector}],
65
+ method:debug?'event.offline.list':'event.offline.get'
66
+ },this, 500);
67
+ resolve(result);
60
68
  }
69
+
61
70
  });
62
71
  }
63
72
 
package/base/BX24.ts CHANGED
@@ -494,16 +494,11 @@ export abstract class baseBX24{
494
494
  return cb(res);
495
495
  })
496
496
  .catch(err=>{
497
- if (err instanceof Error){
498
- throw err;
499
- }
500
- else{
501
- cb(new CallResult(err, {
502
- data:params,
503
- method,
504
- callback:cb
505
- }, this, 500));
506
- }
497
+ cb(new CallResult({error_description:String(err)}, {
498
+ data:params,
499
+ method,
500
+ callback:cb
501
+ },this, 500));
507
502
  })
508
503
  }
509
504
  }
package/dist/BX24Server.js CHANGED
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.BX24Server = void 0;
4
4
  const BX24_1 = require("./base/BX24");
5
+ const callResult_1 = require("./callResult");
5
6
  class BX24Server extends BX24_1.baseBX24 {
6
7
  constructor(param) {
7
8
  var _a;
@@ -26,33 +27,42 @@ class BX24Server extends BX24_1.baseBX24 {
26
27
  }
27
28
  getOfflineEvents(debug = false, clear = true, authConnector = '') {
28
29
  return new Promise((resolve) => {
29
- if (debug) {
30
- this.callMethod('event.offline.list', { auth_connector: authConnector }, ress => {
31
- var _a;
32
- if (ress.error()) {
33
- this.logger.error(ress.error(), new Error(ress.error()));
34
- }
35
- if (!ress.answer)
36
- ress.answer = {};
37
- if (!ress.answer.result)
38
- ress.answer.result = {};
39
- ress.answer.result = { events: this.formatEvents(((_a = ress === null || ress === void 0 ? void 0 : ress.answer) === null || _a === void 0 ? void 0 : _a.result) || []) };
40
- resolve(ress);
41
- });
30
+ try {
31
+ if (debug) {
32
+ this.callMethod('event.offline.list', { auth_connector: authConnector }, ress => {
33
+ var _a;
34
+ if (ress.error()) {
35
+ this.logger.error(ress.error(), new Error(ress.error()));
36
+ }
37
+ if (!ress.answer)
38
+ ress.answer = {};
39
+ if (!ress.answer.result)
40
+ ress.answer.result = {};
41
+ ress.answer.result = { events: this.formatEvents(((_a = ress === null || ress === void 0 ? void 0 : ress.answer) === null || _a === void 0 ? void 0 : _a.result) || []) };
42
+ resolve(ress);
43
+ });
44
+ }
45
+ else {
46
+ this.callMethod('event.offline.get', { clear: clear ? 1 : 0, auth_connector: authConnector }, ress => {
47
+ var _a, _b;
48
+ if (ress.error()) {
49
+ this.logger.error(ress.error(), new Error(ress.error()));
50
+ }
51
+ if (!ress.answer)
52
+ ress.answer = {};
53
+ if (!ress.answer.result)
54
+ ress.answer.result = {};
55
+ ress.answer.result.events = this.formatEvents(((_b = (_a = ress === null || ress === void 0 ? void 0 : ress.answer) === null || _a === void 0 ? void 0 : _a.result) === null || _b === void 0 ? void 0 : _b.events) || []);
56
+ resolve(ress);
57
+ });
58
+ }
42
59
  }
43
- else {
44
- this.callMethod('event.offline.get', { clear: clear ? 1 : 0, auth_connector: authConnector }, ress => {
45
- var _a, _b;
46
- if (ress.error()) {
47
- this.logger.error(ress.error(), new Error(ress.error()));
48
- }
49
- if (!ress.answer)
50
- ress.answer = {};
51
- if (!ress.answer.result)
52
- ress.answer.result = {};
53
- ress.answer.result.events = this.formatEvents(((_b = (_a = ress === null || ress === void 0 ? void 0 : ress.answer) === null || _a === void 0 ? void 0 : _a.result) === null || _b === void 0 ? void 0 : _b.events) || []);
54
- resolve(ress);
55
- });
60
+ catch (err) {
61
+ const result = new callResult_1.CallResult({ error_description: String(err) }, {
62
+ data: [debug ? { auth_connector: authConnector } : { clear: clear ? 1 : 0, auth_connector: authConnector }],
63
+ method: debug ? 'event.offline.list' : 'event.offline.get'
64
+ }, this, 500);
65
+ resolve(result);
56
66
  }
57
67
  });
58
68
  }
package/dist/base/BX24.js CHANGED
@@ -421,16 +421,11 @@ class baseBX24 {
421
421
  return cb(res);
422
422
  })
423
423
  .catch(err => {
424
- if (err instanceof Error) {
425
- throw err;
426
- }
427
- else {
428
- cb(new callResult_1.CallResult(err, {
429
- data: params,
430
- method,
431
- callback: cb
432
- }, this, 500));
433
- }
424
+ cb(new callResult_1.CallResult({ error_description: String(err) }, {
425
+ data: params,
426
+ method,
427
+ callback: cb
428
+ }, this, 500));
434
429
  });
435
430
  }
436
431
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@slavmak2486/bx24ts",
3
- "version": "1.1.24",
3
+ "version": "1.1.26",
4
4
  "description": "Library for bitrix24",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",