@tencent-connect/openclaw-qqbot 1.6.4-alpha.2 → 1.6.4-alpha.4

package/dist/src/gateway.js

@@ -263,41 +263,63 @@ async function ensureImageServer(log, publicBaseUrl) {
 // 区分 gateway restart（进程重启）和 health-monitor 断线重连
 let isFirstReadyGlobal = true;
 const STARTUP_MARKER_FILE = path.join(getQQBotDataDir("data"), "startup-marker.json");
-/**
- * 判断是否为首次安装或版本更新，返回对应的问候语。
- * - 首次安装 / 版本变更 → "Haha，我的'灵魂'已上线，随时等你吩咐。"
- * - 普通重启（同版本） → null（不发送）
- */
-function getStartupGreeting() {
-    const currentVersion = getPluginVersion();
-    let isFirstOrUpdated = true;
+const STARTUP_GREETING_TEXT = `Haha，我的'灵魂'已上线，随时等你吩咐。`;
+const STARTUP_GREETING_RETRY_COOLDOWN_MS = 10 * 60 * 1000;
+function readStartupMarker() {
     try {
         if (fs.existsSync(STARTUP_MARKER_FILE)) {
             const data = JSON.parse(fs.readFileSync(STARTUP_MARKER_FILE, "utf8"));
-            if (data.version === currentVersion) {
-                isFirstOrUpdated = false;
-            }
+            return data || {};
         }
     }
     catch {
-        // 文件损坏或不存在，视为首次
-    }
-    // 普通重启（同版本）不发送问候语
-    if (!isFirstOrUpdated) {
-        return null;
+        // 文件损坏或不存在，视为无 marker
     }
-    // 更新 marker 文件
+    return {};
+}
+function writeStartupMarker(data) {
     try {
-        fs.writeFileSync(STARTUP_MARKER_FILE, JSON.stringify({
-            version: currentVersion,
-            startedAt: new Date().toISOString(),
-            greetedAt: new Date().toISOString(),
-        }) + "\n");
+        fs.writeFileSync(STARTUP_MARKER_FILE, JSON.stringify(data) + "\n");
     }
     catch {
         // ignore
     }
-    return `Haha，我的'灵魂'已上线，随时等你吩咐。`;
+}
+/**
+ * 判断是否需要发送“灵魂上线”问候：
+ * - 首次安装 / 版本变更：可发送
+ * - 同版本：不发送
+ * - 同版本近期失败：冷却期内不重试，减少噪音
+ */
+function getStartupGreetingPlan() {
+    const currentVersion = getPluginVersion();
+    const marker = readStartupMarker();
+    if (marker.version === currentVersion) {
+        return { shouldSend: false, version: currentVersion, reason: "same-version" };
+    }
+    if (marker.lastFailureVersion === currentVersion && marker.lastFailureAt) {
+        const lastFailureAtMs = new Date(marker.lastFailureAt).getTime();
+        if (!Number.isNaN(lastFailureAtMs) && Date.now() - lastFailureAtMs < STARTUP_GREETING_RETRY_COOLDOWN_MS) {
+            return { shouldSend: false, version: currentVersion, reason: "cooldown" };
+        }
+    }
+    return { shouldSend: true, greeting: STARTUP_GREETING_TEXT, version: currentVersion };
+}
+function markStartupGreetingSent(version) {
+    writeStartupMarker({
+        version,
+        startedAt: new Date().toISOString(),
+        greetedAt: new Date().toISOString(),
+    });
+}
+function markStartupGreetingFailed(version, reason) {
+    const marker = readStartupMarker();
+    writeStartupMarker({
+        ...marker,
+        lastFailureVersion: version,
+        lastFailureAt: new Date().toISOString(),
+        lastFailureReason: reason,
+    });
 }
 /**
  * 启动 Gateway WebSocket 连接（带自动重连）
@@ -392,6 +414,9 @@ export async function startGateway(ctx) {
     // 使用模块级 isFirstReadyGlobal，确保只有进程级重启才发送问候语
     // health-monitor 重连不会重新初始化为 true
     const ADMIN_MARKER_FILE = path.join(getQQBotDataDir("data"), `admin-${account.accountId}.json`);
+    const safeAccountId = account.accountId.replace(/[^a-zA-Z0-9._-]/g, "_");
+    const safeAppId = account.appId.replace(/[^a-zA-Z0-9._-]/g, "_");
+    const UPGRADE_GREETING_TARGET_FILE = path.join(getQQBotDataDir("data"), `upgrade-greeting-target-${safeAccountId}-${safeAppId}.json`);
     /**
      * 读取已持久化的管理员 openid
      */
@@ -406,6 +431,25 @@ export async function startGateway(ctx) {
         catch { /* 文件损坏视为无 */ }
         return undefined;
     };
+    const loadUpgradeGreetingTargetOpenId = () => {
+        try {
+            if (fs.existsSync(UPGRADE_GREETING_TARGET_FILE)) {
+                const data = JSON.parse(fs.readFileSync(UPGRADE_GREETING_TARGET_FILE, "utf8"));
+                if (data.openid)
+                    return data.openid;
+            }
+        }
+        catch { /* 文件损坏视为无 */ }
+        return undefined;
+    };
+    const clearUpgradeGreetingTargetOpenId = () => {
+        try {
+            if (fs.existsSync(UPGRADE_GREETING_TARGET_FILE)) {
+                fs.unlinkSync(UPGRADE_GREETING_TARGET_FILE);
+            }
+        }
+        catch { /* ignore */ }
+    };
     /**
      * 将管理员 openid 持久化到文件
      */
@@ -434,30 +478,37 @@ export async function startGateway(ctx) {
     /** 异步发送启动问候语（仅发给管理员） */
     const sendStartupGreetings = (trigger) => {
         (async () => {
+            const plan = getStartupGreetingPlan();
+            if (!plan.shouldSend || !plan.greeting) {
+                log?.info(`[qqbot:${account.accountId}] Skipping startup greeting (${plan.reason ?? "debounced"}, trigger=${trigger})`);
+                return;
+            }
+            const upgradeTargetOpenId = loadUpgradeGreetingTargetOpenId();
+            const targetOpenId = upgradeTargetOpenId || resolveAdminOpenId();
+            if (!targetOpenId) {
+                markStartupGreetingFailed(plan.version, "no-admin");
+                log?.info(`[qqbot:${account.accountId}] Skipping startup greeting (no admin or known user)`);
+                return;
+            }
             try {
-                const greeting = getStartupGreeting();
-                if (!greeting) {
-                    log?.info(`[qqbot:${account.accountId}] Skipping startup greeting (debounced, trigger=${trigger})`);
-                }
-                else {
-                    const adminId = resolveAdminOpenId();
-                    if (!adminId) {
-                        log?.info(`[qqbot:${account.accountId}] Skipping startup greeting (no admin or known user)`);
-                    }
-                    else {
-                        log?.info(`[qqbot:${account.accountId}] Sending startup greeting to admin (trigger=${trigger}): "${greeting}"`);
-                        const token = await getAccessToken(account.appId, account.clientSecret);
-                        const GREETING_TIMEOUT_MS = 10_000;
-                        await Promise.race([
-                            sendProactiveC2CMessage(token, adminId, greeting),
-                            new Promise((_, reject) => setTimeout(() => reject(new Error("Startup greeting send timeout (10s)")), GREETING_TIMEOUT_MS)),
-                        ]);
-                        log?.info(`[qqbot:${account.accountId}] Sent startup greeting to admin: ${adminId}`);
-                    }
+                const receiverType = upgradeTargetOpenId ? "upgrade-requester" : "admin";
+                log?.info(`[qqbot:${account.accountId}] Sending startup greeting to ${receiverType} (trigger=${trigger}): "${plan.greeting}"`);
+                const token = await getAccessToken(account.appId, account.clientSecret);
+                const GREETING_TIMEOUT_MS = 10_000;
+                await Promise.race([
+                    sendProactiveC2CMessage(token, targetOpenId, plan.greeting),
+                    new Promise((_, reject) => setTimeout(() => reject(new Error("Startup greeting send timeout (10s)")), GREETING_TIMEOUT_MS)),
+                ]);
+                markStartupGreetingSent(plan.version);
+                if (upgradeTargetOpenId) {
+                    clearUpgradeGreetingTargetOpenId();
                 }
+                log?.info(`[qqbot:${account.accountId}] Sent startup greeting to ${receiverType}: ${targetOpenId}`);
             }
             catch (err) {
-                log?.error(`[qqbot:${account.accountId}] Failed to send startup greeting: ${err}`);
+                const message = err instanceof Error ? err.message : String(err);
+                markStartupGreetingFailed(plan.version, message);
+                log?.error(`[qqbot:${account.accountId}] Failed to send startup greeting: ${message}`);
             }
         })();
     };
@@ -587,6 +638,7 @@ export async function startGateway(ctx) {
             channelId: msg.channelId,
             groupOpenid: msg.groupOpenid,
             accountId: account.accountId,
+            appId: account.appId,
             accountConfig: account.config,
             queueSnapshot: getQueueSnapshot(peerId),
         };

package/dist/src/slash-commands.d.ts

@@ -35,6 +35,8 @@ export interface SlashCommandContext {
     groupOpenid?: string;
     /** 账号 ID */
     accountId: string;
+    /** Bot App ID */
+    appId: string;
     /** 账号配置（供指令读取可配置项） */
     accountConfig?: QQBotAccountConfig;
     /** 当前用户队列状态快照 */

package/dist/src/slash-commands.js

@@ -15,7 +15,7 @@ import { execFileSync, execFile } from "node:child_process";
 import path from "node:path";
 import fs from "node:fs";
 import { getUpdateInfo } from "./update-checker.js";
-import { getHomeDir, isWindows } from "./utils/platform.js";
+import { getHomeDir, getQQBotDataDir, isWindows } from "./utils/platform.js";
 import { fileURLToPath } from "node:url";
 const require = createRequire(import.meta.url);
 // 读取 package.json 中的版本号
@@ -126,6 +126,22 @@ registerCommand({
     },
 });
 const DEFAULT_UPGRADE_URL = "https://doc.weixin.qq.com/doc/w3_AKEAGQaeACgCNHrh1CbHzTAKtT2gB?scode=AJEAIQdfAAozxFEnLZAKEAGQaeACg";
+function saveUpgradeGreetingTarget(accountId, appId, openid) {
+    const safeAccountId = accountId.replace(/[^a-zA-Z0-9._-]/g, "_");
+    const safeAppId = appId.replace(/[^a-zA-Z0-9._-]/g, "_");
+    const filePath = path.join(getQQBotDataDir("data"), `upgrade-greeting-target-${safeAccountId}-${safeAppId}.json`);
+    try {
+        fs.writeFileSync(filePath, JSON.stringify({
+            accountId,
+            appId,
+            openid,
+            savedAt: new Date().toISOString(),
+        }) + "\n");
+    }
+    catch {
+        // ignore
+    }
+}
 // ============ 热更新 ============
 /**
  * 找到 CLI 命令名（openclaw / clawdbot / moltbot）
@@ -294,6 +310,7 @@ registerCommand({
             }
             return `❌ 当前环境不支持热更新（需要 bash 环境）\n⬆️升级指引：[点击查看](${url})\n\n> Windows 用户请安装 Git for Windows 后重试，或手动执行升级脚本`;
         }
+        saveUpgradeGreetingTarget(ctx.accountId, ctx.appId, ctx.senderId);
         const lines = [
             `🔄 开始热更新...`,
             `📌 当前版本：v${PLUGIN_VERSION}`,

package/package.json

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

package/src/gateway.ts

@@ -352,44 +352,78 @@ async function ensureImageServer(log?: GatewayContext["log"], publicBaseUrl?: st
 let isFirstReadyGlobal = true;
 
 const STARTUP_MARKER_FILE = path.join(getQQBotDataDir("data"), "startup-marker.json");
+const STARTUP_GREETING_TEXT = `Haha，我的'灵魂'已上线，随时等你吩咐。`;
+const STARTUP_GREETING_RETRY_COOLDOWN_MS = 10 * 60 * 1000;
+
+type StartupMarkerData = {
+  version?: string;
+  startedAt?: string;
+  greetedAt?: string;
+  lastFailureAt?: string;
+  lastFailureReason?: string;
+  lastFailureVersion?: string;
+};
 
-/**
- * 判断是否为首次安装或版本更新，返回对应的问候语。
- * - 首次安装 / 版本变更 → "Haha，我的'灵魂'已上线，随时等你吩咐。"
- * - 普通重启（同版本） → null（不发送）
- */
-function getStartupGreeting(): string | null {
-  const currentVersion = getPluginVersion();
-  let isFirstOrUpdated = true;
-
+function readStartupMarker(): StartupMarkerData {
   try {
     if (fs.existsSync(STARTUP_MARKER_FILE)) {
-      const data = JSON.parse(fs.readFileSync(STARTUP_MARKER_FILE, "utf8"));
-      if (data.version === currentVersion) {
-        isFirstOrUpdated = false;
-      }
+      const data = JSON.parse(fs.readFileSync(STARTUP_MARKER_FILE, "utf8")) as StartupMarkerData;
+      return data || {};
     }
   } catch {
-    // 文件损坏或不存在，视为首次
-  }
-
-  // 普通重启（同版本）不发送问候语
-  if (!isFirstOrUpdated) {
-    return null;
+    // 文件损坏或不存在，视为无 marker
   }
+  return {};
+}
 
-  // 更新 marker 文件
+function writeStartupMarker(data: StartupMarkerData): void {
   try {
-    fs.writeFileSync(STARTUP_MARKER_FILE, JSON.stringify({
-      version: currentVersion,
-      startedAt: new Date().toISOString(),
-      greetedAt: new Date().toISOString(),
-    }) + "\n");
+    fs.writeFileSync(STARTUP_MARKER_FILE, JSON.stringify(data) + "\n");
   } catch {
     // ignore
   }
+}
+
+/**
+ * 判断是否需要发送“灵魂上线”问候：
+ * - 首次安装 / 版本变更：可发送
+ * - 同版本：不发送
+ * - 同版本近期失败：冷却期内不重试，减少噪音
+ */
+function getStartupGreetingPlan(): { shouldSend: boolean; greeting?: string; version: string; reason?: string } {
+  const currentVersion = getPluginVersion();
+  const marker = readStartupMarker();
+
+  if (marker.version === currentVersion) {
+    return { shouldSend: false, version: currentVersion, reason: "same-version" };
+  }
+
+  if (marker.lastFailureVersion === currentVersion && marker.lastFailureAt) {
+    const lastFailureAtMs = new Date(marker.lastFailureAt).getTime();
+    if (!Number.isNaN(lastFailureAtMs) && Date.now() - lastFailureAtMs < STARTUP_GREETING_RETRY_COOLDOWN_MS) {
+      return { shouldSend: false, version: currentVersion, reason: "cooldown" };
+    }
+  }
+
+  return { shouldSend: true, greeting: STARTUP_GREETING_TEXT, version: currentVersion };
+}
+
+function markStartupGreetingSent(version: string): void {
+  writeStartupMarker({
+    version,
+    startedAt: new Date().toISOString(),
+    greetedAt: new Date().toISOString(),
+  });
+}
 
-  return `Haha，我的'灵魂'已上线，随时等你吩咐。`;
+function markStartupGreetingFailed(version: string, reason: string): void {
+  const marker = readStartupMarker();
+  writeStartupMarker({
+    ...marker,
+    lastFailureVersion: version,
+    lastFailureAt: new Date().toISOString(),
+    lastFailureReason: reason,
+  });
 }
 
 /**
@@ -492,6 +526,9 @@ export async function startGateway(ctx: GatewayContext): Promise<void> {
   // health-monitor 重连不会重新初始化为 true
 
   const ADMIN_MARKER_FILE = path.join(getQQBotDataDir("data"), `admin-${account.accountId}.json`);
+  const safeAccountId = account.accountId.replace(/[^a-zA-Z0-9._-]/g, "_");
+  const safeAppId = account.appId.replace(/[^a-zA-Z0-9._-]/g, "_");
+  const UPGRADE_GREETING_TARGET_FILE = path.join(getQQBotDataDir("data"), `upgrade-greeting-target-${safeAccountId}-${safeAppId}.json`);
 
   /**
    * 读取已持久化的管理员 openid
@@ -506,6 +543,24 @@ export async function startGateway(ctx: GatewayContext): Promise<void> {
     return undefined;
   };
 
+  const loadUpgradeGreetingTargetOpenId = (): string | undefined => {
+    try {
+      if (fs.existsSync(UPGRADE_GREETING_TARGET_FILE)) {
+        const data = JSON.parse(fs.readFileSync(UPGRADE_GREETING_TARGET_FILE, "utf8")) as { openid?: string };
+        if (data.openid) return data.openid;
+      }
+    } catch { /* 文件损坏视为无 */ }
+    return undefined;
+  };
+
+  const clearUpgradeGreetingTargetOpenId = (): void => {
+    try {
+      if (fs.existsSync(UPGRADE_GREETING_TARGET_FILE)) {
+        fs.unlinkSync(UPGRADE_GREETING_TARGET_FILE);
+      }
+    } catch { /* ignore */ }
+  };
+
   /**
    * 将管理员 openid 持久化到文件
    */
@@ -534,27 +589,38 @@ export async function startGateway(ctx: GatewayContext): Promise<void> {
   /** 异步发送启动问候语（仅发给管理员） */
   const sendStartupGreetings = (trigger: "READY" | "RESUMED") => {
     (async () => {
+      const plan = getStartupGreetingPlan();
+      if (!plan.shouldSend || !plan.greeting) {
+        log?.info(`[qqbot:${account.accountId}] Skipping startup greeting (${plan.reason ?? "debounced"}, trigger=${trigger})`);
+        return;
+      }
+
+      const upgradeTargetOpenId = loadUpgradeGreetingTargetOpenId();
+      const targetOpenId = upgradeTargetOpenId || resolveAdminOpenId();
+      if (!targetOpenId) {
+        markStartupGreetingFailed(plan.version, "no-admin");
+        log?.info(`[qqbot:${account.accountId}] Skipping startup greeting (no admin or known user)`);
+        return;
+      }
+
       try {
-        const greeting = getStartupGreeting();
-        if (!greeting) {
-          log?.info(`[qqbot:${account.accountId}] Skipping startup greeting (debounced, trigger=${trigger})`);
-        } else {
-          const adminId = resolveAdminOpenId();
-          if (!adminId) {
-            log?.info(`[qqbot:${account.accountId}] Skipping startup greeting (no admin or known user)`);
-          } else {
-            log?.info(`[qqbot:${account.accountId}] Sending startup greeting to admin (trigger=${trigger}): "${greeting}"`);
-            const token = await getAccessToken(account.appId, account.clientSecret);
-            const GREETING_TIMEOUT_MS = 10_000;
-            await Promise.race([
-              sendProactiveC2CMessage(token, adminId, greeting),
-              new Promise((_, reject) => setTimeout(() => reject(new Error("Startup greeting send timeout (10s)")), GREETING_TIMEOUT_MS)),
-            ]);
-            log?.info(`[qqbot:${account.accountId}] Sent startup greeting to admin: ${adminId}`);
-          }
+        const receiverType = upgradeTargetOpenId ? "upgrade-requester" : "admin";
+        log?.info(`[qqbot:${account.accountId}] Sending startup greeting to ${receiverType} (trigger=${trigger}): "${plan.greeting}"`);
+        const token = await getAccessToken(account.appId, account.clientSecret);
+        const GREETING_TIMEOUT_MS = 10_000;
+        await Promise.race([
+          sendProactiveC2CMessage(token, targetOpenId, plan.greeting),
+          new Promise((_, reject) => setTimeout(() => reject(new Error("Startup greeting send timeout (10s)")), GREETING_TIMEOUT_MS)),
+        ]);
+        markStartupGreetingSent(plan.version);
+        if (upgradeTargetOpenId) {
+          clearUpgradeGreetingTargetOpenId();
         }
+        log?.info(`[qqbot:${account.accountId}] Sent startup greeting to ${receiverType}: ${targetOpenId}`);
       } catch (err) {
-        log?.error(`[qqbot:${account.accountId}] Failed to send startup greeting: ${err}`);
+        const message = err instanceof Error ? err.message : String(err);
+        markStartupGreetingFailed(plan.version, message);
+        log?.error(`[qqbot:${account.accountId}] Failed to send startup greeting: ${message}`);
       }
     })();
   };
@@ -696,6 +762,7 @@ export async function startGateway(ctx: GatewayContext): Promise<void> {
       channelId: msg.channelId,
       groupOpenid: msg.groupOpenid,
       accountId: account.accountId,
+      appId: account.appId,
       accountConfig: account.config,
       queueSnapshot: getQueueSnapshot(peerId),
     };

package/src/slash-commands.ts

@@ -17,7 +17,7 @@ import { execFileSync, execFile } from "node:child_process";
 import path from "node:path";
 import fs from "node:fs";
 import { getUpdateInfo } from "./update-checker.js";
-import { getHomeDir, isWindows } from "./utils/platform.js";
+import { getHomeDir, getQQBotDataDir, isWindows } from "./utils/platform.js";
 import { fileURLToPath } from "node:url";
 const require = createRequire(import.meta.url);
 
@@ -80,6 +80,8 @@ export interface SlashCommandContext {
   groupOpenid?: string;
   /** 账号 ID */
   accountId: string;
+  /** Bot App ID */
+  appId: string;
   /** 账号配置（供指令读取可配置项） */
   accountConfig?: QQBotAccountConfig;
   /** 当前用户队列状态快照 */
@@ -197,6 +199,22 @@ registerCommand({
 
 const DEFAULT_UPGRADE_URL = "https://doc.weixin.qq.com/doc/w3_AKEAGQaeACgCNHrh1CbHzTAKtT2gB?scode=AJEAIQdfAAozxFEnLZAKEAGQaeACg";
 
+function saveUpgradeGreetingTarget(accountId: string, appId: string, openid: string): void {
+  const safeAccountId = accountId.replace(/[^a-zA-Z0-9._-]/g, "_");
+  const safeAppId = appId.replace(/[^a-zA-Z0-9._-]/g, "_");
+  const filePath = path.join(getQQBotDataDir("data"), `upgrade-greeting-target-${safeAccountId}-${safeAppId}.json`);
+  try {
+    fs.writeFileSync(filePath, JSON.stringify({
+      accountId,
+      appId,
+      openid,
+      savedAt: new Date().toISOString(),
+    }) + "\n");
+  } catch {
+    // ignore
+  }
+}
+
 // ============ 热更新 ============
 
 /**
@@ -385,6 +403,8 @@ registerCommand({
       return `❌ 当前环境不支持热更新（需要 bash 环境）\n⬆️升级指引：[点击查看](${url})\n\n> Windows 用户请安装 Git for Windows 后重试，或手动执行升级脚本`;
     }
 
+    saveUpgradeGreetingTarget(ctx.accountId, ctx.appId, ctx.senderId);
+
     const lines = [
       `🔄 开始热更新...`,
       `📌 当前版本：v${PLUGIN_VERSION}`,