weflow-cli 1.5.0 → 1.6.1

package/src/services/wechatMessageService.ts

@@ -7,6 +7,7 @@ import crypto from 'crypto'
 import path from 'path'
 import { WechatClient } from '../core/wechatClient.js'
 import { configService } from './configService.js'
+import { resolveInboundRouting } from './assistantRouting.js'
 import type { WechatOCConfig, WechatLoginSession, WechatInboundMessage, WechatMessageComponent } from '../types.js'
 
 function sleep(ms: number): Promise<void> {
@@ -35,6 +36,18 @@ export class WechatMessageService {
       apiTimeoutMs: config.apiTimeoutMs,
       token: config.token,
     })
+    // 加载持久化的 context_token, 让一次性 send 命令也能复用历史 token
+    if (config.contextTokens && typeof config.contextTokens === 'object') {
+      for (const [wxid, token] of Object.entries(config.contextTokens)) {
+        if (wxid && token) this.contextTokens.set(wxid, token)
+      }
+    } else {
+      // 未显式传入时, 从 configService 读取 (覆盖常见的一次性 send 场景)
+      const persisted = configService.getContextTokens()
+      for (const [wxid, token] of Object.entries(persisted)) {
+        if (wxid && token) this.contextTokens.set(wxid, token)
+      }
+    }
   }
 
   // ====== Login ======
@@ -204,7 +217,10 @@ export class WechatMessageService {
       tokenRequired: true,
     })
 
-    return result.ret === 0 && result.errcode === 0
+    // 服务器成功时返回 message_id (不带 ret/errcode); 失败时返回非零 ret/errcode
+    const failed = (result.ret != null && result.ret !== 0) ||
+                   (result.errcode != null && result.errcode !== 0)
+    return !failed
   }
 
   async sendMedia(
@@ -296,7 +312,9 @@ export class WechatMessageService {
       tokenRequired: true,
     })
 
-    return result.ret === 0 && result.errcode === 0
+    const failed = (result.ret != null && result.ret !== 0) ||
+                   (result.errcode != null && result.errcode !== 0)
+    return !failed
   }
 
   async sendImage(userId: string, imagePath: string): Promise<boolean> {
@@ -328,10 +346,13 @@ export class WechatMessageService {
   private parseInboundMessage(msg: any): WechatInboundMessage | null {
     const fromUserId: string = msg.from_user_id || ''
     if (!fromUserId) return null
+    const routing = resolveInboundRouting(msg, String(configService.get('wechatOcAccountId') || ''))
 
     // Store context token for future replies
     if (msg.context_token) {
-      this.contextTokens.set(fromUserId, msg.context_token)
+      this.contextTokens.set(routing.conversationId, msg.context_token)
+      // 持久化, 让后续一次性 send 命令也能复用
+      try { configService.upsertContextToken(routing.conversationId, msg.context_token) } catch {}
     }
 
     const components: WechatMessageComponent[] = []
@@ -369,6 +390,7 @@ export class WechatMessageService {
     return {
       messageId: msg.client_id || uuidHex(),
       fromUserId,
+      ...routing,
       senderNickname: msg.from_user_id || '',
       timestamp: Math.floor(Date.now() / 1000),
       timestampMs: Date.now(),