@wazo/sdk 0.37.20 → 0.37.21

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 (110) hide show
  1. package/dist/wazo-sdk.js +5 -5
  2. package/esm/__tests__/api-client.test.js +44 -5
  3. package/esm/__tests__/web-rtc-client.test.js +70 -15
  4. package/esm/api/agentd.js +25 -2
  5. package/esm/api/amid.js +25 -2
  6. package/esm/api/application.js +25 -2
  7. package/esm/api/auth.js +25 -2
  8. package/esm/api/call-logd.js +25 -2
  9. package/esm/api/calld.js +25 -2
  10. package/esm/api/chatd.js +25 -2
  11. package/esm/api/confd.js +44 -5
  12. package/esm/api/ctid-ng.js +25 -2
  13. package/esm/api/dird.js +25 -2
  14. package/esm/api/webhookd.js +25 -2
  15. package/esm/api-client.js +44 -5
  16. package/esm/checker/Checker.js +72 -15
  17. package/esm/checker/checks/aor.js +44 -5
  18. package/esm/checker/checks/api.js +44 -5
  19. package/esm/checker/checks/index.js +72 -15
  20. package/esm/checker/checks/wazo-websocket.js +27 -2
  21. package/esm/checker/checks/webrtc-transport.js +70 -15
  22. package/esm/checker/checks/webrtc.js +70 -15
  23. package/esm/domain/AdHocAPIConference.js +44 -5
  24. package/esm/domain/Features.js +44 -5
  25. package/esm/domain/Meeting.js +14 -1
  26. package/esm/domain/Phone/CTIPhone.js +44 -5
  27. package/esm/domain/Phone/WebRTCPhone.js +32 -3
  28. package/esm/index.js +85 -16
  29. package/esm/lib/WazoSessionDescriptionHandler.js +25 -2
  30. package/esm/service/CallApi.js +44 -5
  31. package/esm/service/IssueReporter.js +25 -2
  32. package/esm/service/__tests__/IssueReporter.test.js +25 -2
  33. package/esm/service/getApiClient.js +44 -5
  34. package/esm/simple/Auth.js +85 -16
  35. package/esm/simple/Configuration.js +85 -16
  36. package/esm/simple/Directory.js +44 -5
  37. package/esm/simple/Phone.js +85 -16
  38. package/esm/simple/Websocket.js +28 -2
  39. package/esm/simple/index.js +85 -16
  40. package/esm/simple/room/LocalParticipant.js +85 -16
  41. package/esm/simple/room/Participant.js +85 -16
  42. package/esm/simple/room/RemoteParticipant.js +85 -16
  43. package/esm/simple/room/Room.js +85 -16
  44. package/esm/simple/room/SipRoom.js +85 -16
  45. package/esm/simple/room/Stream.js +85 -16
  46. package/esm/simple/room/__tests__/RemoteParticipant.test.js +85 -16
  47. package/esm/simple/utils.js +85 -16
  48. package/esm/utils/__tests__/api-requester.test.js +25 -2
  49. package/esm/utils/api-requester.js +25 -2
  50. package/esm/web-rtc-client.js +70 -15
  51. package/esm/websocket-client.js +28 -3
  52. package/lib/__tests__/api-client.test.js +44 -5
  53. package/lib/__tests__/web-rtc-client.test.js +70 -15
  54. package/lib/api/agentd.js +25 -2
  55. package/lib/api/amid.js +25 -2
  56. package/lib/api/application.js +25 -2
  57. package/lib/api/auth.js +25 -2
  58. package/lib/api/call-logd.js +25 -2
  59. package/lib/api/calld.js +25 -2
  60. package/lib/api/chatd.js +25 -2
  61. package/lib/api/confd.js +44 -5
  62. package/lib/api/ctid-ng.js +25 -2
  63. package/lib/api/dird.js +25 -2
  64. package/lib/api/webhookd.js +25 -2
  65. package/lib/api-client.js +44 -5
  66. package/lib/checker/Checker.js +72 -15
  67. package/lib/checker/checks/aor.js +44 -5
  68. package/lib/checker/checks/api.js +44 -5
  69. package/lib/checker/checks/index.js +72 -15
  70. package/lib/checker/checks/wazo-websocket.js +27 -2
  71. package/lib/checker/checks/webrtc-transport.js +70 -15
  72. package/lib/checker/checks/webrtc.js +70 -15
  73. package/lib/domain/AdHocAPIConference.js +44 -5
  74. package/lib/domain/Features.js +44 -5
  75. package/lib/domain/Meeting.js +14 -1
  76. package/lib/domain/Phone/CTIPhone.js +44 -5
  77. package/lib/domain/Phone/WebRTCPhone.js +32 -3
  78. package/lib/index.js +85 -16
  79. package/lib/lib/WazoSessionDescriptionHandler.js +25 -2
  80. package/lib/service/CallApi.js +44 -5
  81. package/lib/service/IssueReporter.js +25 -2
  82. package/lib/service/__tests__/IssueReporter.test.js +25 -2
  83. package/lib/service/getApiClient.js +44 -5
  84. package/lib/simple/Auth.js +85 -16
  85. package/lib/simple/Configuration.js +85 -16
  86. package/lib/simple/Directory.js +44 -5
  87. package/lib/simple/Phone.js +85 -16
  88. package/lib/simple/Websocket.js +28 -2
  89. package/lib/simple/index.js +85 -16
  90. package/lib/simple/room/LocalParticipant.js +85 -16
  91. package/lib/simple/room/Participant.js +85 -16
  92. package/lib/simple/room/RemoteParticipant.js +85 -16
  93. package/lib/simple/room/Room.js +85 -16
  94. package/lib/simple/room/SipRoom.js +85 -16
  95. package/lib/simple/room/Stream.js +85 -16
  96. package/lib/simple/room/__tests__/RemoteParticipant.test.js +85 -16
  97. package/lib/simple/utils.js +85 -16
  98. package/lib/utils/__tests__/api-requester.test.js +25 -2
  99. package/lib/utils/api-requester.js +25 -2
  100. package/lib/web-rtc-client.js +70 -15
  101. package/lib/websocket-client.js +28 -2
  102. package/package.json +1 -1
  103. package/src/api/confd.js +5 -2
  104. package/src/domain/Meeting.js +14 -1
  105. package/src/domain/Phone/WebRTCPhone.js +7 -1
  106. package/src/service/IssueReporter.js +25 -2
  107. package/src/simple/Phone.js +5 -0
  108. package/src/types/WebSocketMessage.js +5 -1
  109. package/src/web-rtc-client.js +26 -10
  110. package/src/websocket-client.js +2 -0
