@tiledesk/tiledesk-tybot-connector 2.5.0 → 2.6.0

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 (50) hide show
  1. package/CHANGELOG.md +1 -52
  2. package/ExtUtil.js +1 -0
  3. package/TdCache copy.js +242 -0
  4. package/TiledeskExpression.js +1 -6
  5. package/TiledeskWhenExpression.js +1 -18
  6. package/engine/MongodbBotsDataSource.js +1 -3
  7. package/engine/MongodbIntentsMachine.js +2 -3
  8. package/engine/TiledeskChatbot.js +4 -76
  9. package/engine/TiledeskChatbotConst.js +1 -7
  10. package/engine/mock/MockBotsDataSource.js +6 -11
  11. package/index.js +36 -132
  12. package/models/faq_kb.js +0 -11
  13. package/package.json +1 -1
  14. package/services/AIController.js +1 -31
  15. package/services/AIService.js +33 -62
  16. package/services/IntegrationService.js +1 -4
  17. package/services/{LLMService.js → KbService.js} +3 -3
  18. package/services/RequestService.js +2 -23
  19. package/services/TilebotService.js +3 -19
  20. package/tiledeskChatbotPlugs/DirectivesChatbotPlug.js +17 -34
  21. package/tiledeskChatbotPlugs/directives/DirAiCondition.js +51 -18
  22. package/tiledeskChatbotPlugs/directives/DirAiPrompt.js +52 -103
  23. package/tiledeskChatbotPlugs/directives/DirAskGPTV2.js +5 -108
  24. package/tiledeskChatbotPlugs/directives/DirCallSubagent.js +8 -34
  25. package/tiledeskChatbotPlugs/directives/DirCaptureUserReply.js +11 -36
  26. package/tiledeskChatbotPlugs/directives/DirGptTask.js +4 -16
  27. package/tiledeskChatbotPlugs/directives/DirIntent.js +6 -12
  28. package/tiledeskChatbotPlugs/directives/DirIteration.js +10 -63
  29. package/tiledeskChatbotPlugs/directives/DirMoveToAgent.js +16 -69
  30. package/tiledeskChatbotPlugs/directives/DirRemoveCurrentBot.js +2 -40
  31. package/tiledeskChatbotPlugs/directives/DirReply.js +6 -81
  32. package/tiledeskChatbotPlugs/directives/DirReplyV2.js +4 -58
  33. package/tiledeskChatbotPlugs/directives/DirWebRequest.js +0 -8
  34. package/tiledeskChatbotPlugs/directives/DirWebRequestV2.js +1 -11
  35. package/tiledeskChatbotPlugs/directives/DirWebRequestV2_old.js +418 -0
  36. package/tiledeskChatbotPlugs/directives/DirWebResponse.js +2 -5
  37. package/tiledeskChatbotPlugs/directives/Directives.js +0 -6
  38. package/utils/HttpUtils.js +17 -99
  39. package/utils/TiledeskChatbotUtil.js +5 -73
  40. package/utils/winston.js +2 -80
  41. package/services/InternalSubAgentService.js +0 -330
  42. package/tiledeskChatbotPlugs/directives/DirInviteHuman.js +0 -259
  43. package/tiledeskChatbotPlugs/directives/DirInvokeSubAgent.js +0 -345
  44. package/tiledeskChatbotPlugs/directives/DirJSONConditionMulti.js +0 -171
  45. package/tiledeskChatbotPlugs/directives/DirRemoveHuman.js +0 -129
  46. package/tiledeskChatbotPlugs/directives/DirReturn.js +0 -98
  47. package/utils/ConnectorsV3.js +0 -292
  48. package/utils/LlmStream.js +0 -215
  49. package/utils/SentenceChunker.js +0 -94
  50. package/utils/StreamSender.js +0 -109
