@ryantest/openclaw-qqbot 1.6.7-beta.5 → 1.6.7-beta.6

package/dist/src/slash-commands.js

@@ -14,23 +14,42 @@ import { getPackageVersion } from "./utils/pkg-version.js";
 // Re-export 供外部模块使用（gateway.ts / startup-greeting.ts 等）
 export { getFrameworkVersion, parseFrameworkDateVersion } from "./upgrade-utils.js";
 let PLUGIN_VERSION = getPackageVersion(import.meta.url);
-// ============ 指令注册表 ============
-const commands = new Map();
+// ============ 指令注册表（延迟初始化避免循环依赖 TDZ） ============
+let commands = null;
+function getCommandsMap() {
+    if (!commands)
+        commands = new Map();
+    return commands;
+}
+/** 待注册的指令队列（在循环依赖模块 import 时暂存） */
+const pendingRegistrations = [];
 export function registerCommand(cmd) {
-    commands.set(cmd.name.toLowerCase(), cmd);
+    if (commands) {
+        commands.set(cmd.name.toLowerCase(), cmd);
+    }
+    else {
+        pendingRegistrations.push(cmd);
+    }
 }
 /** 获取指令注册表（只读访问，供 bot-help 等使用） */
 export function getCommands() {
-    return commands;
+    return getCommandsMap();
 }
 // ============ 注册所有内置指令 ============
 // 通过 side-effect import 触发各指令模块的 registerCommand 调用
+// 此时 commands 可能还未初始化（循环依赖），指令暂存到 pendingRegistrations
 import "./commands/bot-ping.js";
 import "./commands/bot-version.js";
 import "./commands/bot-help.js";
 import "./commands/bot-upgrade.js";
 import "./commands/bot-logs.js";
 import "./commands/bot-clear-storage.js";
+// flush 待注册队列
+getCommandsMap();
+for (const cmd of pendingRegistrations) {
+    commands.set(cmd.name.toLowerCase(), cmd);
+}
+pendingRegistrations.length = 0;
 // ============ 匹配入口 ============
 /**
  * 尝试匹配并执行插件级斜杠指令
@@ -45,7 +64,7 @@ export async function matchSlashCommand(ctx) {
     const spaceIdx = content.indexOf(" ");
     const cmdName = (spaceIdx === -1 ? content.slice(1) : content.slice(1, spaceIdx)).toLowerCase();
     const args = spaceIdx === -1 ? "" : content.slice(spaceIdx + 1).trim();
-    const cmd = commands.get(cmdName);
+    const cmd = getCommandsMap().get(cmdName);
     if (!cmd)
         return null; // 不是插件级指令，交给框架
     // /指令 ? — 返回用法说明

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryantest/openclaw-qqbot",
-  "version": "1.6.7-beta.5",
+  "version": "1.6.7-beta.6",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/slash-commands.ts

@@ -87,22 +87,35 @@ export interface SlashCommand {
   handler: (ctx: SlashCommandContext) => SlashCommandResult | Promise<SlashCommandResult>;
 }
 
-// ============ 指令注册表 ============
+// ============ 指令注册表（延迟初始化避免循环依赖 TDZ） ============
 
-const commands: Map<string, SlashCommand> = new Map();
+let commands: Map<string, SlashCommand> | null = null;
+
+function getCommandsMap(): Map<string, SlashCommand> {
+  if (!commands) commands = new Map();
+  return commands;
+}
+
+/** 待注册的指令队列（在循环依赖模块 import 时暂存） */
+const pendingRegistrations: SlashCommand[] = [];
 
 export function registerCommand(cmd: SlashCommand): void {
-  commands.set(cmd.name.toLowerCase(), cmd);
+  if (commands) {
+    commands.set(cmd.name.toLowerCase(), cmd);
+  } else {
+    pendingRegistrations.push(cmd);
+  }
 }
 
 /** 获取指令注册表（只读访问，供 bot-help 等使用） */
 export function getCommands(): ReadonlyMap<string, SlashCommand> {
-  return commands;
+  return getCommandsMap();
 }
 
 // ============ 注册所有内置指令 ============
 
 // 通过 side-effect import 触发各指令模块的 registerCommand 调用
+// 此时 commands 可能还未初始化（循环依赖），指令暂存到 pendingRegistrations
 import "./commands/bot-ping.js";
 import "./commands/bot-version.js";
 import "./commands/bot-help.js";
@@ -110,6 +123,13 @@ import "./commands/bot-upgrade.js";
 import "./commands/bot-logs.js";
 import "./commands/bot-clear-storage.js";
 
+// flush 待注册队列
+getCommandsMap();
+for (const cmd of pendingRegistrations) {
+  commands!.set(cmd.name.toLowerCase(), cmd);
+}
+pendingRegistrations.length = 0;
+
 // ============ 匹配入口 ============
 
 /**
@@ -126,7 +146,7 @@ export async function matchSlashCommand(ctx: SlashCommandContext): Promise<Slash
   const cmdName = (spaceIdx === -1 ? content.slice(1) : content.slice(1, spaceIdx)).toLowerCase();
   const args = spaceIdx === -1 ? "" : content.slice(spaceIdx + 1).trim();
 
-  const cmd = commands.get(cmdName);
+  const cmd = getCommandsMap().get(cmdName);
   if (!cmd) return null; // 不是插件级指令，交给框架
 
   // /指令 ? — 返回用法说明