openclaw-xiaoyou 1.1.0 → 1.2.1

package/docs/install-xiaoyou.sh

@@ -323,24 +323,57 @@ install_or_upgrade() {
 patch_config() {
   [[ -n "$WS_URL" || -n "$TOKEN" ]] || return 0
 
-  log "写入 xiaoyou channel 配置"
-  run openclaw config set "channels.${CHANNEL_KEY}.enabled" true --strict-json
+  log "写入 xiaoyou channel 配置（直接修改配置文件）"
 
-  if [[ -n "$WS_URL" ]]; then
-    run openclaw config set "channels.${CHANNEL_KEY}.wsUrl" "$WS_URL"
-  fi
-  if [[ -n "$TOKEN" ]]; then
-    run openclaw config set "channels.${CHANNEL_KEY}.authToken" "$TOKEN"
-  fi
+  local config_file
+  config_file="$(openclaw_config_file)"
 
-  run openclaw config set "channels.${CHANNEL_KEY}.dmSecurity" open
-  run openclaw config set "channels.${CHANNEL_KEY}.reconnectIntervalMs" 3000 --strict-json
-  run openclaw config set "channels.${CHANNEL_KEY}.heartbeatIntervalMs" 30000 --strict-json
-  run openclaw config set "channels.${CHANNEL_KEY}.heartbeatTimeoutMs" 10000 --strict-json
+  if [[ ! -f "$config_file" ]]; then
+    die "配置文件不存在: $config_file"
+  fi
 
-  local config_file
-  config_file="$(capture_or_empty openclaw config file)"
-  log "已写入配置: ${config_file:-$(openclaw_config_file)}"
+  # 使用 python3 直接写入配置，绕过 openclaw config set 的 channel id 校验
+  python3 -c "
+import json, sys
+
+config_file = '$config_file'
+ws_url = '$WS_URL'
+token = '$TOKEN'
+
+try:
+    with open(config_file, 'r') as f:
+        cfg = json.load(f)
+except Exception as e:
+    print(f'[xiaoyou-install][error] 无法读取配置文件: {e}', file=sys.stderr)
+    sys.exit(1)
+
+# 确保 channels 对象存在
+cfg.setdefault('channels', {})
+
+# 写入 xiaoyou channel 配置
+xiaoyou = cfg['channels'].get('xiaoyou', {})
+xiaoyou['enabled'] = True
+if ws_url:
+    xiaoyou['wsUrl'] = ws_url
+if token:
+    xiaoyou['authToken'] = token
+xiaoyou.setdefault('dmSecurity', 'open')
+xiaoyou.setdefault('allowFrom', ['*'])
+xiaoyou.setdefault('reconnectIntervalMs', 3000)
+xiaoyou.setdefault('heartbeatIntervalMs', 30000)
+xiaoyou.setdefault('heartbeatTimeoutMs', 10000)
+cfg['channels']['xiaoyou'] = xiaoyou
+
+try:
+    with open(config_file, 'w') as f:
+        json.dump(cfg, f, indent=2, ensure_ascii=False)
+    print('[xiaoyou-install] 配置写入成功')
+except Exception as e:
+    print(f'[xiaoyou-install][error] 写入配置失败: {e}', file=sys.stderr)
+    sys.exit(1)
+" || die "写入配置失败"
+
+  log "已写入配置: $config_file"
 }
 
 # -----------------------------------------------------------------------------
@@ -375,11 +408,31 @@ xiayou_status() {
 
 xiayou_uninstall_plugin_only() {
   # 仅删除插件记录和文件，不删除配置（升级时用）
-  if command_exists openclaw; then
-    run_or_dry_run openclaw config unset "plugins.entries.${PLUGIN_NAME}" || true
-    run_or_dry_run openclaw config unset "plugins.installs.${PLUGIN_NAME}" || true
+  local config_file
+  config_file="$(openclaw_config_file)"
+
+  if [[ -f "$config_file" ]] && command_exists python3; then
+    python3 -c "
+import json
+config_file = '$config_file'
+with open(config_file, 'r') as f:
+    cfg = json.load(f)
+changed = False
+for key in ['xiaoyou', 'openclaw-xiaoyou']:
+    if cfg.get('plugins', {}).get('entries', {}).pop(key, None): changed = True
+    if cfg.get('plugins', {}).get('installs', {}).pop(key, None): changed = True
+    allow = cfg.get('plugins', {}).get('allow', [])
+    if key in allow:
+        allow.remove(key)
+        changed = True
+if changed:
+    with open(config_file, 'w') as f:
+        json.dump(cfg, f, indent=2, ensure_ascii=False)
+    print('[xiaoyou-install] 已清理插件注册记录')
+" || true
   fi
-  run_or_dry_run rm -rf "$HOME/.openclaw/extensions/${PLUGIN_NAME}" "$HOME"/.openclaw/extensions/.openclaw-* || true
+
+  run_or_dry_run rm -rf "$HOME/.openclaw/extensions/xiaoyou" "$HOME/.openclaw/extensions/openclaw-xiaoyou" "$HOME"/.openclaw/extensions/.openclaw-* || true
 }
 
 xiayou_uninstall() {
@@ -392,13 +445,29 @@ xiayou_uninstall() {
   fi
 
   log "开始卸载 xiaoyou channel"
-  if command_exists openclaw; then
-    run_or_dry_run openclaw config unset "channels.${CHANNEL_KEY}" || warn "删除 channels.${CHANNEL_KEY} 失败"
-    run_or_dry_run openclaw config unset "plugins.entries.${PLUGIN_NAME}" || warn "删除 plugins.entries 失败"
-    run_or_dry_run openclaw config unset "plugins.installs.${PLUGIN_NAME}" || warn "删除 plugins.installs 失败"
+
+  local config_file
+  config_file="$(openclaw_config_file)"
+
+  if [[ -f "$config_file" ]] && command_exists python3; then
+    run_or_dry_run python3 -c "
+import json
+config_file = '$config_file'
+with open(config_file, 'r') as f:
+    cfg = json.load(f)
+cfg.get('channels', {}).pop('xiaoyou', None)
+for key in ['xiaoyou', 'openclaw-xiaoyou']:
+    cfg.get('plugins', {}).get('entries', {}).pop(key, None)
+    cfg.get('plugins', {}).get('installs', {}).pop(key, None)
+    allow = cfg.get('plugins', {}).get('allow', [])
+    if key in allow: allow.remove(key)
+with open(config_file, 'w') as f:
+    json.dump(cfg, f, indent=2, ensure_ascii=False)
+print('[xiaoyou-install] 已清理所有 xiaoyou 配置')
+" || warn "清理配置失败"
   fi
 
-  run_or_dry_run rm -rf "$HOME/.openclaw/extensions/${PLUGIN_NAME}" "$HOME"/.openclaw/extensions/.openclaw-* || warn "删除插件文件失败"
+  run_or_dry_run rm -rf "$HOME/.openclaw/extensions/xiaoyou" "$HOME/.openclaw/extensions/openclaw-xiaoyou" "$HOME"/.openclaw/extensions/.openclaw-* || warn "删除插件文件失败"
 
   if [[ "$CHECK_ONLY" -eq 1 ]]; then
     phase_end "xiaoyou.uninstall" "planned" "check-only：已输出计划，未执行"
@@ -424,6 +493,13 @@ main() {
 
   install_or_upgrade
 
+  # 重启 gateway 让插件和配置生效
+  if [[ "$CHECK_ONLY" -eq 0 ]] && openclaw_gateway_running; then
+    log "重启 gateway 以加载插件和配置..."
+    run openclaw gateway restart || warn "gateway 重启失败，请手动执行: openclaw gateway restart"
+    sleep 5
+  fi
+
   log "完成。企业服务端应能收到来自 xiaoyou 插件的 WebSocket 连接。"
   phase_end "main.entry" "ok" "安装流程完成"
 }

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.1",
   "type": "module",
   "description": "Xiaoyou channel plugin for OpenClaw — connects enterprise services via persistent outbound WebSocket",
   "openclaw": {

package/setup-entry.ts

@@ -13,6 +13,6 @@ export default {
   description: "Bridge OpenClaw to enterprise services via WebSocket",
   setup: {
     resolveAccount: xiayouPlugin.config.resolveAccount,
-    inspectAccount: xiayouPlugin.config.inspectAccount,
+    isConfigured: xiayouPlugin.config.isConfigured,
   },
 };

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" });