@@ -130,6 +130,7 @@ class IssueReporter {
130
130
 
131
131
 
132
132
 
133
+
133
134
 
134
135
  constructor() {
135
136
  addLevelsTo(this);
@@ -141,12 +142,17 @@ class IssueReporter {
141
142
  this.bufferTimeout = null;
142
143
  this._boundProcessBuffer = this._processBuffer.bind(this);
143
144
  this._boundParseLoggerBody = this._parseLoggerBody.bind(this);
145
+ this._callback = null;
144
146
  }
145
147
 
146
148
  init() {
147
149
  this._catchConsole();
148
150
  }
149
151
 
152
+ setCallback(cb ) {
153
+ this._callback = cb;
154
+ }
155
+
150
156
  configureRemoteClient(configuration = { tag: 'wazo-sdk', host: null, port: null, level: null, extra: {} }) {
151
157
  this.remoteClientConfiguration = configuration;
152
158
  }
@@ -182,6 +188,7 @@ class IssueReporter {
182
188
 
183
189
  // Handle category label
184
190
  let category = null;
191
+ let skipSendToRemote = false;
185
192
  let extra = {};
186
193
  if (args[0].indexOf(CATEGORY_PREFIX) === 0) {
187
194
  category = args[0].split('=')[1];
@@ -197,6 +204,7 @@ class IssueReporter {
197
204
  errorMessage: lastArg.message,
198
205
  errorStack: lastArg.stack,
199
206
  errorType: lastArg.constructor.name,
207
+ skipSendToRemote: lastArg.skipSendToRemote,
200
208
  };
201
209
  } else {
202
210
  extra = lastArg;
@@ -205,6 +213,11 @@ class IssueReporter {
205
213
  args.splice(1, 1);
206
214
  }
207
215
 
216
+ if (extra.skipSendToRemote) {
217
+ skipSendToRemote = true;
218
+ delete extra.skipSendToRemote;
219
+ }
220
+
208
221
  const date = moment().format('YYYY-MM-DD HH:mm:ss.SSS');
209
222
  const message = args.join(', ');
210
223
  let consoleMessage = message;
@@ -225,7 +238,13 @@ class IssueReporter {
225
238
  const oldMethod = this.oldConsoleMethods[consoleLevel] || this.oldConsoleMethods.log;
226
239
  oldMethod.apply(oldMethod, [date, consoleMessage]);
227
240
 
228
- this._sendToRemoteLogger(level, { date, message, category, ...extra });
241
+ if (this._callback) {
242
+ this._callback(level, consoleMessage);
243
+ }
244
+
245
+ if (!skipSendToRemote) {
246
+ this._sendToRemoteLogger(level, { date, message, category, ...extra });
247
+ }
229
248
  }
230
249
 
231
250
  logRequest(url , options , response , start ) {
@@ -370,7 +389,11 @@ class IssueReporter {
370
389
  },
371
390
  // $FlowFixMe
372
391
  body,
373
- }).catch(() => {
392
+ }).catch((e ) => {
393
+ // $FlowFixMe
394
+ e.skipSendToRemote = true;
395
+ this.log('error', this._makeCategory('grafana'), 'Sending log to grafana, error', e);
396
+
374
397
  setTimeout(() => {
375
398
  if (isArray) {
376
399
  payload = payload.map(message => {
@@ -2614,11 +2637,24 @@ class Meeting {
2614
2637
  });
2615
2638
  }
2616
2639
 
2640
+ static parseMany(items ) {
2641
+ return items.map(plain => Meeting.parse(plain));
2642
+ }
2643
+
2617
2644
  static newFrom(meeting ) {
2618
2645
  return newFrom(meeting, Meeting);
2619
2646
  }
2620
2647
 
2621
- constructor({ uuid, name, guestSipAuthorization, ownerUuids, port, uri, number, persistent } = {}) {
2648
+ constructor({
2649
+ uuid,
2650
+ name,
2651
+ guestSipAuthorization,
2652
+ ownerUuids,
2653
+ port,
2654
+ uri,
2655
+ number,
2656
+ persistent,
2657
+ } = {}) {
2622
2658
  this.guestSipAuthorization = guestSipAuthorization;
2623
2659
  this.uri = uri;
2624
2660
  this.name = name;
@@ -2704,8 +2740,11 @@ var confdMethods = (client , baseUrl ) => ({
2704
2740
  }
2705
2741
  },
2706
2742
 
2707
- createMyMeeting: (name ) =>
2708
- client.post(`${baseUrl}/users/me/meetings`, { name }).then(Meeting.parse),
2743
+ getMyMeetings: () =>
2744
+ client.get(`${baseUrl}/users/me/meetings`).then(response => Meeting.parseMany(response.items)),
2745
+
2746
+ createMyMeeting: (name , persistent ) =>
2747
+ client.post(`${baseUrl}/users/me/meetings`, { name, persistent }).then(Meeting.parse),
2709
2748
 
2710
2749
  deleteMyMeeting: (meetingUuid ) =>
2711
2750
  client.delete(`${baseUrl}/users/me/meetings/${meetingUuid}`, null),
@@ -412,6 +412,7 @@ class IssueReporter {
412
412
 
413
413
 
414
414
 
415
+
415
416
 
416
417
  constructor() {
417
418
  addLevelsTo(this);
@@ -423,12 +424,17 @@ class IssueReporter {
423
424
  this.bufferTimeout = null;
424
425
  this._boundProcessBuffer = this._processBuffer.bind(this);
425
426
  this._boundParseLoggerBody = this._parseLoggerBody.bind(this);
427
+ this._callback = null;
426
428
  }
427
429
 
428
430
  init() {
429
431
  this._catchConsole();
430
432
  }
431
433
 
434
+ setCallback(cb ) {
435
+ this._callback = cb;
436
+ }
437
+
432
438
  configureRemoteClient(configuration = { tag: 'wazo-sdk', host: null, port: null, level: null, extra: {} }) {
433
439
  this.remoteClientConfiguration = configuration;
434
440
  }
@@ -464,6 +470,7 @@ class IssueReporter {
464
470
 
465
471
  // Handle category label
466
472
  let category = null;
473
+ let skipSendToRemote = false;
467
474
  let extra = {};
468
475
  if (args[0].indexOf(CATEGORY_PREFIX) === 0) {
469
476
  category = args[0].split('=')[1];
@@ -479,6 +486,7 @@ class IssueReporter {
479
486
  errorMessage: lastArg.message,
480
487
  errorStack: lastArg.stack,
481
488
  errorType: lastArg.constructor.name,
489
+ skipSendToRemote: lastArg.skipSendToRemote,
482
490
  };
483
491
  } else {
484
492
  extra = lastArg;
@@ -487,6 +495,11 @@ class IssueReporter {
487
495
  args.splice(1, 1);
488
496
  }
489
497
 
498
+ if (extra.skipSendToRemote) {
499
+ skipSendToRemote = true;
500
+ delete extra.skipSendToRemote;
501
+ }
502
+
490
503
  const date = moment().format('YYYY-MM-DD HH:mm:ss.SSS');
491
504
  const message = args.join(', ');
492
505
  let consoleMessage = message;
@@ -507,7 +520,13 @@ class IssueReporter {
507
520
  const oldMethod = this.oldConsoleMethods[consoleLevel] || this.oldConsoleMethods.log;
508
521
  oldMethod.apply(oldMethod, [date, consoleMessage]);
509
522
 
510
- this._sendToRemoteLogger(level, { date, message, category, ...extra });
523
+ if (this._callback) {
524
+ this._callback(level, consoleMessage);
525
+ }
526
+
527
+ if (!skipSendToRemote) {
528
+ this._sendToRemoteLogger(level, { date, message, category, ...extra });
529
+ }
511
530
  }
512
531
 
513
532
  logRequest(url , options , response , start ) {
@@ -652,7 +671,11 @@ class IssueReporter {
652
671
  },
653
672
  // $FlowFixMe
654
673
  body,
655
- }).catch(() => {
674
+ }).catch((e ) => {
675
+ // $FlowFixMe
676
+ e.skipSendToRemote = true;
677
+ this.log('error', this._makeCategory('grafana'), 'Sending log to grafana, error', e);
678
+
656
679
  setTimeout(() => {
657
680
  if (isArray) {
658
681
  payload = payload.map(message => {
@@ -3195,11 +3218,24 @@ class Meeting {
3195
3218
  });
3196
3219
  }
3197
3220
 
3221
+ static parseMany(items ) {
3222
+ return items.map(plain => Meeting.parse(plain));
3223
+ }
3224
+
3198
3225
  static newFrom(meeting ) {
3199
3226
  return newFrom(meeting, Meeting);
3200
3227
  }
3201
3228
 
3202
- constructor({ uuid, name, guestSipAuthorization, ownerUuids, port, uri, number, persistent } = {}) {
3229
+ constructor({
3230
+ uuid,
3231
+ name,
3232
+ guestSipAuthorization,
3233
+ ownerUuids,
3234
+ port,
3235
+ uri,
3236
+ number,
3237
+ persistent,
3238
+ } = {}) {
3203
3239
  this.guestSipAuthorization = guestSipAuthorization;
3204
3240
  this.uri = uri;
3205
3241
  this.name = name;
@@ -3285,8 +3321,11 @@ var confdMethods = (client , baseUrl ) => ({
3285
3321
  }
3286
3322
  },
3287
3323
 
3288
- createMyMeeting: (name ) =>
3289
- client.post(`${baseUrl}/users/me/meetings`, { name }).then(Meeting.parse),
3324
+ getMyMeetings: () =>
3325
+ client.get(`${baseUrl}/users/me/meetings`).then(response => Meeting.parseMany(response.items)),
3326
+
3327
+ createMyMeeting: (name , persistent ) =>
3328
+ client.post(`${baseUrl}/users/me/meetings`, { name, persistent }).then(Meeting.parse),
3290
3329
 
3291
3330
  deleteMyMeeting: (meetingUuid ) =>
3292
3331
  client.delete(`${baseUrl}/users/me/meetings/${meetingUuid}`, null),
@@ -5698,7 +5737,9 @@ class WebRTCClient extends Emitter {
5698
5737
  const inviteOptions = {
5699
5738
  requestDelegate: {
5700
5739
  onAccept: (response ) => {
5701
- session.sessionDescriptionHandler.peerConnection.sfu = conference;
5740
+ if (session.sessionDescriptionHandler.peerConnection) {
5741
+ session.sessionDescriptionHandler.peerConnection.sfu = conference;
5742
+ }
5702
5743
  this._onAccepted(session, response.session, true);
5703
5744
  },
5704
5745
  onReject: (response ) => {
@@ -6570,6 +6611,16 @@ class WebRTCClient extends Emitter {
6570
6611
  return this.hasRemoteVideo(sessionId) ? this.getRemoteStream(sessionId) : null;
6571
6612
  }
6572
6613
 
6614
+ // Useful in a react-native environment when remoteMediaStream is not updated
6615
+ getRemoteVideoStreamFromPc(sessionId ) {
6616
+ const pc = this.getPeerConnection(sessionId);
6617
+ if (!pc) {
6618
+ return null;
6619
+ }
6620
+
6621
+ return pc.getRemoteStreams().find(stream => !!stream.getVideoTracks().length);
6622
+ }
6623
+
6573
6624
  hasVideo(sessionId ) {
6574
6625
  return this.hasLocalVideo(sessionId) || this.hasRemoteVideo(sessionId);
6575
6626
  }
@@ -7348,18 +7399,22 @@ class WebRTCClient extends Emitter {
7348
7399
  });
7349
7400
 
7350
7401
  networkStats.packetsLost = packetsLost;
7351
- networkStats.audioBytesSent = audioBytesSent;
7402
+ networkStats.totalAudioBytesSent = audioBytesSent;
7403
+ networkStats.audioBytesSent = audioBytesSent - lastAudioSent;
7404
+ networkStats.totalAudioBytesReceived = audioBytesReceived - lastAudioReceived;
7352
7405
  networkStats.audioBytesReceived = audioBytesReceived;
7353
- networkStats.videoBytesSent = videoBytesSent;
7354
- networkStats.videoBytesReceived = videoBytesReceived;
7406
+ networkStats.totalVideoBytesSent = videoBytesSent;
7407
+ networkStats.videoBytesSent = videoBytesSent - lastVideoSent;
7408
+ networkStats.totalVideoBytesReceived = videoBytesReceived;
7409
+ networkStats.videoBytesReceived = videoBytesReceived - lastVideoReceived;
7410
+ networkStats.totalTransportSent = transportSent - lastTransportSent;
7355
7411
  networkStats.transportSent = transportSent;
7356
- networkStats.transportReceived = transportReceived;
7357
-
7358
- const bandwidth = (networkStats.audioBytesSent - lastAudioSent) + (networkStats.videoBytesSent - lastVideoSent)
7359
- + (networkStats.audioBytesReceived - lastAudioReceived) + (networkStats.videoBytesReceived - lastVideoReceived)
7360
- + (networkStats.transportReceived - lastTransportReceived) + (networkStats.transportSent - lastTransportSent);
7412
+ networkStats.totalTransportReceived = transportReceived;
7413
+ networkStats.transportReceived = transportReceived - lastTransportReceived;
7361
7414
 
7362
- networkStats.bandwidth = bandwidth;
7415
+ networkStats.bandwidth = networkStats.audioBytesSent + networkStats.audioBytesReceived
7416
+ + networkStats.videoBytesSent + networkStats.videoBytesReceived + networkStats.transportReceived
7417
+ + networkStats.transportSent;
7363
7418
 
7364
7419
  this.eventEmitter.emit(ON_NETWORK_STATS, session, networkStats, this.sessionNetworkStats[sessionId]);
7365
7420
  this.sessionNetworkStats[sessionId].push(networkStats);
package/esm/api/agentd.js CHANGED
@@ -126,6 +126,7 @@ class IssueReporter {
126
126
 
127
127
 
128
128
 
129
+
129
130
 
130
131
  constructor() {
131
132
  addLevelsTo(this);
@@ -137,12 +138,17 @@ class IssueReporter {
137
138
  this.bufferTimeout = null;
138
139
  this._boundProcessBuffer = this._processBuffer.bind(this);
139
140
  this._boundParseLoggerBody = this._parseLoggerBody.bind(this);
141
+ this._callback = null;
140
142
  }
141
143
 
142
144
  init() {
143
145
  this._catchConsole();
144
146
  }
145
147
 
148
+ setCallback(cb ) {
149
+ this._callback = cb;
150
+ }
151
+
146
152
  configureRemoteClient(configuration = { tag: 'wazo-sdk', host: null, port: null, level: null, extra: {} }) {
147
153
  this.remoteClientConfiguration = configuration;
148
154
  }
@@ -178,6 +184,7 @@ class IssueReporter {
178
184
 
179
185
  // Handle category label
180
186
  let category = null;
187
+ let skipSendToRemote = false;
181
188
  let extra = {};
182
189
  if (args[0].indexOf(CATEGORY_PREFIX) === 0) {
183
190
  category = args[0].split('=')[1];
@@ -193,6 +200,7 @@ class IssueReporter {
193
200
  errorMessage: lastArg.message,
194
201
  errorStack: lastArg.stack,
195
202
  errorType: lastArg.constructor.name,
203
+ skipSendToRemote: lastArg.skipSendToRemote,
196
204
  };
197
205
  } else {
198
206
  extra = lastArg;
@@ -201,6 +209,11 @@ class IssueReporter {
201
209
  args.splice(1, 1);
202
210
  }
203
211
 
212
+ if (extra.skipSendToRemote) {
213
+ skipSendToRemote = true;
214
+ delete extra.skipSendToRemote;
215
+ }
216
+
204
217
  const date = moment().format('YYYY-MM-DD HH:mm:ss.SSS');
205
218
  const message = args.join(', ');
206
219
  let consoleMessage = message;
@@ -221,7 +234,13 @@ class IssueReporter {
221
234
  const oldMethod = this.oldConsoleMethods[consoleLevel] || this.oldConsoleMethods.log;
222
235
  oldMethod.apply(oldMethod, [date, consoleMessage]);
223
236
 
224
- this._sendToRemoteLogger(level, { date, message, category, ...extra });
237
+ if (this._callback) {
238
+ this._callback(level, consoleMessage);
239
+ }
240
+
241
+ if (!skipSendToRemote) {
242
+ this._sendToRemoteLogger(level, { date, message, category, ...extra });
243
+ }
225
244
  }
226
245
 
227
246
  logRequest(url , options , response , start ) {
@@ -366,7 +385,11 @@ class IssueReporter {
366
385
  },
367
386
  // $FlowFixMe
368
387
  body,
369
- }).catch(() => {
388
+ }).catch((e ) => {
389
+ // $FlowFixMe
390
+ e.skipSendToRemote = true;
391
+ this.log('error', this._makeCategory('grafana'), 'Sending log to grafana, error', e);
392
+
370
393
  setTimeout(() => {
371
394
  if (isArray) {
372
395
  payload = payload.map(message => {
package/esm/api/amid.js CHANGED
@@ -65,6 +65,7 @@ class IssueReporter {
65
65
 
66
66
 
67
67
 
68
+
68
69
 
69
70
  constructor() {
70
71
  addLevelsTo(this);
@@ -76,12 +77,17 @@ class IssueReporter {
76
77
  this.bufferTimeout = null;
77
78
  this._boundProcessBuffer = this._processBuffer.bind(this);
78
79
  this._boundParseLoggerBody = this._parseLoggerBody.bind(this);
80
+ this._callback = null;
79
81
  }
80
82
 
81
83
  init() {
82
84
  this._catchConsole();
83
85
  }
84
86
 
87
+ setCallback(cb ) {
88
+ this._callback = cb;
89
+ }
90
+
85
91
  configureRemoteClient(configuration = { tag: 'wazo-sdk', host: null, port: null, level: null, extra: {} }) {
86
92
  this.remoteClientConfiguration = configuration;
87
93
  }
@@ -117,6 +123,7 @@ class IssueReporter {
117
123
 
118
124
  // Handle category label
119
125
  let category = null;
126
+ let skipSendToRemote = false;
120
127
  let extra = {};
121
128
  if (args[0].indexOf(CATEGORY_PREFIX) === 0) {
122
129
  category = args[0].split('=')[1];
@@ -132,6 +139,7 @@ class IssueReporter {
132
139
  errorMessage: lastArg.message,
133
140
  errorStack: lastArg.stack,
134
141
  errorType: lastArg.constructor.name,
142
+ skipSendToRemote: lastArg.skipSendToRemote,
135
143
  };
136
144
  } else {
137
145
  extra = lastArg;
@@ -140,6 +148,11 @@ class IssueReporter {
140
148
  args.splice(1, 1);
141
149
  }
142
150
 
151
+ if (extra.skipSendToRemote) {
152
+ skipSendToRemote = true;
153
+ delete extra.skipSendToRemote;
154
+ }
155
+
143
156
  const date = moment().format('YYYY-MM-DD HH:mm:ss.SSS');
144
157
  const message = args.join(', ');
145
158
  let consoleMessage = message;
@@ -160,7 +173,13 @@ class IssueReporter {
160
173
  const oldMethod = this.oldConsoleMethods[consoleLevel] || this.oldConsoleMethods.log;
161
174
  oldMethod.apply(oldMethod, [date, consoleMessage]);
162
175
 
163
- this._sendToRemoteLogger(level, { date, message, category, ...extra });
176
+ if (this._callback) {
177
+ this._callback(level, consoleMessage);
178
+ }
179
+
180
+ if (!skipSendToRemote) {
181
+ this._sendToRemoteLogger(level, { date, message, category, ...extra });
182
+ }
164
183
  }
165
184
 
166
185
  logRequest(url , options , response , start ) {
@@ -305,7 +324,11 @@ class IssueReporter {
305
324
  },
306
325
  // $FlowFixMe
307
326
  body,
308
- }).catch(() => {
327
+ }).catch((e ) => {
328
+ // $FlowFixMe
329
+ e.skipSendToRemote = true;
330
+ this.log('error', this._makeCategory('grafana'), 'Sending log to grafana, error', e);
331
+
309
332
  setTimeout(() => {
310
333
  if (isArray) {
311
334
  payload = payload.map(message => {
@@ -126,6 +126,7 @@ class IssueReporter {
126
126
 
127
127
 
128
128
 
129
+
129
130
 
130
131
  constructor() {
131
132
  addLevelsTo(this);
@@ -137,12 +138,17 @@ class IssueReporter {
137
138
  this.bufferTimeout = null;
138
139
  this._boundProcessBuffer = this._processBuffer.bind(this);
139
140
  this._boundParseLoggerBody = this._parseLoggerBody.bind(this);
141
+ this._callback = null;
140
142
  }
141
143
 
142
144
  init() {
143
145
  this._catchConsole();
144
146
  }
145
147
 
148
+ setCallback(cb ) {
149
+ this._callback = cb;
150
+ }
151
+
146
152
  configureRemoteClient(configuration = { tag: 'wazo-sdk', host: null, port: null, level: null, extra: {} }) {
147
153
  this.remoteClientConfiguration = configuration;
148
154
  }
@@ -178,6 +184,7 @@ class IssueReporter {
178
184
 
179
185
  // Handle category label
180
186
  let category = null;
187
+ let skipSendToRemote = false;
181
188
  let extra = {};
182
189
  if (args[0].indexOf(CATEGORY_PREFIX) === 0) {
183
190
  category = args[0].split('=')[1];
@@ -193,6 +200,7 @@ class IssueReporter {
193
200
  errorMessage: lastArg.message,
194
201
  errorStack: lastArg.stack,
195
202
  errorType: lastArg.constructor.name,
203
+ skipSendToRemote: lastArg.skipSendToRemote,
196
204
  };
197
205
  } else {
198
206
  extra = lastArg;
@@ -201,6 +209,11 @@ class IssueReporter {
201
209
  args.splice(1, 1);
202
210
  }
203
211
 
212
+ if (extra.skipSendToRemote) {
213
+ skipSendToRemote = true;
214
+ delete extra.skipSendToRemote;
215
+ }
216
+
204
217
  const date = moment().format('YYYY-MM-DD HH:mm:ss.SSS');
205
218
  const message = args.join(', ');
206
219
  let consoleMessage = message;
@@ -221,7 +234,13 @@ class IssueReporter {
221
234
  const oldMethod = this.oldConsoleMethods[consoleLevel] || this.oldConsoleMethods.log;
222
235
  oldMethod.apply(oldMethod, [date, consoleMessage]);
223
236
 
224
- this._sendToRemoteLogger(level, { date, message, category, ...extra });
237
+ if (this._callback) {
238
+ this._callback(level, consoleMessage);
239
+ }
240
+
241
+ if (!skipSendToRemote) {
242
+ this._sendToRemoteLogger(level, { date, message, category, ...extra });
243
+ }
225
244
  }
226
245
 
227
246
  logRequest(url , options , response , start ) {
@@ -366,7 +385,11 @@ class IssueReporter {
366
385
  },
367
386
  // $FlowFixMe
368
387
  body,
369
- }).catch(() => {
388
+ }).catch((e ) => {
389
+ // $FlowFixMe
390
+ e.skipSendToRemote = true;
391
+ this.log('error', this._makeCategory('grafana'), 'Sending log to grafana, error', e);
392
+
370
393
  setTimeout(() => {
371
394
  if (isArray) {
372
395
  payload = payload.map(message => {
package/esm/api/auth.js CHANGED
@@ -127,6 +127,7 @@ class IssueReporter {
127
127
 
128
128
 
129
129
 
130
+
130
131
 
131
132
  constructor() {
132
133
  addLevelsTo(this);
@@ -138,12 +139,17 @@ class IssueReporter {
138
139
  this.bufferTimeout = null;
139
140
  this._boundProcessBuffer = this._processBuffer.bind(this);
140
141
  this._boundParseLoggerBody = this._parseLoggerBody.bind(this);
142
+ this._callback = null;
141
143
  }
142
144
 
143
145
  init() {
144
146
  this._catchConsole();
145
147
  }
146
148
 
149
+ setCallback(cb ) {
150
+ this._callback = cb;
151
+ }
152
+
147
153
  configureRemoteClient(configuration = { tag: 'wazo-sdk', host: null, port: null, level: null, extra: {} }) {
148
154
  this.remoteClientConfiguration = configuration;
149
155
  }
@@ -179,6 +185,7 @@ class IssueReporter {
179
185
 
180
186
  // Handle category label
181
187
  let category = null;
188
+ let skipSendToRemote = false;
182
189
  let extra = {};
183
190
  if (args[0].indexOf(CATEGORY_PREFIX) === 0) {
184
191
  category = args[0].split('=')[1];
@@ -194,6 +201,7 @@ class IssueReporter {
194
201
  errorMessage: lastArg.message,
195
202
  errorStack: lastArg.stack,
196
203
  errorType: lastArg.constructor.name,
204
+ skipSendToRemote: lastArg.skipSendToRemote,
197
205
  };
198
206
  } else {
199
207
  extra = lastArg;
@@ -202,6 +210,11 @@ class IssueReporter {
202
210
  args.splice(1, 1);
203
211
  }
204
212
 
213
+ if (extra.skipSendToRemote) {
214
+ skipSendToRemote = true;
215
+ delete extra.skipSendToRemote;
216
+ }
217
+
205
218
  const date = moment().format('YYYY-MM-DD HH:mm:ss.SSS');
206
219
  const message = args.join(', ');
207
220
  let consoleMessage = message;
@@ -222,7 +235,13 @@ class IssueReporter {
222
235
  const oldMethod = this.oldConsoleMethods[consoleLevel] || this.oldConsoleMethods.log;
223
236
  oldMethod.apply(oldMethod, [date, consoleMessage]);
224
237
 
225
- this._sendToRemoteLogger(level, { date, message, category, ...extra });
238
+ if (this._callback) {
239
+ this._callback(level, consoleMessage);
240
+ }
241
+
242
+ if (!skipSendToRemote) {
243
+ this._sendToRemoteLogger(level, { date, message, category, ...extra });
244
+ }
226
245
  }
227
246
 
228
247
  logRequest(url , options , response , start ) {
@@ -367,7 +386,11 @@ class IssueReporter {
367
386
  },
368
387
  // $FlowFixMe
369
388
  body,
370
- }).catch(() => {
389
+ }).catch((e ) => {
390
+ // $FlowFixMe
391
+ e.skipSendToRemote = true;
392
+ this.log('error', this._makeCategory('grafana'), 'Sending log to grafana, error', e);
393
+
371
394
  setTimeout(() => {
372
395
  if (isArray) {
373
396
  payload = payload.map(message => {
@@ -66,6 +66,7 @@ class IssueReporter {
66
66
 
67
67
 
68
68
 
69
+
69
70
 
70
71
  constructor() {
71
72
  addLevelsTo(this);
@@ -77,12 +78,17 @@ class IssueReporter {
77
78
  this.bufferTimeout = null;
78
79
  this._boundProcessBuffer = this._processBuffer.bind(this);
79
80
  this._boundParseLoggerBody = this._parseLoggerBody.bind(this);
81
+ this._callback = null;
80
82
  }
81
83
 
82
84
  init() {
83
85
  this._catchConsole();
84
86
  }
85
87
 
88
+ setCallback(cb ) {
89
+ this._callback = cb;
90
+ }
91
+
86
92
  configureRemoteClient(configuration = { tag: 'wazo-sdk', host: null, port: null, level: null, extra: {} }) {
87
93
  this.remoteClientConfiguration = configuration;
88
94
  }
@@ -118,6 +124,7 @@ class IssueReporter {
118
124
 
119
125
  // Handle category label
120
126
  let category = null;
127
+ let skipSendToRemote = false;
121
128
  let extra = {};
122
129
  if (args[0].indexOf(CATEGORY_PREFIX) === 0) {
123
130
  category = args[0].split('=')[1];
@@ -133,6 +140,7 @@ class IssueReporter {
133
140
  errorMessage: lastArg.message,
134
141
  errorStack: lastArg.stack,
135
142
  errorType: lastArg.constructor.name,
143
+ skipSendToRemote: lastArg.skipSendToRemote,
136
144
  };
137
145
  } else {
138
146
  extra = lastArg;
@@ -141,6 +149,11 @@ class IssueReporter {
141
149
  args.splice(1, 1);
142
150
  }
143
151
 
152
+ if (extra.skipSendToRemote) {
153
+ skipSendToRemote = true;
154
+ delete extra.skipSendToRemote;
155
+ }
156
+
144
157
  const date = moment().format('YYYY-MM-DD HH:mm:ss.SSS');
145
158
  const message = args.join(', ');
146
159
  let consoleMessage = message;
@@ -161,7 +174,13 @@ class IssueReporter {
161
174
  const oldMethod = this.oldConsoleMethods[consoleLevel] || this.oldConsoleMethods.log;
162
175
  oldMethod.apply(oldMethod, [date, consoleMessage]);
163
176
 
164
- this._sendToRemoteLogger(level, { date, message, category, ...extra });
177
+ if (this._callback) {
178
+ this._callback(level, consoleMessage);
179
+ }
180
+
181
+ if (!skipSendToRemote) {
182
+ this._sendToRemoteLogger(level, { date, message, category, ...extra });
183
+ }
165
184
  }
166
185
 
167
186
  logRequest(url , options , response , start ) {
@@ -306,7 +325,11 @@ class IssueReporter {
306
325
  },
307
326
  // $FlowFixMe
308
327
  body,
309
- }).catch(() => {
328
+ }).catch((e ) => {
329
+ // $FlowFixMe
330
+ e.skipSendToRemote = true;
331
+ this.log('error', this._makeCategory('grafana'), 'Sending log to grafana, error', e);
332
+
310
333
  setTimeout(() => {
311
334
  if (isArray) {
312
335
  payload = payload.map(message => {