@dcrays/dcgchat-test 0.1.9 → 0.1.10

package/src/monitor.ts

@@ -1,190 +1,191 @@
-import type { ClawdbotConfig, RuntimeEnv } from "openclaw/plugin-sdk";
-import WebSocket from "ws";
-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";
-import { installSkill, uninstallSkill } from "./skill.js";
-
-export type MonitorDcgchatOpts = {
-  config?: ClawdbotConfig;
-  runtime?: RuntimeEnv;
-  abortSignal?: AbortSignal;
-  accountId?: string;
-};
-
-const RECONNECT_DELAY_MS = 3000;
-const HEARTBEAT_INTERVAL_MS = 30_000;
-
-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", 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");
-    return;
-  }
-
-  const account = resolveAccount(cfg, accountId ?? "default");
-  const log = runtime?.log ?? console.log;
-  const err = runtime?.error ?? console.error;
-
-  if (!account.wsUrl) {
-    err(`dcgchat[${account.accountId}]: wsUrl not configured`);
-    return;
-  }
-
-  let shouldReconnect = true;
-  let ws: WebSocket | null = null;
-  let heartbeatTimer: ReturnType<typeof setInterval> | null = null;
-
-  const stopHeartbeat = () => {
-    if (heartbeatTimer) {
-      clearInterval(heartbeatTimer);
-      heartbeatTimer = null;
-    }
-  };
-
-  const startHeartbeat = () => {
-    stopHeartbeat();
-    heartbeatTimer = setInterval(() => {
-      if (ws?.readyState === WebSocket.OPEN) {
-        const heartbeat = {
-          messageType: "openclaw_bot_heartbeat",
-          _userId: Number(account.userId) || 0,
-          source: "client",
-          content: {
-            bot_token: account.botToken,
-            status: "1",
-          },
-        };
-        ws.send(JSON.stringify(heartbeat));
-        // log(`dcgchat[${account.accountId}]: heartbeat sent, ${JSON.stringify(heartbeat)}`);
-      }
-    }, HEARTBEAT_INTERVAL_MS);
-  };
-
-  const connect = () => {
-    if (!shouldReconnect) return;
-
-    const connectUrl = buildConnectUrl(account as Record<string, any>);
-    log(`dcgchat[${account.accountId}]: connecting to ${connectUrl}`);
-    ws = new WebSocket(connectUrl);
-
-    ws.on("open", () => {
-      log(`dcgchat[${account.accountId}]: connected`);
-      setWsConnection(ws);
-      startHeartbeat();
-    });
-
-    ws.on("message", async (data) => {
-      log(`dcgchat[${account.accountId}]: on message, ${data.toString()}`);
-      let parsed: { messageType?: string; content: any };
-      try {
-        parsed = JSON.parse(data.toString());
-      } catch {
-        err(`dcgchat[${account.accountId}]: invalid JSON received`);
-        return;
-      }
-
-      if (parsed.messageType === "openclaw_bot_heartbeat") {
-        log(`dcgchat[${account.accountId}]: heartbeat ack received, ${data.toString()}`);
-        return;
-      }
-      try {
-        parsed.content = JSON.parse(parsed.content);
-      } catch {
-        err(`dcgchat[${account.accountId}]: invalid JSON received`);
-        return;
-      }
-      
-      if (parsed.messageType == "openclaw_bot_chat") {
-        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,
-          accountId: account.accountId,
-          runtime,
-          onChunk: (reply) => {
-            if (ws?.readyState === WebSocket.OPEN) {
-              const res = { ...reply, content: JSON.stringify(reply.content) };
-              ws.send(JSON.stringify(res));
-            }
-          },
-        });
-      }  else if (parsed.messageType == "openclaw_bot_event") {
-        const { event_type, operation_type, skill_url, skill_code, skill_id, bot_token, websocket_trace_id } = parsed.content ? parsed.content : {} as Record<string, any>;
-        const content = { event_type, operation_type, skill_url, skill_code, skill_id, bot_token, websocket_trace_id };
-        if (event_type === "skill") {
-          if (operation_type === "install" || operation_type === "enable") {
-            installSkill({ path: skill_url, code: skill_code }, content);
-          } else if (operation_type === "remove" || operation_type === "disable") {
-            uninstallSkill({ code: skill_code }, content);
-          } else {
-            log(`dcgchat[${account.accountId}]: openclaw_bot_event unknown event_type: ${event_type}, ${data.toString()}`);
-          }
-        } else {
-          log(`dcgchat[${account.accountId}]: openclaw_bot_event unknown operation_type: ${operation_type}, ${data.toString()}`);
-        }
-      } else {
-        log(`dcgchat[${account.accountId}]: ignoring unknown messageType: ${parsed.messageType}`);
-      }
-
-    });
-
-    ws.on("close", (code, reason) => {
-      stopHeartbeat();
-      setWsConnection(null);
-      log(
-        `dcgchat[${account.accountId}]: disconnected (code=${code}, reason=${reason?.toString() || ""})`,
-      );
-      if (shouldReconnect) {
-        log(`dcgchat[${account.accountId}]: reconnecting in ${RECONNECT_DELAY_MS}ms...`);
-        setTimeout(connect, RECONNECT_DELAY_MS);
-      }
-    });
-
-    ws.on("error", (e) => {
-      err(`dcgchat[${account.accountId}]: WebSocket error: ${String(e)}`);
-    });
-  };
-
-  connect();
-
-  await new Promise<void>((resolve) => {
-    if (abortSignal?.aborted) {
-      shouldReconnect = false;
-      ws?.close();
-      resolve();
-      return;
-    }
-    abortSignal?.addEventListener(
-      "abort",
-      () => {
-        log(`dcgchat[${account.accountId}]: stopping`);
-        stopHeartbeat();
-        shouldReconnect = false;
-        ws?.close();
-        resolve();
-      },
-      { once: true },
-    );
-  });
-}
+import type { ClawdbotConfig, RuntimeEnv } from "openclaw/plugin-sdk";
+import WebSocket from "ws";
+import { handleDcgchatMessage } from "./bot.js";
+import { resolveAccount } from "./channel.js";
+import { setWsConnection } from "./connection.js";
+import type { InboundMessage, OutboundReply } from "./types.js";
+import { setMsgParams,setMsgStatus } from "./tool.js";
+import { installSkill, uninstallSkill } from "./skill.js";
+
+export type MonitorDcgchatOpts = {
+  config?: ClawdbotConfig;
+  runtime?: RuntimeEnv;
+  abortSignal?: AbortSignal;
+  accountId?: string;
+};
+
+const RECONNECT_DELAY_MS = 3000;
+const HEARTBEAT_INTERVAL_MS = 30_000;
+
+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", 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");
+    return;
+  }
+
+  const account = resolveAccount(cfg, accountId ?? "default");
+  const log = runtime?.log ?? console.log;
+  const err = runtime?.error ?? console.error;
+
+  if (!account.wsUrl) {
+    err(`dcgchat[${account.accountId}]: wsUrl not configured`);
+    return;
+  }
+
+  let shouldReconnect = true;
+  let ws: WebSocket | null = null;
+  let heartbeatTimer: ReturnType<typeof setInterval> | null = null;
+
+  const stopHeartbeat = () => {
+    if (heartbeatTimer) {
+      clearInterval(heartbeatTimer);
+      heartbeatTimer = null;
+    }
+  };
+
+  const startHeartbeat = () => {
+    stopHeartbeat();
+    heartbeatTimer = setInterval(() => {
+      if (ws?.readyState === WebSocket.OPEN) {
+        const heartbeat = {
+          messageType: "openclaw_bot_heartbeat",
+          _userId: Number(account.userId) || 0,
+          source: "client",
+          content: {
+            bot_token: account.botToken,
+            status: "1",
+          },
+        };
+        ws.send(JSON.stringify(heartbeat));
+        // log(`dcgchat[${account.accountId}]: heartbeat sent, ${JSON.stringify(heartbeat)}`);
+      }
+    }, HEARTBEAT_INTERVAL_MS);
+  };
+
+  const connect = () => {
+    if (!shouldReconnect) return;
+
+    const connectUrl = buildConnectUrl(account as Record<string, any>);
+    log(`dcgchat[${account.accountId}]: connecting to ${connectUrl}`);
+    ws = new WebSocket(connectUrl);
+
+    ws.on("open", () => {
+      log(`dcgchat[${account.accountId}]: connected`);
+      setWsConnection(ws);
+      startHeartbeat();
+    });
+
+    ws.on("message", async (data) => {
+      log(`dcgchat[${account.accountId}]: on message, ${data.toString()}`);
+      let parsed: { messageType?: string; content: any };
+      try {
+        parsed = JSON.parse(data.toString());
+      } catch {
+        err(`dcgchat[${account.accountId}]: invalid JSON received`);
+        return;
+      }
+
+      if (parsed.messageType === "openclaw_bot_heartbeat") {
+        log(`dcgchat[${account.accountId}]: heartbeat ack received, ${data.toString()}`);
+        return;
+      }
+      try {
+        parsed.content = JSON.parse(parsed.content);
+      } catch {
+        err(`dcgchat[${account.accountId}]: invalid JSON received`);
+        return;
+      }
+      
+      if (parsed.messageType == "openclaw_bot_chat") {
+        const msg = parsed as unknown as InboundMessage;
+        setMsgStatus('running');
+        setMsgParams({
+          userId: msg._userId,
+          token: msg.content.bot_token,
+          sessionId: msg.content.session_id,
+          messageId: msg.content.message_id,
+        });
+        await handleDcgchatMessage({
+          cfg,
+          msg,
+          accountId: account.accountId,
+          runtime,
+          onChunk: (reply) => {
+            if (ws?.readyState === WebSocket.OPEN) {
+              const res = { ...reply, content: JSON.stringify(reply.content) };
+              ws.send(JSON.stringify(res));
+            }
+          },
+        });
+      }  else if (parsed.messageType == "openclaw_bot_event") {
+        const { event_type, operation_type, skill_url, skill_code, skill_id, bot_token, websocket_trace_id } = parsed.content ? parsed.content : {} as Record<string, any>;
+        const content = { event_type, operation_type, skill_url, skill_code, skill_id, bot_token, websocket_trace_id };
+        if (event_type === "skill") {
+          if (operation_type === "install" || operation_type === "enable") {
+            installSkill({ path: skill_url, code: skill_code }, content);
+          } else if (operation_type === "remove" || operation_type === "disable") {
+            uninstallSkill({ code: skill_code }, content);
+          } else {
+            log(`dcgchat[${account.accountId}]: openclaw_bot_event unknown event_type: ${event_type}, ${data.toString()}`);
+          }
+        } else {
+          log(`dcgchat[${account.accountId}]: openclaw_bot_event unknown operation_type: ${operation_type}, ${data.toString()}`);
+        }
+      } else {
+        log(`dcgchat[${account.accountId}]: ignoring unknown messageType: ${parsed.messageType}`);
+      }
+
+    });
+
+    ws.on("close", (code, reason) => {
+      stopHeartbeat();
+      setWsConnection(null);
+      log(
+        `dcgchat[${account.accountId}]: disconnected (code=${code}, reason=${reason?.toString() || ""})`,
+      );
+      if (shouldReconnect) {
+        log(`dcgchat[${account.accountId}]: reconnecting in ${RECONNECT_DELAY_MS}ms...`);
+        setTimeout(connect, RECONNECT_DELAY_MS);
+      }
+    });
+
+    ws.on("error", (e) => {
+      err(`dcgchat[${account.accountId}]: WebSocket error: ${String(e)}`);
+    });
+  };
+
+  connect();
+
+  await new Promise<void>((resolve) => {
+    if (abortSignal?.aborted) {
+      shouldReconnect = false;
+      ws?.close();
+      resolve();
+      return;
+    }
+    abortSignal?.addEventListener(
+      "abort",
+      () => {
+        log(`dcgchat[${account.accountId}]: stopping`);
+        stopHeartbeat();
+        shouldReconnect = false;
+        ws?.close();
+        resolve();
+      },
+      { once: true },
+    );
+  });
+}

