@tencent-connect/openclaw-qqbot 1.7.1 → 2.0.0

package/index.ts

@@ -1,31 +1,69 @@
-import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
-import { emptyPluginConfigSchema } from "openclaw/plugin-sdk";
+/**
+ * @tencent-connect/openclaw-qqbot
+ *
+ * 独立版 QQ Bot 通道插件 — 基于 @tencent-connect/qqbot-nodejs SDK 重构。
+ *
+ * 直接依赖：
+ * - openclaw/plugin-sdk：OpenClaw 插件框架
+ * - @tencent-connect/qqbot-nodejs：QQ 开放平台 Node.js SDK
+ */
+import type { OpenClawPluginApi } from 'openclaw/plugin-sdk';
+import { emptyPluginConfigSchema } from 'openclaw/plugin-sdk';
 
-import { qqbotPlugin } from "./src/channel.js";
-import { setQQBotRuntime } from "./src/runtime.js";
-import { registerChannelTool } from "./src/tools/channel.js";
-import { registerRemindTool } from "./src/tools/remind.js";
+import { qqbotPlugin } from './src/channel.js';
+import { setQQBotRuntime } from './src/runtime.js';
+import { registerPlatformTool } from './src/tools/platform.js';
+import { registerRemindTool } from './src/tools/remind.js';
+import { verifyRuntimeContract } from './src/adapter/contract.js';
+
+let registered = false;
 
 const plugin = {
-  id: "openclaw-qqbot",
-  name: "QQ Bot",
-  description: "QQ Bot channel plugin",
+  id: 'openclaw-qqbot',
+  name: 'QQ Bot',
+  description: 'QQ Bot channel plugin',
   configSchema: emptyPluginConfigSchema(),
   register(api: OpenClawPluginApi) {
     setQQBotRuntime(api.runtime);
+
+    if (!registered) {
+      registered = true;
+      const contract = verifyRuntimeContract(api.runtime);
+      if (!contract.ok) {
+        throw new Error(
+          `openclaw-qqbot incompatible with openclaw ${contract.version}: ` +
+          `missing required APIs: ${contract.missing.join(', ')}. ` +
+          `Please upgrade openclaw or downgrade the plugin.`,
+        );
+      }
+    }
+
     api.registerChannel({ plugin: qqbotPlugin as any });
-    registerChannelTool(api);
+    registerPlatformTool(api);
     registerRemindTool(api);
   },
 };
 
 export default plugin;
 
-export { qqbotPlugin } from "./src/channel.js";
-export { setQQBotRuntime, getQQBotRuntime } from "./src/runtime.js";
-export { qqbotOnboardingAdapter } from "./src/onboarding.js";
-export * from "./src/types.js";
-export * from "./src/api.js";
-export * from "./src/config.js";
-export * from "./src/gateway.js";
-export * from "./src/outbound.js";
+// ── Public API exports ──
+
+export { qqbotPlugin } from './src/channel.js';
+export { setQQBotRuntime, getQQBotRuntime } from './src/runtime.js';
+export { getBotForAccount, tryGetBotForAccount, buildUserAgent } from './src/bot-instance.js';
+export { qqbotOnboardingAdapter } from './src/features/onboarding.js';
+export { QQBotGateway } from './src/gateway/index.js';
+export { sendText, sendMedia } from './src/outbound/outbound-service.js';
+export { parseTarget } from './src/outbound/target.js';
+export { dispatchToOpenClaw } from './src/dispatch/index.js';
+export {
+  PersistedRefIndexStore,
+  getPersistedRefIndexStore,
+  flushAllRefIndexStores,
+} from './src/features/ref-index-store.js';
+export {
+  StreamingController,
+  shouldUseStreaming,
+} from './src/outbound/streaming-controller.js';
+export * from './src/types.js';
+export * from './src/config.js';

package/openclaw.plugin.json

