@dcrays/dcgchat-test 0.1.9 → 0.1.10

package/src/skill.ts

@@ -1,111 +1,111 @@
-/**  skill utils */
-import axios from 'axios';
-/** @ts-ignore */
-import unzipper from 'unzipper';
-import fs from 'fs';
-import path from 'path';
-import { logDcgchat } from './log.js';
-import { getWorkspaceDir } from './runtime.js';
-import { getWsConnection } from './connection.js';
-
-type ISkillParams = {
-  path: string;
-  code: string;
-}
-
-function sendEvent(msgContent: Record<string, any>) {
-  const ws = getWsConnection()
-  if (ws?.readyState === WebSocket.OPEN) {
-    ws.send(JSON.stringify({
-      messageType: "openclaw_bot_event",
-      source: "client",
-      content: msgContent
-    }));
-    logDcgchat.info(`技能安装: ${JSON.stringify(msgContent)}`);
-
-  }
-}
-
-export async function installSkill(params: ISkillParams, msgContent: Record<string, any>) {
-  const { path: cdnUrl, code } = params;
-  const workspacePath = getWorkspaceDir();
-  
-  const skillDir = path.join(workspacePath, 'skills', code);
-  
-  // 确保 skills 目录存在
-  const skillsDir = path.join(workspacePath, 'skills');
-  if (!fs.existsSync(skillsDir)) {
-    fs.mkdirSync(skillsDir, { recursive: true });
-  }
-  // 如果目标目录已存在，先删除
-  if (fs.existsSync(skillDir)) {
-    fs.rmSync(skillDir, { recursive: true, force: true });
-  }
-  
-  try {
-    // 下载 zip 文件
-    const response = await axios({
-      method: 'get',
-      url: cdnUrl,
-      responseType: 'stream'
-    });
-    // 创建目标目录
-    fs.mkdirSync(skillDir, { recursive: true });
-    // 解压文件到目标目录，跳过顶层文件夹
-    await new Promise((resolve, reject) => {
-      response.data
-        .pipe(unzipper.Parse())
-        .on('entry', (entry: any) => {
-          const entryPath = entry.path;
-          // 跳过顶层目录，只处理子文件和文件夹
-          const pathParts = entryPath.split('/');
-          if (pathParts.length > 1) {
-            // 移除第一级目录
-            const newPath = pathParts.slice(1).join('/');
-            const targetPath = path.join(skillDir, newPath);
-            
-            if (entry.type === 'Directory') {
-              fs.mkdirSync(targetPath, { recursive: true });
-              entry.autodrain();
-            } else {
-              // 确保父目录存在
-              const parentDir = path.dirname(targetPath);
-              if (!fs.existsSync(parentDir)) {
-                fs.mkdirSync(parentDir, { recursive: true });
-              }
-              entry.pipe(fs.createWriteStream(targetPath));
-            }
-          } else {
-            entry.autodrain();
-          }
-        })
-        .on('close', resolve)
-        .on('error', reject);
-    });
-    sendEvent({ ...msgContent, status: 'ok' })
-  } catch (error) {
-    // 如果安装失败，清理目录
-    if (fs.existsSync(skillDir)) {
-      fs.rmSync(skillDir, { recursive: true, force: true });
-    }
-    sendEvent({ ...msgContent, status: 'fail' })
-  }
-}
-
-export function uninstallSkill(params: Omit<ISkillParams, 'path'>, msgContent: Record<string, any>) {
-  const { code } = params;
-  
-  const workspacePath = getWorkspaceDir();
-  if (!workspacePath) {
-    throw new Error('未找到工作区路径');
-  }
-  
-  const skillDir = path.join(workspacePath, 'skills', code);
-  
-  if (fs.existsSync(skillDir)) {
-    fs.rmSync(skillDir, { recursive: true, force: true });
-    sendEvent({ ...msgContent, status: 'ok' })
-  } else {
-    sendEvent({ ...msgContent, status: 'fail' })
-  }
+/**  skill utils */
+import axios from 'axios';
+/** @ts-ignore */
+import unzipper from 'unzipper';
+import fs from 'fs';
+import path from 'path';
+import { logDcgchat } from './log.js';
+import { getWorkspaceDir } from './runtime.js';
+import { getWsConnection } from './connection.js';
+
+type ISkillParams = {
+  path: string;
+  code: string;
+}
+
+function sendEvent(msgContent: Record<string, any>) {
+  const ws = getWsConnection()
+  if (ws?.readyState === WebSocket.OPEN) {
+    ws.send(JSON.stringify({
+      messageType: "openclaw_bot_event",
+      source: "client",
+      content: msgContent
+    }));
+    logDcgchat.info(`技能安装: ${JSON.stringify(msgContent)}`);
+
+  }
+}
+
+export async function installSkill(params: ISkillParams, msgContent: Record<string, any>) {
+  const { path: cdnUrl, code } = params;
+  const workspacePath = getWorkspaceDir();
+  
+  const skillDir = path.join(workspacePath, 'skills', code);
+  
+  // 确保 skills 目录存在
+  const skillsDir = path.join(workspacePath, 'skills');
+  if (!fs.existsSync(skillsDir)) {
+    fs.mkdirSync(skillsDir, { recursive: true });
+  }
+  // 如果目标目录已存在，先删除
+  if (fs.existsSync(skillDir)) {
+    fs.rmSync(skillDir, { recursive: true, force: true });
+  }
+  
+  try {
+    // 下载 zip 文件
+    const response = await axios({
+      method: 'get',
+      url: cdnUrl,
+      responseType: 'stream'
+    });
+    // 创建目标目录
+    fs.mkdirSync(skillDir, { recursive: true });
+    // 解压文件到目标目录，跳过顶层文件夹
+    await new Promise((resolve, reject) => {
+      response.data
+        .pipe(unzipper.Parse())
+        .on('entry', (entry: any) => {
+          const entryPath = entry.path;
+          // 跳过顶层目录，只处理子文件和文件夹
+          const pathParts = entryPath.split('/');
+          if (pathParts.length > 1) {
+            // 移除第一级目录
+            const newPath = pathParts.slice(1).join('/');
+            const targetPath = path.join(skillDir, newPath);
+            
+            if (entry.type === 'Directory') {
+              fs.mkdirSync(targetPath, { recursive: true });
+              entry.autodrain();
+            } else {
+              // 确保父目录存在
+              const parentDir = path.dirname(targetPath);
+              if (!fs.existsSync(parentDir)) {
+                fs.mkdirSync(parentDir, { recursive: true });
+              }
+              entry.pipe(fs.createWriteStream(targetPath));
+            }
+          } else {
+            entry.autodrain();
+          }
+        })
+        .on('close', resolve)
+        .on('error', reject);
+    });
+    sendEvent({ ...msgContent, status: 'ok' })
+  } catch (error) {
+    // 如果安装失败，清理目录
+    if (fs.existsSync(skillDir)) {
+      fs.rmSync(skillDir, { recursive: true, force: true });
+    }
+    sendEvent({ ...msgContent, status: 'fail' })
+  }
+}
+
+export function uninstallSkill(params: Omit<ISkillParams, 'path'>, msgContent: Record<string, any>) {
+  const { code } = params;
+  
+  const workspacePath = getWorkspaceDir();
+  if (!workspacePath) {
+    throw new Error('未找到工作区路径');
+  }
+  
+  const skillDir = path.join(workspacePath, 'skills', code);
+  
+  if (fs.existsSync(skillDir)) {
+    fs.rmSync(skillDir, { recursive: true, force: true });
+    sendEvent({ ...msgContent, status: 'ok' })
+  } else {
+    sendEvent({ ...msgContent, status: 'fail' })
+  }
 }

package/src/tool.ts

@@ -1,65 +1,75 @@
-
-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)}`);
-    }
-  });
+
+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
+}
+let msgStatus: 'running' | 'finished' | '' = '';
+export function setMsgParams(params: any) {
+  msgParams = params;
+}
+
+export function getMsgParams() {
+  return msgParams;
+}
+
+export function setMsgStatus(status: 'running' | 'finished' | '') {
+  msgStatus = status;
+}
+
+export function getMsgStatus() {
+  return msgStatus;
+}
+
+export function monitoringToolMessage(api: OpenClawPluginApi) {
+  api.on("after_tool_call", (event, payload) => {
+    const ws = getWsConnection()
+    const params = getMsgParams();
+    const status = getMsgStatus();
+    // 
+    if (ws?.readyState === WebSocket.OPEN && status === 'running') {
+      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

@@ -1,103 +1,103 @@
-/**
- * 插件配置（channels.dcgchat 下的字段）
- */
-export type DcgchatConfig = {
-  enabled?: boolean;
-  /** 后端 WebSocket 地址，例如 ws://localhost:8080/openclaw/ws */
-  wsUrl?: string;
-  /** 连接认证 token */
-  botToken?: string;
-  /** 用户标识 */
-  userId?: string;
-  domainId?: string;
-  appId?: string;
-};
-
-export type ResolvedDcgchatAccount = {
-  accountId: string;
-  enabled: boolean;
-  configured: boolean;
-  wsUrl: string;
-  botToken: string;
-  userId: string;
-  domainId?: string;
-  appId?: string;
-};
-
-/**
- * 下行消息：后端 → OpenClaw（用户发的消息）
- */
-// export type InboundMessage = {
-//   type: "message";
-//   userId: string;
-//   text: string;
-// };
-export type InboundMessage = {
-  messageType: string; // "openclaw_bot_chat",
-  _userId: number;
-  source: string; // 'server',
-  // content: string;
-  content: {
-    bot_token: string;
-    session_id: string;
-    message_id: string;
-    text: string;
-    file_urls?: string[];
-  };
-};
-
-//  {"_userId":40,"content":"{\"bot_token\":\"sk_b7f8a3e1c5d24e6f8a1b3c4d5e6f7a8b\",\"session_id\":\"1\",\"message_id\":\"1\",\"text\":\"你好\"}","messageType":"openclaw_bot_chat","msgId":398599,"source":"server","title":"OPENCLAW机器人对话"}
-
-/**
- * 上行消息：OpenClaw → 后端（Agent 回复）
- */
-// export type OutboundReply = {
-//   type: "reply";
-//   userId: string;
-//   text: string;
-// };
-
-export type OutboundReply = {
-  messageType: string; // "openclaw_bot_chat",
-  _userId: number; // 100
-  source: string; // 'client',
-  // content: string;
-  content: {
-    bot_token: string; // ""
-    session_id: string; // ""
-    message_id: string; // ""
-    response: string; // ""
-    state: string; // final, chunk
-  };
-};
-
-export interface IResponse<T = unknown> {
-  /** 响应状态码 */
-  code?: number | string;
-  /** 响应数据 */
-  data?: T;
-  /** 响应消息 */
-  message?: string;
-}
-
-export interface IStsToken {
-  bucket: string;
-  endPoint: string;
-  expiration: string;
-  ossFileKey: string;
-  policy: string;
-  region: string;
-  signature: string;
-  sourceFileName: string;
-  stsEndPoint: string;
-  tempAccessKeyId: string;
-  tempAccessKeySecret: string;
-  tempSecurityToken: string;
-  uploadDir: string;
-  protocol: string;
-}
-
-export interface IStsTokenReq {
-  sourceFileName: string
-  isPrivate: number
-}
+/**
+ * 插件配置（channels.dcgchat 下的字段）
+ */
+export type DcgchatConfig = {
+  enabled?: boolean;
+  /** 后端 WebSocket 地址，例如 ws://localhost:8080/openclaw/ws */
+  wsUrl?: string;
+  /** 连接认证 token */
+  botToken?: string;
+  /** 用户标识 */
+  userId?: string;
+  domainId?: string;
+  appId?: string;
+};
+
+export type ResolvedDcgchatAccount = {
+  accountId: string;
+  enabled: boolean;
+  configured: boolean;
+  wsUrl: string;
+  botToken: string;
+  userId: string;
+  domainId?: string;
+  appId?: string;
+};
+
+/**
+ * 下行消息：后端 → OpenClaw（用户发的消息）
+ */
+// export type InboundMessage = {
+//   type: "message";
+//   userId: string;
+//   text: string;
+// };
+export type InboundMessage = {
+  messageType: string; // "openclaw_bot_chat",
+  _userId: number;
+  source: string; // 'server',
+  // content: string;
+  content: {
+    bot_token: string;
+    session_id: string;
+    message_id: string;
+    text: string;
+    file_urls?: string[];
+  };
+};
+
+//  {"_userId":40,"content":"{\"bot_token\":\"sk_b7f8a3e1c5d24e6f8a1b3c4d5e6f7a8b\",\"session_id\":\"1\",\"message_id\":\"1\",\"text\":\"你好\"}","messageType":"openclaw_bot_chat","msgId":398599,"source":"server","title":"OPENCLAW机器人对话"}
+
+/**
+ * 上行消息：OpenClaw → 后端（Agent 回复）
+ */
+// export type OutboundReply = {
+//   type: "reply";
+//   userId: string;
+//   text: string;
+// };
+
+export type OutboundReply = {
+  messageType: string; // "openclaw_bot_chat",
+  _userId: number; // 100
+  source: string; // 'client',
+  // content: string;
+  content: {
+    bot_token: string; // ""
+    session_id: string; // ""
+    message_id: string; // ""
+    response: string; // ""
+    state: string; // final, chunk
+  };
+};
+
+export interface IResponse<T = unknown> {
+  /** 响应状态码 */
+  code?: number | string;
+  /** 响应数据 */
+  data?: T;
+  /** 响应消息 */
+  message?: string;
+}
+
+export interface IStsToken {
+  bucket: string;
+  endPoint: string;
+  expiration: string;
+  ossFileKey: string;
+  policy: string;
+  region: string;
+  signature: string;
+  sourceFileName: string;
+  stsEndPoint: string;
+  tempAccessKeyId: string;
+  tempAccessKeySecret: string;
+  tempSecurityToken: string;
+  uploadDir: string;
+  protocol: string;
+}
+
+export interface IStsTokenReq {
+  sourceFileName: string
+  isPrivate: number
+}