@microsoft/agents-hosting 1.6.0-beta.43.g9cc9760779 → 1.6.0-beta.49.gc43479e95a

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 (30) hide show
  1. package/dist/package.json +3 -4
  2. package/dist/src/app/attachmentDownloader.js +5 -10
  3. package/dist/src/app/attachmentDownloader.js.map +1 -1
  4. package/dist/src/app/teamsAttachmentDownloader.js +6 -14
  5. package/dist/src/app/teamsAttachmentDownloader.js.map +1 -1
  6. package/dist/src/auth/msalTokenProvider.js +32 -6
  7. package/dist/src/auth/msalTokenProvider.js.map +1 -1
  8. package/dist/src/connector-client/connectorClient.d.ts +10 -6
  9. package/dist/src/connector-client/connectorClient.js +91 -66
  10. package/dist/src/connector-client/connectorClient.js.map +1 -1
  11. package/dist/src/errorHelper.js +14 -0
  12. package/dist/src/errorHelper.js.map +1 -1
  13. package/dist/src/httpClient.d.ts +60 -0
  14. package/dist/src/httpClient.js +173 -0
  15. package/dist/src/httpClient.js.map +1 -0
  16. package/dist/src/index.d.ts +1 -0
  17. package/dist/src/index.js +1 -0
  18. package/dist/src/index.js.map +1 -1
  19. package/dist/src/oauth/userTokenClient.d.ts +5 -4
  20. package/dist/src/oauth/userTokenClient.js +95 -69
  21. package/dist/src/oauth/userTokenClient.js.map +1 -1
  22. package/package.json +3 -4
  23. package/src/app/attachmentDownloader.ts +6 -8
  24. package/src/app/teamsAttachmentDownloader.ts +7 -11
  25. package/src/auth/msalTokenProvider.ts +37 -9
  26. package/src/connector-client/connectorClient.ts +106 -78
  27. package/src/errorHelper.ts +16 -0
  28. package/src/httpClient.ts +223 -0
  29. package/src/index.ts +1 -0
  30. package/src/oauth/userTokenClient.ts +100 -75
package/dist/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "$schema": "https://json.schemastore.org/package.json",
3
3
  "name": "@microsoft/agents-hosting",
4
- "version": "1.6.0-beta.43.g9cc9760779",
4
+ "version": "1.6.0-beta.49.gc43479e95a",
5
5
  "homepage": "https://github.com/microsoft/Agents-for-js",
