@tencent-connect/openclaw-qqbot 1.6.5-alpha.2 → 1.6.5-alpha.3

package/dist/src/api.js

@@ -2,7 +2,6 @@
  * QQ Bot API 鉴权和请求封装
  * [修复版] 已重构为支持多实例并发，消除全局变量冲突
  */
-import { createRequire } from "node:module";
 import os from "node:os";
 import { computeFileHash, getCachedFileInfo, setCachedFileInfo } from "./utils/upload-cache.js";
 import { sanitizeFileName } from "./utils/platform.js";
@@ -11,12 +10,8 @@ const TOKEN_URL = "https://bots.qq.com/app/getAppAccessToken";
 // ============ Plugin User-Agent ============
 // 格式: QQBotPlugin/{version} (Node/{nodeVersion}; {os})
 // 示例: QQBotPlugin/1.6.0 (Node/22.14.0; darwin)
-const _require = createRequire(import.meta.url);
-let _pluginVersion = "unknown";
-try {
-    _pluginVersion = _require("../package.json").version ?? "unknown";
-}
-catch { /* fallback */ }
+import { getPackageVersion } from "./utils/pkg-version.js";
+const _pluginVersion = getPackageVersion(import.meta.url);
 export const PLUGIN_USER_AGENT = `QQBotPlugin/${_pluginVersion} (Node/${process.versions.node}; ${os.platform()})`;
 // 运行时配置
 let currentMarkdownSupport = false;
@@ -234,21 +229,48 @@ export async function apiRequest(accessToken, method, path, body, timeoutMs) {
     });
     const traceId = res.headers.get("x-tps-trace-id") ?? "";
     console.log(`[qqbot-api] <<< Status: ${res.status} ${res.statusText}${traceId ? ` | TraceId: ${traceId}` : ""}`);
-    let data;
     let rawBody;
     try {
         rawBody = await res.text();
-        console.log(`[qqbot-api] <<< Body:`, rawBody);
-        data = JSON.parse(rawBody);
     }
     catch (err) {
-        throw new Error(`Failed to parse response[${path}]: ${err instanceof Error ? err.message : String(err)}`);
+        throw new Error(`读取响应失败[${path}]: ${err instanceof Error ? err.message : String(err)}`);
     }
+    console.log(`[qqbot-api] <<< Body:`, rawBody);
+    // 检测非 JSON 响应（HTML 网关错误页 / CDN 限流页等）
+    const contentType = res.headers.get("content-type") ?? "";
+    const isHtmlResponse = contentType.includes("text/html") || rawBody.trimStart().startsWith("<");
     if (!res.ok) {
-        const error = data;
-        throw new Error(`API Error [${path}]: ${error.message ?? JSON.stringify(data)}`);
+        if (isHtmlResponse) {
+            // HTML 响应 = 网关/限流层返回的错误页，给出友好提示
+            const statusHint = res.status === 502 || res.status === 503 || res.status === 504
+                ? "调用发生异常，请稍候重试"
+                : res.status === 429
+                    ? "请求过于频繁，已被限流"
+                    : `开放平台返回 HTTP ${res.status}`;
+            throw new Error(`${statusHint}（${path}），请稍后重试`);
+        }
+        // JSON 错误响应
+        try {
+            const error = JSON.parse(rawBody);
+            throw new Error(`API Error [${path}]: ${error.message ?? rawBody}`);
+        }
+        catch (parseErr) {
+            if (parseErr instanceof Error && parseErr.message.startsWith("API Error"))
+                throw parseErr;
+            throw new Error(`API Error [${path}] HTTP ${res.status}: ${rawBody.slice(0, 200)}`);
+        }
+    }
+    // 成功响应但不是 JSON（极端异常情况）
+    if (isHtmlResponse) {
+        throw new Error(`QQ 服务端返回了非 JSON 响应（${path}），可能是临时故障，请稍后重试`);
+    }
+    try {
+        return JSON.parse(rawBody);
+    }
+    catch {
+        throw new Error(`开放平台响应格式异常（${path}），请稍后重试`);
     }
-    return data;
 }
 // ============ 上传重试（指数退避） ============
 const UPLOAD_MAX_RETRIES = 2;

package/dist/src/slash-commands.js

@@ -18,16 +18,9 @@ import { getUpdateInfo, checkVersionExists } from "./update-checker.js";
 import { getHomeDir, getQQBotDataDir, isWindows } from "./utils/platform.js";
 import { saveCredentialBackup } from "./credential-backup.js";
 import { fileURLToPath } from "node:url";
+import { getPackageVersion } from "./utils/pkg-version.js";
 const require = createRequire(import.meta.url);