@@ -0,0 +1,418 @@
1
+ let axios = require('axios');
2
+ let https = require("https");
3
+ const { Filler } = require('../Filler');
4
+ const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
5
+ const { DirIntent } = require('./DirIntent');
6
+
7
+ class DirWebRequestV2 {
8
+ constructor(context) {
9
+ if (!context) {
10
+ throw new Error('context object is mandatory.');
11
+ }
12
+ this.context = context;
13
+ this.tdcache = context.tdcache;
14
+ this.requestId = context.requestId;
15
+ this.chatbot = context.chatbot;
16
+ this.log = context.log;
17
+
18
+ this.intentDir = new DirIntent(context);
19
+ }
20
+
21
+ execute(directive, callback) {
22
+ let action;
23
+ if (directive.action) {
24
+ action = directive.action;
25
+ }
26
+ else {
27
+ console.error("Incorrect directive:", JSON.stringify(directive));
28
+ callback();
29
+ return;
30
+ }
31
+ this.go(action, (stop) => {
32
+ if (this.log) {console.log("(webrequestv2, stop?", stop); }
33
+ callback(stop);
34
+ });
35
+ }
36
+
37
+ async go(action, callback) {
38
+ if (this.log) {console.log("webRequest action:", JSON.stringify(action));}
39
+
40
+ // Condition branches
41
+ let trueIntent = action.trueIntent;
42
+ let falseIntent = action.falseIntent;
43
+ const trueIntentAttributes = action.trueIntentAttributes;
44
+ const falseIntentAttributes = action.falseIntentAttributes;
45
+ let stopOnConditionMet = action.stopOnConditionMet;
46
+ if (trueIntent && trueIntent.trim() === "") {
47
+ trueIntent = null;
48
+ }
49
+ if (falseIntent && falseIntent.trim() === "") {
50
+ falseIntent = null;
51
+ }
52
+
53
+ let requestAttributes = null;
54
+ if (this.tdcache) {
55
+ requestAttributes =
56
+ await TiledeskChatbot.allParametersStatic(
57
+ this.tdcache, this.requestId
58
+ );
59
+ }
60
+ const filler = new Filler();
61
+ const url = filler.fill(action.url, requestAttributes);
62
+
63
+ let headers = {};
64
+ if (action.headersString) {
65
+ let headersDict = action.headersString
66
+ for (const [key, value] of Object.entries(headersDict)) {
67
+ if (this.log) {console.log("header:", key, "value:", value)}
68
+ let filled_value = filler.fill(value, requestAttributes);
69
+ headers[key] = filled_value;
70
+ }
71
+ }
72
+
73
+ let json = null;
74
+ try {
75
+ if (action.jsonBody && action.bodyType == "json") {
76
+ if (this.log) {console.log("action.body is:", action.jsonBody);}
77
+ let jsonBody = filler.fill(action.jsonBody, requestAttributes);
78
+ try {
79
+ json = JSON.parse(jsonBody);
80
+ if (this.log) {console.log("json is:", json);}
81
+ }
82
+ catch(err) {
83
+ console.error("Error parsing webRequest jsonBody:", jsonBody);
84
+ if (callback) {
85
+ if (falseIntent) {
86
+ await this.chatbot.addParameter("flowError", "Error parsing jsonBody");
87
+ this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes, () => {
88
+ console.log('herrrrr 11111' )
89
+ callback(true); // stop the flow
90
+ return;
91
+ });
92
+ }
93
+ else {
94
+ console.log('herrrrr 2222' )
95
+ callback(false); // continue the flow
96
+ return;
97
+ }
98
+ }
99
+ }
100
+ }
101
+ else if (action.formData && action.bodyType == "form-data") {
102
+ let formData = filler.fill(action.formData, requestAttributes);
103
+ if (this.log) {console.log("action.body is form-data:", formData);}
104
+ // // fill
105
+ if (formData && formData.length > 0) {
106
+ for (let i = 0; i < formData.length; i++) {
107
+ let field = formData[i];
108
+ if (field.value) {
109
+ field.value = filler.fill(field.value, requestAttributes);
110
+ if (this.log) {console.log("field filled:", field.value);}
111
+ }
112
+ }
113
+ }
114
+ json = {};
115
+ for (let i = 0; i < formData.length; i++) {
116
+ let field = formData[i];
117
+ if (field.enabled && field.value && field.type === "URL") {
118
+ if (this.log) {console.log("Getting file:", field.value);}
119
+ let response = await axios.get(field.value,
120
+ {
121
+ responseType: 'stream'
122
+ }
123
+ );
124
+ let stream = response.data;
125
+ // if (this.log) {console.log("Stream data:", stream);}
126
+ json[field.name] = stream;
127
+ // process.exit(0);
128
+ }
129
+ else if (field.enabled && field.value && field.type === "Text") {
130
+ json[field.name] = field.value;
131
+ }
132
+ }
133
+ if (this.log) {console.log("final json:", json);}
134
+ }
135
+ else {
136
+ if (this.log) {console.log("no action upload parts");}
137
+ }
138
+
139
+ }
140
+ catch(error) {
141
+ console.error("Error", error);
142
+ if (callback) {
143
+ if (falseIntent) {
144
+ await this.chatbot.addParameter("flowError", "Error: " + error);
145
+ this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes, () => {
146
+ callback(true); // stop the flow
147
+ return;
148
+ });
149
+ }
150
+ else {
151
+ callback(false); // continue the flow
152
+ return;
153
+ }
154
+ }
155
+ }
156
+
157
+
158
+
159
+ let timeout = this.#webrequest_timeout(action, 20000, 1, 300000);
160
+
161
+ if (this.log) {console.log("webRequest URL", url);}
162
+
163
+ const HTTPREQUEST = {
164
+ url: url,
165
+ headers: headers,
166
+ json: json,
167
+ method: action.method,
168
+ timeout: timeout
169
+ };
170
+
171
+ if (this.log) {console.log("webRequest HTTPREQUEST", HTTPREQUEST);}
172
+ this.#myrequest(
173
+ HTTPREQUEST, async (err, res) => {
174
+ if (this.log && err) {
175
+ console.log("webRequest error:", err);
176
+ }
177
+ if (this.log) {console.log("got res:", res);}
178
+ let resbody = res.data;
179
+ let status = res.status;
180
+ let error = res.error;
181
+ await this.#assignAttributes(action, resbody, status, error)
182
+ if (this.log) {console.log("webRequest resbody:", resbody);}
183
+ if (err) {
184
+ if (this.log) {console.error("webRequest error:", err);}
185
+ if (callback) {
186
+ if (falseIntent) {
187
+ this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes, () => {
188
+ callback(true); // stop the flow
189
+ });
190
+ }
191
+ else {
192
+ callback(false); // continue the flow
193
+ }
194
+ }
195
+ }
196
+ else if(res.status >= 200 && res.status <= 299) {
197
+ if (trueIntent) {
198
+ await this.#executeCondition(true, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes, () => {
199
+ callback(true); // stop the flow
200
+ });
201
+ }
202
+ else {
203
+ callback(false); // continue the flow
204
+ }
205
+ }
206
+ else {
207
+ if (falseIntent) {
208
+ this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes, () => {
209
+ callback(true); // stop the flow
210
+ });
211
+ }
212
+ else {
213
+ callback(false); // continue the flow
214
+ }
215
+ }
216
+ }
217
+ );
218
+ }
219
+
220
+ async #executeCondition(result, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes, callback) {
221
+ let trueIntentDirective = null;
222
+ if (trueIntent) {
223
+ trueIntentDirective = DirIntent.intentDirectiveFor(trueIntent, trueIntentAttributes);
224
+ }
225
+ let falseIntentDirective = null;
226
+ if (falseIntent) {
227
+ falseIntentDirective = DirIntent.intentDirectiveFor(falseIntent, falseIntentAttributes);
228
+ }
229
+ if (result === true) {
230
+ if (trueIntentDirective) {
231
+ this.intentDir.execute(trueIntentDirective, () => {
232
+ callback();
233
+ });
234
+ }
235
+ else {
236
+ if (this.log) {console.log("No trueIntentDirective specified");}
237
+ callback();
238
+ }
239
+ }
240
+ else {
241
+ if (falseIntentDirective) {
242
+ this.intentDir.execute(falseIntentDirective, () => {
243
+ callback();
244
+ });
245
+ }
246
+ else {
247
+ if (this.log) {console.log("No falseIntentDirective specified");}
248
+ callback();
249
+ }
250
+ }
251
+ }
252
+
253
+ async #assignAttributes(action, resbody, status, error) {
254
+ if (this.log) {
255
+ console.log("assignAttributes resbody:", resbody)
256
+ console.log("assignAttributes error:", error)
257
+ console.log("assignAttributes status:", status)
258
+ console.log("assignAttributes action:", action)
259
+ }
260
+ if (this.context.tdcache) {
261
+ if (action.assignResultTo && resbody) {
262
+ if (this.log) {console.log("assign assignResultTo:", resbody);}
263
+ await TiledeskChatbot.addParameterStatic(this.context.tdcache, this.context.requestId, action.assignResultTo, resbody);
264
+ }
265
+ if (action.assignErrorTo && error) {
266
+ if (this.log) {console.log("assign assignResultTo:", error);}
267
+ await TiledeskChatbot.addParameterStatic(this.context.tdcache, this.context.requestId, action.assignErrorTo, error);
268
+ }
269
+ if (action.assignStatusTo && status) {
270
+ if (this.log) {console.log("assign assignStatusTo:", status);}
271
+ await TiledeskChatbot.addParameterStatic(this.context.tdcache, this.context.requestId, action.assignStatusTo, status);
272
+ }
273
+ // Debug log
274
+ if (this.log) {
275
+ const all_parameters = await TiledeskChatbot.allParametersStatic(this.context.tdcache, this.context.requestId);
276
+ for (const [key, value] of Object.entries(all_parameters)) {
277
+ if (this.log) {console.log("(webRequest) request parameter:", key, "value:", value, "type:", typeof value)}
278
+ }
279
+ }
280
+ }
281
+ }
282
+
283
+ #myrequest(options, callback) {
284
+ try {
285
+ if (this.log) {
286
+ console.log("API URL:", options.url);
287
+ //console.log("** Options:", JSON.stringify(options));
288
+ // Stringify "options". FIX THE STRINGIFY OF CIRCULAR STRUCTURE BUG - START
289
+ let cache = [];
290
+ let str_Options = JSON.stringify(options, function(key, value) { // try to use a separate function
291
+ if (typeof value === 'object' && value != null) {
292
+ if (cache.indexOf(value) !== -1) {
293
+ return;
294
+ }
295
+ cache.push(value);
296
+ }
297
+ return value;
298
+ });
299
+ console.log("** Options:", str_Options);
300
+ }
301
+ let axios_options = {
302
+ url: options.url,
303
+ method: options.method,
304
+ params: options.params,
305
+ headers: options.headers,
306
+ timeout: options.timeout,
307
+ maxContentLength: 10000000, // max 10mb response size
308
+ maxBodyLength: 10000000 // max 10mb request body size
309
+ }
310
+
311
+ if (options.json !== null) {
312
+ axios_options.data = options.json
313
+ }
314
+ // if (this.log) {
315
+ // console.log("axios_options:", JSON.stringify(axios_options));
316
+ // }
317
+ if (options.url.startsWith("https:")) {
318
+ const httpsAgent = new https.Agent({
319
+ rejectUnauthorized: false,
320
+ });
321
+ axios_options.httpsAgent = httpsAgent;
322
+ }
323
+
324
+ axios(axios_options)
325
+ .then((res) => {
326
+ if (this.log) {
327
+ console.log("Success Response:", res);
328
+ console.log("Response for url:", options.url);
329
+ console.log("Response headers:\n", JSON.stringify(res.headers));
330
+ }
331
+ if (callback) {
332
+ callback(null, res);
333
+ }
334
+ })
335
+ .catch( (err) => {
336
+ if (this.log) {
337
+ if (err.response) {
338
+ console.log("Error Response data:", err.response.data);
339
+ }
340
+ // FIX THE STRINGIFY OF CIRCULAR STRUCTURE BUG - START
341
+ let cache = [];
342
+ let error_log = JSON.stringify(err, function(key, value) { // try to use a separate function
343
+ if (typeof value === 'object' && value != null) {
344
+ if (cache.indexOf(value) !== -1) {
345
+ return;
346
+ }
347
+ cache.push(value);
348
+ }
349
+ return value;
350
+ });
351
+ console.error("An error occurred: ", error_log);
352
+ // FIX THE STRINGIFY OF CIRCULAR STRUCTURE BUG - END
353
+ // console.error("An error occurred:", JSON.stringify(err));
354
+ }
355
+ if (callback) {
356
+ let status = 1000;
357
+ let cache = [];
358
+ let str_error = JSON.stringify(err, function(key, value) { // try to use a separate function
359
+ if (typeof value === 'object' && value != null) {
360
+ if (cache.indexOf(value) !== -1) {
361
+ return;
362
+ }
363
+ cache.push(value);
364
+ }
365
+ return value;
366
+ });
367
+ let error = JSON.parse(str_error) // "status" disappears without this trick
368
+ let errorMessage = JSON.stringify(error);
369
+ if (error.status) {
370
+ status = error.status;
371
+ }
372
+ if (error.message) {
373
+ errorMessage = error.message;
374
+ }
375
+ let data = null;
376
+ if (err.response) {
377
+ data = err.response.data;
378
+ }
379
+ callback(
380
+ null, {
381
+ status: status,
382
+ data: data,
383
+ error: errorMessage
384
+ }
385
+ );
386
+ }
387
+ });
388
+ }
389
+ catch(error) {
390
+ console.error("Error:", error);
391
+ }
392
+ }
393
+
394
+ #webrequest_timeout(action, default_timeout, min, max) {
395
+ let timeout = default_timeout;
396
+ if (!action.settings) {
397
+ return timeout;
398
+ }
399
+ // console.log("default timeout:", timeout);
400
+ // console.log("action.settings:", action.settings);
401
+ // console.log("action.settings.timeout:", action.settings.timeout);
402
+ // console.log("typeof action.settings.timeout:", typeof action.settings.timeout);
403
+ // console.log("action.settings.timeout > min", action.settings.timeout > min)
404
+ // console.log("action.settings.timeout < max", action.settings.timeout < max)
405
+
406
+ if (action.settings.timeout) {
407
+ if ((typeof action.settings.timeout === "number") && action.settings.timeout > min && action.settings.timeout < max) {
408
+ timeout = Math.round(action.settings.timeout)
409
+ // console.log("new timeout:", timeout);
410
+ }
411
+ }
412
+ // console.log("returning timeout:", timeout);
413
+ return timeout
414
+ }
415
+
416
+ }
417
+
418
+ module.exports = { DirWebRequestV2 };
@@ -4,7 +4,6 @@ const { TiledeskChatbotUtil } = require('../../utils/TiledeskChatbotUtil');
4
4
  const winston = require('../../utils/winston');
