@microsoft/agents-hosting 1.6.0-beta.9.gce9d8facd2 → 1.6.1

package/src/app/proactive/proactive.ts

@@ -49,6 +49,10 @@ export class Proactive<TState extends TurnState> {
     this._storage = options.storage
   }
 
+  private _storageKey (conversationId: string): string {
+    return `${STORAGE_KEY_PREFIX}${conversationId}`
+  }
+
   private requireStorage (): Storage {
     if (!this._storage) {
       throw ExceptionHelper.generateException(Error, Errors.ProactiveStorageRequired)
@@ -104,7 +108,7 @@ export class Proactive<TState extends TurnState> {
    */
   storeConversation (conversation: Conversation): Promise<string>
   async storeConversation (contextOrConversation: TurnContext | Conversation): Promise<string> {
-    return trace(ProactiveTraceDefinitions.storeConversation, async ({ record }) => {
+    return trace(ProactiveTraceDefinitions.storeConversation, async ({ record, actions }) => {
       const conv =
         contextOrConversation instanceof Conversation
           ? contextOrConversation
@@ -112,8 +116,11 @@ export class Proactive<TState extends TurnState> {
 
       conv.validate()
       const id = conv.reference.conversation.id
+      const storage = this.requireStorage()
+      const key = this._storageKey(id)
       record({ conversationId: id })
-      await this.requireStorage().write({ [`${STORAGE_KEY_PREFIX}${id}`]: { reference: conv.reference, claims: conv.claims } })
+      const linkedItem = await actions.link(storage, key)
+      await storage.write({ [key]: { ...linkedItem, reference: conv.reference, claims: conv.claims } })
       return id
     })
   }
@@ -134,8 +141,8 @@ export class Proactive<TState extends TurnState> {
   async getConversation (conversationId: string): Promise<Conversation | undefined> {
     return trace(ProactiveTraceDefinitions.getConversation, async ({ record }) => {
       record({ conversationId })
-      const result = await this.requireStorage().read([`${STORAGE_KEY_PREFIX}${conversationId}`])
-      const stored = result[`${STORAGE_KEY_PREFIX}${conversationId}`] as { reference: any; claims: any } | undefined
+      const storageKey = this._storageKey(conversationId)
+      const stored = (await this.requireStorage().read([storageKey]))?.[storageKey]
       if (!stored) {
         record({ found: false })
         return undefined
@@ -186,7 +193,7 @@ export class Proactive<TState extends TurnState> {
   async deleteConversation (conversationId: string): Promise<void> {
     return trace(ProactiveTraceDefinitions.deleteConversation, async ({ record }) => {
       record({ conversationId })
-      await this.requireStorage().delete([`${STORAGE_KEY_PREFIX}${conversationId}`])
+      await this.requireStorage().delete([this._storageKey(conversationId)])
     })
   }
 
@@ -231,22 +238,26 @@ export class Proactive<TState extends TurnState> {
     conversationOrId: Conversation | string,
     activity: Partial<Activity>
   ): Promise<ResourceResponse> {
-    return trace(ProactiveTraceDefinitions.sendActivity, async ({ record }) => {
-      const conv =
-        typeof conversationOrId === 'string'
-          ? await this.getConversationOrThrow(conversationOrId)
-          : conversationOrId
+    return trace(ProactiveTraceDefinitions.sendActivity, async ({ record, actions }) => {
+      const conv = typeof conversationOrId === 'string'
+        ? await this.getConversationOrThrow(conversationOrId)
+        : conversationOrId
 
+      const id = conv.reference.conversation.id
       const activityToSend: Partial<Activity> = { type: 'message', ...activity }
 
       record({
-        conversationId: conv.reference.conversation.id,
+        conversationId: id,
         channelId: conv.reference.channelId,
         activityType: activityToSend.type ?? 'message',
       })
 
+      if (this._storage) {
+        await actions.link(this._storage, this._storageKey(id))
+      }
+
       logger.info('sendActivity: conversation=%s channel=%s serviceUrl=%s',
-        conv.reference.conversation.id, conv.reference.channelId, conv.reference.serviceUrl)
+        id, conv.reference.channelId, conv.reference.serviceUrl)
 
       let response: ResourceResponse | undefined
       let caughtError: unknown
@@ -261,7 +272,7 @@ export class Proactive<TState extends TurnState> {
       })
 
       if (caughtError !== undefined) {
-        logger.warn('sendActivity: failed for conversation=%s: %s', conv.reference.conversation.id, caughtError)
+        logger.warn('sendActivity: failed for conversation=%s: %s', id, caughtError)
         throw caughtError
       }
       if (response === undefined) throw ExceptionHelper.generateException(Error, Errors.ProactiveSendActivityNoResponse)
@@ -345,20 +356,25 @@ export class Proactive<TState extends TurnState> {
     autoSignInHandlers?: string[],
     continuationActivity?: Partial<Activity>
   ): Promise<void> {
-    return trace(ProactiveTraceDefinitions.continueConversation, async ({ record }) => {
-      const conv =
-        typeof conversationOrId === 'string'
-          ? await this.getConversationOrThrow(conversationOrId)
-          : conversationOrId
+    return trace(ProactiveTraceDefinitions.continueConversation, async ({ record, actions }) => {
+      const conv = typeof conversationOrId === 'string'
+        ? await this.getConversationOrThrow(conversationOrId)
+        : conversationOrId
+
+      const id = conv.reference.conversation.id
 
       record({
-        conversationId: conv.reference.conversation.id,
+        conversationId: id,
         channelId: conv.reference.channelId,
         hasAutoSignIn: !!autoSignInHandlers?.length,
       })
 
+      if (this._storage) {
+        await actions.link(this._storage, this._storageKey(id))
+      }
+
       logger.info('continueConversation: conversation=%s channel=%s serviceUrl=%s',
-        conv.reference.conversation.id, conv.reference.channelId, conv.reference.serviceUrl)
+        id, conv.reference.channelId, conv.reference.serviceUrl)
 
       let caughtError: unknown
 
@@ -384,7 +400,7 @@ export class Proactive<TState extends TurnState> {
             const allAcquired = results.every((r) => !!r.token)
             if (!allAcquired) {
               logger.warn('continueConversation: not all tokens acquired for conversation=%s handlers=%o',
-                conv.reference.conversation.id, autoSignInHandlers)
+                id, autoSignInHandlers)
               if (this._options.failOnUnsignedInConnections !== false) {
                 throw ExceptionHelper.generateException(Error, Errors.ProactiveNotAllTokensAcquired)
               }
@@ -403,10 +419,10 @@ export class Proactive<TState extends TurnState> {
       })
 
       if (caughtError !== undefined) {
-        logger.warn('continueConversation: failed for conversation=%s: %s', conv.reference.conversation.id, caughtError)
+        logger.warn('continueConversation: failed for conversation=%s: %s', id, caughtError)
         throw caughtError
       }
-      logger.debug('continueConversation: complete for conversation=%s', conv.reference.conversation.id)
+      logger.debug('continueConversation: complete for conversation=%s', id)
     })
   }
 

package/src/app/teamsAttachmentDownloader.ts

@@ -9,7 +9,7 @@ import { ConnectorClient } from '../connector-client'
 import { InputFile, InputFileDownloader } from './inputFileDownloader'
 import { TurnContext } from '../turnContext'
 import { TurnState } from './turnState'
-import axios, { AxiosInstance } from 'axios'
+import { HttpClient } from '../httpClient'
 import { z } from 'zod'
 
 const logger = debug('agents:M365AttachmentDownloader')
@@ -18,11 +18,11 @@ const logger = debug('agents:M365AttachmentDownloader')
  * Downloads attachments from Teams and M365 using the bots access token.
  */
 export class M365AttachmentDownloader<TState extends TurnState = TurnState> implements InputFileDownloader<TState> {
-  private _httpClient: AxiosInstance
+  private _httpClient: HttpClient
   private _stateKey: string
 
   public constructor (stateKey: string = 'inputFiles') {
-    this._httpClient = axios.create()
+    this._httpClient = new HttpClient()
     this._stateKey = stateKey
   }
 
@@ -43,7 +43,7 @@ export class M365AttachmentDownloader<TState extends TurnState = TurnState> impl
     }
 
     const connectorClient : ConnectorClient = context.turnState.get<ConnectorClient>(context.adapter.ConnectorClientKey)
-    this._httpClient.defaults.headers = connectorClient.axiosInstance.defaults.headers
+    this._httpClient.defaultHeaders = { ...connectorClient.httpClient.defaultHeaders }
 
     const files: InputFile[] = []
     for (const attachment of attachments) {
@@ -71,13 +71,9 @@ export class M365AttachmentDownloader<TState extends TurnState = TurnState> impl
         const downloadUrl = parsed.success ? parsed.data.downloadUrl : attachment.contentUrl
         const response = await this._httpClient.get(downloadUrl, { responseType: 'arraybuffer' })
 
-        const content = Buffer.from(response.data, 'binary')
-        const contentTypeHeader = typeof response.headers.get === 'function'
-          ? response.headers.get('content-type')
-          : response.headers['content-type']
-        const contentType = Array.isArray(contentTypeHeader)
-          ? (contentTypeHeader[0] ?? 'application/octet-stream')
-          : (typeof contentTypeHeader === 'string' ? contentTypeHeader : 'application/octet-stream')
+        const content = Buffer.from(response.data as ArrayBuffer)
+        const contentTypeHeader = response.headers.get('content-type')
+        const contentType = typeof contentTypeHeader === 'string' ? contentTypeHeader : 'application/octet-stream'
         inputFile = { content, contentType, contentUrl: attachment.contentUrl }
       } catch (error) {
         logger.error(`Failed to download Teams attachment: ${error}`)