@dcrays/dcgchat-test 0.4.24 → 0.4.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcrays/dcgchat-test",
-  "version": "0.4.24",
+  "version": "0.4.27",
   "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,3 +1,4 @@
+import fs from 'node:fs'
 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'
@@ -103,6 +104,53 @@ function outboundChatId(rawTo: string | undefined, normalizedTo: string): string
   return raw.indexOf('dcg-cron:') >= 0 ? raw : normalizedTo
 }
 
+/**
+ * 仅从 JSON / `{ file | path | url }` 等结构里取出路径字符串，不做改写（不拼 workspace、不 normalize）。
+ */
+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(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(raw.trim())
+    }
+  }
+}
+
+/** 将出站 media 展平为路径字符串列表（去重保序；路径保持 Core 原样） */
+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()
@@ -129,7 +177,34 @@ export async function sendDcgchatMedia(opts: DcgchatMediaSendOptions): Promise<v
     return
   }
 
-  const mediaUrl = opts.mediaUrl
+  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
+  }
+  // 判断文件存在
+  try {
+    if (!fs.existsSync(mediaUrl)) {
+      dcgLogger(`dcgchat: sendMedia skipped (file not found): ${mediaUrl} sessionKey=${sessionKey}`, 'error')
+      return
+    }
+  } catch (err) {
+    dcgLogger(`dcgchat: sendMedia skipped (cannot stat path): ${mediaUrl} ${String(err)} sessionKey=${sessionKey}`, 'error')
+  }
 
   if (mediaUrl && msgCtx.sessionId) {
     if (hasSentMediaKey(msgCtx.sessionId, mediaUrl)) {
@@ -143,10 +218,6 @@ export async function sendDcgchatMedia(opts: DcgchatMediaSendOptions): Promise<v
   if (!msgCtx.sessionId) {
     msgCtx.sessionId = sessionId
   }
-  if (!mediaUrl || !msgCtx.sessionId) {
-    dcgLogger(`dcgchat: sendMedia skipped (duplicate in session): ${mediaUrl} sessionId=${msgCtx.sessionId} sessionKey=${sessionKey}`)
-    return
-  }
   const fileName = mediaUrl?.split(/[\\/]/).pop() || ''
   const notMessageId = `${msgCtx?.messageId}`?.length === 13 || !msgCtx?.messageId
   try {
@@ -360,11 +431,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-test",
         messageId,

package/src/cronToolCall.ts

@@ -137,7 +137,7 @@ function patchCronDeliveryInParams(
     if (agentId) d.accountId = agentId
     if (announceNoChannel) {
       d.bestEffort = true
-      d.channel = 'dcgchat-test'
+      d.channel = "dcgchat-test"
     }
   }
 
@@ -191,7 +191,7 @@ export function cronToolCall(event: { toolName: any; params: any; toolCallId: an
     if (params.command.indexOf('cron create') > -1 || params.command.indexOf('cron add') > -1) {
       const newParams = JSON.parse(JSON.stringify(params)) as Record<string, unknown>
       newParams.command =
-        params.command.replace('--json', '') + `  --session-key ${sk}  --channel ${'dcgchat-test'}  --to dcg-cron:${sk} --json`
+        params.command.replace('--json', '') + `  --session-key ${sk}  --channel ${"dcgchat-test"}  --to dcg-cron:${sk} --json`
       return { params: newParams }
     } else {
       return undefined