5
5
  let axios = require('axios');
6
6
  const { Logger } = require('../../Logger');
7
- const { TiledeskChatbotConst } = require('../../engine/TiledeskChatbotConst');
8
7
 
9
8
  class DirWebResponse {
10
9
 
@@ -66,11 +65,9 @@ class DirWebResponse {
66
65
  this.logger.native("[Web Response] payload: ", webResponse);
67
66
 
68
67
  const topic = `/webhooks/${this.requestId}`;
69
- const readyKey = TiledeskChatbotConst.redisWebhookReadyKey(this.requestId);
70
-
68
+
71
69
  try {
72
- await this.tdcache.publish(topic, JSON.stringify(webResponse));
73
- await this.tdcache.set(readyKey, '1', { EX: 120 });
70
+ this.tdcache.publish(topic, JSON.stringify(webResponse));
74
71
  winston.verbose("DirWebResponse Published webresponse to topic: " + topic);
75
72
  }
76
73
  catch(e) {
@@ -22,7 +22,6 @@ class Directives {
22
22
  static FUNCTION_VALUE = "functionvalue";
23
23
  static JSON_CONDITION = "jsoncondition";
24
24
  static JSON_CONDITION_2 = "jsoncondition2"; // NEW: azione JSON Condition V2 del Design Studio
25
- static JSON_CONDITION_MULTI = "jsonconditionmulti"; // NEW: condizione a piu' casi in sequenza, un'uscita per caso
26
25
  static SET_ATTRIBUTE = "setattribute";
27
26
  static SET_ATTRIBUTE_V2 = "setattribute-v2";
28
27
  static REPLY = 'reply';
@@ -64,14 +63,9 @@ class Directives {
64
63
  static MOVE_TO_UNASSIGNED = "move_to_unassigned";
65
64
  static CONNECT_BLOCK = "connect_block";
66
65
  static ADD_TAGS = 'add_tags'
67
- static WEBHOOK = 'webhook';
68
- static INVITE_HUMAN = "invite_human";
69
- static REMOVE_HUMAN = "remove_human";
70
66
  static WEB_RESPONSE = "web_response";
71
67
  static FLOW_LOG = "flow_log";
72
68
  static ADD_KB_CONTENT = "add_kb_content";
73
- static INVOKE_SUB_AGENT = "invoke_subagent";
74
- static RETURN = "return";
75
69
  static DATA_TABLES = "data_table";
76
70
  // DOCPARSE
77
71
  static DOCPARSE_EXTRACT = "docparse_extract";
@@ -1,55 +1,7 @@
1
1
  let axios = require('axios');
2
- const http = require('http');
3
- const https = require('https');
2
+ let https = require("https");
4
3
  const winston = require('./winston');
5
4
 
6
- /**
7
- * When TYBOT_HTTP_KEEP_ALIVE is set to 1, true, yes, or on (case-insensitive),
8
- * axios uses shared http(s).Agent instances with keepAlive: true so connections
9
- * to the same host can be reused (e.g. chained /exec calls).
10
- */
11
- function isHttpClientKeepAliveEnabled() {
12
- const v = process.env.TYBOT_HTTP_KEEP_ALIVE;
13
- if (v === undefined || String(v).trim() === '') {
14
- return false;
15
- }
16
- return ['1', 'true', 'yes', 'on'].includes(String(v).trim().toLowerCase());
17
- }
18
-
19
- const HTTP_CLIENT_KEEP_ALIVE = isHttpClientKeepAliveEnabled();
20
-
21
- let sharedHttpAgent = null;
22
- let sharedHttpsAgent = null;
23
-
24
- function getSharedHttpAgent() {
25
- if (!sharedHttpAgent) {
26
- sharedHttpAgent = new http.Agent({ keepAlive: true });
27
- }
28
- return sharedHttpAgent;
29
- }
30
-
31
- function getSharedHttpsAgent() {
32
- if (!sharedHttpsAgent) {
33
- sharedHttpsAgent = new https.Agent({
34
- keepAlive: true,
35
- rejectUnauthorized: false,
36
- });
37
- }
38
- return sharedHttpsAgent;
39
- }
40
-
41
- if (HTTP_CLIENT_KEEP_ALIVE) {
42
- winston.verbose(
43
- '[HttpUtils] HTTP client keep-alive: ENABLED — shared agents reuse TCP connections (TYBOT_HTTP_KEEP_ALIVE=1). ' +
44
- 'Verbose logs include round-trip time (ms) and [keep-alive client: on].'
45
- );
46
- } else {
47
- winston.verbose(
48
- '[HttpUtils] HTTP client keep-alive: disabled (default). Set TYBOT_HTTP_KEEP_ALIVE=1|true|yes|on to enable. ' +
49
- 'Verbose logs include round-trip time (ms) and [keep-alive client: off].'
50
- );
51
- }
52
-
53
5
  class HttpUtils {
54
6
 
55
7
  constructor() { }
@@ -64,77 +16,43 @@ class HttpUtils {
64
16
  if (options.json !== null) {
65
17
  axios_options.data = options.json
66
18
  }
67
- if (typeof options.timeout === 'number' && options.timeout > 0) {
68
- axios_options.timeout = options.timeout
69
- }
70
- if (options.url.startsWith('https:')) {
71
- if (HTTP_CLIENT_KEEP_ALIVE) {
72
- axios_options.httpsAgent = getSharedHttpsAgent();
73
- } else {
74
- const httpsAgent = new https.Agent({
75
- rejectUnauthorized: false,
76
- });
77
- axios_options.httpsAgent = httpsAgent;
78
- }
79
- } else if (options.url.startsWith('http:')) {
80
- if (HTTP_CLIENT_KEEP_ALIVE) {
81
- axios_options.httpAgent = getSharedHttpAgent();
82
- }
19
+ if (options.url.startsWith("https:")) {
20
+ const httpsAgent = new https.Agent({
21
+ rejectUnauthorized: false,
22
+ });
23
+ axios_options.httpsAgent = httpsAgent;
83
24
  }
84
-
85
- const requestStarted = process.hrtime.bigint();
86
- const httpRoundTripMs = () => Number(process.hrtime.bigint() - requestStarted) / 1e6;
87
- const keepAliveTag = HTTP_CLIENT_KEEP_ALIVE ? 'on' : 'off';
88
-
89
25
  axios(axios_options)
90
26
  .then((res) => {
91
- const ms = httpRoundTripMs();
92
27
  if (res && (res.status >= 200 && res.status <= 299) && res.data) {
93
- winston.verbose(
94
- `[HttpUtils] ${options.method || 'GET'} ${options.url} completed in ${ms.toFixed(2)}ms ` +
95
- `(HTTP ${res.status}) [keep-alive client: ${keepAliveTag}]`
96
- );
97
28
  if (callback) {
98
29
  callback(null, res.data);
99
30
  }
100
31
  }
101
32
  else {
102
- const status = res && res.status != null ? res.status : 'n/a';
103
- winston.verbose(
104
- `[HttpUtils] ${options.method || 'GET'} ${options.url} completed in ${ms.toFixed(2)}ms ` +
105
- `(unexpected response, status ${status}) [keep-alive client: ${keepAliveTag}]`
106
- );
107
33
  if (callback) {
108
34
  callback(new Error("Response status is not 2xx"), null);
109
35
  }
110
36
  }
111
37
  })
112
38
  .catch((error) => {
113
- const ms = httpRoundTripMs();
114
- const status = error.response?.status;
115
- const statusPart = status != null ? `HTTP ${status}` : 'no HTTP response';
116
- winston.verbose(
117
- `[HttpUtils] ${options.method || 'GET'} ${options.url} failed after ${ms.toFixed(2)}ms ` +
118
- `(${statusPart}) [keep-alive client: ${keepAliveTag}]`
119
- );
120
- // Never log the error/response/config objects: they carry request headers (Authorization: JWT ...).
121
- winston.error("HTTP request error: ", HttpUtils.errorSummary(error, options.url));
39
+ if (error.response?.data) {
40
+ if (typeof error.response.data === 'string') {
41
+ winston.error("Axios error response data: " + error.response.data);
42
+ } else {
43
+ winston.error("Axios error response data: ", error.response.data);
44
+ }
45
+ } else if (error.response) {
46
+ winston.error("Axios error response: ", error.response);
47
+ } else {
48
+ winston.error("Axios error: ", error);
49
+ }
122
50
  if (callback) {
123
51
  callback(error, null);
124
52
  }
125
53
  });
126
54
  }
127
55
 
128
- static errorSummary(error, url) {
129
- return {
130
- message: error?.message,
131
- code: error?.code,
132
- status: error?.response?.status,
133
- url: typeof url === 'string' ? url.split('?')[0] : undefined,
134
- data: error?.response?.data
135
- };
136
- }
137
-
138
56
  // static myrequest(options, callback, log) {
139
57
  // winston.verbose("** API URL: " + options.url);
140
58
  // winston.debug("** Options: ", options);