fix: network timeout error (chatgpt-web-dev#671)

xiaokaiwangdragonplus · web-flow · commit 891deffc07c1 · 2025-12-24T19:16:12.000+08:00
diff --git a/service/src/chatgpt/index.ts b/service/src/chatgpt/index.ts
@@ -300,60 +300,81 @@ search result: <search_result>${searchResultContent}</search_result>`,
       const toolCalls: Array<{ type: string, result?: any }> = []
       let editImageId: string | undefined
 
-      for await (const event of stream) {
-        if (event.type === 'response.reasoning_summary_text.delta') {
-          const delta: string = event.delta || ''
-          responseReasoning += delta
-          process?.({
-            delta: { reasoning: delta },
-          })
-        }
-        else if (event.type === 'response.reasoning_summary_text.done') {
-          responseReasoning += '\n'
-          process?.({
-            delta: { reasoning: '\n' },
-          })
-        }
-        else if (event.type === 'response.output_text.delta') {
-          const delta: string = event.delta || ''
-          responseText += delta
-          process?.({
-            text: responseText,
-            delta: { text: delta },
-          })
-        }
-        else if (event.type === 'response.completed') {
-          const resp = event.response
-          responseId = resp.id
-          usage.prompt_tokens = resp.usage.input_tokens
-          usage.completion_tokens = resp.usage.output_tokens
-          usage.total_tokens = resp.usage.total_tokens
-
-          // Extract tool calls from response
-          if (resp.output && Array.isArray(resp.output)) {
-            editImageId = responseId
-            for (const output of resp.output) {
-              if (output.type === 'image_generation_call' && output.result) {
-                const base64Data = output.result
-                const fileIdentifier = await saveBase64ToFile(base64Data)
-
-                if (fileIdentifier) {
-                  toolCalls.push({
-                    type: 'image_generation',
-                    result: fileIdentifier, // 文件名或S3 URL，前端会自动处理
-                  })
-                }
-                else {
-                  toolCalls.push({
-                    type: 'image_generation',
-                    result: base64Data,
-                  })
+      // 心跳机制：防止生图等长时间操作时连接超时
+      let heartbeatInterval: NodeJS.Timeout | null = null
+      const HEARTBEAT_INTERVAL = 30000 // 30秒发送一次心跳
+
+      // 启动心跳定时器
+      heartbeatInterval = setInterval(() => {
+        // 发送心跳数据，保持连接活跃
+        process?.({
+          delta: { heartbeat: true },
+        })
+      }, HEARTBEAT_INTERVAL)
+
+      try {
+        for await (const event of stream) {
+          if (event.type === 'response.reasoning_summary_text.delta') {
+            const delta: string = event.delta || ''
+            responseReasoning += delta
+            process?.({
+              delta: { reasoning: delta },
+            })
+          }
+          else if (event.type === 'response.reasoning_summary_text.done') {
+            responseReasoning += '\n'
+            process?.({
+              delta: { reasoning: '\n' },
+            })
+          }
+          else if (event.type === 'response.output_text.delta') {
+            const delta: string = event.delta || ''
+            responseText += delta
+            process?.({
+              text: responseText,
+              delta: { text: delta },
+            })
+          }
+          else if (event.type === 'response.completed') {
+            const resp = event.response
+            responseId = resp.id
+            usage.prompt_tokens = resp.usage.input_tokens
+            usage.completion_tokens = resp.usage.output_tokens
+            usage.total_tokens = resp.usage.total_tokens
+
+            // Extract tool calls from response
+            if (resp.output && Array.isArray(resp.output)) {
+              editImageId = responseId
+              for (const output of resp.output) {
+                if (output.type === 'image_generation_call' && output.result) {
+                  const base64Data = output.result
+                  const fileIdentifier = await saveBase64ToFile(base64Data)
+
+                  if (fileIdentifier) {
+                    toolCalls.push({
+                      type: 'image_generation',
+                      result: fileIdentifier, // 文件名或S3 URL，前端会自动处理
+                    })
+                  }
+                  else {
+                    toolCalls.push({
+                      type: 'image_generation',
+                      result: base64Data,
+                    })
+                  }
                 }
               }
             }
           }
         }
       }
+      finally {
+        // 清除心跳定时器
+        if (heartbeatInterval) {
+          clearInterval(heartbeatInterval)
+          heartbeatInterval = null
+        }
+      }
 
       const response = {
         id: responseId || messageId,
diff --git a/service/src/chatgpt/types.ts b/service/src/chatgpt/types.ts
@@ -26,6 +26,7 @@ export interface ResponseChunk {
   delta?: {
     reasoning?: string
     text?: string
+    heartbeat?: boolean
   }
   // 工具调用结果
   tool_calls?: Array<{
diff --git a/service/src/routes/chat.ts b/service/src/routes/chat.ts
@@ -67,7 +67,8 @@ router.get('/chat-history', auth, async (req, res) => {
         result.push({
           uuid: c.uuid,
           model: c.model,
-          dateTime: new Date(c.dateTime),
+          // 用户消息使用 promptDateTime（如果存在），否则使用 dateTime（兼容旧数据）
+          dateTime: new Date(c.promptDateTime || c.dateTime),
           text: c.prompt,
           images: c.images,
           inversion: true,
@@ -92,6 +93,7 @@ router.get('/chat-history', auth, async (req, res) => {
         // Build response object with tool-related fields
         const responseObj: any = {
           uuid: c.uuid,
+          // AI回复使用 dateTime（AI回复完成时间）
           dateTime: new Date(c.dateTime),
           searchQuery: c.searchQuery,
           searchResults: c.searchResults,
@@ -411,6 +413,9 @@ router.post('/chat-process', [auth, limiter], async (req, res) => {
                   .map((tool: any) => tool.result)
               }
 
+              // 判断是否是生图请求（有 tool_images 或 tool_calls 中包含 image_generation）
+              const isImageGeneration = tool_images && tool_images.length > 0
+
               if (regenerate && message.options.messageId) {
                 const previousResponse = message.previousResponse || []
                 previousResponse.push({ response: message.response, options: message.options })
@@ -425,6 +430,7 @@ router.post('/chat-process', [auth, limiter], async (req, res) => {
                   tool_images,
                   tool_calls,
                   editImageId,
+                  isImageGeneration, // 生图时更新完成时间
                 )
               }
               else {
@@ -439,6 +445,7 @@ router.post('/chat-process', [auth, limiter], async (req, res) => {
                   tool_images,
                   tool_calls,
                   editImageId,
+                  isImageGeneration, // 生图时更新完成时间
                 )
               }
 
diff --git a/service/src/storage/model.ts b/service/src/storage/model.ts
@@ -133,6 +133,7 @@ export class ChatInfo {
   model: string
   uuid: number
   dateTime: number
+  promptDateTime?: number // 用户消息的创建时间
   prompt: string
   images?: string[]
   searchQuery?: string
@@ -153,7 +154,9 @@ export class ChatInfo {
     this.prompt = prompt
     this.images = images
     this.options = options
-    this.dateTime = new Date().getTime()
+    const now = new Date().getTime()
+    this.dateTime = now
+    this.promptDateTime = now // 保存用户消息的创建时间
   }
 }
 
diff --git a/service/src/storage/mongo.ts b/service/src/storage/mongo.ts
@@ -267,6 +267,7 @@ export async function updateChat(
   tool_images?: string[],
   tool_calls?: Array<{ type: string, result?: any }>,
   editImageId?: string,
+  updateDateTime?: boolean,
 ) {
   const query = { _id: new ObjectId(chatId) }
   const update: any = {
@@ -294,6 +295,9 @@ export async function updateChat(
   if (editImageId)
     update.$set.editImageId = editImageId
 
+  if (updateDateTime || (response && response.trim().length > 0))
+    update.$set.dateTime = new Date().getTime()
+
   await chatCol.updateOne(query, update)
 }
 
diff --git a/src/views/chat/index.vue b/src/views/chat/index.vue
@@ -54,6 +54,30 @@ const currentNavIndexRef = ref<number>(-1)
 // 存储上一次工具调用的响应ID，用于传递 previousResponseId
 const lastToolResponseId = ref<string>('')
 
+// 从历史记录中初始化 lastToolResponseId
+function initLastToolResponseId() {
+  // 遍历历史记录，找到最后一个有 editImageId 的消息
+  for (let i = dataSources.value.length - 1; i >= 0; i--) {
+    const chat = dataSources.value[i]
+    if (!chat.inversion && chat.editImageId) {
+      lastToolResponseId.value = chat.editImageId
+      return
+    }
+  }
+  // 如果没有找到 editImageId，尝试使用最后一个 assistant 消息的 conversationOptions.parentMessageId
+  // 只有当 parentMessageId 以 resp_ 开头时才使用
+  for (let i = dataSources.value.length - 1; i >= 0; i--) {
+    const chat = dataSources.value[i]
+    const parentMessageId = chat.conversationOptions?.parentMessageId
+    if (!chat.inversion && parentMessageId && parentMessageId.startsWith('resp_')) {
+      lastToolResponseId.value = parentMessageId
+      return
+    }
+  }
+  // 如果都没有，清空
+  lastToolResponseId.value = ''
+}
+
 let loadingms: MessageReactive
 let allmsg: MessageReactive
 let prevScrollTop: number
@@ -842,6 +866,8 @@ async function loadMoreMessage(event: any) {
   const lastId = chatStore.chat[chatIndex].data[0].uuid
   await chatStore.syncChat({ roomId: currentChatRoom.value!.roomId } as Chat.ChatRoom, lastId, () => {
     loadingms && loadingms.destroy()
+    // 加载更多消息后，重新初始化 lastToolResponseId
+    initLastToolResponseId()
     nextTick(() => scrollTo(event.target.scrollHeight - scrollPosition))
   }, () => {
     loadingms = ms.loading(
@@ -864,6 +890,8 @@ const handleSyncChat
     // 直接刷 极小概率不请求
     chatStore.syncChat({ roomId: Number(uuid) } as Chat.ChatRoom, undefined, () => {
       firstLoading.value = false
+      // 初始化 lastToolResponseId 从历史记录中
+      initLastToolResponseId()
       const scrollRef = document.querySelector('#scrollRef')
       if (scrollRef)
         nextTick(() => scrollRef.scrollTop = scrollRef.scrollHeight)
@@ -1120,6 +1148,15 @@ watch(() => chatStore.active, () => {
   handleSyncChat()
 })
 
+// 监听 dataSources 变化，自动更新 lastToolResponseId
+// 使用 immediate: false 避免初始化时重复调用（handleSyncChat 回调中已调用）
+watch(() => dataSources.value.length, () => {
+  // 只在数据源长度变化时更新（历史记录加载完成）
+  nextTick(() => {
+    initLastToolResponseId()
+  })
+})
+
 onUnmounted(() => {
   if (loading.value)
     controller.abort()

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ export interface ResponseChunk {`
`26`	`26`	`delta?: {`
`27`	`27`	`reasoning?: string`
`28`	`28`	`text?: string`
	`29`	`+ heartbeat?: boolean`
`29`	`30`	`}`
`30`	`31`	`// 工具调用结果`
`31`	`32`	`tool_calls?: Array<{`