koishi-plugin-ggcevo 1.3.1 → 1.3.3

package/lib/index.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
@@ -30,6 +40,10 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var import_koishi = require("koishi");
+var import_node_fs = __toESM(require("node:fs"));
+var import_node_path = __toESM(require("node:path"));
+var import_node_crypto = require("node:crypto");
+var import_promises = require("node:fs/promises");
 var name = "ggcevo";
 var Config = import_koishi.Schema.intersect([
   import_koishi.Schema.object({
@@ -2423,10 +2437,10 @@ ${rewardLines.join("\n")}` : "";
       return record || null;
     }
   }, "getValidDocsToken");
-  const docsApiRequest = /* @__PURE__ */ __name(async (method, path, data) => {
+  const docsApiRequest = /* @__PURE__ */ __name(async (method, path2, data) => {
     const token = await getValidDocsToken();
     if (!token) throw new Error("腾讯文档应用级账号不可用, 请检查插件配置(Client ID / Client Secret)");
-    const url = `https://docs.qq.com/openapi${path}`;
+    const url = `https://docs.qq.com/openapi${path2}`;
     const headers = {
       "Access-Token": token.access_token,
       "Client-Id": config.tencentDocsClientId,
@@ -2952,19 +2966,35 @@ ${rewardLines.join("\n")}` : "";
 </body>
 </html>`;
   }, "buildMenuHtml");
+  const menuCacheDir = import_node_path.default.resolve(ctx.baseDir, "data/ggcevo/menu");
   const renderMenuImage = /* @__PURE__ */ __name(async (html) => {
     const logger = ctx.logger("ggcevo");
+    const hash = (0, import_node_crypto.createHash)("sha256").update(html).digest("hex");
+    const cachePath = import_node_path.default.resolve(menuCacheDir, `${hash}.jpg`);
+    if (import_node_fs.default.existsSync(cachePath)) {
+      const cached = await (0, import_promises.readFile)(cachePath);
+      return `data:image/jpeg;base64,${cached.toString("base64")}`;
+    }
     if (!ctx.puppeteer) {
       logger.warn("[menu-render] 未启用 puppeteer 服务");
       return "⚠️ 未启用 puppeteer 服务，无法渲染图片菜单。请安装并启用 `koishi-plugin-puppeteer` 或 `@shangxueink/puppeteer-without-canvas`。";
     }
     const page = await ctx.puppeteer.page();
     try {
-      await page.setViewport({ width: 900, height: 100, deviceScaleFactor: 2 });
-      await page.setContent(html, { waitUntil: "networkidle0" });
+      await page.setViewport({ width: 1280, height: 100, deviceScaleFactor: 1 });
+      await page.setContent(html);
+      await page.waitForNetworkIdle();
       const img = await page.screenshot({ type: "jpeg", quality: 85, fullPage: true, encoding: "binary" });
       logger.info("[menu-render] 菜单图渲染完成, 体积 %s KB", (img.length / 1024).toFixed(1));
-      return import_koishi.h.image(`data:image/jpeg;base64,${img.toString("base64")}`);
+      try {
+        await (0, import_promises.mkdir)(menuCacheDir, { recursive: true });
+        const files = await (0, import_promises.readdir)(menuCacheDir);
+        for (const file of files) await (0, import_promises.unlink)(import_node_path.default.resolve(menuCacheDir, file));
+        await (0, import_promises.writeFile)(cachePath, img);
+      } catch (e) {
+        logger.error("[menu-render] 写入菜单图缓存失败: %o", e);
+      }
+      return `data:image/jpeg;base64,${img.toString("base64")}`;
     } catch (e) {
       logger.warn("[menu-render] 渲染菜单图片失败: %o", e);
       return "⚠️ 菜单图片渲染失败，请查看日志后重试。";
@@ -2972,10 +3002,50 @@ ${rewardLines.join("\n")}` : "";
       await page.close();
     }
   }, "renderMenuImage");
+  const sendMenuImage = /* @__PURE__ */ __name(async (session, dataUrl) => {
+    const logger = ctx.logger("ggcevo");
+    if (!dataUrl.startsWith("data:image")) return dataUrl;
+    if (session.platform !== "qq") return import_koishi.h.image(dataUrl);
+    const bot = session.bot;
+    const match = /^data:image\/[\w.+-]+;base64,(.*)$/.exec(dataUrl);
+    if (!match) return "⚠️ 菜单图片数据无效。";
+    try {
+      const fileData = match[1];
+      const msgSeq = (session["seq"] || 0) + 1;
+      session["seq"] = msgSeq;
+      if (session.isDirect) {
+        const fileRes = await bot.internal.sendFilePrivate(session.userId, { file_type: 1, srv_send_msg: false, file_data: fileData });
+        logger.info("[menu-render] QQ 官方图片上传响应: %o", fileRes);
+        await bot.internal.sendPrivateMessage(session.channelId, {
+          msg_type: 7,
+          media: fileRes,
+          content: "",
+          msg_id: session.messageId,
+          msg_seq: msgSeq
+        });
+      } else {
+        const fileRes = await bot.internal.sendFileGuild(session.channelId, { file_type: 1, srv_send_msg: false, file_data: fileData });
+        logger.info("[menu-render] QQ 官方图片上传响应: %o", fileRes);
+        const msgRes = await bot.internal.sendMessage(session.channelId, {
+          msg_type: 7,
+          media: fileRes,
+          content: "",
+          msg_id: session.messageId,
+          msg_seq: msgSeq
+        });
+        logger.info("[menu-render] QQ 官方消息发送响应: %o", msgRes);
+        if (msgRes?.audit_id) logger.warn("[menu-render] QQ 消息进入审核(audit_id=%s), 需开启 MESSAGE_AUDIT intent 才能确认最终是否发出", msgRes.audit_id);
+      }
+      return;
+    } catch (e) {
+      logger.error("[menu-render] QQ 官方发送菜单图失败: %o", e);
+      return "⚠️ QQ 发送菜单图失败，请查看日志中的错误信息。";
+    }
+  }, "sendMenuImage");
   ctx.command("咕咕之战", "查看咕咕之战内容分类菜单").alias("菜单").action(async ({ session }) => {
     if (config.menuStyle === "image") {
-      const result = await renderMenuImage(buildMenuHtml("咕咕之战", "内容分类菜单 · 输入指令名即可使用"));
-      return typeof result === "string" ? result : (0, import_koishi.h)("quote", { id: session.messageId }, result);
+      const dataUrl = await renderMenuImage(buildMenuHtml("咕咕之战", "内容分类菜单 · 输入指令名即可使用"));
+      return sendMenuImage(session, dataUrl);
     }
     return buildTextMenu();
   });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-ggcevo",
   "description": "GGCEVO 综合插件：星际争霸2游戏句柄绑定 + 签到/抽奖/兑换/背包/活动系统等虚拟物品玩法",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/readme.md

@@ -179,6 +179,21 @@ npm install koishi-plugin-ggcevo
 
 ## 更新日志
 
+### v1.3.3
+
+修复 QQ 官方机器人不发送图片菜单且无报错的问题。
+
+- **移除图片消息的引用回复**：`咕咕之战` 图片菜单不再包裹 `<quote>` 引用（与 preview-help 一致，裸发图片）。此前消息同时携带 `message_reference` + 被动回复 `msg_id` + `media` 的组合，在 QQ 官方接口下可能被静默丢弃
+- **QQ 官方机器人手动发送 + 真实响应日志**：图片模式下，QQ 平台不再走适配器（适配器会吞掉 QQ 接口错误导致「无报错」），改为插件直接调用 QQ 官方富媒体上传（`/v2/groups/{id}/files`）与消息发送接口，并将 QQ 真实返回（含 `file_uuid`/`audit_id`/错误码）输出到 `[menu-render]` 日志；若返回 `audit_id`（消息进入审核）会额外警告，提示需开启 `MESSAGE_AUDIT` intent
+- **非 QQ 平台**：图片直接发送，不再带引用
+
+### v1.3.2
+
+图片菜单渲染对齐 preview-help 方案，新增磁盘缓存。
+
+- **新增图片菜单磁盘缓存**：`咕咕之战` 图片菜单按 HTML 内容 hash 缓存到 `data/ggcevo/menu/`，命中缓存直接读回图片（免去重复渲染、无需 puppeteer 也可返回缓存图），渲染成功后会清理旧缓存文件
+- **渲染参数对齐 preview-help**：viewport 由 900×DPR2 调整为 1280×DPR1，`setContent` 后改用 `waitForNetworkIdle()` 等待页面网络空闲
+
 ### v1.3.1
 
 取消 Markdown 按钮菜单，改为可配置的文字/图片菜单。