fix: update message thread on events

.github/workflows/ci.yml

@@ -15,8 +15,6 @@ jobs:
     steps:
       - name: Checkout service-agent
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - name: Setup node v20
         uses: actions/setup-node@v4

packages/main/src/controllers/message/MessageService.ts

@@ -396,7 +396,7 @@ export class MessageService {
           content: {},
           tags: { messageId: message.id, connectionId: message.connectionId },
         })
-      this.logger.debug!(`messageId: ${messageId}`)
+      this.logger.debug!(`messageId saved: ${messageId}`)
       return { id: messageId ?? utils.uuid() } // TODO: persistant mapping between AFJ records and Service Agent flows. Support external message id setting
     } catch (error) {
       this.logger.error(`Error: ${error.stack}`)

packages/main/src/events/MessageEvents.ts

@@ -94,6 +94,7 @@ export const messageEvents = async (agent: ServiceAgent, config: ServerConfig) =
         timestamp: new Date(), // It can take also 'sentTime' to be related to the origin
       })
 
+      if (msg.threadId) msg.threadId = await getRecordId(agent, msg.threadId)
       await sendMessageReceivedEvent(agent, msg, msg.timestamp, config)
     }
 
@@ -148,7 +149,7 @@ export const messageEvents = async (agent: ServiceAgent, config: ServerConfig) =
     if (message.type === CallOfferMessage.type.messageTypeUri) {
       const callOffer = message as CallOfferMessage
       const msg = new CallOfferRequestMessage({
-        id: message.id,
+        id: await getRecordId(agent, message.id),
         connectionId: connection.id,
         offerExpirationTime: callOffer.offerExpirationTime ?? undefined,
         offerStartTime: callOffer.offerStartTime ?? undefined,
@@ -164,7 +165,7 @@ export const messageEvents = async (agent: ServiceAgent, config: ServerConfig) =
     if (message.type === CallEndMessage.type.messageTypeUri) {
       const thread = (message as CallEndMessage).thread
       const msg = new CallEndRequestMessage({
-        id: message.id,
+        id: await getRecordId(agent, message.id),
         connectionId: connection.id,
         threadId: thread?.threadId,
         timestamp: new Date(),
@@ -176,7 +177,7 @@ export const messageEvents = async (agent: ServiceAgent, config: ServerConfig) =
     if (message.type === CallAcceptMessage.type.messageTypeUri) {
       const parameters = (message as CallAcceptMessage).parameters
       const msg = new CallAcceptRequestMessage({
-        id: message.id,
+        id: await getRecordId(agent, message.id),
         connectionId: connection.id,
         parameters: parameters,
         threadId: message.thread?.threadId,
@@ -189,7 +190,7 @@ export const messageEvents = async (agent: ServiceAgent, config: ServerConfig) =
     if (message.type === CallRejectMessage.type.messageTypeUri) {
       const thread = (message as CallEndMessage).thread
       const msg = new CallRejectRequestMessage({
-        id: message.id,
+        id: await getRecordId(agent, message.id),
         connectionId: connection.id,
         threadId: thread?.threadId,
         timestamp: new Date(),
@@ -221,7 +222,7 @@ export const messageEvents = async (agent: ServiceAgent, config: ServerConfig) =
           ],
           connectionId: record.connectionId!,
           id: message.id,
-          threadId: record.threadId,
+          threadId: await getRecordId(agent, record.threadId),
           timestamp: record.updatedAt,
         })
 
@@ -312,7 +313,7 @@ export const messageEvents = async (agent: ServiceAgent, config: ServerConfig) =
           ],
           connectionId: record.connectionId!,
           id: message.id,
-          threadId: record.threadId,
+          threadId: await getRecordId(agent, record.threadId),
           timestamp: record.updatedAt,
         })
 
@@ -330,7 +331,6 @@ export const messageEvents = async (agent: ServiceAgent, config: ServerConfig) =
       config.logger.debug(`CredentialStateChangedEvent received. Record id: 
       ${JSON.stringify(payload.credentialRecord.id)}, state: ${JSON.stringify(payload.credentialRecord.state)}`)
       const record = payload.credentialRecord
-      const flowRecord = await agent.genericRecords.findById(record.threadId)
 
       if (record.state === CredentialState.ProposalReceived) {
         const credentialProposalMessage = await agent.credentials.findProposalMessage(record.id)
@@ -348,14 +348,15 @@ export const messageEvents = async (agent: ServiceAgent, config: ServerConfig) =
           timestamp: record.createdAt,
         })
 
+        if (message.threadId) message.threadId = await getRecordId(agent, message.threadId)
         await sendMessageReceivedEvent(agent, message, message.timestamp, config)
       } else if (
         [CredentialState.Declined, CredentialState.Done, CredentialState.Abandoned].includes(record.state)
       ) {
         const message = new CredentialReceptionMessage({
           connectionId: record.connectionId!,
           id: record.id,
-          threadId: (flowRecord?.getTag('messageId') as string) ?? record.threadId,
+          threadId: await getRecordId(agent, record.threadId),
           state:
             record.errorMessage === 'issuance-abandoned: e.msg.refused'
               ? CredentialState.Declined
@@ -400,6 +401,7 @@ export const messageEvents = async (agent: ServiceAgent, config: ServerConfig) =
           })),
         })
 
+        if (message.threadId) message.threadId = await getRecordId(agent, message.threadId)
         await sendMessageReceivedEvent(agent, message, message.timestamp, config)
       }
     }
@@ -468,6 +470,7 @@ export const messageEvents = async (agent: ServiceAgent, config: ServerConfig) =
       mrzData,
     })
 
+    msg.id = await getRecordId(agent, msg.id)
     await sendMessageReceivedEvent(agent, msg, msg.timestamp, config)
   })
 
@@ -481,6 +484,7 @@ export const messageEvents = async (agent: ServiceAgent, config: ServerConfig) =
       dataGroups,
     })
 
+    msg.id = await getRecordId(agent, msg.id)
     await sendMessageReceivedEvent(agent, msg, msg.timestamp, config)
   })
 
@@ -505,6 +509,7 @@ export const messageEvents = async (agent: ServiceAgent, config: ServerConfig) =
         threadId,
         state: stateMap[description.code as MrtdProblemReportReason],
       })
+      msg.id = await getRecordId(agent, msg.id)
       await sendMessageReceivedEvent(agent, msg, msg.timestamp, config)
     } else if (
       [MrtdProblemReportReason.MrzRefused, MrtdProblemReportReason.MrzTimeout].includes(
@@ -516,6 +521,7 @@ export const messageEvents = async (agent: ServiceAgent, config: ServerConfig) =
         threadId,
         state: stateMap[description.code as MrtdProblemReportReason],
       })
+      msg.id = await getRecordId(agent, msg.id)
       await sendMessageReceivedEvent(agent, msg, msg.timestamp, config)
     }
   })
@@ -529,8 +535,6 @@ const sendMessageReceivedEvent = async (
   timestamp: Date,
   config: ServerConfig,
 ) => {
-  const recordId = await agent.genericRecords.findById(message.id)
-  if (recordId?.getTag('messageId') as string) message.id = recordId?.getTag('messageId') as string
   const body = new MessageReceived({
     timestamp,
     message: message,
@@ -558,3 +562,8 @@ const sendMessageStateUpdatedEvent = async (options: {
   })
   await sendWebhookEvent(config.webhookUrl + '/message-state-updated', body, config.logger)
 }
+
+const getRecordId = async (agent: ServiceAgent, id: string): Promise<string> => {
+  const record = await agent.genericRecords.findById(id)
+  return (record?.getTag('messageId') as string) ?? id
+}