6
6
  "repository": {
7
7
  "type": "git",
@@ -21,9 +21,8 @@
21
21
  "dependencies": {
22
22
  "@azure/core-auth": "1.10.1",
23
23
  "@azure/msal-node": "5.1.5",
24
- "@microsoft/agents-activity": "1.6.0-beta.43.g9cc9760779",
25
- "@microsoft/agents-telemetry": "1.6.0-beta.43.g9cc9760779",
26
- "axios": "1.17.0",
24
+ "@microsoft/agents-activity": "1.6.0-beta.49.gc43479e95a",
25
+ "@microsoft/agents-telemetry": "1.6.0-beta.49.gc43479e95a",
27
26
  "jsonwebtoken": "9.0.3",
28
27
  "jwks-rsa": "4.0.1",
29
28
  "zod": "3.25.75"
package/dist/src/app/attachmentDownloader.js CHANGED
@@ -3,12 +3,9 @@
3
3
  * Copyright (c) Microsoft Corporation. All rights reserved.
4
4
  * Licensed under the MIT License.
5
5
  */
6
- var __importDefault = (this && this.__importDefault) || function (mod) {
7
- return (mod && mod.__esModule) ? mod : { "default": mod };
8
- };
9
6
  Object.defineProperty(exports, "__esModule", { value: true });
10
7
  exports.AttachmentDownloader = void 0;
11
- const axios_1 = __importDefault(require("axios"));
8
+ const httpClient_1 = require("../httpClient");
12
9
  const agents_telemetry_1 = require("@microsoft/agents-telemetry");
13
10
  const auth_1 = require("../auth");
14
11
  const logger = (0, agents_telemetry_1.debug)('agents:attachmentDownloader');
@@ -30,7 +27,7 @@ class AttachmentDownloader {
30
27
  * @param stateKey The key to store files in state. Defaults to 'inputFiles'.
31
28
  */
32
29
  constructor(stateKey = 'inputFiles') {
33
- this._httpClient = axios_1.default.create();
30
+ this._httpClient = new httpClient_1.HttpClient();
34
31
  this._stateKey = stateKey;
35
32
  }
36
33
  /**
@@ -73,17 +70,15 @@ class AttachmentDownloader {
73
70
  async downloadFile(attachment, accessToken) {
74
71
  if ((attachment.contentUrl && attachment.contentUrl.startsWith('https://')) ||
75
72
  (attachment.contentUrl && attachment.contentUrl.startsWith('http://localhost'))) {
76
- let headers;
73
+ const headers = {};
77
74
  if (accessToken.length > 0) {
78
- headers = {
79
- Authorization: `Bearer ${accessToken}`
80
- };
75
+ headers.Authorization = `Bearer ${accessToken}`;
81
76
  }
82
77
  const response = await this._httpClient.get(attachment.contentUrl, {
83
78
  headers,
84
79
  responseType: 'arraybuffer'
85
80
  });
86
- const content = Buffer.from(response.data, 'binary');
81
+ const content = Buffer.from(response.data);
87
82
  let contentType = attachment.contentType;
88
83
  if (contentType === 'image/*') {
89
84
  contentType = 'image/png';
package/dist/src/app/attachmentDownloader.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"attachmentDownloader.js","sourceRoot":"","sources":["../../../src/app/attachmentDownloader.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"attachmentDownloader.js","sourceRoot":"","sources":["../../../src/app/attachmentDownloader.ts"],"names":[],"mappings":"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"}
package/dist/src/app/teamsAttachmentDownloader.js CHANGED
@@ -3,14 +3,11 @@
3
3
  * Copyright (c) Microsoft Corporation. All rights reserved.
4
4
  * Licensed under the MIT License.
5
5
  */
6
- var __importDefault = (this && this.__importDefault) || function (mod) {
7
- return (mod && mod.__esModule) ? mod : { "default": mod };
8
- };
9
6
  Object.defineProperty(exports, "__esModule", { value: true });
10
7
  exports.TeamsAttachmentDownloader = exports.M365AttachmentDownloader = void 0;
11
8
  const agents_activity_1 = require("@microsoft/agents-activity");
12
9
  const agents_telemetry_1 = require("@microsoft/agents-telemetry");
13
- const axios_1 = __importDefault(require("axios"));
10
+ const httpClient_1 = require("../httpClient");
14
11
  const zod_1 = require("zod");
15
12
  const logger = (0, agents_telemetry_1.debug)('agents:M365AttachmentDownloader');
16
13
  /**
@@ -18,7 +15,7 @@ const logger = (0, agents_telemetry_1.debug)('agents:M365AttachmentDownloader');
18
15
  */
19
16
  class M365AttachmentDownloader {
20
17
  constructor(stateKey = 'inputFiles') {
21
- this._httpClient = axios_1.default.create();
18
+ this._httpClient = new httpClient_1.HttpClient();
22
19
  this._stateKey = stateKey;
23
20
  }
24
21
  /**
@@ -38,7 +35,7 @@ class M365AttachmentDownloader {
38
35
  return Promise.resolve([]);
39
36
  }
40
37
  const connectorClient = context.turnState.get(context.adapter.ConnectorClientKey);
41
- this._httpClient.defaults.headers = connectorClient.axiosInstance.defaults.headers;
38
+ this._httpClient.defaultHeaders = { ...connectorClient.httpClient.defaultHeaders };
42
39
  const files = [];
43
40
  for (const attachment of attachments) {
44
41
  const file = await this.downloadFile(attachment);
@@ -54,7 +51,6 @@ class M365AttachmentDownloader {
54
51
  * @returns {Promise<InputFile>} - Promise that resolves to the downloaded input file.
55
52
  */
56
53
  async downloadFile(attachment) {
57
- var _a;
58
54
  let inputFile;
59
55
  if (attachment.contentUrl && attachment.contentUrl.startsWith('https://')) {
60
56
  try {
@@ -62,13 +58,9 @@ class M365AttachmentDownloader {
62
58
  const parsed = contentSchema.safeParse(attachment.content);
63
59
  const downloadUrl = parsed.success ? parsed.data.downloadUrl : attachment.contentUrl;
64
60
  const response = await this._httpClient.get(downloadUrl, { responseType: 'arraybuffer' });
65
- const content = Buffer.from(response.data, 'binary');
66
- const contentTypeHeader = typeof response.headers.get === 'function'
67
- ? response.headers.get('content-type')
68
- : response.headers['content-type'];
69
- const contentType = Array.isArray(contentTypeHeader)
70
- ? ((_a = contentTypeHeader[0]) !== null && _a !== void 0 ? _a : 'application/octet-stream')
71
- : (typeof contentTypeHeader === 'string' ? contentTypeHeader : 'application/octet-stream');
61
+ const content = Buffer.from(response.data);
62
+ const contentTypeHeader = response.headers.get('content-type');
63
+ const contentType = typeof contentTypeHeader === 'string' ? contentTypeHeader : 'application/octet-stream';
72
64
  inputFile = { content, contentType, contentUrl: attachment.contentUrl };
73
65
  }
74
66
  catch (error) {
package/dist/src/app/teamsAttachmentDownloader.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"teamsAttachmentDownloader.js","sourceRoot":"","sources":["../../../src/app/teamsAttachmentDownloader.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"teamsAttachmentDownloader.js","sourceRoot":"","sources":["../../../src/app/teamsAttachmentDownloader.ts"],"names":[],"mappings":"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"}
package/dist/src/auth/msalTokenProvider.js CHANGED
@@ -9,7 +9,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
9
9
  Object.defineProperty(exports, "__esModule", { value: true });
10
10
  exports.MsalTokenProvider = void 0;
11
11
  const msal_node_1 = require("@azure/msal-node");
12
- const axios_1 = __importDefault(require("axios"));
13
12
  const authConfiguration_1 = require("./authConfiguration");
14
13
  const agents_telemetry_1 = require("@microsoft/agents-telemetry");
15
14
  const crypto_1 = require("crypto");
@@ -22,6 +21,13 @@ const agents_activity_1 = require("@microsoft/agents-activity");
22
21
  const errorHelper_1 = require("../errorHelper");
23
22
  const audience = 'api://AzureADTokenExchange';
24
23
  const logger = (0, agents_telemetry_1.debug)('agents:msal');
24
+ const agenticTokenRequestTimeoutMs = 30000;
25
+ function isAbortError(error) {
26
+ return error instanceof Error && error.name === 'AbortError';
27
+ }
28
+ function createTokenRequestTimeoutError(timeoutMs) {
29
+ return agents_activity_1.ExceptionHelper.generateException(Error, errorHelper_1.Errors.TokenRequestTimeout, undefined, { timeoutMs: timeoutMs.toString() });
30
+ }
25
31
  /**
26
32
  * Provides tokens using MSAL.
27
33
  */
@@ -289,17 +295,37 @@ class MsalTokenProvider {
289
295
  if (data.grant_type !== 'user_fic') {
290
296
  data.client_info = '2';
291
297
  }
292
- const token = await axios_1.default.post(url, data, {
298
+ const controller = new AbortController();
299
+ const timeoutId = setTimeout(() => {
300
+ controller.abort(createTokenRequestTimeoutError(agenticTokenRequestTimeoutMs));
301
+ }, agenticTokenRequestTimeoutMs);
302
+ const token = await fetch(url, {
303
+ method: 'POST',
293
304
  headers: {
294
305
  'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8'
306
+ },
307
+ body: new URLSearchParams(data).toString(),
308
+ signal: controller.signal
309
+ }).then(async (response) => {
310
+ if (!response.ok) {
311
+ const errorBody = await response.text();
312
+ const error = new Error(`Token request failed with status ${response.status}: ${errorBody}`);
313
+ error.toJSON = () => ({ status: response.status, body: errorBody });
314
+ throw error;
295
315
  }
316
+ return response.json();
296
317
  }).catch((error) => {
297
- logger.error('Error acquiring token: ', error.toJSON());
298
- throw error;
318
+ const resolvedError = isAbortError(error)
319
+ ? (controller.signal.reason instanceof Error ? controller.signal.reason : createTokenRequestTimeoutError(agenticTokenRequestTimeoutMs))
320
+ : error;
321
+ logger.error('Error acquiring token: ', resolvedError.toJSON ? resolvedError.toJSON() : resolvedError);
322
+ throw resolvedError;
323
+ }).finally(() => {
324
+ clearTimeout(timeoutId);
299
325
  });
300
326
  // capture token, expire local cache 5 minutes early
301
- this._agenticTokenCache.set(cacheKey, token.data.access_token, token.data.expires_in - 300);
302
- return token.data.access_token;
327
+ this._agenticTokenCache.set(cacheKey, token.access_token, token.expires_in - 300);
328
+ return token.access_token;
303
329
  }
304
330
  async getAgenticUserToken(tenantId, agentAppInstanceId, agenticUserId, scopes) {
305
331
  return (0, agents_telemetry_1.trace)(observability_1.AuthenticationTraceDefinitions.getAgenticUserToken, async ({ record }) => {
package/dist/src/auth/msalTokenProvider.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"msalTokenProvider.js","sourceRoot":"","sources":["../../../src/auth/msalTokenProvider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"msalTokenProvider.js","sourceRoot":"","sources":["../../../src/auth/msalTokenProvider.ts"],"names":[],"mappings":"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"}
package/dist/src/connector-client/connectorClient.d.ts CHANGED
@@ -1,5 +1,7 @@
1
- /** * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. */
2
- import { AxiosInstance } from 'axios';
1
+ /**
2
+ * Copyright (c) Microsoft Corporation. All rights reserved.
3
+ * Licensed under the MIT License.
4
+ */
3
5
  import { AuthConfiguration } from '../auth/authConfiguration';
4
6
  import { AuthProvider } from '../auth/authProvider';
5
7
  import { Activity, ChannelAccount, ConversationParameters } from '@microsoft/agents-activity';
@@ -10,18 +12,19 @@ import { AttachmentInfo } from './attachmentInfo';
10
12
  import { AttachmentData } from './attachmentData';
11
13
  import { getProductInfo } from '../getProductInfo';
12
14
  import { HeaderPropagationCollection } from '../headerPropagation';
15
+ import { HttpClient } from '../httpClient';
13
16
  export { getProductInfo };
14
17
  /**
15
18
  * ConnectorClient is a client for interacting with the Microsoft Connector API.
16
19
  */
17
20
  export declare class ConnectorClient {
18
- protected readonly _axiosInstance: AxiosInstance;
21
+ protected readonly _httpClient: HttpClient;
19
22
  /**
20
23
  * Private constructor for the ConnectorClient.
21
- * @param axInstance - The AxiosInstance to use for HTTP requests.
24
+ * @param httpClient - The HttpClient instance to use for HTTP requests.
22
25
  */
23
- protected constructor(axInstance: AxiosInstance);
24
- get axiosInstance(): AxiosInstance;
26
+ protected constructor(httpClient: HttpClient);
27
+ get httpClient(): HttpClient;
25
28
  /**
26
29
  * Creates a new instance of ConnectorClient with authentication.
27
30
  * @param baseURL - The base URL for the API.
@@ -111,4 +114,5 @@ export declare class ConnectorClient {
111
114
  * @returns The attachment as a readable stream.
112
115
  */
113
116
  getAttachment(attachmentId: string, viewId: string): Promise<NodeJS.ReadableStream>;
117
+ private executeRequest;
114
118
  }
package/dist/src/connector-client/connectorClient.js CHANGED
@@ -1,11 +1,10 @@
1
1
  "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
2
+ /**
3
+ * Copyright (c) Microsoft Corporation. All rights reserved.
4
+ * Licensed under the MIT License.
5
+ */
5
6
  Object.defineProperty(exports, "__esModule", { value: true });
6
7
  exports.ConnectorClient = exports.getProductInfo = void 0;
7
- /** * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. */
8
- const axios_1 = __importDefault(require("axios"));
9
8
  const agents_telemetry_1 = require("@microsoft/agents-telemetry");
10
9
  const agents_activity_1 = require("@microsoft/agents-activity");
11
10
  const errorHelper_1 = require("../errorHelper");
@@ -16,58 +15,35 @@ const headerPropagation_1 = require("../headerPropagation");
16
15
  const agents_telemetry_2 = require("@microsoft/agents-telemetry");
17
16
  const observability_1 = require("../observability");
18
17
  const env_1 = require("../utils/env");
18
+ const httpClient_1 = require("../httpClient");
19
19
  const logger = (0, agents_telemetry_1.debug)('agents:connector-client');
20
+ function formatHttpErrorMessage(error) {
21
+ var _a;
22
+ const responseData = (_a = error.response) === null || _a === void 0 ? void 0 : _a.data;
23
+ if (responseData === undefined) {
24
+ return error.message;
25
+ }
26
+ try {
27
+ const serializedResponseData = JSON.stringify(responseData);
28
+ return serializedResponseData === undefined ? error.message : `${error.message}: ${serializedResponseData}`;
29
+ }
30
+ catch {
31
+ return error.message;
32
+ }
33
+ }
20
34
  /**
21
35
  * ConnectorClient is a client for interacting with the Microsoft Connector API.
22
36
  */
23
37
  class ConnectorClient {
24
38
  /**
25
39
  * Private constructor for the ConnectorClient.
26
- * @param axInstance - The AxiosInstance to use for HTTP requests.
40
+ * @param httpClient - The HttpClient instance to use for HTTP requests.
27
41
  */
28
- constructor(axInstance) {
29
- this._axiosInstance = axInstance;
30
- this._axiosInstance.interceptors.request.use((config) => {
31
- const { method, url, data, headers, params } = config;
32
- // Clone headers and remove Authorization before logging
33
- const { Authorization, authorization, ...headersToLog } = headers || {};
34
- logger.debug('Request: ', {
35
- host: this._axiosInstance.getUri(),
36
- url,
37
- data,
38
- method,
39
- params,
40
- headers: headersToLog
41
- });
42
- return config;
43
- });
44
- this._axiosInstance.interceptors.response.use((config) => {
45
- const { status, statusText, config: requestConfig } = config;
46
- logger.debug('Response: ', {
47
- status,
48
- statusText,
49
- host: this._axiosInstance.getUri(),
50
- url: requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.url,
51
- data: config.config.data,
52
- method: requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.method,
53
- });
54
- return config;
55
- }, (error) => {
56
- const { code, message, stack, response } = error;
57
- const errorDetails = {
58
- code,
59
- host: this._axiosInstance.getUri(),
60
- url: error.config.url,
61
- method: error.config.method,
62
- data: error.config.data,
63
- message: message + JSON.stringify(response === null || response === void 0 ? void 0 : response.data),
64
- stack,
65
- };
66
- return Promise.reject(errorDetails);
67
- });
42
+ constructor(httpClient) {
43
+ this._httpClient = httpClient;
68
44
  }
69
- get axiosInstance() {
70
- return this._axiosInstance;
45
+ get httpClient() {
46
+ return this._httpClient;
71
47
  }
72
48
  /**
73
49
  * Creates a new instance of ConnectorClient with authentication.
@@ -94,16 +70,17 @@ class ConnectorClient {
94
70
  (0, getProductInfo_1.applyUserAgentHeader)(headerPropagation);
95
71
  headerPropagation.override({
96
72
  Accept: 'application/json',
97
- 'Content-Type': 'application/json', // Required by transformRequest
98
- });
99
- const axiosInstance = axios_1.default.create({
100
- baseURL,
101
- headers: headerPropagation.outgoing,
73
+ 'Content-Type': 'application/json',
102
74
  });
75
+ const clientHeaders = { ...headerPropagation.outgoing };
103
76
  if (token && token.length > 1) {
104
- axiosInstance.defaults.headers.common.Authorization = `Bearer ${token}`;
77
+ clientHeaders.Authorization = `Bearer ${token}`;
105
78
  }
106
- return new ConnectorClient(axiosInstance);
79
+ const httpClient = new httpClient_1.HttpClient({
80
+ baseURL,
81
+ headers: clientHeaders,
82
+ });
83
+ return new ConnectorClient(httpClient);
107
84
  }
108
85
  /**
109
86
  * Retrieves a list of conversations.
@@ -118,7 +95,7 @@ class ConnectorClient {
118
95
  url: '/v3/conversations',
119
96
  params: continuationToken ? { continuationToken } : undefined
120
97
  };
121
- const response = await this._axiosInstance(config);
98
+ const response = await this.executeRequest(config);
122
99
  record({ httpStatusCode: (_a = response.status) === null || _a === void 0 ? void 0 : _a.toString() });
123
100
  return response.data;
124
101
  });
@@ -136,7 +113,7 @@ class ConnectorClient {
136
113
  'Content-Type': 'application/json'
137
114
  }
138
115
  };
139
- const response = await this._axiosInstance(config);
116
+ const response = await this.executeRequest(config);
140
117
  record({ httpStatusCode: (_a = response.status) === null || _a === void 0 ? void 0 : _a.toString() });
141
118
  return response.data;
142
119
  });
@@ -161,7 +138,7 @@ class ConnectorClient {
161
138
  },
162
139
  data: payload
163
140
  };
164
- const response = await this._axiosInstance(config);
141
+ const response = await this.executeRequest(config);
165
142
  record({ httpStatusCode: (_a = response.status) === null || _a === void 0 ? void 0 : _a.toString() });
166
143
  return response.data;
167
144
  });
@@ -191,7 +168,7 @@ class ConnectorClient {
191
168
  data: (0, activityWireCompat_1.normalizeOutgoingActivity)(body),
192
169
  ...(body.channelId === agents_activity_1.Channels.Msteams && body.isTargetedActivity() ? { params: { isTargetedActivity: 'true' } } : {})
193
170
  };
194
- const response = await this._axiosInstance(config);
171
+ const response = await this.executeRequest(config);
195
172
  record({ httpStatusCode: (_a = response.status) === null || _a === void 0 ? void 0 : _a.toString() });
196
173
  logger.info('Reply to conversation/activity: ', response.data.id, activityId);
197
174
  return response.data;
@@ -239,7 +216,7 @@ class ConnectorClient {
239
216
  data: (0, activityWireCompat_1.normalizeOutgoingActivity)(body),
240
217
  ...(body.channelId === agents_activity_1.Channels.Msteams && body.isTargetedActivity() ? { params: { isTargetedActivity: 'true' } } : {})
241
218
  };
242
- const response = await this._axiosInstance(config);
219
+ const response = await this.executeRequest(config);
243
220
  record({ httpStatusCode: (_a = response.status) === null || _a === void 0 ? void 0 : _a.toString() });
244
221
  return response.data;
245
222
  });
@@ -267,7 +244,7 @@ class ConnectorClient {
267
244
  data: (0, activityWireCompat_1.normalizeOutgoingActivity)(body),
268
245
  ...(body.channelId === agents_activity_1.Channels.Msteams && body.isTargetedActivity() ? { params: { isTargetedActivity: 'true' } } : {})
269
246
  };
270
- const response = await this._axiosInstance(config);
247
+ const response = await this.executeRequest(config);
271
248
  record({ httpStatusCode: (_a = response.status) === null || _a === void 0 ? void 0 : _a.toString() });
272
249
  return response.data;
273
250
  });
@@ -294,7 +271,7 @@ class ConnectorClient {
294
271
  },
295
272
  ...(isTargetedActivity ? { params: { isTargetedActivity: 'true' } } : {})
296
273
  };
297
- const response = await this._axiosInstance(config);
274
+ const response = await this.executeRequest(config);
298
275
  record({ httpStatusCode: (_a = response.status) === null || _a === void 0 ? void 0 : _a.toString() });
299
276
  return response.data;
300
277
  });
@@ -320,7 +297,7 @@ class ConnectorClient {
320
297
  },
321
298
  data: body
322
299
  };
323
- const response = await this._axiosInstance(config);
300
+ const response = await this.executeRequest(config);
324
301
  record({ httpStatusCode: (_a = response.status) === null || _a === void 0 ? void 0 : _a.toString() });
325
302
  return response.data;
326
303
  });
@@ -344,7 +321,7 @@ class ConnectorClient {
344
321
  'Content-Type': 'application/json'
345
322
  }
346
323
  };
347
- const response = await this._axiosInstance(config);
324
+ const response = await this.executeRequest(config);
348
325
  record({ httpStatusCode: (_a = response.status) === null || _a === void 0 ? void 0 : _a.toString() });
349
326
  return response.data;
350
327
  });
@@ -370,13 +347,61 @@ class ConnectorClient {
370
347
  url: `v3/attachments/${attachmentId}/views/${viewId}`,
371
348
  headers: {
372
349
  'Content-Type': 'application/json'
373
- }
350
+ },
351
+ responseType: 'stream'
374
352
  };
375
- const response = await this._axiosInstance(config);
353
+ const response = await this.executeRequest(config);
376
354
  record({ httpStatusCode: (_a = response.status) === null || _a === void 0 ? void 0 : _a.toString() });
377
355
  return response.data;
378
356
  });
379
357
  }
358
+ async executeRequest(config) {
359
+ var _a, _b, _c;
360
+ const { method, url, data, headers, params } = config;
361
+ const { Authorization, authorization, ...headersToLog } = { ...this._httpClient.defaultHeaders, ...headers };
362
+ logger.debug('Request: ', {
363
+ host: this._httpClient.baseURL,
364
+ url,
365
+ data,
366
+ method,
367
+ params,
368
+ headers: headersToLog
369
+ });
370
+ try {
371
+ const response = await this._httpClient.request(config);
372
+ logger.debug('Response: ', {
373
+ status: response.status,
374
+ statusText: response.statusText,
375
+ host: this._httpClient.baseURL,
376
+ url: (_a = response.config) === null || _a === void 0 ? void 0 : _a.url,
377
+ data: (_b = response.config) === null || _b === void 0 ? void 0 : _b.data,
378
+ method: (_c = response.config) === null || _c === void 0 ? void 0 : _c.method,
379
+ });
380
+ return response;
381
+ }
382
+ catch (error) {
383
+ if (error instanceof httpClient_1.HttpError) {
384
+ const message = formatHttpErrorMessage(error);
385
+ logger.debug('Response error: ', {
386
+ host: this._httpClient.baseURL,
387
+ url: error.config.url,
388
+ method: error.config.method,
389
+ data: error.config.data,
390
+ message,
391
+ stack: error.stack,
392
+ });
393
+ Object.assign(error, {
394
+ host: this._httpClient.baseURL,
395
+ url: error.config.url,
396
+ method: error.config.method,
397
+ data: error.config.data,
398
+ message,
399
+ });
400
+ throw error;
401
+ }
402
+ throw error;
403
+ }
404
+ }
380
405
  }
381
406
  exports.ConnectorClient = ConnectorClient;
382
407
  //# sourceMappingURL=connectorClient.js.map