fix the duplication

Author: Randall-Jiang

packages/core/src/amazonqTest/chat/controller/messenger/messenger.ts

@@ -39,6 +39,7 @@ import { keys } from '../../../../shared/utilities/tsUtils'
 import { cancellingProgressField, testGenCompletedField } from '../../../models/constants'
 import { testGenState } from '../../../../codewhisperer/models/model'
 import { TelemetryHelper } from '../../../../codewhisperer/util/telemetryHelper'
+import { extractErrorInfo } from '../../../../shared/utilities/messageUtil'
 
 export type UnrecoverableErrorType = 'no-project-found' | 'no-open-file-found' | 'invalid-file-type'
 
@@ -249,26 +250,19 @@ export class Messenger {
             { timeout: 60000, truthy: true }
         )
             .catch((error: any) => {
-                let errorMessage = 'Error reading chat stream.'
-                let statusCode = undefined
-                let requestID = undefined
-                if (error instanceof CodeWhispererStreamingServiceException) {
-                    errorMessage = error.message
-                    statusCode = getHttpStatusCode(error) ?? 0
-                    requestID = getRequestId(error)
-                }
+                const errorInfo = extractErrorInfo(error)
                 let message = 'This error is reported to the team automatically. Please try sending your message again.'
-                if (errorMessage !== undefined) {
-                    message += `\n\nDetails: ${errorMessage}`
+                if (errorInfo.errorMessage !== undefined) {
+                    message += `\n\nDetails: ${errorInfo.errorMessage}`
                 }
 
-                if (statusCode !== undefined) {
-                    message += `\n\nStatus Code: ${statusCode}`
+                if (errorInfo.statusCode !== undefined) {
+                    message += `\n\nStatus Code: ${errorInfo.statusCode}`
                 }
 
-                if (requestID !== undefined) {
-                    messageId = requestID
-                    message += `\n\nRequest ID: ${requestID}`
+                if (errorInfo.requestId !== undefined) {
+                    messageId = errorInfo.requestId
+                    message += `\n\nRequest ID: ${errorInfo.requestId}`
                 }
                 this.sendMessage(message.trim(), tabID, 'answer')
             })

packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts

@@ -47,6 +47,7 @@ import { ChatStream } from '../../../tools/chatStream'
 import { getWorkspaceForFile } from '../../../../shared/utilities/workspaceUtils'
 import path from 'path'
 import { CommandValidation } from '../../../tools/executeBash'
+import { extractErrorInfo } from '../../../../shared/utilities/messageUtil'
 
 export type StaticTextResponseType = 'quick-action-help' | 'onboarding-help' | 'transform' | 'help'
 
@@ -326,26 +327,21 @@ export class Messenger {
             { timeout: 60000, truthy: true }
         )
             .catch((error: any) => {
-                let errorMessage = 'Error reading chat stream.'
-                let statusCode = undefined
-                let requestID = undefined
-
-                if (error instanceof CodeWhispererStreamingServiceException) {
-                    errorMessage = error.message
-                    statusCode = getHttpStatusCode(error) ?? 0
-                    requestID = getRequestId(error)
-                }
-
+                const errorInfo = extractErrorInfo(error)
                 this.showChatExceptionMessage(
-                    { errorMessage, statusCode: statusCode?.toString(), sessionID: undefined },
+                    {
+                        errorMessage: errorInfo.errorMessage,
+                        statusCode: errorInfo.statusCode?.toString(),
+                        sessionID: undefined,
+                    },
                     tabID,
-                    requestID
+                    errorInfo.requestId
                 )
-                getLogger().error(`error: ${errorMessage} tabID: ${tabID} requestID: ${requestID}`)
+                getLogger().error(`error: ${errorInfo.errorMessage} tabID: ${tabID} requestID: ${errorInfo.requestId}`)
 
                 followUps = []
                 relatedSuggestions = []
-                this.telemetryHelper.recordMessageResponseError(triggerPayload, tabID, statusCode ?? 0)
+                this.telemetryHelper.recordMessageResponseError(triggerPayload, tabID, errorInfo.statusCode ?? 0)
             })
             .finally(async () => {
                 if (

packages/core/src/shared/utilities/messageUtil.ts

@@ -0,0 +1,31 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { CodeWhispererStreamingServiceException } from '@amzn/codewhisperer-streaming'
+import { getHttpStatusCode, getRequestId } from '../errors'
+
+export interface MessageErrorInfo {
+    errorMessage: string
+    statusCode?: number
+    requestId?: string
+}
+
+export function extractErrorInfo(error: any): MessageErrorInfo {
+    let errorMessage = 'Error reading chat stream.'
+    let statusCode = undefined
+    let requestId = undefined
+
+    if (error instanceof CodeWhispererStreamingServiceException) {
+        errorMessage = error.message
+        statusCode = getHttpStatusCode(error) ?? 0
+        requestId = getRequestId(error)
+    }
+
+    return {
+        errorMessage,
+        statusCode,
+        requestId,
+    }
+}