@dcrays/dcgchat 0.3.30 → 0.3.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcrays/dcgchat",
-  "version": "0.3.30",
+  "version": "0.3.31",
   "type": "module",
   "description": "OpenClaw channel plugin for 书灵墨宝 (WebSocket)",
   "main": "index.ts",
@@ -42,4 +42,4 @@
       "defaultChoice": "npm"
     }
   }
-}
+}

package/src/bot.ts

@@ -180,8 +180,11 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
   }
   setParamsMessage(effectiveSessionKey, mergedParams)
   // 与 OpenClaw 会话投递里仍可能出现的 ctx.to=SenderId（userId）对齐，便于 getOutboundMsgParams 命中
-  console.log('🚀 ~ handleDcgchatMessage ~ mergedParams:', mergedParams)
+  dcgLogger(
+    `target normalize: rawTarget=${userId}, normalizedTarget=${effectiveSessionKey}, conversationId=${conversationId ?? ''}, messageId=${msg.content.message_id}`
+  )
   setParamsMessage(userId, mergedParams)
+  dcgLogger(`target alias bound: aliasTarget=${userId} -> sessionKey=${effectiveSessionKey}`)
   const outboundCtx = getEffectiveMsgParams(effectiveSessionKey)
   const agentEntry =
     effectiveAgentId && effectiveAgentId !== 'main' ? config.agents?.list?.find((a) => a.id === effectiveAgentId) : undefined
@@ -249,6 +252,9 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
       OriginatingTo: effectiveSessionKey,
       ...mediaPayload
     })
+  dcgLogger(
+    `inbound context target: rawTarget=${userId}, normalizedTarget=${effectiveSessionKey}, ctx.To=${String(ctxPayload.To ?? '')}, ctx.SessionKey=${String(ctxPayload.SessionKey ?? '')}, ctx.OriginatingTo=${String(ctxPayload.OriginatingTo ?? '')}`
+  )
 
     const sentMediaKeys = new Set<string>()
     const getMediaKey = (url: string) => url.split(/[\\/]/).pop() ?? url
@@ -442,6 +448,9 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
 
     // Record session metadata
     const storePath = core.channel.session.resolveStorePath(config.session?.store)
+    dcgLogger(
+      `record session route: rawTarget=${userId}, normalizedTarget=${effectiveSessionKey}, updateLastRoute.to=${effectiveSessionKey}, accountId=${route.accountId}`
+    )
     core.channel.session
       .recordInboundSession({
         storePath,

package/src/channel.ts

@@ -15,8 +15,15 @@ export type DcgchatMediaSendOptions = {
   text?: string
 }
 
+function normalizeSessionTarget(rawTo: string): string {
+  const cleaned = rawTo.replace('dcg-cron:', '').trim()
+  if (!cleaned) return ''
+  return getParamsMessage(cleaned)?.sessionKey?.trim() || cleaned
+}
+
 export async function sendDcgchatMedia(opts: DcgchatMediaSendOptions): Promise<void> {
-  const msgCtx = getOutboundMsgParams(opts.sessionKey ?? '')
+  const sessionKey = normalizeSessionTarget(opts.sessionKey ?? '')
+  const msgCtx = getOutboundMsgParams(sessionKey)
   if (!isWsOpen()) {
     dcgLogger(`outbound media skipped -> ws not open: ${opts.mediaUrl ?? ''}`)
     return
@@ -36,21 +43,20 @@ export async function sendDcgchatMedia(opts: DcgchatMediaSendOptions): Promise<v
 
   try {
     const botToken = msgCtx.botToken ?? getOpenClawConfig()?.channels?.["dcgchat"]?.botToken ?? ''
-    console.log('🚀 ~ sendDcgchatMedia ~ botToken:', botToken)
     const url = opts.mediaUrl ? await ossUpload(opts.mediaUrl, botToken, 1) : ''
     wsSendRaw(msgCtx, {
       response: opts.text ?? '',
       message_tags: { source: 'file' },
       files: [{ url, name: fileName }]
     })
-    dcgLogger(`dcgchat: sendMedia session=${opts.sessionKey}, file=${fileName}`)
+    dcgLogger(`dcgchat: sendMedia session=${sessionKey}, file=${fileName}`)
   } catch (error) {
     wsSendRaw(msgCtx, {
       response: opts.text ?? '',
       message_tags: { source: 'file' },
       files: [{ url: opts.mediaUrl ?? '', name: fileName }]
     })
-    dcgLogger(`dcgchat: error sendMedia session=${opts.sessionKey}: ${String(error)}`, 'error')
+    dcgLogger(`dcgchat: error sendMedia session=${sessionKey}: ${String(error)}`, 'error')
   }
 }
 
@@ -141,7 +147,7 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
     })
   },
   messaging: {
-    normalizeTarget: (raw) => raw?.trim() || undefined,
+    normalizeTarget: (raw) => normalizeSessionTarget(raw ?? '') || undefined,
     targetResolver: {
       looksLikeId: (raw) => Boolean(raw?.trim()),
       hint: 'effectiveSessionKey（与 SessionKey 一致；勿填配置里的 WS userId）'
@@ -155,10 +161,17 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
   },
   outbound: {
     deliveryMode: 'direct',
+    resolveTarget: ({ to }) => {
+      const normalized = normalizeSessionTarget(to ?? '')
+      if (!normalized) {
+        return { ok: false, error: new Error('target is empty') }
+      }
+      return { ok: true, to: normalized }
+    },
     textChunkLimit: 4000,
     sendText: async (ctx) => {
       const isCron = ctx.to.indexOf('dcg-cron:') >= 0
-      const to = ctx.to.replace('dcg-cron:', '')
+      const to = normalizeSessionTarget(ctx.to)
       dcgLogger(`channel sendText to ${ctx.to} `)
       const outboundCtx = getOutboundMsgParams(to)
       const cronMsgId = getCronMessageId(to)
@@ -189,7 +202,7 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
     },
     sendMedia: async (ctx) => {
       const isCron = ctx.to.indexOf('dcg-cron:') >= 0
-      const to = ctx.to.replace('dcg-cron:', '')
+      const to = normalizeSessionTarget(ctx.to)
       const outboundCtx = getOutboundMsgParams(to)
       const msgCtx = getParamsMessage(to) ?? outboundCtx
       const cronMsgId = getCronMessageId(to)