@@ -4,18 +4,34 @@
   "description": "QQ Bot channel plugin with message support, cron jobs, and proactive messaging",
   "channels": ["qqbot"],
   "extensions": ["./preload.cjs"],
-  "skills": ["skills/qqbot-channel", "skills/qqbot-remind", "skills/qqbot-media", "skills/qqbot-upgrade"],
+  "skills": ["skills/qqbot-channel", "skills/qqbot-remind", "skills/qqbot-upgrade"],
+  "contracts": {
+    "tools": ["qqbot_platform_api", "qqbot_remind"]
+  },
   "capabilities": {
     "proactiveMessaging": true,
     "cronJobs": true
   },
   "configSchema": {
     "type": "object",
-    "additionalProperties": false,
-    "properties": {}
+    "additionalProperties": true,
+    "properties": {
+      "appId": { "type": "string", "description": "QQ Bot AppID" },
+      "clientSecret": { "type": "string", "description": "QQ Bot AppSecret" }
+    }
   },
   "channelConfigs": {
     "qqbot": {
+      "schema": {
+        "type": "object",
+        "additionalProperties": true,
+        "properties": {
+          "appId": { "type": "string", "description": "QQ Bot AppID" },
+          "clientSecret": { "type": "string", "description": "QQ Bot AppSecret" }
+        }
+      },
+      "label": "QQ Bot",
+      "description": "QQ Bot channel configuration with message support, cron jobs, and proactive messaging.",
       "preferOver": ["qqbot"]
     }
   }

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@tencent-connect/openclaw-qqbot",
-  "version": "1.7.1",
+  "version": "2.0.0",
+  "description": "QQ Bot channel plugin for OpenClaw",
   "publishConfig": {
     "access": "public"
   },
   "type": "module",
-  "main": "dist/index.js",
+  "main": "dist/index.cjs",
   "types": "dist/index.d.ts",
   "bin": {
     "openclaw-qqbot": "./bin/qqbot-cli.js",
@@ -20,6 +21,7 @@
     "index.ts",
     "preload.cjs",
     "tsconfig.json",
+    "tsup.config.ts",
     "openclaw.plugin.json"
   ],
   "openclaw": {
@@ -33,38 +35,27 @@
     }
   },
   "scripts": {
-    "build": "tsc || true",
-    "postbuild": "node -e \"const fs=require('fs'),p=require('path'),ext=p.join(require('os').homedir(),'.openclaw/extensions/openclaw-qqbot');if(fs.existsSync(ext)&&!fs.lstatSync(ext).isSymbolicLink()){const d=p.join(ext,'dist'),pr=p.join(ext,'preload.cjs');fs.cpSync('dist',d,{recursive:true});fs.copyFileSync('preload.cjs',pr);console.log('[postbuild] synced to',ext)}\"",
-    "dev": "tsc --watch",
-    "prepack": "npm install --omit=dev",
-    "postinstall": "node scripts/postinstall-link-sdk.js 2>/dev/null || true"
+    "build": "tsup",
+    "dev": "tsup --watch",
+    "typecheck": "tsc --noEmit",
+    "lint:runtime": "npx tsx src/runtime-adapter/lint-runtime-access.ts"
   },
   "dependencies": {
-    "mpg123-decoder": "^1.0.3",
-    "silk-wasm": "^3.7.1",
-    "ws": "^8.18.0"
+    "@tencent-connect/qqbot-connector": "1.2.0",
+    "@tencent-connect/qqbot-nodejs": "^1.0.4"
   },
-  "bundledDependencies": [
-    "mpg123-decoder",
-    "silk-wasm",
-    "ws"
-  ],
   "devDependencies": {
-    "@types/node": "^20.0.0",
-    "@types/ws": "^8.5.0",
+    "@types/node": "^20.19.43",
+    "tsup": "^8.5.1",
     "typescript": "^5.9.3"
   },
   "peerDependencies": {
+    "@tencent-connect/qqbot-connector": "1.2.0",
     "openclaw": "*"
   },
   "homepage": "https://github.com/tencent-connect/openclaw-qqbot",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/tencent-connect/openclaw-qqbot.git"
