openclaw-xiaoyou 1.1.0 → 1.2.0

package/index.ts

@@ -3,10 +3,6 @@
  *
  * 安装方式:
  *   openclaw plugins install openclaw-xiaoyou
- *   openclaw plugins enable openclaw-xiaoyou
- *
- * 配置方式:
- *   openclaw channels add --channel xiaoyou
  */
 
 import { xiayouPlugin, setRuntime } from "./src/channel.js";
@@ -19,7 +15,7 @@ const plugin = {
 
   register(api: any) {
     // 注入 runtime，供 gateway/outbound 内部使用
-    setRuntime(api.runtime);
+    if (api.runtime) setRuntime(api.runtime);
 
     // 注册 channel
     api.registerChannel({ plugin: xiayouPlugin });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-xiaoyou",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "type": "module",
   "description": "Xiaoyou channel plugin for OpenClaw — connects enterprise services via persistent outbound WebSocket",
   "openclaw": {

package/src/channel.ts

@@ -3,8 +3,6 @@
  *
  * 运行在 OpenClaw Gateway 进程内，通过 gateway adapter 管理
  * 与企业服务的 WebSocket 连接生命周期。
- *
- * 用户通过 OpenClaw 标准 channel 配置来设置企业服务地址等参数。
  */
 
 import type { ResolvedAccount } from "./types.js";
@@ -14,7 +12,6 @@ import { createEnterpriseClient, type EnterpriseClient } from "./enterprise-clie
 
 let _client: EnterpriseClient | null = null;
 
-/** OpenClaw runtime API 引用，由 index.ts register() 注入 */
 let _runtime: any = null;
 export function setRuntime(rt: any) { _runtime = rt; }
 export function getRuntime() { return _runtime; }
@@ -25,6 +22,12 @@ function getChannelConfig(cfg: any): any {
   return cfg?.channels?.xiaoyou ?? {};
 }
 
+function listAccountIds(cfg: any): string[] {
+  const section = getChannelConfig(cfg);
+  if (section?.wsUrl) return ["default"];
+  return [];
+}
+
 function resolveAccount(cfg: any, accountId?: string | null): any {
   const section = getChannelConfig(cfg);
   const id = accountId || "default";
@@ -35,32 +38,10 @@ function resolveAccount(cfg: any, accountId?: string | null): any {
     config: section,
     enabled: section.enabled !== false,
     configured,
-    wsUrl: section.wsUrl ?? "",
-    authToken: section.authToken ?? "",
-    allowFrom: section.allowFrom ?? [],
-    dmPolicy: section.dmSecurity,
-    reconnectIntervalMs: section.reconnectIntervalMs ?? 3000,
-    maxReconnectAttempts: section.maxReconnectAttempts ?? 0,
-    heartbeatIntervalMs: section.heartbeatIntervalMs ?? 30000,
-    heartbeatTimeoutMs: section.heartbeatTimeoutMs ?? 10000,
-  };
-}
-
-function inspectAccount(cfg: any) {
-  const section = getChannelConfig(cfg);
-  return {
-    enabled: Boolean(section?.wsUrl),
-    configured: Boolean(section?.wsUrl),
-    tokenStatus: section?.authToken ? "available" : "missing",
+    name: "Xiaoyou",
   };
 }
 
-function listAccountIds(cfg: any): string[] {
-  const section = getChannelConfig(cfg);
-  if (section?.wsUrl) return ["default"];
-  return [];
-}
-
 // ─── Channel Plugin ──────────────────────────────────
 
 export const xiayouPlugin = {
@@ -89,11 +70,11 @@ export const xiayouPlugin = {
     blockStreaming: false,
   },
 
-  // ── Config（必须）──────────────────────────────────
+  reload: { configPrefixes: ["channels.xiaoyou"] },
+
   config: {
-    resolveAccount,
-    inspectAccount,
     listAccountIds,
+    resolveAccount,
     isConfigured: (account: any): boolean => Boolean(account?.config?.wsUrl),
     describeAccount: (account: any) => ({
       accountId: account?.accountId || "default",
@@ -103,37 +84,41 @@ export const xiayouPlugin = {
     defaultAccountId: (): string => "default",
   },
 
-  // ── DM 安全策略 ────────────────────────────────────
   security: {
     dm: {
       channelKey: "xiaoyou",
-      resolvePolicy: (account: ResolvedAccount) => account.dmPolicy,
-      resolveAllowFrom: (account: ResolvedAccount) => account.allowFrom,
-      defaultPolicy: "allowlist",
+      resolvePolicy: (account: any) => account?.config?.dmSecurity ?? "open",
+      resolveAllowFrom: (account: any) => account?.config?.allowFrom ?? ["*"],
+      defaultPolicy: "open",
     },
   },
 
-  // ── 回复线程模式 ───────────────────────────────────
   threading: { topLevelReplyToMode: "reply" as const },
 
   // ── Gateway 生命周期 ───────────────────────────────
-  reload: { configPrefixes: ["channels.xiaoyou"] },
-
   gateway: {
     startAccount: async (ctx: any) => {
       const { account, cfg, log } = ctx;
+
+      // 注入 runtime
+      if (ctx.runtime) setRuntime(ctx.runtime);
+
       const section = account?.config || getChannelConfig(cfg);
       const logger = log || console;
 
+      if (!section?.wsUrl) {
+        throw new Error("xiaoyou: wsUrl is required");
+      }
+
       const resolved: ResolvedAccount = {
-        wsUrl: section?.wsUrl ?? "",
-        authToken: section?.authToken ?? "",
-        allowFrom: section?.allowFrom ?? [],
-        dmPolicy: section?.dmSecurity,
-        reconnectIntervalMs: section?.reconnectIntervalMs ?? 3000,
-        maxReconnectAttempts: section?.maxReconnectAttempts ?? 0,
-        heartbeatIntervalMs: section?.heartbeatIntervalMs ?? 30000,
-        heartbeatTimeoutMs: section?.heartbeatTimeoutMs ?? 10000,
+        wsUrl: section.wsUrl,
+        authToken: section.authToken ?? "",
+        allowFrom: section.allowFrom ?? [],
+        dmPolicy: section.dmSecurity ?? "open",
+        reconnectIntervalMs: section.reconnectIntervalMs ?? 3000,
+        maxReconnectAttempts: section.maxReconnectAttempts ?? 0,
+        heartbeatIntervalMs: section.heartbeatIntervalMs ?? 30000,
+        heartbeatTimeoutMs: section.heartbeatTimeoutMs ?? 10000,
       };
 
       // 断开已有连接
@@ -145,7 +130,7 @@ export const xiayouPlugin = {
         onMessage: async (msg) => {
           const runtime = getRuntime();
           if (!runtime) {
-            logger.error("[xiaoyou] runtime not available");
+            logger.error("[xiaoyou] runtime not available, cannot dispatch");
             return;
           }
           await runtime.inbound.dispatch({
@@ -168,7 +153,18 @@ export const xiayouPlugin = {
       client.connect();
       _client = client;
       logger.info("[xiaoyou] gateway started");
-      return client;
+
+      // 保持 startAccount 挂起，直到 abortSignal 触发
+      return new Promise<void>((resolve) => {
+        if (ctx.abortSignal) {
+          ctx.abortSignal.addEventListener("abort", () => {
+            logger.info("[xiaoyou] abortSignal received, disconnecting");
+            client.disconnect();
+            if (_client === client) _client = null;
+            resolve();
+          });
+        }
+      });
     },
 
     stopAccount: async () => {
@@ -211,8 +207,8 @@ export const xiayouPlugin = {
   status: {
     describe: async ({ account }: any) => {
       const issues: Array<{ severity: string; message: string }> = [];
-      const wsUrl = account?.wsUrl ?? account?.config?.wsUrl;
-      const authToken = account?.authToken ?? account?.config?.authToken;
+      const wsUrl = account?.config?.wsUrl;
+      const authToken = account?.config?.authToken;
 
       if (!wsUrl) issues.push({ severity: "error", message: "wsUrl not configured" });
       if (!authToken) issues.push({ severity: "warning", message: "authToken not set" });