@xiaozhi-pro/openclaw-plugin 1.0.4 → 1.0.6

package/dist/src/accounts.d.ts

@@ -2,6 +2,12 @@ import type { OpenClawConfig } from "openclaw/plugin-sdk/account-resolution";
 import { type ResolvedXiaozhiProAccount } from "./types.js";
 export type { ResolvedXiaozhiProAccount };
 export declare function listAccountIds(cfg: OpenClawConfig): string[];
+/**
+ * 解析小智Pro账号配置。
+ * 签名兼容 createHybridChannelConfigAdapter 要求: (cfg, accountId?) => Account
+ * 内部用 adaptScopedAccountAccessor 包裹后传给 createHybridChannelConfigAdapter，
+ * 因为该函数内部以 ({ cfg, accountId }) 对象方式调用 resolveAccount。
+ */
 export declare function resolveAccount(cfg: OpenClawConfig, accountId?: string | null): ResolvedXiaozhiProAccount;
 /** 获取小智Pro WS URL（固定地址） */
 export declare function getXiaozhiProWsUrl(): string;

package/dist/src/accounts.js

@@ -1,7 +1,13 @@
 import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/account-id";
 import { normalizeLowercaseStringOrEmpty } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { formatAllowFromLowercase } from "openclaw/plugin-sdk/allow-from";
 import { XIAOZHI_PRO_WS_URL } from "./types.js";
+function normalizeAllowFrom(value) {
+    if (!value)
+        return [];
+    if (Array.isArray(value))
+        return value.map((v) => String(v).toLowerCase().trim()).filter(Boolean);
+    return [];
+}
 export function listAccountIds(cfg) {
     const section = cfg.channels?.["xiaozhi-pro"];
     if (!section)
@@ -11,6 +17,12 @@ export function listAccountIds(cfg) {
     }
     return [DEFAULT_ACCOUNT_ID];
 }
+/**
+ * 解析小智Pro账号配置。
+ * 签名兼容 createHybridChannelConfigAdapter 要求: (cfg, accountId?) => Account
+ * 内部用 adaptScopedAccountAccessor 包裹后传给 createHybridChannelConfigAdapter，
+ * 因为该函数内部以 ({ cfg, accountId }) 对象方式调用 resolveAccount。
+ */
 export function resolveAccount(cfg, accountId) {
     const section = (cfg.channels?.["xiaozhi-pro"] ?? {});
     const accounts = section.accounts;
@@ -20,7 +32,7 @@ export function resolveAccount(cfg, accountId) {
         enabled: raw.enabled !== false,
         token: normalizeLowercaseStringOrEmpty(raw.token),
         dmPolicy: raw.dmPolicy ?? "open",
-        allowedUserIds: formatAllowFromLowercase(raw.allowedUserIds ?? raw.allowFrom),
+        allowedUserIds: normalizeAllowFrom(raw.allowedUserIds ?? raw.allowFrom),
     };
 }
 /** 获取小智Pro WS URL（固定地址） */

package/dist/src/channel.js

@@ -8,6 +8,7 @@ import { createChatChannelPlugin, } from "openclaw/plugin-sdk/channel-core";
 import { waitUntilAbort } from "openclaw/plugin-sdk/channel-runtime";
 import { createEmptyChannelDirectoryAdapter } from "openclaw/plugin-sdk/directory-runtime";
 import { createHybridChannelConfigAdapter, createScopedDmSecurityResolver, } from "openclaw/plugin-sdk/channel-config-helpers";
+import { formatAllowFromLowercase } from "openclaw/plugin-sdk/allow-from";
 import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/account-id";
 import { getXiaozhiProRuntime } from "./runtime.js";
 import { listAccountIds, resolveAccount, } from "./accounts.js";
@@ -50,7 +51,7 @@ export const xiaozhiProPlugin = createChatChannelPlugin({
             defaultAccountId: () => DEFAULT_ACCOUNT_ID,
             clearBaseFields: ["token", "dmPolicy", "allowedUserIds"],
             resolveAllowFrom: (account) => account.allowedUserIds,
-            formatAllowFrom: (ids) => ids.map(String),
+            formatAllowFrom: (allowFrom) => formatAllowFromLowercase({ allowFrom: Array.isArray(allowFrom) ? allowFrom : allowFrom?.allowFrom ?? [] }),
         }),
         // 目标寻址
         messaging: {

package/dist/src/ws-client.js

@@ -9,16 +9,22 @@ export function connectXiaozhiProWs(config) {
     let ws = null;
     let reconnectTimer = null;
     let reconnectAttempts = 0;
+    let authFatal = false;
     const MAX_RECONNECT_DELAY = 30_000;
     function connect() {
-        if (abortSignal.aborted)
+        if (abortSignal.aborted || authFatal)
             return;
         ws = new WebSocket(url);
         ws.on("open", () => {
             reconnectAttempts = 0;
             log?.info?.(`[xiaozhi-pro] WS 已连接: ${url}`);
             // 发送 auth 消息（和小智Pro服务端协议对齐）
-            ws.send(JSON.stringify({ type: "auth", token: account.token }));
+            const token = account.token;
+            const masked = token.length > 8
+                ? `${token.slice(0, 4)}****${token.slice(-4)}`
+                : "****";
+            log?.info?.(`[xiaozhi-pro] 发送认证: token=${masked} (长度=${token.length})`);
+            ws.send(JSON.stringify({ type: "auth", token }));
         });
         ws.on("message", (raw) => {
             try {
@@ -29,6 +35,8 @@ export function connectXiaozhiProWs(config) {
                 }
                 if (data.type === "auth_fail") {
                     log?.error?.(`[xiaozhi-pro] 认证失败: ${data.error} - ${data.message}`);
+                    log?.error?.(`[xiaozhi-pro] 认证失败为不可恢复错误，停止重连。请检查 token 配置后重启服务。`);
+                    authFatal = true;
                     ws?.close();
                     return;
                 }
@@ -75,7 +83,7 @@ export function connectXiaozhiProWs(config) {
         activeConnections.set(accountId, ws);
     }
     function scheduleReconnect() {
-        if (abortSignal.aborted)
+        if (abortSignal.aborted || authFatal)
             return;
         const delay = Math.min(1000 * Math.pow(2, reconnectAttempts), MAX_RECONNECT_DELAY);
         reconnectAttempts++;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xiaozhi-pro/openclaw-plugin",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "小智Pro (XiaoZhi Pro) channel plugin for OpenClaw via WebSocket",
   "type": "module",
   "main": "./dist/index.js",