From aea2d576fe5062db84dd2747e2d308cf6fc4879b Mon Sep 17 00:00:00 2001
From: Miku <miku@mikus.ink>
Date: Fri, 7 Aug 2026 12:20:59 +0800
Subject: [PATCH] =?UTF-8?q?feat(plugin):=20qq-direct-notify=20msg=5Fid=20?=
 =?UTF-8?q?=E6=8C=81=E4=B9=85=E5=8C=96=20+=20=E8=A2=AB=E5=8A=A8=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E8=87=AA=E5=8A=A8=E9=99=8D=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- msg_id 持久化到 data/qq-direct-msgids.json，插件重启后自动恢复（48h 被动窗口内免重新激活）
- 被动消息失败（msg_id 过期/无效，11255 等）自动清除并降级主动消息重试
- 不再依赖"每次启动后用户先发消息"才能走被动通道
---
 plugins/available/qq-direct-notify.js | 39 +++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/plugins/available/qq-direct-notify.js b/plugins/available/qq-direct-notify.js
index bb86099..9a82956 100644
--- a/plugins/available/qq-direct-notify.js
+++ b/plugins/available/qq-direct-notify.js
@@ -125,6 +125,8 @@ module.exports = {
       return;
     }
     log('info', 'QQ Direct Notify 就绪');
+    // 恢复持久化的 msg_id（重启不丢被动通道）
+    loadMsgIds();
     // 启动事件监听（记录主人最近 msg_id，发送时走被动消息免额度）
     startListener(appId, clientSecret, log);
   },
@@ -282,6 +284,14 @@ async function sendWithRetry(appId, clientSecret, openid, content, retries, log)
         attempt = -1; // 重试循环重新从 0 开始（只允许一次刷新）
         continue;
       }
+      // 被动消息失败（msg_id 过期/无效）→ 清除并降级主动消息重试一次
+      const hadMsgId = getLastMsgId(openid);
+      if (hadMsgId && /11255|invalid|forbidden/i.test(msg)) {
+        log('warn', `被动消息失败（msg_id 可能过期），降级主动消息重试: ${msg}`);
+        lastMsgIdByUser.delete(openid);
+        saveMsgIds();
+        continue;
+      }
       log('error', `QQ 发送失败（第 ${attempt + 1} 次尝试）: ${msg}`);
       if (attempt < (retries || 0)) {
         await new Promise((r) => setTimeout(r, 1000 * Math.pow(2, attempt)));
@@ -297,6 +307,7 @@ async function sendWithRetry(appId, clientSecret, openid, content, retries, log)
 // ---------------------------------------------------------------------------
 
 const lastMsgIdByUser = new Map(); // openid → 最近一条消息的 msg_id
+const MSGID_STORE_FILE = 'data/qq-direct-msgids.json'; // 持久化（重启恢复）
 let ws = null;
 let heartbeatTimer = null;
 let reconnectTimer = null;
@@ -306,6 +317,33 @@ let stopRequested = false;
 let reconnectAttempts = 0;
 let connectTimeoutId = null; // 建连阶段超时（收到 READY 后清除）
 
+// 启动时从磁盘恢复 msg_id（重启不丢，48h 被动窗口内依然有效）
+function loadMsgIds() {
+  try {
+    const fs = require('fs');
+    const path = require('path');
+    const file = path.resolve(MSGID_STORE_FILE);
+    if (fs.existsSync(file)) {
+      const data = JSON.parse(fs.readFileSync(file, 'utf8'));
+      if (data && typeof data === 'object') {
+        for (const [k, v] of Object.entries(data)) {
+          if (v) lastMsgIdByUser.set(k, v);
+        }
+      }
+    }
+  } catch { /* 忽略加载失败 */ }
+}
+
+function saveMsgIds() {
+  try {
+    const fs = require('fs');
+    const path = require('path');
+    const file = path.resolve(MSGID_STORE_FILE);
+    fs.mkdirSync(path.dirname(file), { recursive: true });
+    fs.writeFileSync(file, JSON.stringify(Object.fromEntries(lastMsgIdByUser)), 'utf8');
+  } catch { /* 忽略保存失败 */ }
+}
+
 function getLastMsgId(openid) {
   return lastMsgIdByUser.get(openid) || null;
 }
@@ -439,6 +477,7 @@ function handleGatewayMessage(msg, appId, clientSecret, log) {
       const userOpenid = msg.d.author && msg.d.author.user_openid;
       if (msgId && userOpenid) {
         lastMsgIdByUser.set(userOpenid, msgId);
+        saveMsgIds(); // 持久化，重启恢复
         log('info', `QQ C2C 事件已记录 msg_id（openid ${userOpenid.slice(0, 8)}...）`);
       }
     }