-  },
-  "bundleDependencies": [
-    "mpg123-decoder",
-    "silk-wasm",
-    "ws"
-  ]
+  }
 }

package/preload.cjs

@@ -9,25 +9,28 @@
  */
 "use strict";
 
+const path = require("node:path");
+const fs = require("node:fs");
 const { ensurePluginSdkSymlink } = require("./scripts/link-sdk-core.cjs");
 
-// 1) 同步创建 symlink
+// 1) 同步创建 symlink（确保 openclaw/plugin-sdk 可解析）
 ensurePluginSdkSymlink(__dirname, "[preload]");
 
-// 2) Node 22 原生支持 CJS require() 加载 ESM 模块
-//    同步加载插件入口，确保框架同步检查 register/activate 时能找到
-const _pluginModule = require("./dist/index.js");
+// 2) 加载编译产物（向后兼容：优先 .cjs，fallback .js）
+const cjsPath = path.join(__dirname, "dist", "index.cjs");
+const jsPath = path.join(__dirname, "dist", "index.js");
 
-// 3) 展平 default export：框架检查 register/activate 在顶级属性
-//    ESM 的 export default 在 require() 后变成 { default: plugin, ... }
-const _default = _pluginModule.default;
-const merged = Object.assign({}, _pluginModule);
-if (_default && typeof _default === "object") {
-  for (const key of Object.keys(_default)) {
-    if (!(key in merged)) {
-      merged[key] = _default[key];
+if (fs.existsSync(cjsPath)) {
+  module.exports = require(cjsPath);
+} else {
+  // 兼容旧版 tsc 编译产物（ESM .js），需展平 default export
+  const _mod = require(jsPath);
+  const _default = _mod.default;
+  const merged = Object.assign({}, _mod);
+  if (_default && typeof _default === "object") {
+    for (const key of Object.keys(_default)) {
+      if (!(key in merged)) merged[key] = _default[key];
     }
   }
+  module.exports = merged;
 }
-
-module.exports = merged;

package/scripts/link-sdk-core.cjs

@@ -3,12 +3,14 @@
  *
  * 被 preload.cjs 和 postinstall-link-sdk.js 共同使用，避免代码重复。
  * 必须是 CJS 格式，因为 preload.cjs 需要同步 require()。
+ *
+ * 注意：本模块不使用 child_process，避免被 openclaw 安全检查拦截。
  */
 "use strict";
 
 const path = require("node:path");
 const fs = require("node:fs");
-const { execSync } = require("node:child_process");
+const os = require("node:os");
 
 const CLI_NAMES = ["openclaw", "clawdbot", "moltbot"];
 
@@ -27,6 +29,104 @@ function compareVersionGte(version, target) {
   return true;
 }
 
+/**
+ * 获取全局 node_modules 候选目录列表（按优先级排序）。
+ * 不依赖 npm/child_process，通过常用路径推导。
+ */
+function getGlobalNodeModulesDirs() {
+  const dirs = [];
+  const npmPrefix = process.env.npm_config_prefix || process.env.PREFIX;
+  if (npmPrefix) {
+    // macOS: prefix/lib/node_modules; Windows: prefix/node_modules
+    dirs.push(path.join(npmPrefix, "lib", "node_modules"));
+    dirs.push(path.join(npmPrefix, "node_modules"));
+  }
+
+  // nvm / fnm / volta 等版本管理器
+  // process.execPath = .../versions/node/vX.Y.Z/bin/node
+  const execBase = path.dirname(path.dirname(process.execPath));
+  dirs.push(path.join(execBase, "lib", "node_modules"));
+  dirs.push(path.join(execBase, "node_modules"));
+
+  // Homebrew (macOS Intel)
+  dirs.push("/usr/local/lib/node_modules");
+  // Homebrew (macOS Apple Silicon)
+  dirs.push("/opt/homebrew/lib/node_modules");
+  // Linux / macOS 标准路径
+  dirs.push("/usr/lib/node_modules");
+  // pnpm global (XDG)
+  const xdgData = process.env.XDG_DATA_HOME || path.join(os.homedir(), ".local", "share");
+  dirs.push(path.join(xdgData, "pnpm", "global", "5", "node_modules"));
+  dirs.push(path.join(xdgData, "npm", "lib", "node_modules"));
+
+  return dirs;
+}
+
+/**
+ * 在全局 node_modules 目录中查找指定包的 package.json。
+ */
+function findPackageInGlobalDirs(packageName) {
+  for (const dir of getGlobalNodeModulesDirs()) {
+    const pkgPath = path.join(dir, packageName, "package.json");
+    try {
+      if (fs.existsSync(pkgPath)) return pkgPath;
+    } catch {}
+  }
+  return null;
+}
+
+/**
+ * 在 $PATH 中查找 CLI 可执行文件。
+ */
+function findCliInPath(cliName) {
+  const pathEnv = process.env.PATH || "";
+  const ext = process.platform === "win32" ? ".cmd" : "";
+  const dirs = pathEnv.split(path.delimiter);
+
+  for (const dir of dirs) {
+    const binPath = path.join(dir, cliName + ext);
+    try {
+      if (fs.existsSync(binPath)) return fs.realpathSync(binPath);
+    } catch {}
+  }
+  return null;
+}
+
+/**
+ * 从 CLI 二进制路径反查全局 node_modules 中的 package.json。
+ */
+function resolveGlobalRootFromBin(binPath, cliName) {
+  // 方式 A: bin -> ../lib/node_modules/<cli>/package.json
+  const binDir = path.dirname(binPath);
+  const c1 = path.resolve(binDir, "..", "lib", "node_modules", cliName, "package.json");
+  try { if (fs.existsSync(c1)) return c1; } catch {}
+
+  // 方式 B: bin -> ../package.json (如果在 node_modules/.bin 下)
+  const c2 = path.resolve(binDir, "..", "package.json");
+  try {
+    if (fs.existsSync(c2)) {
+      const parentDir = path.dirname(c2);
+      if (fs.existsSync(path.join(parentDir, "plugin-sdk")) || fs.existsSync(path.join(parentDir, "dist", "plugin-sdk"))) {
+        return c2;
+      }
+    }
+  } catch {}
+
+  return null;
+}
+
+/**
+ * 读取 package.json 中的版本号。
+ */
+function readPkgVersion(pkgPath) {
+  try {
+    const v = JSON.parse(fs.readFileSync(pkgPath, "utf-8")).version;
+    return v || null;
+  } catch {
+    return null;
+  }
+}
+
 /**
  * 检查 openclaw 版本是否 >= 2026.3.22（需要 symlink 的最低版本）。
  * 如果无法检测版本，返回 true（保守策略：宁可多创建也不遗漏）。
@@ -34,29 +134,25 @@ function compareVersionGte(version, target) {
 function isOpenclawVersionRequiresSymlink() {
   const REQUIRED = [2026, 3, 22];
 
-  // Strategy 1: 从全局 openclaw 的 package.json 读取版本
-  try {
-    const globalRoot = execSync("npm root -g", { encoding: "utf-8", timeout: 5000 }).trim();
-    for (const name of CLI_NAMES) {
-      const pkgPath = path.join(globalRoot, name, "package.json");
-      if (fs.existsSync(pkgPath)) {
-        const v = JSON.parse(fs.readFileSync(pkgPath, "utf-8")).version;
-        if (v) return compareVersionGte(v, REQUIRED);
-      }
+  // Strategy 1: 从全局 node_modules 读取 package.json 版本
+  for (const name of CLI_NAMES) {
+    const pkgPath = findPackageInGlobalDirs(name);
+    if (pkgPath) {
+      const v = readPkgVersion(pkgPath);
+      if (v) return compareVersionGte(v, REQUIRED);
     }
-  } catch {}
+  }
 
-  // Strategy 2: 从 CLI 命令获取版本
+  // Strategy 2: 从 CLI 二进制反查到 package.json
   for (const name of CLI_NAMES) {
-    try {
-      const out = execSync(`${name} --version`, {
-        encoding: "utf-8",
-        timeout: 5000,
-        stdio: ["pipe", "pipe", "pipe"],
-      }).trim();
-      const m = out.match(/(\d+\.\d+\.\d+)/);
-      if (m) return compareVersionGte(m[1], REQUIRED);
-    } catch {}
+    const binPath = findCliInPath(name);
+    if (binPath) {
+      const pkgPath = resolveGlobalRootFromBin(binPath, name);
+      if (pkgPath) {
+        const v = readPkgVersion(pkgPath);
+        if (v) return compareVersionGte(v, REQUIRED);
+      }
+    }
   }
 
   return true;
@@ -64,34 +160,22 @@ function isOpenclawVersionRequiresSymlink() {
 
 /**
  * 查找全局 openclaw 安装路径。
- * 三种策略依次尝试：npm root -g、which <cli>、从 extensions 目录推断。
+ * 三种策略依次尝试：全局 node_modules、$PATH 反查、extensions 目录推断。
  */
 function findOpenclawRoot(pluginRoot) {
-  // Strategy 1: npm root -g
-  try {
-    const globalRoot = execSync("npm root -g", { encoding: "utf-8", timeout: 5000 }).trim();
-    for (const name of CLI_NAMES) {
-      const candidate = path.join(globalRoot, name);
-      if (fs.existsSync(path.join(candidate, "package.json"))) return candidate;
-    }
-  } catch {}
+  // Strategy 1: 从全局 node_modules 查找
+  for (const name of CLI_NAMES) {
+    const pkgPath = findPackageInGlobalDirs(name);
+    if (pkgPath) return path.dirname(pkgPath);
+  }
 
-  // Strategy 2: which <cli>
-  const whichCmd = process.platform === "win32" ? "where" : "which";
+  // Strategy 2: 从 $PATH 反查
   for (const name of CLI_NAMES) {
-    try {
-      const bin = execSync(`${whichCmd} ${name}`, {
-        encoding: "utf-8",
-        timeout: 5000,
-        stdio: ["pipe", "pipe", "pipe"],
-      }).trim().split("\n")[0];
-      if (!bin) continue;
-      const realBin = fs.realpathSync(bin);
-      const c1 = path.resolve(path.dirname(realBin), "..", "lib", "node_modules", name);
-      if (fs.existsSync(path.join(c1, "package.json"))) return c1;
-      const c2 = path.resolve(path.dirname(realBin), "..");
-      if (fs.existsSync(path.join(c2, "package.json")) && fs.existsSync(path.join(c2, "plugin-sdk"))) return c2;
-    } catch {}
+    const binPath = findCliInPath(name);
+    if (binPath) {
+      const pkgPath = resolveGlobalRootFromBin(binPath, name);
+      if (pkgPath) return path.dirname(pkgPath);
+    }
   }
 
   // Strategy 3: 从 extensions 目录推断
@@ -100,11 +184,10 @@ function findOpenclawRoot(pluginRoot) {
   const dataDirName = path.basename(dataDir);
   const cliName = dataDirName.replace(/^\./, "");
   if (cliName) {
-    try {
-      const globalRoot = execSync("npm root -g", { encoding: "utf-8", timeout: 5000 }).trim();
-      const candidate = path.join(globalRoot, cliName);
-      if (fs.existsSync(path.join(candidate, "package.json"))) return candidate;
-    } catch {}
+    for (const dir of getGlobalNodeModulesDirs()) {
+      const pkgPath = path.join(dir, cliName, "package.json");
+      try { if (fs.existsSync(pkgPath)) return path.dirname(pkgPath); } catch {}
+    }
   }
 
   return null;