@dcrays/dcgchat 0.1.6 → 0.1.8

package/index.ts

@@ -2,6 +2,7 @@ import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
 import { emptyPluginConfigSchema } from "openclaw/plugin-sdk";
 import { dcgchatPlugin } from "./src/channel.js";
 import { setDcgchatRuntime } from "./src/runtime.js";
+import { monitoringToolMessage } from "./src/tool.js";
 
 const plugin = {
   id: "dcgchat",
@@ -10,6 +11,7 @@ const plugin = {
   configSchema: emptyPluginConfigSchema(),
   register(api: OpenClawPluginApi) {
     setDcgchatRuntime(api.runtime);
+    monitoringToolMessage(api);
     api.registerChannel({ plugin: dcgchatPlugin });
   },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcrays/dcgchat",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "type": "module",
   "description": "OpenClaw channel plugin for DCG Chat (WebSocket)",
   "main": "index.ts",

package/src/bot.ts

@@ -4,6 +4,7 @@ import { createReplyPrefixContext } from "openclaw/plugin-sdk";
 import type { InboundMessage, OutboundReply } from "./types.js";
 import { getDcgchatRuntime } from "./runtime.js";
 import { resolveAccount } from "./channel.js";
+import { setMsgParams } from "./tool.js";
 
 type MediaInfo = {
   path: string;
@@ -244,6 +245,10 @@ export async function handleDcgchatMessage(params: {
         state: 'final',
       },
     });
+    setMsgParams({
+      sessionId: '',
+      messageId: ''
+    });
     log(`dcgchat[${accountId}]: final state sent`);
 
     markDispatchIdle();

package/src/channel.ts

@@ -4,6 +4,7 @@ import type { ResolvedDcgchatAccount, DcgchatConfig } from "./types.js";
 import { logDcgchat } from "./log.js";
 import { getWsConnection } from "./connection.js";
 import { ossUpload } from "./oss.js";
+import { getMsgParams } from "./tool.js";
 
 export function resolveAccount(cfg: OpenClawConfig, accountId?: string | null): ResolvedDcgchatAccount {
   const id = accountId ?? DEFAULT_ACCOUNT_ID;
@@ -15,6 +16,8 @@ export function resolveAccount(cfg: OpenClawConfig, accountId?: string | null):
     wsUrl: raw.wsUrl ?? "",
     botToken: raw.botToken ?? "",
     userId: raw.userId ?? "",
+    domainId: raw.domainId ?? "",
+    appId: raw.appId ?? "",
   };
 }
 
@@ -35,9 +38,10 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
     threads: true,
     media: true,
     nativeCommands: true,
-    reactions: false,
+    reactions: true,
     edit: false,
     reply: true,
+    effects: true,
     // blockStreaming: true,
   },
   reload: { configPrefixes: ["channels.dcgchat"] },
@@ -50,6 +54,8 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
         wsUrl: { type: "string" },
         botToken: { type: "string" },
         userId: { type: "string" },
+        appId: { type: "string" },
+        domainId: { type: "string" },
         capabilities: { type: "array", items: { type: "string" } },
       },
     },
@@ -76,6 +82,8 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
       wsUrl: account.wsUrl,
       botToken: account.botToken ? "***" : "",
       userId: account.userId,
