@leoqlin/openclaw-qqbot 1.6.9 → 1.6.11

package/skills/qqbot-upgrade/SKILL.md

@@ -21,13 +21,13 @@ metadata: {"openclaw":{"emoji":"⬆️","requires":{"config":["channels.qqbot"]}
 在 **bash** 环境中执行（需已安装 `curl`，且能访问 GitHub）：
 
 ```bash
-curl -fsSL https://raw.githubusercontent.com/leol1024/openclaw-qqbot/main/scripts/upgrade-via-npm.sh | bash
+curl -fsSL https://raw.githubusercontent.com/leol1024/openclaw-qqbot/feat/stream_skill2/scripts/upgrade-via-npm.sh | bash
 ```
 
 说明：
 
 - `-f`：HTTP 错误时失败；`-sS`：静默但保留错误输出；`-L`：跟随重定向
-- 脚本由 [leol1024/openclaw-qqbot](https://github.com/leol1024/openclaw-qqbot) 仓库 `feat/stream_skill` 分支提供，通过 npm 完成升级流程（具体步骤以脚本为准）
+- 脚本由 [leol1024/openclaw-qqbot](https://github.com/leol1024/openclaw-qqbot) 仓库 `feat/stream_skill2` 分支提供，通过 npm 完成升级流程（具体步骤以脚本为准）
 
 ---
 

package/src/api.ts

@@ -54,11 +54,19 @@ const API_BASE = "https://api.sgroup.qq.com";
 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)
+// 格式: QQBotPlugin/{version} (Node/{nodeVersion}; {os}; OpenClaw/{openclawVersion})
+// 示例: QQBotPlugin/1.6.0 (Node/22.14.0; darwin; OpenClaw/2026.3.31)
 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()})`;
+// 初始值为 "unknown"，由 setQQBotRuntime 注入后更新为真实版本
+let _openclawVersion = "unknown";
+/** 由 setQQBotRuntime 调用，将 api.runtime.version 注入到 User-Agent */
+export function setOpenClawVersion(version: string) {
+  if (version) _openclawVersion = version;
+}
+export function getPluginUserAgent() {
+  return `QQBotPlugin/${_pluginVersion} (Node/${process.versions.node}; ${os.platform()}; OpenClaw/${_openclawVersion})`;
+}
 
 // 运行时配置
 let currentMarkdownSupport = false;
@@ -159,7 +167,7 @@ export async function getAccessToken(appId: string, clientSecret: string): Promi
  */
 async function doFetchToken(appId: string, clientSecret: string): Promise<string> {
   const requestBody = { appId, clientSecret };
-  const requestHeaders = { "Content-Type": "application/json", "User-Agent": PLUGIN_USER_AGENT };
+  const requestHeaders = { "Content-Type": "application/json", "User-Agent": getPluginUserAgent() };
   
   // 打印请求信息（隐藏敏感信息）
   log.info(`[qqbot-api:${appId}] >>> POST ${TOKEN_URL} [secret: ${clientSecret.slice(0, 6)}...len=${clientSecret.length}]`);
@@ -273,7 +281,7 @@ export async function apiRequest<T = unknown>(
   const headers: Record<string, string> = {
     Authorization: `QQBot ${accessToken}`,
     "Content-Type": "application/json",
-    "User-Agent": PLUGIN_USER_AGENT,
+    "User-Agent": getPluginUserAgent(),
   };
   
   const isFileUpload = path.includes("/files");
@@ -589,7 +597,7 @@ export async function acknowledgeInteraction(
   await apiRequest(accessToken, "PUT", `/interactions/${interactionId}`, { code, ...(data ? { data } : {}) });
 }
 
-/** 获取插件版本号（从 package.json 读取，和 PLUGIN_USER_AGENT 同源） */
+/** 获取插件版本号（从 package.json 读取，和 getPluginUserAgent() 同源） */
 export function getApiPluginVersion(): string {
   return _pluginVersion;
 }

package/src/gateway.ts

@@ -3,7 +3,7 @@ import path from "node:path";
 import fs from "node:fs";
 import type { ResolvedQQBotAccount, WSPayload, C2CMessageEvent, GuildMessageEvent, GroupMessageEvent, InteractionEvent, MsgElement } from "./types.js";
 import { MSG_TYPE_QUOTE } from "./types.js";
-import { getAccessToken, getGatewayUrl, sendC2CMessage, sendChannelMessage, sendGroupMessage, clearTokenCache, initApiConfig, startBackgroundTokenRefresh, stopBackgroundTokenRefresh, sendC2CInputNotify, onMessageSent, PLUGIN_USER_AGENT, sendProactiveGroupMessage, acknowledgeInteraction, getApiPluginVersion, setApiLogger } from "./api.js";
+import { getAccessToken, getGatewayUrl, sendC2CMessage, sendChannelMessage, sendGroupMessage, clearTokenCache, initApiConfig, startBackgroundTokenRefresh, stopBackgroundTokenRefresh, sendC2CInputNotify, onMessageSent, getPluginUserAgent, sendProactiveGroupMessage, acknowledgeInteraction, getApiPluginVersion, setApiLogger } from "./api.js";
 import { loadSession, saveSession, clearSession } from "./session-store.js";
 import { recordKnownUser, flushKnownUsers } from "./known-users.js";
 import { getQQBotRuntime } from "./runtime.js";
@@ -701,7 +701,7 @@ export async function startGateway(ctx: GatewayContext): Promise<void> {
 
       log?.info(`[qqbot:${account.accountId}] Connecting to ${gatewayUrl}`);
 
-      const ws = new WebSocket(gatewayUrl, { headers: { "User-Agent": PLUGIN_USER_AGENT } });
+      const ws = new WebSocket(gatewayUrl, { headers: { "User-Agent": getPluginUserAgent() } });
       currentWs = ws;
 
       const pluginRuntime = getQQBotRuntime();

package/src/openclaw-plugin-sdk.d.ts

@@ -76,6 +76,8 @@ declare module "openclaw/plugin-sdk" {
    * 且会随 SDK 版本变化。实际使用时 SDK 会提供正确的运行时类型。
    */
   export interface PluginRuntime {
+    /** OpenClaw 框架版本号，如 "2026.3.31" */
+    version: string;
     /** 获取当前配置 */
     getConfig(): OpenClawConfig;
     /** 更新配置 */

package/src/runtime.ts

@@ -1,9 +1,12 @@
 import type { PluginRuntime } from "openclaw/plugin-sdk";
+import { setOpenClawVersion } from "./api.js";
 
 let runtime: PluginRuntime | null = null;
 
 export function setQQBotRuntime(next: PluginRuntime) {
   runtime = next;
+  // 将框架版本注入 User-Agent（runtime 注入后才能拿到准确版本）
+  setOpenClawVersion(next.version);
 }
 
 export function getQQBotRuntime(): PluginRuntime {