-// 读取 package.json 中的版本号
-let PLUGIN_VERSION = "unknown";
-try {
-    const pkg = require("../package.json");
-    PLUGIN_VERSION = pkg.version ?? "unknown";
-}
-catch {
-    // fallback
-}
+let PLUGIN_VERSION = getPackageVersion(import.meta.url);
 // 获取 openclaw 框架版本（缓存结果，只执行一次）
 let _frameworkVersion = null;
 function getFrameworkVersion() {

package/dist/src/update-checker.js

@@ -9,6 +9,7 @@
  */
 import { createRequire } from "node:module";
 import https from "node:https";
+import { getPackageVersion } from "./utils/pkg-version.js";
 const require = createRequire(import.meta.url);
 const PKG_NAME = "@tencent-connect/openclaw-qqbot";
 const ENCODED_PKG = encodeURIComponent(PKG_NAME);
@@ -16,14 +17,7 @@ const REGISTRIES = [
     `https://registry.npmjs.org/${ENCODED_PKG}`,
     `https://registry.npmmirror.com/${ENCODED_PKG}`,
 ];
-let CURRENT_VERSION = "unknown";
-try {
-    const pkg = require("../package.json");
-    CURRENT_VERSION = pkg.version ?? "unknown";
-}
-catch {
-    // fallback
-}
+let CURRENT_VERSION = getPackageVersion(import.meta.url);
 let _log;
 function fetchJson(url, timeoutMs) {
     return new Promise((resolve, reject) => {

package/dist/src/utils/pkg-version.d.ts

@@ -0,0 +1,5 @@
+/**
+ * 从 import.meta.url 向上遍历目录树查找 package.json 并读取 version。
+ * 不依赖硬编码的 "../" 层级，无论编译输出结构如何变化都能可靠找到。
+ */
+export declare function getPackageVersion(metaUrl?: string): string;

package/dist/src/utils/pkg-version.js

@@ -0,0 +1,51 @@
+/**
+ * 从 import.meta.url 向上遍历目录树查找 package.json 并读取 version。
+ * 不依赖硬编码的 "../" 层级，无论编译输出结构如何变化都能可靠找到。
+ */
+import { fileURLToPath } from "node:url";
+import { createRequire } from "node:module";
+import path from "node:path";
+import fs from "node:fs";
+let _cached = null;
+export function getPackageVersion(metaUrl) {
+    if (_cached !== null)
+        return _cached;
+    // Strategy 1: 从调用者的 import.meta.url（或本模块）向上遍历找 package.json
+    const startFile = metaUrl ? fileURLToPath(metaUrl) : fileURLToPath(import.meta.url);
+    let dir = path.dirname(startFile);
+    const root = path.parse(dir).root;
+    while (dir !== root) {
+        const candidate = path.join(dir, "package.json");
+        try {
+            if (fs.existsSync(candidate)) {
+                const pkg = JSON.parse(fs.readFileSync(candidate, "utf8"));
+                // 确认是我们自己的包（避免找到其他 package.json）
+                if (pkg.name === "@tencent-connect/openclaw-qqbot" && pkg.version) {
+                    _cached = pkg.version;
+                    return _cached;
+                }
+            }
+        }
+        catch {
+            // ignore and try parent
+        }
+        dir = path.dirname(dir);
+    }
+    // Strategy 2: fallback 用 createRequire 尝试常见相对路径
+    try {
+        const require = createRequire(metaUrl ?? import.meta.url);
+        for (const rel of ["../../package.json", "../package.json", "./package.json"]) {
+            try {
+                const pkg = require(rel);
+                if (pkg?.version) {
+                    _cached = pkg.version;
+                    return _cached;
+                }
+            }
+            catch { /* next */ }
+        }
+    }
+    catch { /* fallback */ }
+    _cached = "unknown";
+    return _cached;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tencent-connect/openclaw-qqbot",
-  "version": "1.6.5-alpha.2",
+  "version": "1.6.5-alpha.3",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/scripts/upgrade-via-npm.ps1

@@ -242,7 +242,7 @@ if ($MissingModules.Count -gt 0) {
 $nmDir = Join-Path $STAGING_DIR "node_modules"
 if (Test-Path $nmDir) {
     $BundledOK = $true
-    foreach ($dep in @("ws", "undici")) {
+    foreach ($dep in @("ws", "silk-wasm")) {
         if (-not (Test-Path (Join-Path $nmDir $dep))) {
             Write-Host "  [WARN] Bundled dependency missing: $dep" -ForegroundColor Yellow
             $BundledOK = $false
@@ -273,6 +273,7 @@ Write-Host "  [OK] All preflight checks passed"
 # [3/5] Replace plugin directory (in-place overwrite to avoid file-lock issues)
 Write-Host ""
 Write-Host "[3/5] Replacing plugin directory..."
+if (-not (Test-Path $EXTENSIONS_DIR)) { New-Item -ItemType Directory -Path $EXTENSIONS_DIR -Force | Out-Null }
 $TARGET_DIR = Join-Path $EXTENSIONS_DIR "openclaw-qqbot"
 
 if (-not (Test-Path $TARGET_DIR)) {

package/scripts/upgrade-via-npm.sh

@@ -236,7 +236,7 @@ fi
 # (e) bundled node_modules 健康检查
 if [ -d "$STAGING_DIR/node_modules" ]; then
     BUNDLED_OK=true
-    for dep in "ws" "undici"; do
+    for dep in "ws" "silk-wasm"; do
         if [ ! -d "$STAGING_DIR/node_modules/$dep" ]; then
             echo "  ⚠️  bundled 依赖缺失: $dep"
             BUNDLED_OK=false
@@ -268,6 +268,7 @@ echo "  ✅ Preflight 检查全部通过"
 # 策略：先把 staging 放到 extensions/ 同级的临时名，再做单次 mv 替换
 echo ""
 echo "[3/5] 原子替换插件目录..."
+mkdir -p "$EXTENSIONS_DIR"
 TARGET_DIR="$EXTENSIONS_DIR/openclaw-qqbot"
 OLD_DIR="$(dirname "$EXTENSIONS_DIR")/.qqbot-upgrade-old"
 

package/src/api.ts

@@ -3,7 +3,6 @@
  * [修复版] 已重构为支持多实例并发，消除全局变量冲突
  */
 
-import { createRequire } from "node:module";
 import os from "node:os";
 import { computeFileHash, getCachedFileInfo, setCachedFileInfo } from "./utils/upload-cache.js";
 import { sanitizeFileName } from "./utils/platform.js";
@@ -14,9 +13,8 @@ const TOKEN_URL = "https://bots.qq.com/app/getAppAccessToken";
 // ============ Plugin User-Agent ============
 // 格式: QQBotPlugin/{version} (Node/{nodeVersion}; {os})
 // 示例: QQBotPlugin/1.6.0 (Node/22.14.0; darwin)
-const _require = createRequire(import.meta.url);
-let _pluginVersion = "unknown";
-try { _pluginVersion = _require("../package.json").version ?? "unknown"; } catch { /* fallback */ }
+import { getPackageVersion } from "./utils/pkg-version.js";
+const _pluginVersion = getPackageVersion(import.meta.url);
 export const PLUGIN_USER_AGENT = `QQBotPlugin/${_pluginVersion} (Node/${process.versions.node}; ${os.platform()})`;
 
 // 运行时配置
@@ -285,22 +283,48 @@ export async function apiRequest<T = unknown>(
   const traceId = res.headers.get("x-tps-trace-id") ?? "";
   console.log(`[qqbot-api] <<< Status: ${res.status} ${res.statusText}${traceId ? ` | TraceId: ${traceId}` : ""}`);
 
-  let data: T;
   let rawBody: string;
   try {
     rawBody = await res.text();
-    console.log(`[qqbot-api] <<< Body:`, rawBody);
-    data = JSON.parse(rawBody) as T;
   } catch (err) {
-    throw new Error(`Failed to parse response[${path}]: ${err instanceof Error ? err.message : String(err)}`);
+    throw new Error(`读取响应失败[${path}]: ${err instanceof Error ? err.message : String(err)}`);
   }
+  console.log(`[qqbot-api] <<< Body:`, rawBody);
+
+  // 检测非 JSON 响应（HTML 网关错误页 / CDN 限流页等）
+  const contentType = res.headers.get("content-type") ?? "";
+  const isHtmlResponse = contentType.includes("text/html") || rawBody.trimStart().startsWith("<");
 
   if (!res.ok) {
-    const error = data as { message?: string; code?: number };
-    throw new Error(`API Error [${path}]: ${error.message ?? JSON.stringify(data)}`);
+    if (isHtmlResponse) {
+      // HTML 响应 = 网关/限流层返回的错误页，给出友好提示
+      const statusHint = res.status === 502 || res.status === 503 || res.status === 504
+        ? "调用发生异常，请稍候重试"
+        : res.status === 429
+          ? "请求过于频繁，已被限流"
+          : `开放平台返回 HTTP ${res.status}`;
+      throw new Error(`${statusHint}（${path}），请稍后重试`);
+    }
+    // JSON 错误响应
+    try {
+      const error = JSON.parse(rawBody) as { message?: string; code?: number };
+      throw new Error(`API Error [${path}]: ${error.message ?? rawBody}`);
+    } catch (parseErr) {
+      if (parseErr instanceof Error && parseErr.message.startsWith("API Error")) throw parseErr;
+      throw new Error(`API Error [${path}] HTTP ${res.status}: ${rawBody.slice(0, 200)}`);
+    }
   }
 
-  return data;
+  // 成功响应但不是 JSON（极端异常情况）
+  if (isHtmlResponse) {
+    throw new Error(`QQ 服务端返回了非 JSON 响应（${path}），可能是临时故障，请稍后重试`);
+  }
+
+  try {
+    return JSON.parse(rawBody) as T;
+  } catch {
+    throw new Error(`开放平台响应格式异常（${path}），请稍后重试`);
+  }
 }
 
 // ============ 上传重试（指数退避） ============

package/src/slash-commands.ts

@@ -20,16 +20,10 @@ import { getUpdateInfo, checkVersionExists } from "./update-checker.js";
 import { getHomeDir, getQQBotDataDir, isWindows } from "./utils/platform.js";
 import { saveCredentialBackup } from "./credential-backup.js";
 import { fileURLToPath } from "node:url";
+import { getPackageVersion } from "./utils/pkg-version.js";
 const require = createRequire(import.meta.url);
 
-// 读取 package.json 中的版本号
-let PLUGIN_VERSION = "unknown";
-try {
-  const pkg = require("../package.json");
-  PLUGIN_VERSION = pkg.version ?? "unknown";
-} catch {
-  // fallback
-}
+let PLUGIN_VERSION = getPackageVersion(import.meta.url);
 
 // 获取 openclaw 框架版本（缓存结果，只执行一次）
 let _frameworkVersion: string | null = null;

package/src/update-checker.ts

@@ -10,6 +10,7 @@
 
 import { createRequire } from "node:module";
 import https from "node:https";
+import { getPackageVersion } from "./utils/pkg-version.js";
 
 const require = createRequire(import.meta.url);
 
@@ -21,13 +22,7 @@ const REGISTRIES = [
   `https://registry.npmmirror.com/${ENCODED_PKG}`,
 ];
 
-let CURRENT_VERSION = "unknown";
-try {
-  const pkg = require("../package.json");
-  CURRENT_VERSION = pkg.version ?? "unknown";
-} catch {
-  // fallback
-}
+let CURRENT_VERSION = getPackageVersion(import.meta.url);
 
 export interface UpdateInfo {
   current: string;

package/src/utils/pkg-version.ts

@@ -0,0 +1,54 @@
+/**
+ * 从 import.meta.url 向上遍历目录树查找 package.json 并读取 version。
+ * 不依赖硬编码的 "../" 层级，无论编译输出结构如何变化都能可靠找到。
+ */
+
+import { fileURLToPath } from "node:url";
+import { createRequire } from "node:module";
+import path from "node:path";
+import fs from "node:fs";
+
+let _cached: string | null = null;
+
+export function getPackageVersion(metaUrl?: string): string {
+  if (_cached !== null) return _cached;
+
+  // Strategy 1: 从调用者的 import.meta.url（或本模块）向上遍历找 package.json
+  const startFile = metaUrl ? fileURLToPath(metaUrl) : fileURLToPath(import.meta.url);
+  let dir = path.dirname(startFile);
+  const root = path.parse(dir).root;
+
+  while (dir !== root) {
+    const candidate = path.join(dir, "package.json");
+    try {
+      if (fs.existsSync(candidate)) {
+        const pkg = JSON.parse(fs.readFileSync(candidate, "utf8"));
+        // 确认是我们自己的包（避免找到其他 package.json）
+        if (pkg.name === "@tencent-connect/openclaw-qqbot" && pkg.version) {
+          _cached = pkg.version as string;
+          return _cached;
+        }
+      }
+    } catch {
+      // ignore and try parent
+    }
+    dir = path.dirname(dir);
+  }
+
+  // Strategy 2: fallback 用 createRequire 尝试常见相对路径
+  try {
+    const require = createRequire(metaUrl ?? import.meta.url);
+    for (const rel of ["../../package.json", "../package.json", "./package.json"]) {
+      try {
+        const pkg = require(rel);
+        if (pkg?.version) {
+          _cached = pkg.version as string;
+          return _cached;
+        }
+      } catch { /* next */ }
+    }
+  } catch { /* fallback */ }
+
+  _cached = "unknown";
+  return _cached;
+}