@microsoft/agents-hosting-extensions-teams 1.6.0-beta.8.g226709c215 → 1.6.1

package/dist/src/client/teamsConnectorClient.d.ts

@@ -1,3 +1,4 @@
+/** * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. */
 import { Activity, ChannelAccount } from '@microsoft/agents-activity';
 import { TeamsChannelAccount } from '../activity-extensions/teamsChannelAccount';
 import { MeetingInfo } from '../meeting/meetingInfo';
@@ -12,7 +13,7 @@ import { ConnectorClient } from '@microsoft/agents-hosting';
  */
 export declare class TeamsConnectorClient {
     private client;
-    private axiosInstance;
+    private _httpClient;
     constructor(client: ConnectorClient);
     /**
      * Retrieves a member from a conversation or team.
@@ -143,4 +144,5 @@ export declare class TeamsConnectorClient {
      * @returns A CancelOperationResponse object containing the response.
      */
     cancelOperation(operationId: string): Promise<CancelOperationResponse>;
+    private executeRequest;
 }

package/dist/src/client/teamsConnectorClient.js

@@ -1,8 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TeamsConnectorClient = void 0;
+/** * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. */
 const agents_activity_1 = require("@microsoft/agents-activity");
 const errorHelper_1 = require("../errorHelper");
+const agents_hosting_1 = require("@microsoft/agents-hosting");
+const agents_telemetry_1 = require("@microsoft/agents-telemetry");
+const logger = (0, agents_telemetry_1.debug)('agents:connector-client');
+function formatHttpErrorMessage(error) {
+    var _a;
+    const responseData = (_a = error.response) === null || _a === void 0 ? void 0 : _a.data;
+    if (responseData === undefined) {
+        return error.message;
+    }
+    try {
+        const serializedResponseData = JSON.stringify(responseData);
+        return serializedResponseData === undefined ? error.message : `${error.message}: ${serializedResponseData}`;
+    }
+    catch {
+        return error.message;
+    }
+}
 /**
  * A client for interacting with Microsoft Teams APIs.
  * Extends the ConnectorClient class to provide Teams-specific functionalities.
@@ -10,7 +28,7 @@ const errorHelper_1 = require("../errorHelper");
 class TeamsConnectorClient {
     constructor(client) {
         this.client = client;
-        this.axiosInstance = client.axiosInstance;
+        this._httpClient = client.httpClient;
     }
     /**
      * Retrieves a member from a conversation or team.
@@ -77,7 +95,7 @@ class TeamsConnectorClient {
                 'Content-Type': 'application/json'
             }
         };
-        const response = await this.axiosInstance(config);
+        const response = await this.executeRequest(config);
         return response.data;
     }
     /**
@@ -112,11 +130,11 @@ class TeamsConnectorClient {
             method: 'get',
             url: `v3/conversations/${conversationId}/pagedMembers`,
             params: {
-                pageSize,
+                pageSize: String(pageSize),
                 continuationToken
             }
         };
-        const response = await this.axiosInstance(config);
+        const response = await this.executeRequest(config);
         return response.data;
     }
     /**
@@ -129,7 +147,7 @@ class TeamsConnectorClient {
             method: 'get',
             url: `v3/teams/${teamId}/conversations`
         };
-        const response = await this.axiosInstance(config);
+        const response = await this.executeRequest(config);
         const convList = response.data;
         return convList.conversations || [];
     }
@@ -143,7 +161,7 @@ class TeamsConnectorClient {
             method: 'get',
             url: `v3/teams/${teamId}`
         };
-        const response = await this.axiosInstance(config);
+        const response = await this.executeRequest(config);
         return response.data;
     }
     /**
@@ -159,7 +177,7 @@ class TeamsConnectorClient {
             url: `v1/meetings/${meetingId}/participants/${participantId}`,
             params: { tenantId }
         };
-        const response = await this.axiosInstance(config);
+        const response = await this.executeRequest(config);
         return response.data;
     }
     /**
@@ -172,7 +190,7 @@ class TeamsConnectorClient {
             method: 'get',
             url: `v1/meetings/${meetingId}`
         };
-        const response = await this.axiosInstance(config);
+        const response = await this.executeRequest(config);
         return response.data;
     }
     /**
@@ -187,7 +205,7 @@ class TeamsConnectorClient {
             url: `v1/meetings/${meetingId}/notification`,
             data: notification
         };
-        const response = await this.axiosInstance(config);
+        const response = await this.executeRequest(config);
         return response.data;
     }
     /**
@@ -208,7 +226,7 @@ class TeamsConnectorClient {
             url: 'v3/batch/conversation/users',
             data: content
         };
-        const response = await this.axiosInstance(config);
+        const response = await this.executeRequest(config);
         return response.data;
     }
     /**
@@ -227,7 +245,7 @@ class TeamsConnectorClient {
             url: 'v3/batch/conversation/tenant',
             data: content
         };
-        const response = await this.axiosInstance(config);
+        const response = await this.executeRequest(config);
         return response.data;
     }
     /**
@@ -248,7 +266,7 @@ class TeamsConnectorClient {
             url: 'v3/batch/conversation/team',
             data: content
         };
-        const response = await this.axiosInstance(config);
+        const response = await this.executeRequest(config);
         return response.data;
     }
     /**
@@ -269,7 +287,7 @@ class TeamsConnectorClient {
             url: 'v3/batch/conversation/channels',
             data: content
         };
-        const response = await this.axiosInstance(config);
+        const response = await this.executeRequest(config);
         return response.data;
     }
     /**
@@ -282,7 +300,7 @@ class TeamsConnectorClient {
             method: 'get',
             url: `v3/batch/conversation/${operationId}`
         };
-        const response = await this.axiosInstance(config);
+        const response = await this.executeRequest(config);
         return response.data;
     }
     /**
@@ -295,7 +313,7 @@ class TeamsConnectorClient {
             method: 'get',
             url: `v3/batch/conversation/failedentries/${operationId}`
         };
-        const response = await this.axiosInstance(config);
+        const response = await this.executeRequest(config);
         return response.data;
     }
     /**
@@ -308,9 +326,56 @@ class TeamsConnectorClient {
             method: 'delete',
             url: `v3/batch/conversation/${operationId}`
         };
-        const response = await this.axiosInstance(config);
+        const response = await this.executeRequest(config);
         return response.data;
     }
+    async executeRequest(config) {
+        var _a, _b, _c;
+        const { method, url, data, headers, params } = config;
+        const { Authorization, authorization, ...headersToLog } = { ...this._httpClient.defaultHeaders, ...headers };
+        logger.debug('Request: ', {
+            host: this._httpClient.baseURL,
+            url,
+            data,
+            method,
+            params,
+            headers: headersToLog
+        });
+        try {
+            const response = await this._httpClient.request(config);
+            logger.debug('Response: ', {
+                status: response.status,
+                statusText: response.statusText,
+                host: this._httpClient.baseURL,
+                url: (_a = response.config) === null || _a === void 0 ? void 0 : _a.url,
+                data: (_b = response.config) === null || _b === void 0 ? void 0 : _b.data,
+                method: (_c = response.config) === null || _c === void 0 ? void 0 : _c.method,
+            });
+            return response;
+        }
+        catch (error) {
+            if (error instanceof agents_hosting_1.HttpError) {
+                const message = formatHttpErrorMessage(error);
+                logger.debug('Response error: ', {
+                    host: this._httpClient.baseURL,
+                    url: error.config.url,
+                    method: error.config.method,
+                    data: error.config.data,
+                    message,
+                    stack: error.stack,
+                });
+                Object.assign(error, {
+                    host: this._httpClient.baseURL,
+                    url: error.config.url,
+                    method: error.config.method,
+                    data: error.config.data,
+                    message,
+                });
+                throw error;
+            }
+            throw error;
+        }
+    }
 }
 exports.TeamsConnectorClient = TeamsConnectorClient;
 //# sourceMappingURL=teamsConnectorClient.js.map

package/dist/src/client/teamsConnectorClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"teamsConnectorClient.js","sourceRoot":"","sources":["../../../src/client/teamsConnectorClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"teamsConnectorClient.js","sourceRoot":"","sources":["../../../src/client/teamsConnectorClient.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@microsoft/agents-hosting-extensions-teams",
-  "version": "1.6.0-beta.8.g226709c215",
+  "version": "1.6.1",
   "homepage": "https://github.com/microsoft/Agents-for-js",
   "repository": {
     "type": "git",
@@ -19,9 +19,9 @@
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
   "dependencies": {
-    "@microsoft/agents-hosting": "1.6.0-beta.8.g226709c215",
-    "@microsoft/agents-activity": "1.6.0-beta.8.g226709c215",
-    "axios": "1.15.0",
+    "@microsoft/agents-hosting": "1.6.1",
+    "@microsoft/agents-activity": "1.6.1",
+    "@microsoft/agents-telemetry": "1.6.1",
     "zod": "3.25.75"
   },
   "license": "MIT",

package/src/client/teamsConnectorClient.ts

@@ -1,5 +1,4 @@
 /** * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. */
