@dcrays/dcgchat 0.4.24 → 0.4.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcrays/dcgchat",
-  "version": "0.4.24",
+  "version": "0.4.25",
   "type": "module",
   "description": "OpenClaw channel plugin for 书灵墨宝 (WebSocket)",
   "main": "index.ts",

package/src/bot.ts

@@ -11,7 +11,7 @@ import {
   getWorkspaceDir,
   setMsgStatus
 } from './utils/global.js'
-import { resolveAccount, sendDcgchatMedia } from './channel.js'
+import { normalizeOutboundMediaPaths, resolveAccount, sendDcgchatMedia } from './channel.js'
 import { generateSignUrl } from './request/api.js'
 import { sendChunk, sendFinal, sendText as sendTextMsg, sendError, wsSendRaw, sendText } from './transport.js'
 import { dcgLogger } from './utils/log.js'
@@ -143,8 +143,11 @@ function buildMediaPayload(mediaList: MediaInfo[]): MediaPayload {
 }
 
 function resolveReplyMediaList(payload: ReplyPayload): string[] {
-  if (payload.mediaUrls?.length) return payload.mediaUrls.filter(Boolean)
-  return payload.mediaUrl ? [payload.mediaUrl] : []
+  const p = payload as { mediaUrls?: unknown[]; mediaUrl?: unknown }
+  if (p.mediaUrls != null && Array.isArray(p.mediaUrls) && p.mediaUrls.length > 0) {
+    return normalizeOutboundMediaPaths(p.mediaUrls)
+  }
+  return normalizeOutboundMediaPaths(p.mediaUrl ?? null)
 }
 
 const typingCallbacks = createTypingCallbacks({

package/src/channel.ts

@@ -1,4 +1,5 @@
 import fs from 'node:fs'
+import path from 'node:path'
 import type { ChannelPlugin, OpenClawConfig, PluginRuntime } from 'openclaw/plugin-sdk'
 import { createPluginRuntimeStore, DEFAULT_ACCOUNT_ID } from 'openclaw/plugin-sdk'
 import type { ResolvedDcgchatAccount, DcgchatConfig } from './types.js'
@@ -9,6 +10,7 @@ import {
   getDcgchatRuntime,
   getInfoBySessionKey,
   getOpenClawConfig,
+  getWorkspaceDir,
   hasSentMediaKey,
   setCronMessageId
 } from './utils/global.js'
@@ -104,6 +106,64 @@ function outboundChatId(rawTo: string | undefined, normalizedTo: string): string
   return raw.indexOf('dcg-cron:') >= 0 ? raw : normalizedTo
 }
 
+/**
+ * Core / message 工具可能传入：
+ * - 本地绝对路径字符串
+ * - 工作区虚拟路径（如 `/mobook/xxx`，需落到 `getWorkspaceDir()`）
+ * - `mediaUrls` 为 `{ file: string }[]` 或整段 JSON 字符串
+ */
+function resolveWorkspaceMediaPath(p: string): string {
+  const s = p.trim()
+  if (!s) return ''
+  if (fs.existsSync(s)) return path.normalize(s)
+  const rel = s.replace(/^[\\/]+/, '')
+  return path.normalize(path.join(getWorkspaceDir(), rel))
+}
+
+function collectOutboundMediaPaths(item: unknown, out: string[]): void {
+  if (item == null) return
+  if (typeof item === 'string') {
+    const t = item.trim()
+    if (!t) return
+    if (t.startsWith('[')) {
+      try {
+        const parsed = JSON.parse(t) as unknown
+        collectOutboundMediaPaths(parsed, out)
+        return
+      } catch {
+        /* 非 JSON，按普通路径处理 */
+      }
+    }
+    out.push(resolveWorkspaceMediaPath(t))
+    return
+  }
+  if (Array.isArray(item)) {
+    for (const el of item) collectOutboundMediaPaths(el, out)
+    return
+  }
+  if (typeof item === 'object') {
+    const o = item as Record<string, unknown>
+    const raw = o.file ?? o.path ?? o.url
+    if (typeof raw === 'string' && raw.trim()) {
+      out.push(resolveWorkspaceMediaPath(raw))
+    }
+  }
+}
+
+/** 将出站 media 载荷统一为可 `fs` 访问的本地路径列表（去重保序） */
+export function normalizeOutboundMediaPaths(raw: unknown): string[] {
+  const acc: string[] = []
+  collectOutboundMediaPaths(raw, acc)
+  const seen = new Set<string>()
+  const deduped: string[] = []
+  for (const p of acc) {
+    if (!p || seen.has(p)) continue
+    seen.add(p)
+    deduped.push(p)
+  }
+  return deduped
+}
+
 export async function sendDcgchatMedia(opts: DcgchatMediaSendOptions): Promise<void> {
   const rawOpt = (opts.sessionKey ?? '').trim()
   const strippedForCron = rawOpt.replace(/^dcg-cron:/i, '').trim()
@@ -130,7 +190,21 @@ export async function sendDcgchatMedia(opts: DcgchatMediaSendOptions): Promise<v
     return
   }
 
-  const mediaUrl = opts.mediaUrl?.trim()
+  const expanded = normalizeOutboundMediaPaths(opts.mediaUrl)
+  if (expanded.length === 0) {
+    dcgLogger(
+      `dcgchat: sendMedia skipped (no resolvable path): ${typeof opts.mediaUrl === 'string' ? opts.mediaUrl : JSON.stringify(opts.mediaUrl)} sessionKey=${sessionKey}`,
+      'error'
+    )
+    return
+  }
+  if (expanded.length > 1) {
+    for (const single of expanded) {
+      await sendDcgchatMedia({ ...opts, mediaUrl: single })
+    }
+    return
+  }
+  const mediaUrl = expanded[0]
   if (!mediaUrl || !msgCtx.sessionId) {
     dcgLogger(`dcgchat: sendMedia skipped (duplicate in session): ${mediaUrl} sessionId=${msgCtx.sessionId} sessionKey=${sessionKey}`)
     return
@@ -370,11 +444,17 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
       }
 
       dcgLogger(`channel sendMedia to ${ctx.to}`)
-      await sendDcgchatMedia({
-        sessionKey: to || '',
-        mediaUrl: ctx.mediaUrl || '',
-        ...(isCron ? { messageId } : {})
-      })
+
+      const ctxExt = ctx as { mediaUrls?: unknown; mediaUrl?: string }
+      const rawMedia = ctxExt.mediaUrls ?? ctxExt.mediaUrl
+      const paths = normalizeOutboundMediaPaths(rawMedia)
+      for (const mediaUrl of paths) {
+        await sendDcgchatMedia({
+          sessionKey: to || '',
+          mediaUrl,
+          ...(isCron ? { messageId } : {})
+        })
+      }
       return {
         channel: "dcgchat",
         messageId,