@dcrays/dcgchat-test 0.2.27 → 0.2.28

package/src/channel.ts

@@ -1,126 +1,97 @@
-import type { ChannelPlugin, OpenClawConfig } from "openclaw/plugin-sdk";
-import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk";
-import type { ResolvedDcgchatAccount, DcgchatConfig } from "./types.js";
-import { getWsConnection } from "./connection.js";
-import { ossUpload } from "./oss.js";
-import { getMsgParams } from "./tool.js";
+import type { ChannelPlugin, OpenClawConfig } from 'openclaw/plugin-sdk'
+import { DEFAULT_ACCOUNT_ID } from 'openclaw/plugin-sdk'
+import type { ResolvedDcgchatAccount, DcgchatConfig } from './types.js'
+import { ossUpload } from './request/oss.js'
+import { addSentMediaKey, getMsgParams, hasSentMediaKey } from './utils/global.js'
+import { type DcgchatMsgContext, isWsOpen, sendFinal, wsSendRaw } from './transport.js'
+import { dcgLogger, setLogger } from './utils/log.js'
 
-type DcgchatMediaSendContext = {
-  cfg: OpenClawConfig;
-  accountId?: string | null;
-  log?: (message: string) => void;
-  mediaUrl?: string;
-  text?: string;
-};
+export type DcgchatMediaSendOptions = {
+  msgCtx: DcgchatMsgContext
+  mediaUrl?: string
+  text?: string
+}
+
+export async function sendDcgchatMedia(opts: DcgchatMediaSendOptions): Promise<void> {
+  const { msgCtx } = opts
+  console.log('🚀 ~ sendDcgchatMedia ~ msgCtx:', msgCtx)
 
-export async function sendDcgchatMedia(ctx: DcgchatMediaSendContext): Promise<void> {
-  const ws = getWsConnection();
-  const params = getMsgParams();
-  const log = ctx.log ?? console.log;
+  if (!isWsOpen()) {
+    dcgLogger(`outbound media skipped -> ws not open: ${opts.mediaUrl ?? ''}`)
+    return
+  }
 
-  if (ws?.readyState !== WebSocket.OPEN) {
-    log(`[dcgchat][${ctx.accountId ?? DEFAULT_ACCOUNT_ID}] outbound media skipped -> ${ws?.readyState}: ${ctx.mediaUrl ?? ""}`);
-    return;
+  const mediaUrl = opts.mediaUrl
+  if (mediaUrl && hasSentMediaKey(msgCtx.messageId, mediaUrl)) {
+    dcgLogger(`dcgchat: sendMedia skipped (duplicate in session): ${mediaUrl}`)
+    return
+  }
+  if (mediaUrl) {
+    addSentMediaKey(msgCtx.messageId, mediaUrl)
   }
 
-  const fileName = ctx.mediaUrl?.split(/[\\/]/).pop() || "";
-  const { botToken } = resolveAccount(ctx.cfg, ctx.accountId);
+  const fileName = mediaUrl?.split(/[\\/]/).pop() || ''
 
   try {
-    const url = ctx.mediaUrl ? await ossUpload(ctx.mediaUrl, botToken) : "";
-    console.log("🚀 ~ sendDcgchatMedia ~ ctx.mediaUrl:", ctx.mediaUrl)
-    const content = {
-      messageType: "openclaw_bot_chat",
-      _userId: params.userId,
-      source: "client",
-      content: {
-        bot_token: botToken,
-        domain_id: params.domainId,
-        app_id: params.appId,
-        bot_id: params.botId,
-        agent_id: params.agentId,
-        response: ctx.text ?? "",
-        files: [{
-          url,
-          name: fileName,
-        }],
-        session_id: params.sessionId,
-        message_id: params.messageId || Date.now().toString(),
-      },
-    };
-    ws.send(JSON.stringify(content));
-    log(`dcgchat[${ctx.accountId}]: sendMedia alioss to ${params.userId}, ${JSON.stringify(content)}`);
+    const url = opts.mediaUrl ? await ossUpload(opts.mediaUrl, msgCtx.botToken) : ''
+    wsSendRaw(msgCtx, {
+      response: opts.text ?? '',
+      files: [{ url, name: fileName }]
+    })
+    dcgLogger(`dcgchat: sendMedia to user ${msgCtx.userId}, file=${fileName}`)
   } catch (error) {
-    const content = {
-      messageType: "openclaw_bot_chat",
-      _userId: params.userId,
-      source: "client",
-      content: {
-        bot_token: botToken,
-        domain_id: params.domainId,
-        app_id: params.appId,
-        bot_id: params.botId,
-        agent_id: params.agentId,
-        response: ctx.text ?? "",
-        files: [{
-          url: ctx.mediaUrl,
-          name: fileName,
-        }],
-        session_id: params.sessionId || Date.now().toString(),
-        message_id: Date.now().toString(),
-      },
-    };
-    ws.send(JSON.stringify(content));
-    log(`dcgchat[${ctx.accountId}]: error sendMedia to ${params.userId}, ${JSON.stringify(content)}`);
-  } finally {
-    ws.send(JSON.stringify({
-      messageType: "openclaw_bot_chat",
-      _userId: params.userId,
-      source: "client",
-      content: {
-        bot_token: botToken,
-        domain_id: params.domainId,
-        app_id: params.appId,
-        bot_id: params.botId,
-        agent_id: params.agentId,
-        ssession_id: params.sessionId,
-        message_id: Date.now().toString(),
-        response: "",
-        state: "final",
-      },
-    }));
+    wsSendRaw(msgCtx, {
+      response: opts.text ?? '',
+      files: [{ url: opts.mediaUrl ?? '', name: fileName }]
+    })
+    dcgLogger(`dcgchat: error sendMedia to user ${msgCtx.userId}: ${String(error)}`, 'error')
   }
 }
 
-
 export function resolveAccount(cfg: OpenClawConfig, accountId?: string | null): ResolvedDcgchatAccount {
-  const id = accountId ?? DEFAULT_ACCOUNT_ID;
-  const raw = (cfg.channels?.["dcgchat-test"] as DcgchatConfig | undefined) ?? {};
+  const id = accountId ?? DEFAULT_ACCOUNT_ID
+  const raw = (cfg.channels?.["dcgchat-test"] as DcgchatConfig | undefined) ?? {}
   return {
     accountId: id,
     enabled: raw.enabled !== false,
     configured: Boolean(raw.wsUrl),
-    wsUrl: raw.wsUrl ?? "",
-    botToken: raw.botToken ?? "",
-    userId: raw.userId ?? "",
-    domainId: raw.domainId ?? "",
-    appId: raw.appId ?? "",
-  };
+    wsUrl: raw.wsUrl ?? '',
+    botToken: raw.botToken ?? '',
+    userId: raw.userId ?? '',
+    domainId: raw.domainId ?? '',
+    appId: raw.appId ?? ''
+  }
+}
+
+/** Build a DcgchatMsgContext for the outbound pipeline (uses global msgParams). */
+function createOutboundMsgContext(cfg: OpenClawConfig, accountId?: string | null): DcgchatMsgContext {
+  const params = getMsgParams()
+  const { botToken } = resolveAccount(cfg, accountId)
+  return {
+    userId: params.userId,
+    botToken,
+    domainId: params.domainId,
+    appId: params.appId,
+    botId: params.botId,
+    agentId: params.agentId,
+    sessionId: params.sessionId,
+    messageId: params.messageId
+  }
 }
 
 export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
   id: "dcgchat-test",
   meta: {
     id: "dcgchat-test",
-    label: "书灵墨宝",
-    selectionLabel: "书灵墨宝",
-    docsPath: "/channels/dcgchat-test",
+    label: '书灵墨宝',
+    selectionLabel: '书灵墨宝',
+    docsPath: '/channels/dcgchat',
     docsLabel: "dcgchat-test",
-    blurb: "连接 OpenClaw 与 书灵墨宝 产品",
-    order: 80,
+    blurb: '连接 OpenClaw 与 书灵墨宝 产品',
+    order: 80
   },
   capabilities: {
-    chatTypes: ["direct"],
+    chatTypes: ['direct'],
     polls: false,
     threads: true,
     media: true,
@@ -128,24 +99,24 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
     reactions: true,
     edit: false,
     reply: true,
-    effects: true,
+    effects: true
     // blockStreaming: true,
   },
-  reload: { configPrefixes: ["channels.dcgchat-test"] },
+  reload: { configPrefixes: ['channels.dcgchat'] },
   configSchema: {
     schema: {
-      type: "object",
+      type: 'object',
       additionalProperties: false,
       properties: {
-        enabled: { type: "boolean" },
-        wsUrl: { type: "string" },
-        botToken: { type: "string" },
-        userId: { type: "string" },
-        appId: { type: "string" },
-        domainId: { type: "string" },
-        capabilities: { type: "array", items: { type: "string" } },
-      },
-    },
+        enabled: { type: 'boolean' },
+        wsUrl: { type: 'string' },
+        botToken: { type: 'string' },
+        userId: { type: 'string' },
+        appId: { type: 'string' },
+        domainId: { type: 'string' },
+        capabilities: { type: 'array', items: { type: 'string' } }
+      }
+    }
   },
   config: {
     listAccountIds: () => [DEFAULT_ACCOUNT_ID],
@@ -155,11 +126,11 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
       ...cfg,
       channels: {
         ...cfg.channels,
-        "dcgchat-test": {
+        dcgchat: {
           ...(cfg.channels?.["dcgchat-test"] as Record<string, unknown> | undefined),
-          enabled,
-        },
-      },
+          enabled
+        }
+      }
     }),
     isConfigured: (account) => account.configured,
     describeAccount: (account) => ({
@@ -167,96 +138,60 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
       enabled: account.enabled,
       configured: account.configured,
       wsUrl: account.wsUrl,
-      botToken: account.botToken ? "***" : "",
+      botToken: account.botToken ? '***' : '',
       userId: account.userId,
       domainId: account.domainId,
-      appId: account.appId,
-    }),
+      appId: account.appId
+    })
   },
   messaging: {
     normalizeTarget: (raw) => raw?.trim() || undefined,
     targetResolver: {
       looksLikeId: (raw) => Boolean(raw?.trim()),
-      hint: "userId",
-    },
+      hint: 'userId'
+    }
   },
   outbound: {
-    deliveryMode: "direct",
-    // textChunkLimit: 25,
+    deliveryMode: 'direct',
     textChunkLimit: 4000,
     sendText: async (ctx) => {
-      const ws = getWsConnection()
-      const params = getMsgParams();
-      const log = console.log;
-       if (ws?.readyState === WebSocket.OPEN) {
-        const {botToken} = resolveAccount(ctx.cfg, ctx.accountId);
-        const content = {
-          messageType: "openclaw_bot_chat",
-          _userId: params.userId,
-          source: "client",
-          content: {
-            bot_token: botToken,
-            domain_id: params.domainId,
-            app_id: params.appId,
-            bot_id: params.botId,
-            agent_id: params.agentId,
-            response: ctx.text,
-            session_id: params.sessionId,
-            message_id: params.messageId || Date.now().toString(),
-          },
-        };
-        ws.send(JSON.stringify(content));
-        ws.send(JSON.stringify({
-           messageType: "openclaw_bot_chat",
-          _userId: params.userId,
-          source: "client",
-          content: {
-            bot_token: botToken,
-            domain_id: params.domainId,
-            app_id: params.appId,
-            bot_id: params.botId,
-            agent_id: params.agentId,
-            ssession_id: params.sessionId,
-            message_id: params.messageId || Date.now().toString(),
-            response: '',
-            state: 'final',
-          },
-        }));
-        log(`dcgchat[${ctx.accountId}]: channel sendText to ${params.userId}, ${JSON.stringify(content)}`);
-      } else {
-        log(`[dcgchat][${ctx.accountId ?? DEFAULT_ACCOUNT_ID}] outbound -> : ${ctx.text}`);
+      const msgCtx = createOutboundMsgContext(ctx.cfg, ctx.accountId)
+      if (isWsOpen()) {
+        wsSendRaw(msgCtx, { response: ctx.text })
+        sendFinal(msgCtx)
+        dcgLogger(`channel sendText to ${msgCtx.userId}`)
       }
       return {
         channel: "dcgchat-test",
         messageId: `dcg-${Date.now()}`,
-        chatId: params.userId.toString(),
-      };
+        chatId: msgCtx.userId.toString()
+      }
     },
     sendMedia: async (ctx) => {
-      const params = getMsgParams();
-      await sendDcgchatMedia(ctx);
+      const msgCtx = createOutboundMsgContext(ctx.cfg, ctx.accountId)
+      await sendDcgchatMedia({ msgCtx, mediaUrl: ctx.mediaUrl })
       return {
         channel: "dcgchat-test",
         messageId: `dcg-${Date.now()}`,
-        chatId: params.userId.toString(),
-      };  
-    },
+        chatId: msgCtx.userId.toString()
+      }
+    }
   },
   gateway: {
     startAccount: async (ctx) => {
-      const { monitorDcgchatProvider } = await import("./monitor.js");
-      const account = resolveAccount(ctx.cfg, ctx.accountId);
+      const { monitorDcgchatProvider } = await import('./monitor.js')
+      const account = resolveAccount(ctx.cfg, ctx.accountId)
+      setLogger(ctx.runtime)
       if (!account.wsUrl) {
-        ctx.log?.warn(`dcgchat[${account.accountId}]: wsUrl not configured, skipping`);
-        return;
+        dcgLogger(`dcgchat[${account.accountId}]: wsUrl not configured, skipping`, 'error')
+        return
       }
-      // ctx.log?.info(`dcgchat[${account.accountId}]: connecting to ${account.wsUrl}`);
       return monitorDcgchatProvider({
         config: ctx.cfg,
         runtime: ctx.runtime,
         abortSignal: ctx.abortSignal,
-        accountId: ctx.accountId,
-      });
-    },
-  },
-};
+        accountId: ctx.accountId
+      })
+    }
+  }
+}