-import { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios'
 import { Activity, ChannelAccount, ExceptionHelper } from '@microsoft/agents-activity'
 import { Errors } from '../errorHelper'
 import { TeamsChannelAccount } from '../activity-extensions/teamsChannelAccount'
@@ -9,7 +8,24 @@ import { MeetingNotificationResponse } from '../meeting/meetingNotificationRespo
 import { ChannelInfo } from '../activity-extensions/channelInfo'
 import { TeamsChannelData } from '../activity-extensions'
 import { BatchFailedEntriesResponse, BatchOperationStateResponse, CancelOperationResponse, TeamDetails, TeamsBatchOperationResponse, TeamsMember, TeamsPagedMembersResult } from './teamsConnectorClient.types'
-import { ConnectorClient } from '@microsoft/agents-hosting'
+import { ConnectorClient, HttpClient, HttpError, HttpRequestConfig, HttpResponse } from '@microsoft/agents-hosting'
+import { debug } from '@microsoft/agents-telemetry'
+
+const logger = debug('agents:connector-client')
+
+function formatHttpErrorMessage (error: HttpError): string {
+  const responseData = error.response?.data
+  if (responseData === undefined) {
+    return error.message
+  }
+
+  try {
+    const serializedResponseData = JSON.stringify(responseData)
+    return serializedResponseData === undefined ? error.message : `${error.message}: ${serializedResponseData}`
+  } catch {
+    return error.message
+  }
+}
 
 interface ConversationList {
   conversations?: ChannelInfo[]
@@ -19,9 +35,9 @@ interface ConversationList {
  * Extends the ConnectorClient class to provide Teams-specific functionalities.
  */
 export class TeamsConnectorClient {
-  private axiosInstance: AxiosInstance
+  private _httpClient: HttpClient
   constructor (private client: ConnectorClient) {
-    this.axiosInstance = client.axiosInstance
+    this._httpClient = client.httpClient
   }
 
   /**
@@ -83,14 +99,14 @@ export class TeamsConnectorClient {
    * @returns A ChannelAccount representing the conversation member.
    */
   public async getConversationMember (conversationId: string, userId: string): Promise<ChannelAccount> {
-    const config: AxiosRequestConfig = {
+    const config: HttpRequestConfig = {
       method: 'get',
       url: `/v3/conversations/${conversationId}/members/${userId}`,
       headers: {
         'Content-Type': 'application/json'
       }
     }
-    const response: AxiosResponse = await this.axiosInstance(config)
+    const response: HttpResponse<ChannelAccount> = await this.executeRequest<ChannelAccount>(config)
     return response.data
   }
 
@@ -126,15 +142,15 @@ export class TeamsConnectorClient {
    * @returns A TeamsPagedMembersResult containing the paged members.
    */
   public async getConversationPagedMember (conversationId: string, pageSize: number, continuationToken: string): Promise<TeamsPagedMembersResult> {
-    const config: AxiosRequestConfig = {
+    const config: HttpRequestConfig = {
       method: 'get',
       url: `v3/conversations/${conversationId}/pagedMembers`,
       params: {
-        pageSize,
+        pageSize: String(pageSize),
         continuationToken
       }
     }
-    const response = await this.axiosInstance(config)
+    const response = await this.executeRequest<TeamsPagedMembersResult>(config)
     return response.data
   }
 
@@ -144,11 +160,11 @@ export class TeamsConnectorClient {
    * @returns An array of ChannelInfo objects representing the channels.
    */
   public async fetchChannelList (teamId: string): Promise<ChannelInfo[]> {
-    const config: AxiosRequestConfig = {
+    const config: HttpRequestConfig = {
       method: 'get',
       url: `v3/teams/${teamId}/conversations`
     }
-    const response = await this.axiosInstance(config)
+    const response = await this.executeRequest<ConversationList>(config)
     const convList: ConversationList = response.data
     return convList.conversations || []
   }
@@ -159,11 +175,11 @@ export class TeamsConnectorClient {
    * @returns A TeamDetails object containing the team details.
    */
   public async fetchTeamDetails (teamId: string): Promise<TeamDetails> {
-    const config: AxiosRequestConfig = {
+    const config: HttpRequestConfig = {
       method: 'get',
       url: `v3/teams/${teamId}`
     }
-    const response = await this.axiosInstance(config)
+    const response = await this.executeRequest<TeamDetails>(config)
     return response.data
   }
 
@@ -175,12 +191,12 @@ export class TeamsConnectorClient {
    * @returns A string containing participant information.
    */
   public async fetchMeetingParticipant (meetingId: string, participantId: string, tenantId: string): Promise<string> {
-    const config: AxiosRequestConfig = {
+    const config: HttpRequestConfig = {
       method: 'get',
       url: `v1/meetings/${meetingId}/participants/${participantId}`,
       params: { tenantId }
     }
-    const response = await this.axiosInstance(config)
+    const response = await this.executeRequest<string>(config)
     return response.data
   }
 
@@ -190,11 +206,11 @@ export class TeamsConnectorClient {
    * @returns A MeetingInfo object containing the meeting information.
    */
   public async fetchMeetingInfo (meetingId: string): Promise<MeetingInfo> {
-    const config: AxiosRequestConfig = {
+    const config: HttpRequestConfig = {
       method: 'get',
       url: `v1/meetings/${meetingId}`
     }
-    const response = await this.axiosInstance(config)
+    const response = await this.executeRequest<MeetingInfo>(config)
     return response.data
   }
 
@@ -205,12 +221,12 @@ export class TeamsConnectorClient {
    * @returns A MeetingNotificationResponse object containing the response.
    */
   public async sendMeetingNotification (meetingId: string, notification: MeetingNotification): Promise<MeetingNotificationResponse> {
-    const config: AxiosRequestConfig = {
+    const config: HttpRequestConfig = {
       method: 'post',
       url: `v1/meetings/${meetingId}/notification`,
       data: notification
     }
-    const response = await this.axiosInstance(config)
+    const response = await this.executeRequest<MeetingNotificationResponse>(config)
     return response.data
   }
 
@@ -227,12 +243,12 @@ export class TeamsConnectorClient {
       members,
       tenantId
     }
-    const config: AxiosRequestConfig = {
+    const config: HttpRequestConfig = {
       method: 'post',
       url: 'v3/batch/conversation/users',
       data: content
     }
-    const response = await this.axiosInstance(config)
+    const response = await this.executeRequest<TeamsBatchOperationResponse>(config)
     return response.data
   }
 
@@ -247,12 +263,12 @@ export class TeamsConnectorClient {
       activity,
       tenantId
     }
-    const config: AxiosRequestConfig = {
+    const config: HttpRequestConfig = {
       method: 'post',
       url: 'v3/batch/conversation/tenant',
       data: content
     }
-    const response = await this.axiosInstance(config)
+    const response = await this.executeRequest<TeamsBatchOperationResponse>(config)
     return response.data
   }
 
@@ -269,12 +285,12 @@ export class TeamsConnectorClient {
       tenantId,
       teamId
     }
-    const config: AxiosRequestConfig = {
+    const config: HttpRequestConfig = {
       method: 'post',
       url: 'v3/batch/conversation/team',
       data: content
     }
-    const response = await this.axiosInstance(config)
+    const response = await this.executeRequest<TeamsBatchOperationResponse>(config)
     return response.data
   }
 
@@ -291,12 +307,12 @@ export class TeamsConnectorClient {
       tenantId,
       members
     }
-    const config: AxiosRequestConfig = {
+    const config: HttpRequestConfig = {
       method: 'post',
       url: 'v3/batch/conversation/channels',
       data: content
     }
-    const response = await this.axiosInstance(config)
+    const response = await this.executeRequest<TeamsBatchOperationResponse>(config)
     return response.data
   }
 
@@ -306,11 +322,11 @@ export class TeamsConnectorClient {
    * @returns A BatchOperationStateResponse object containing the operation state.
    */
   public async getOperationState (operationId: string): Promise<BatchOperationStateResponse> {
-    const config: AxiosRequestConfig = {
+    const config: HttpRequestConfig = {
       method: 'get',
       url: `v3/batch/conversation/${operationId}`
     }
-    const response = await this.axiosInstance(config)
+    const response = await this.executeRequest<BatchOperationStateResponse>(config)
     return response.data
   }
 
@@ -320,11 +336,11 @@ export class TeamsConnectorClient {
    * @returns A BatchFailedEntriesResponse object containing the failed entries.
    */
   public async getFailedEntries (operationId: string): Promise<BatchFailedEntriesResponse> {
-    const config: AxiosRequestConfig = {
+    const config: HttpRequestConfig = {
       method: 'get',
       url: `v3/batch/conversation/failedentries/${operationId}`
     }
-    const response = await this.axiosInstance(config)
+    const response = await this.executeRequest<BatchFailedEntriesResponse>(config)
     return response.data
   }
 
@@ -334,12 +350,61 @@ export class TeamsConnectorClient {
    * @returns A CancelOperationResponse object containing the response.
    */
   public async cancelOperation (operationId: string): Promise<CancelOperationResponse> {
-    const config: AxiosRequestConfig = {
+    const config: HttpRequestConfig = {
       method: 'delete',
       url: `v3/batch/conversation/${operationId}`
     }
 
-    const response = await this.axiosInstance(config)
+    const response = await this.executeRequest<CancelOperationResponse>(config)
     return response.data
   }
+
+  private async executeRequest<T = unknown> (config: HttpRequestConfig): Promise<HttpResponse<T>> {
+    const { method, url, data, headers, params } = config
+    const { Authorization, authorization, ...headersToLog } = { ...this._httpClient.defaultHeaders, ...headers } as Record<string, string>
+    logger.debug('Request: ', {
+      host: this._httpClient.baseURL,
+      url,
+      data,
+      method,
+      params,
+      headers: headersToLog
+    })
+
+    try {
+      const response = await this._httpClient.request<T>(config)
+      logger.debug('Response: ', {
+        status: response.status,
+        statusText: response.statusText,
+        host: this._httpClient.baseURL,
+        url: response.config?.url,
+        data: response.config?.data,
+        method: response.config?.method,
+      })
+      return response
+    } catch (error) {
+      if (error instanceof HttpError) {
+        const message = formatHttpErrorMessage(error)
+        logger.debug('Response error: ', {
+          host: this._httpClient.baseURL,
+          url: error.config.url,
+          method: error.config.method,
+          data: error.config.data,
+          message,
+          stack: error.stack,
+        })
+
+        Object.assign(error, {
+          host: this._httpClient.baseURL,
+          url: error.config.url,
+          method: error.config.method,
+          data: error.config.data,
+          message,
+        })
+
+        throw error
+      }
+      throw error
+    }
+  }
 }