weflow-cli 1.9.0 → 1.10.0

package/src/services/wechatMessageService.ts

@@ -8,6 +8,8 @@ import path from 'path'
 import { WechatClient } from '../core/wechatClient.js'
 import { configService } from './configService.js'
 import { resolveInboundRouting } from './assistantRouting.js'
+import { mediaTypeOf, saveInboundMedia, wechatMediaDir } from './wechatMedia.js'
+import type { InboundMediaType } from './wechatMedia.js'
 import type { WechatOCConfig, WechatLoginSession, WechatInboundMessage, WechatMessageComponent } from '../types.js'
 
 function sleep(ms: number): Promise<void> {
@@ -64,10 +66,16 @@ export class WechatMessageService {
   private messageCallbacks: Array<(msg: WechatInboundMessage) => void> = []
   /** 服务端说过 token 失效了。**只由长轮询置位**（见 `classifyPollResult`），恢复时清掉 */
   private tokenExpired = false
+  /** 入站媒体是否落地。undefined = 每次去读配置（默认关，见 `wechatMedia.ts` 的边界 1） */
+  private mediaDownload?: boolean | string
+  /** 落地目录。undefined = 用 `wechatMediaDir()`（可被环境变量改，测试用临时目录） */
+  private mediaDirOverride?: string
 
   constructor(config: WechatOCConfig = {}) {
     this.config = config
     this.syncBuf = config.syncBuf || ''
+    this.mediaDownload = config.mediaDownload
+    this.mediaDirOverride = config.mediaDir
     this.client = new WechatClient({
       baseUrl: config.baseUrl,
       cdnBaseUrl: config.cdnBaseUrl,
@@ -225,7 +233,7 @@ export class WechatMessageService {
         const msgs: any[] = data.msgs || []
         for (const msg of msgs) {
           if (this.shutdownFlag) return
-          const inbound = this.parseInboundMessage(msg)
+          const inbound = await this.parseInboundMessage(msg)
           if (inbound) {
             for (const cb of this.messageCallbacks) {
               try { cb(inbound) } catch (error: any) {
@@ -409,7 +417,40 @@ export class WechatMessageService {
 
   // ====== Private ======
 
-  private parseInboundMessage(msg: any): WechatInboundMessage | null {
+  /** 入站媒体落地的开关：构造时注入的优先，其次读配置。默认关 —— 关着就不发任何网络请求 */
+  private mediaDownloadEnabled(): boolean {
+    const raw = this.mediaDownload ?? configService.get('wechatMediaDownload')
+    return raw === true || raw === 'true'
+  }
+
+  /**
+   * 下载一件入站媒体并落盘，返回路径；**没开这个功能、或下载失败，都返回空串**。
+   * 失败会往日志里写一行原因 —— "没开"和"开了但失败了"必须分得开，否则出事时两种证据全无。
+   */
+  private async inboundMediaPath(
+    item: any,
+    mediaType: InboundMediaType,
+    index: number,
+    messageId: string,
+  ): Promise<string> {
+    if (!this.mediaDownloadEnabled()) return ''
+    const result = await saveInboundMedia({
+      item,
+      mediaType,
+      index,
+      messageId,
+      dir: this.mediaDirOverride || wechatMediaDir(),
+      serverFileName: mediaType === 'file' ? item?.file_item?.file_name : undefined,
+      download: (param, key) => this.client.downloadMedia(param, key),
+    })
+    if (!result.path) {
+      console.warn(`入站媒体未落地（${mediaType}）：${result.reason}`)
+      return ''
+    }
+    return result.path
+  }
+
+  private async parseInboundMessage(msg: any): Promise<WechatInboundMessage | null> {
     const fromUserId: string = msg.from_user_id || ''
     if (!fromUserId) return null
     const routing = resolveInboundRouting(msg, String(configService.get('wechatOcAccountId') || ''))
@@ -423,19 +464,29 @@ export class WechatMessageService {
 
     const components: WechatMessageComponent[] = []
     const itemList: any[] = msg.item_list || []
+    const messageId: string = msg.client_id || uuidHex()
+    let mediaIndex = 0
 
     for (const item of itemList) {
       const itemType = item.type as number
       if (itemType === 1 && item.text_item) {
         components.push({ type: 'plain', text: item.text_item.text || '' })
-      } else if (itemType === 2 && item.image_item) {
-        components.push({ type: 'image', filePath: '' }) // image download deferred
-      } else if (itemType === 3 && item.voice_item) {
-        components.push({ type: 'record', filePath: '' })
-      } else if (itemType === 4 && item.file_item) {
-        components.push({ type: 'file', name: item.file_item.file_name || '', filePath: '' })
-      } else if (itemType === 5 && item.video_item) {
-        components.push({ type: 'video', filePath: '' })
+        continue
+      }
+      const mediaType = mediaTypeOf(itemType)
+      // 缺节点就整项跳过（与既有行为一致：形状不对的项不进 components）
+      if (!mediaType || !item[`${mediaType === 'record' ? 'voice' : mediaType}_item`]) continue
+      mediaIndex += 1
+      // 落盘（默认关，关着时这里不做任何 IO）
+      const filePath = await this.inboundMediaPath(item, mediaType, mediaIndex, messageId)
+      if (mediaType === 'image') {
+        components.push({ type: 'image', filePath })
+      } else if (mediaType === 'record') {
+        components.push({ type: 'record', filePath })
+      } else if (mediaType === 'file') {
+        components.push({ type: 'file', name: item.file_item.file_name || '', filePath })
+      } else {
+        components.push({ type: 'video', filePath })
       }
     }
 
@@ -454,7 +505,7 @@ export class WechatMessageService {
     const messageStr = textComponents.map(c => (c as { type: 'plain'; text: string }).text).join('')
 
     return {
-      messageId: msg.client_id || uuidHex(),
+      messageId,
       fromUserId,
       ...routing,
       senderNickname: msg.from_user_id || '',

package/src/types.ts

@@ -65,6 +65,10 @@ export interface WechatOCConfig {
   apiTimeoutMs?: number
   typingKeepaliveIntervalS?: number
   typingTicketTtlS?: number
+  /** 入站媒体是否落地（缺省=读 `wechatMediaDownload` 配置，默认关）。见 src/services/wechatMedia.ts */
+  mediaDownload?: boolean | string
+  /** 入站媒体落地目录（缺省=output/wechat-media/，可被 WEFLOW_WECHAT_MEDIA_DIR 改） */
+  mediaDir?: string
 }
 
 export interface WechatLoginSession {

package/dist/src/utils/wechatEmoji.d.ts

@@ -1,5 +0,0 @@
-/** Replace known WeChat face codes like [害羞] with emoji; unknown codes pass through. */
-export declare function convertFaces(text: string | undefined | null): string;
-/** Convert faces, then truncate without splitting a surrogate pair. */
-export declare function convertFacesTruncated(text: string | undefined | null, max: number): string;
-//# sourceMappingURL=wechatEmoji.d.ts.map

package/dist/src/utils/wechatEmoji.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"wechatEmoji.d.ts","sourceRoot":"","sources":["../../../src/utils/wechatEmoji.ts"],"names":[],"mappings":"AA4BA,wFAAwF;AACxF,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,MAAM,CAGpE;AAED,uEAAuE;AACvE,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAE1F"}

package/dist/src/utils/wechatEmoji.js

@@ -1,35 +0,0 @@
-import { readFileSync } from 'fs';
-import { dirname, join } from 'path';
-import { fileURLToPath } from 'url';
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-// dist/src/utils -> package root. The table is shared with the Python side.
-const DATA_FILE = join(__dirname, '..', '..', '..', 'scripts', 'data', 'wechat_emoji.json');
-const faces = {};
-try {
-    const parsed = JSON.parse(readFileSync(DATA_FILE, 'utf8'));
-    for (const [name, emoji] of Object.entries(parsed)) {
-        // Entries starting with "_" are documentation, not faces.
-        if (!name.startsWith('_') && typeof emoji === 'string') {
-            faces[name] = emoji;
-        }
-    }
-}
-catch {
-    // Missing table just means faces stay as their [名称] source text.
-}
-const escapeRe = (text) => text.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-const names = Object.keys(faces).sort((a, b) => b.length - a.length);
-// Longest name first so [左哼哼] can never be shadowed by a shorter prefix.
-const pattern = names.length > 0 ? new RegExp(`\\[(${names.map(escapeRe).join('|')})\\]`, 'g') : null;
-/** Replace known WeChat face codes like [害羞] with emoji; unknown codes pass through. */
-export function convertFaces(text) {
-    if (!text || !pattern)
-        return text || '';
-    return text.replace(pattern, (match, name) => faces[name] ?? match);
-}
-/** Convert faces, then truncate without splitting a surrogate pair. */
-export function convertFacesTruncated(text, max) {
-    return Array.from(convertFaces(text)).slice(0, max).join('');
-}
-//# sourceMappingURL=wechatEmoji.js.map

package/dist/src/utils/wechatEmoji.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"wechatEmoji.js","sourceRoot":"","sources":["../../../src/utils/wechatEmoji.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,IAAI,CAAA;AACjC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAA;AAEnC,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACjD,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;AAErC,4EAA4E;AAC5E,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,mBAAmB,CAAC,CAAA;AAE3F,MAAM,KAAK,GAA2B,EAAE,CAAA;AACxC,IAAI,CAAC;IACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAA4B,CAAA;IACrF,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACnD,0DAA0D;QAC1D,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YACvD,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAA;QACrB,CAAC;IACH,CAAC;AACH,CAAC;AAAC,MAAM,CAAC;IACP,iEAAiE;AACnE,CAAC;AAED,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAU,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAA;AACtF,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAA;AACpE,yEAAyE;AACzE,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;AAErG,wFAAwF;AACxF,MAAM,UAAU,YAAY,CAAC,IAA+B;IAC1D,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO;QAAE,OAAO,IAAI,IAAI,EAAE,CAAA;IACxC,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,IAAY,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,CAAA;AAC7E,CAAC;AAED,uEAAuE;AACvE,MAAM,UAAU,qBAAqB,CAAC,IAA+B,EAAE,GAAW;IAChF,OAAO,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;AAC9D,CAAC"}