+      domainId: account.domainId,
+      appId: account.appId,
     }),
   },
   messaging: {
@@ -91,8 +99,8 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
     textChunkLimit: 4000,
     sendText: async (ctx) => {
       const target = ctx.to || "(implicit)";
-      logDcgchat.info(`[dcgchat][${ctx.accountId ?? DEFAULT_ACCOUNT_ID}] outbound -> sendText ${target}: ${ctx.text}`);
       const ws = getWsConnection()
+      const params = getMsgParams();
        if (ws?.readyState === WebSocket.OPEN) {
         const {botToken} = resolveAccount(ctx.cfg, ctx.accountId);
         const content = {
@@ -102,12 +110,14 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
           content: {
             bot_token: botToken,
             response: ctx.text,
-            session_id:ctx.accountId ||  Date.now().toString(),
-            message_id: Date.now().toString(),
+            session_id: params.sessionId ||  Date.now().toString(),
+            message_id: params.messageId ||Date.now().toString(),
           },
         };
         ws.send(JSON.stringify(content));
         logDcgchat.info(`dcgchat[${ctx.accountId}]: sendText to ${target}, ${JSON.stringify(content)}`);
+      } else {
+        logDcgchat.warn(`[dcgchat][${ctx.accountId ?? DEFAULT_ACCOUNT_ID}] outbound -> ${ws?.readyState}: ${ctx.text}`);
       }
       return {
         channel: "dcgchat",
@@ -117,8 +127,8 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
     },
     sendMedia: async (ctx) => {
       const target = ctx.to || "(implicit)";
-      logDcgchat.info(`[dcgchat][${ctx.accountId ?? DEFAULT_ACCOUNT_ID}] outbound -> sendMedia ${target}: ${ctx.text + ctx.mediaUrl}`);
       const ws = getWsConnection()
+      const params = getMsgParams();
        if (ws?.readyState === WebSocket.OPEN) {
         const {botToken} = resolveAccount(ctx.cfg, ctx.accountId);
         try {
@@ -131,12 +141,12 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
             content: {
               bot_token: botToken,
               response: ctx.text + '\n' +  `[${fileName}](${url})`,
-              session_id:ctx.accountId ||  Date.now().toString(),
-              message_id: Date.now().toString(),
+              session_id: params.sessionId ||  Date.now().toString(),
+              message_id: params.messageId ||Date.now().toString(),
             },
           };
           ws.send(JSON.stringify(content));
-          logDcgchat.info(`dcgchat[${ctx.accountId}]: sendText to ${target}, ${JSON.stringify(content)}`);
+          logDcgchat.info(`dcgchat[${ctx.accountId}]: sendMedia to ${target}, ${JSON.stringify(content)}`);
         } catch (error) {
          const content = {
             messageType: "openclaw_bot_chat",
@@ -145,13 +155,15 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
             content: {
               bot_token: botToken,
               response: ctx.text + '\n' +  ctx.mediaUrl,
-              session_id:ctx.accountId ||  Date.now().toString(),
-              message_id: Date.now().toString(),
+              session_id: params.sessionId ||  Date.now().toString(),
+              message_id: params.messageId ||Date.now().toString(),
             },
           };
           ws.send(JSON.stringify(content));
-          logDcgchat.info(`dcgchat[${ctx.accountId}]: sendText to ${target}, ${JSON.stringify(content)}`);
+          logDcgchat.info(`dcgchat[${ctx.accountId}]: sendMedia to ${target}, ${JSON.stringify(content)}`);
         }
+      } else {
+        logDcgchat.warn(`[dcgchat][${ctx.accountId ?? DEFAULT_ACCOUNT_ID}] outbound -> ${ws?.readyState}: ${ctx.text}`);
       }
       return {
         channel: "dcgchat",

package/src/monitor.ts

@@ -4,6 +4,7 @@ import { handleDcgchatMessage } from "./bot.js";
 import { resolveAccount } from "./channel.js";
 import { setWsConnection } from "./connection.js";
 import type { InboundMessage, OutboundReply } from "./types.js";
+import { setMsgParams } from "./tool.js";
 
 export type MonitorDcgchatOpts = {
   config?: ClawdbotConfig;
@@ -15,17 +16,19 @@ export type MonitorDcgchatOpts = {
 const RECONNECT_DELAY_MS = 3000;
 const HEARTBEAT_INTERVAL_MS = 30_000;
 
-function buildConnectUrl(wsUrl: string, botToken: string, userId: string): string {
+function buildConnectUrl(account: Record<string, string>): string {
+  const { wsUrl, botToken, userId, domainId, appId } = account;
   const url = new URL(wsUrl);
   if (botToken) url.searchParams.set("bot_token", botToken);
   if (userId) url.searchParams.set("_userId", userId);
-  url.searchParams.set("_domainId", "1000");
-  url.searchParams.set("_appId", "100");
+  url.searchParams.set("_domainId", domainId || "1000");
+  url.searchParams.set("_appId", appId || "100");
   return url.toString();
 }
 
 export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<void> {
   const { config, runtime, abortSignal, accountId } = opts;
+  // @ts-ignore
   const cfg = config ?? (runtime?.config?.() as ClawdbotConfig | undefined);
   if (!cfg) {
     runtime?.error?.("dcgchat: no config available");
@@ -74,7 +77,7 @@ export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<
   const connect = () => {
     if (!shouldReconnect) return;
 
-    const connectUrl = buildConnectUrl(account.wsUrl, account.botToken, account.userId);
+    const connectUrl = buildConnectUrl(account as Record<string, any>);
     log(`dcgchat[${account.accountId}]: connecting to ${connectUrl}`);
     ws = new WebSocket(connectUrl);
 
@@ -107,6 +110,12 @@ export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<
       parsed.content = JSON.parse(parsed.content);
 
       const msg = parsed as unknown as InboundMessage;
+      setMsgParams({
+        userId: msg._userId,
+        token: msg.content.bot_token,
+        sessionId: msg.content.session_id,
+        messageId: msg.content.message_id,
+      });
       await handleDcgchatMessage({
         cfg,
         msg,

package/src/tool.ts

@@ -0,0 +1,65 @@
+
+import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
+import { getWsConnection } from "./connection.js";
+import { logDcgchat } from "./log.js";
+
+let msgParams = {} as {
+  userId: number;
+  token: string
+  sessionId: string
+  messageId: string
+}
+
+export function setMsgParams(params: any) {
+  msgParams = params;
+}
+
+export function getMsgParams() {
+  return msgParams;
+}
+
+export function monitoringToolMessage(api: OpenClawPluginApi) {
+  api.on("after_tool_call", (event, payload) => {
+    const ws = getWsConnection()
+    const params = getMsgParams();
+    if (ws?.readyState === WebSocket.OPEN && params?.sessionId) {
+      ws.send(JSON.stringify({
+        messageType: "openclaw_bot_chat",
+        _userId: params?.userId,
+        source: "client",
+        content: {
+          bot_token: params?.token,
+          response: 'all_finished',
+          session_id:params?.sessionId,
+          message_id: params?.messageId || Date.now().toString()
+        },
+      }));
+      ws.send(JSON.stringify({
+        messageType: "openclaw_bot_chat",
+        _userId: params?.userId,
+        source: "client",
+        content: {
+          bot_token: params?.token,
+          response: JSON.stringify({
+            type: 'tool_call',
+            ...event
+          }),
+          session_id:params?.sessionId,
+          message_id: params?.messageId || Date.now().toString()
+        },
+      }));
+      ws.send(JSON.stringify({
+        messageType: "openclaw_bot_chat",
+        _userId: params?.userId,
+        source: "client",
+        content: {
+          bot_token: params?.token,
+          response: 'all_finished',
+          session_id:params?.sessionId,
+          message_id: params?.messageId || Date.now().toString()
+        },
+      }));
+      logDcgchat.info(`dcgchat: tool message to ${params?.sessionId}, ${JSON.stringify(event)}`);
+    }
+  });
+}

package/src/types.ts

@@ -9,6 +9,8 @@ export type DcgchatConfig = {
   botToken?: string;
   /** 用户标识 */
   userId?: string;
+  domainId?: string;
+  appId?: string;
 };
 
 export type ResolvedDcgchatAccount = {
@@ -18,6 +20,8 @@ export type ResolvedDcgchatAccount = {
   wsUrl: string;
   botToken: string;
   userId: string;
+  domainId?: string;
+  appId?: string;
 };
 
 /**