package/src/oss.ts

@@ -1,72 +1,72 @@
-import { createReadStream } from "node:fs";
-import OSS from "ali-oss";
-import { getStsToken, getUserToken } from "./api";
-
-
-/** 将 File/路径/Buffer 转为 ali-oss put 所需的 Buffer 或 ReadableStream */
-async function toUploadContent(
-  input: File | string | Buffer,
-): Promise<{ content: Buffer | ReturnType<typeof createReadStream>; fileName: string }> {
-  if (Buffer.isBuffer(input)) {
-    return { content: input, fileName: "file" };
-  }
-  if (typeof input === "string") {
-    return {
-      content: createReadStream(input),
-      fileName: input.split("/").pop() ?? "file",
-    };
-  }
-  // File: ali-oss 需要 Buffer/Stream，用 arrayBuffer 转 Buffer
-  const buf = Buffer.from(await input.arrayBuffer());
-  return { content: buf, fileName: input.name };
-}
-
-export const ossUpload = async (file: File | string | Buffer, botToken: string) => {
-  await getUserToken(botToken);
-
-  const { content, fileName } = await toUploadContent(file);
-  const data = await getStsToken(fileName, botToken);
-
-  const options: OSS.Options = {
-    // 从STS服务获取的临时访问密钥（AccessKey ID和AccessKey Secret）。
-    accessKeyId: data.tempAccessKeyId,
-    accessKeySecret: data.tempAccessKeySecret,
-    // 从STS服务获取的安全令牌（SecurityToken）。
-    stsToken: data.tempSecurityToken,
-    // 填写Bucket名称。
-    bucket: data.bucket,
-    endpoint: data.endPoint,
-    region: data.region,
-    secure: true,
-    // refreshSTSToken: async () => {
-    //   const tokenResponse = await getStsToken(fileName);
-    //   return {
-    //     accessKeyId: tokenResponse.tempAccessKeyId,
-    //     accessKeySecret: tokenResponse.tempAccessKeySecret,
-    //     stsToken: tokenResponse.tempSecurityToken,
-    //   }
-    // },
-    // // 5 seconds
-    // refreshSTSTokenInterval: 5 * 1000,
-    // // // 5 minutes
-    // // refreshSTSTokenInterval: 5 * 60 * 1000,
-  };
-
-  const client = new OSS(options);
-
-  const name = `${data.uploadDir}${data.ossFileKey}`;
-
-  try {
-    const objectResult = await client.put(name, content);
-  if (objectResult?.res?.status !== 200) {
-    throw new Error("OSS 上传失败");
-  }
-  console.log(objectResult.url);
-  // const url = `${data.protocol || 'http'}://${data.bucket}.${data.endPoint}/${data.uploadDir}${data.ossFileKey}`
-  return objectResult.url;
-  } catch (error) {
-    console.error("OSS 上传失败:", error);
-    throw error;
-  }
-};
-
+import { createReadStream } from "node:fs";
+import OSS from "ali-oss";
+import { getStsToken, getUserToken } from "./api";
+
+
+/** 将 File/路径/Buffer 转为 ali-oss put 所需的 Buffer 或 ReadableStream */
+async function toUploadContent(
+  input: File | string | Buffer,
+): Promise<{ content: Buffer | ReturnType<typeof createReadStream>; fileName: string }> {
+  if (Buffer.isBuffer(input)) {
+    return { content: input, fileName: "file" };
+  }
+  if (typeof input === "string") {
+    return {
+      content: createReadStream(input),
+      fileName: input.split("/").pop() ?? "file",
+    };
+  }
+  // File: ali-oss 需要 Buffer/Stream，用 arrayBuffer 转 Buffer
+  const buf = Buffer.from(await input.arrayBuffer());
+  return { content: buf, fileName: input.name };
+}
+
+export const ossUpload = async (file: File | string | Buffer, botToken: string) => {
+  await getUserToken(botToken);
+
+  const { content, fileName } = await toUploadContent(file);
+  const data = await getStsToken(fileName, botToken);
+
+  const options: OSS.Options = {
+    // 从STS服务获取的临时访问密钥（AccessKey ID和AccessKey Secret）。
+    accessKeyId: data.tempAccessKeyId,
+    accessKeySecret: data.tempAccessKeySecret,
+    // 从STS服务获取的安全令牌（SecurityToken）。
+    stsToken: data.tempSecurityToken,
+    // 填写Bucket名称。
+    bucket: data.bucket,
+    endpoint: data.endPoint,
+    region: data.region,
+    secure: true,
+    // refreshSTSToken: async () => {
+    //   const tokenResponse = await getStsToken(fileName);
+    //   return {
+    //     accessKeyId: tokenResponse.tempAccessKeyId,
+    //     accessKeySecret: tokenResponse.tempAccessKeySecret,
+    //     stsToken: tokenResponse.tempSecurityToken,
+    //   }
+    // },
+    // // 5 seconds
+    // refreshSTSTokenInterval: 5 * 1000,
+    // // // 5 minutes
+    // // refreshSTSTokenInterval: 5 * 60 * 1000,
+  };
+
+  const client = new OSS(options);
+
+  const name = `${data.uploadDir}${data.ossFileKey}`;
+
+  try {
+    const objectResult = await client.put(name, content);
+  if (objectResult?.res?.status !== 200) {
+    throw new Error("OSS 上传失败");
+  }
+  console.log(objectResult.url);
+  // const url = `${data.protocol || 'http'}://${data.bucket}.${data.endPoint}/${data.uploadDir}${data.ossFileKey}`
+  return objectResult.url;
+  } catch (error) {
+    console.error("OSS 上传失败:", error);
+    throw error;
+  }
+};
+