koishi-plugin-rocom 1.0.1 → 1.0.3

package/lib/index.js

@@ -59,9 +59,9 @@ var RocomClient = class {
     if (!uid) return "";
     return uid.trim().replace(/[^a-zA-Z0-9_\- \u4e00-\u9fa5]/g, "").trim();
   }
-  wegameHeaders(fwToken = "", userIdentifier = "", clientType = "", clientId = "") {
+  wegameHeaders(fwToken = "", userIdentifier = "", clientType = "", clientId = "", includeApiKey = true) {
     const headers = {};
-    if (this.apiKey) headers["X-API-Key"] = this.apiKey;
+    if (includeApiKey && this.apiKey) headers["X-API-Key"] = this.apiKey;
     if (fwToken) headers["X-Framework-Token"] = fwToken;
     if (userIdentifier) headers["X-User-Identifier"] = this.sanitizeUid(userIdentifier);
     if (clientType) headers["X-Client-Type"] = clientType;
@@ -123,6 +123,10 @@ var RocomClient = class {
       return String(value);
     }
   }
+  isApiKeyPermissionUndeclaredError(message) {
+    if (!message) return false;
+    return /未声明\s*api\s*key\s*权限|api\s*key\s*permission|api key 权限/i.test(message);
+  }
   logRequestFailureDetails(method, path6, headers, params, body, errorOrResponse) {
     const err = errorOrResponse;
     const response = err?.response;
@@ -265,12 +269,12 @@ ${this.stringifyForLog(details)}`);
       return { status: null, data: null };
     }
   }
-  async getIngameTask(ctx, taskId) {
+  async getIngameTask(ctx, taskId, includeApiKey = true) {
     return this.requestWithStatus(
       ctx,
       "GET",
       `/api/v1/games/rocom/ingame/tasks/${taskId}`,
-      this.wegameHeaders(),
+      this.wegameHeaders("", "", "", "", includeApiKey),
       { acceptedStatuses: [200, 202] }
     );
   }
@@ -358,7 +362,8 @@ ${this.stringifyForLog(details)}`);
       return null;
     }
     const path6 = "/api/v1/games/rocom/ingame/player/search";
-    const headers = this.wegameHeaders();
+    let includeApiKey = true;
+    let headers = this.wegameHeaders();
     const payload = { uid: sanitizedUid, wait_ms: 5e3 };
     let { status, data } = await this.requestWithStatus(ctx, "POST", path6, headers, {
       json: payload,
@@ -374,6 +379,27 @@ ${this.stringifyForLog(details)}`);
       data = fallback.data;
       if (status === 200 && data && this.isIngamePlayerPayload(data)) return data;
     }
+    if (status === null && includeApiKey && this.apiKey && this.isApiKeyPermissionUndeclaredError(this.getLastError(""))) {
+      logger.warn("ingame/player/search rejected X-API-Key, retrying without API key");
+      includeApiKey = false;
+      headers = this.wegameHeaders("", "", "", "", false);
+      const retry = await this.requestWithStatus(ctx, "POST", path6, headers, {
+        json: payload,
+        acceptedStatuses: [200, 202]
+      });
+      status = retry.status;
+      data = retry.data;
+      if (status === 200 && data && this.isIngamePlayerPayload(data)) return data;
+      if (status === null) {
+        const fallback = await this.requestWithStatus(ctx, "GET", path6, headers, {
+          params: payload,
+          acceptedStatuses: [200, 202]
+        });
+        status = fallback.status;
+        data = fallback.data;
+        if (status === 200 && data && this.isIngamePlayerPayload(data)) return data;
+      }
+    }
     if (!data) return null;
     if (this.isIngamePlayerPayload(data)) return data;
     const taskId = data.task_id || data.taskId || data.taskID;
@@ -383,7 +409,7 @@ ${this.stringifyForLog(details)}`);
     }
     for (let i = 0; i < 8; i++) {
       await new Promise((resolve) => setTimeout(resolve, 1e3));
-      const task = await this.getIngameTask(ctx, taskId);
+      const task = await this.getIngameTask(ctx, taskId, includeApiKey);
       if (task.status === 200) return task.data;
       if (task.status === null) return null;
     }
@@ -416,7 +442,8 @@ ${this.stringifyForLog(details)}`);
       return null;
     }
     const path6 = "/api/v1/games/rocom/ingame/home/info";
-    const headers = this.wegameHeaders();
+    let includeApiKey = true;
+    let headers = this.wegameHeaders();
     const payload = { uid: sanitizedUid, wait_ms: waitMs };
     let { status, data } = await this.requestWithStatus(ctx, "POST", path6, headers, {
       json: payload,
@@ -432,6 +459,27 @@ ${this.stringifyForLog(details)}`);
       data = fallback.data;
       if (status === 200 && data && !(data.task_id || data.taskId || data.taskID)) return data;
     }
+    if (status === null && includeApiKey && this.apiKey && this.isApiKeyPermissionUndeclaredError(this.getLastError(""))) {
+      logger.warn("ingame/home/info rejected X-API-Key, retrying without API key");
+      includeApiKey = false;
+      headers = this.wegameHeaders("", "", "", "", false);
+      const retry = await this.requestWithStatus(ctx, "POST", path6, headers, {
+        json: payload,
+        acceptedStatuses: [200, 202]
+      });
+      status = retry.status;
+      data = retry.data;
+      if (status === 200 && data && !(data.task_id || data.taskId || data.taskID)) return data;
+      if (status === null) {
+        const fallback = await this.requestWithStatus(ctx, "GET", path6, headers, {
+          params: payload,
+          acceptedStatuses: [200, 202]
+        });
+        status = fallback.status;
+        data = fallback.data;
+        if (status === 200 && data && !(data.task_id || data.taskId || data.taskID)) return data;
+      }
+    }
     const taskId = data?.task_id || data?.taskId || data?.taskID;
     if (!taskId) {
       if (status === 202) this.setLastError("家园查询任务已入队，但未返回 task_id");
@@ -439,7 +487,7 @@ ${this.stringifyForLog(details)}`);
     }
     for (let i = 0; i < 10; i++) {
       await new Promise((resolve) => setTimeout(resolve, 1e3));
-      const task = await this.getIngameTask(ctx, taskId);
+      const task = await this.getIngameTask(ctx, taskId, includeApiKey);
       if (task.status === 200) return task.data;
       if (task.status === null) return null;
     }
@@ -448,15 +496,31 @@ ${this.stringifyForLog(details)}`);
   }
   async ingameMerchantInfo(ctx, shopId) {
     const params = { shop_id: shopId };
+    let headers = this.wegameHeaders();
     const data = await this.get(
       ctx,
       "/api/v1/games/rocom/ingame/merchant/info",
-      this.wegameHeaders(),
+      headers,
       params,
       { silentFailureDetails: true }
     );
     if (data) return data;
-    return this.post(ctx, "/api/v1/games/rocom/ingame/merchant/info", this.wegameHeaders(), params);
+    const postData = await this.post(ctx, "/api/v1/games/rocom/ingame/merchant/info", headers, params);
+    if (postData) return postData;
+    if (this.apiKey && this.isApiKeyPermissionUndeclaredError(this.getLastError(""))) {
+      logger.warn("ingame/merchant/info rejected X-API-Key, retrying without API key");
+      headers = this.wegameHeaders("", "", "", "", false);
+      const fallbackData = await this.get(
+        ctx,
+        "/api/v1/games/rocom/ingame/merchant/info",
+        headers,
+        params,
+        { silentFailureDetails: true }
+      );
+      if (fallbackData) return fallbackData;
+      return this.post(ctx, "/api/v1/games/rocom/ingame/merchant/info", headers, params);
+    }
+    return null;
   }
   async getFriendship(ctx, fwToken, userIds, userIdentifier = "") {
     return this.get(
@@ -2323,9 +2387,18 @@ function homePlantIcon(deps, iconId) {
 }
 __name(homePlantIcon, "homePlantIcon");
 var homePlantMapCache = null;
+var HOME_PLANT_MAP_RELATIVE_PATH = import_node_path4.default.join("render-templates", "home", "data", "home_item_list.json");
+function resolveHomePlantMapPath() {
+  const candidates = [
+    import_node_path4.default.resolve(__dirname, "..", HOME_PLANT_MAP_RELATIVE_PATH),
+    import_node_path4.default.resolve(__dirname, HOME_PLANT_MAP_RELATIVE_PATH)
+  ];
+  return candidates.find((candidate) => import_node_fs4.default.existsSync(candidate)) || candidates[0];
+}
+__name(resolveHomePlantMapPath, "resolveHomePlantMapPath");
 function loadHomePlantMap() {
   if (homePlantMapCache) return homePlantMapCache;
-  const filePath = import_node_path4.default.resolve(__dirname, "..", "render-templates", "home", "data", "home_item_list.json");
+  const filePath = resolveHomePlantMapPath();
   try {
     const data = JSON.parse(import_node_fs4.default.readFileSync(filePath, "utf-8"));
     homePlantMapCache = data && typeof data === "object" ? data : {};
@@ -3672,27 +3745,99 @@ __name(register6, "register");
 // src/index.ts
 var name = "rocom";
 var inject = { required: ["puppeteer", "database"] };
+var MENU_PAGE_TITLE = "洛克王国帮助菜单";
+var MENU_PAGE_SUBTITLE = "输入对应命令可查看功能，部分数据查询需要先完成账号绑定。";
+var MENU_GROUPS = [
+  {
+    groupTitle: "账号管理",
+    menuItems: [
+      { cmd: "洛克.QQ登录", desc: "QQ 扫码绑定账号" },
+      { cmd: "洛克.微信登录", desc: "微信扫码绑定账号" },
+      { cmd: "洛克.导入", desc: "导入 WeGame 凭证" },
+      { cmd: "洛克.绑定列表", desc: "查看已绑定账号" },
+      { cmd: "洛克.切换", desc: "切换主账号" },
+      { cmd: "洛克.解绑", desc: "删除绑定账号" },
+      { cmd: "洛克.刷新", desc: "刷新当前凭证" }
+    ]
+  },
+  {
+    groupTitle: "数据查询",
+    menuItems: [
+      { cmd: "洛克.档案", desc: "查看个人档案" },
+      { cmd: "洛克.战绩", desc: "查看对战战绩" },
+      { cmd: "洛克.背包", desc: "查看精灵背包" },
+      { cmd: "洛克.阵容", desc: "查看阵容推荐" },
+      { cmd: "查看阵容", desc: "查看阵容详情" },
+      { cmd: "洛克.交换大厅", desc: "查看交换大厅" },
+      { cmd: "洛克.玩家", desc: "查询 ingame 玩家资料" },
+      { cmd: "洛克.家园", desc: "查询家园菜园" },
+      { cmd: "洛克.商店", desc: "查询 ingame 商店" },
+      { cmd: "洛克.好友关系", desc: "查询好友关系" },
+      { cmd: "洛克.学生", desc: "查询学生认证与福利" }
+    ]
+  },
+  {
+    groupTitle: "订阅推送",
+    menuItems: [
+      { cmd: "远行商人", desc: "查看当前商品" },
+      { cmd: "订阅远行商人", desc: "订阅商品提醒" },
+      { cmd: "取消订阅远行商人", desc: "取消商人提醒" },
+      { cmd: "订阅家园菜园", desc: "菜园成熟提醒" },
+      { cmd: "订阅家园灵感", desc: "精灵灵感提醒" },
+      { cmd: "取消订阅家园", desc: "取消家园订阅" }
+    ]
+  },
+  {
+    groupTitle: "百科与查蛋",
+    menuItems: [
+      { cmd: "洛克.wiki", desc: "精灵 Wiki 查询" },
+      { cmd: "洛克.技能", desc: "技能 Wiki 查询" },
+      { cmd: "洛克.查蛋", desc: "精灵查蛋 / 尺寸反查" },
+      { cmd: "洛克.配种", desc: "配种查询" }
+    ]
+  }
+];
+function buildMenuRenderData() {
+  return {
+    pageTitle: MENU_PAGE_TITLE,
+    pageSubtitle: MENU_PAGE_SUBTITLE,
+    menuGroups: MENU_GROUPS
+  };
+}
+__name(buildMenuRenderData, "buildMenuRenderData");
+function buildMenuFallbackText() {
+  const lines = [MENU_PAGE_TITLE, MENU_PAGE_SUBTITLE, ""];
+  for (const group of MENU_GROUPS) {
+    lines.push(group.groupTitle);
+    for (const item of group.menuItems) {
+      lines.push(`  ${item.cmd} - ${item.desc}`);
+    }
+    lines.push("");
+  }
+  return lines.join("\n").trimEnd();
+}
+__name(buildMenuFallbackText, "buildMenuFallbackText");
 var Config = import_koishi11.Schema.intersect([
   import_koishi11.Schema.object({
     apiBaseUrl: import_koishi11.Schema.string().default("https://wegame.shallow.ink").description("API 基础地址"),
     wegameApiKey: import_koishi11.Schema.string().default("").description("WeGame API Key"),
-    qqLoginDebugMode: import_koishi11.Schema.boolean().default(false).description("QQ 扫码登录调试模式：扫码成功后输出用户 fwt（敏感凭证，请仅调试时开启）"),
-    adminUserIds: import_koishi11.Schema.array(String).default([]).description("管理员用户 ID 列表（仅用于管理员命令）"),
+    qqLoginDebugMode: import_koishi11.Schema.boolean().default(false).description("QQ 扫码登录调试模式，仅调试时开启"),
+    adminUserIds: import_koishi11.Schema.array(String).default([]).description("管理员用户 ID 列表"),
     autoRefreshEnabled: import_koishi11.Schema.boolean().default(false).description("启用自动刷新凭证"),
     autoRefreshTime: import_koishi11.Schema.array(String).default(["00:00", "12:00"]).description("自动刷新时间")
   }).description("基础设置"),
   import_koishi11.Schema.object({
-    imageCompressionEnabled: import_koishi11.Schema.boolean().default(true).description("发送图片前启用 PNG 无损压缩。失败或压缩后不更小时会发送原图。"),
-    imageCompressionMinBytes: import_koishi11.Schema.number().default(262144).description("触发压缩的最小图片大小，单位字节。低于此大小直接发送原图。"),
-    imageCompressionLevel: import_koishi11.Schema.number().min(0).max(9).default(9).description("PNG zlib 压缩等级，0-9，数值越大越慢但通常更小。")
+    imageCompressionEnabled: import_koishi11.Schema.boolean().default(true).description("发送图片前启用 PNG 无损压缩"),
+    imageCompressionMinBytes: import_koishi11.Schema.number().default(262144).description("触发压缩的最小图片大小，单位字节"),
+    imageCompressionLevel: import_koishi11.Schema.number().min(0).max(9).default(9).description("PNG zlib 压缩等级 0-9")
   }).description("图片压缩设置"),
   import_koishi11.Schema.object({
     merchantSubscriptionEnabled: import_koishi11.Schema.boolean().default(true).description("启用远行商人订阅"),
-    merchantSubscriptionItems: import_koishi11.Schema.array(String).default(["国王球", "棱镜球", "炫彩精灵蛋"]).description("默认订阅商品"),
-    merchantCheckInterval: import_koishi11.Schema.number().default(3e5).description("商人检查间隔(ms)"),
+    merchantSubscriptionItems: import_koishi11.Schema.array(String).default(["国王球", "梅花镜球", "炫彩精灵蛋"]).description("默认订阅商品"),
+    merchantCheckInterval: import_koishi11.Schema.number().default(3e5).description("商人检查间隔，单位毫秒"),
     merchantPrivateSubscriptionEnabled: import_koishi11.Schema.boolean().default(true).description("允许个人私聊订阅远行商人推送"),
     homeSubscriptionEnabled: import_koishi11.Schema.boolean().default(true).description("启用家园菜园和灵感订阅推送"),
-    homeSubscriptionIntervalMinutes: import_koishi11.Schema.number().default(5).description("家园订阅检查间隔（分钟）")
+    homeSubscriptionIntervalMinutes: import_koishi11.Schema.number().default(5).description("家园订阅检查间隔，单位分钟")
   }).description("订阅推送设置")
 ]);
 function apply(ctx, config) {
@@ -3715,20 +3860,11 @@ function apply(ctx, config) {
       console.warn(`[rocom] legacy framework token migration failed: ${err}`);
     });
   });
-  ctx.command("洛克", "洛克王国帮助菜单").action(async () => [
-    "【洛克王国插件】",
-    "",
-    "📋 账号管理：",
-    "  洛克.QQ登录 / 洛克.微信登录 / 洛克.导入",
-    "  洛克.绑定列表 / 洛克.切换 / 洛克.解绑 / 洛克.刷新",
-    "",
-    "📊 数据查询：",
-    "  洛克.档案 / 洛克.战绩 / 洛克.背包 / 洛克.阵容",
-    "  洛克.交换大厅 / 远行商人 / 订阅远行商人",
-    "",
-    "📖 百科查询：",
-    "  洛克.wiki / 洛克.技能 / 洛克.查蛋 / 洛克.配种"
-  ].join("\n"));
+  ctx.command("洛克", "洛克王国帮助菜单").action(async ({ session }) => {
+    if (!session?.send) return buildMenuFallbackText();
+    const png = await renderer.renderHtml(ctx, "menu", buildMenuRenderData());
+    await sendImageWithFallback(session, png, buildMenuFallbackText(), "menu:main", config);
+  });
   register(deps);
   register2(deps);
   register3(deps);

package/lib/render-templates/bind-list/style.css

@@ -1,7 +1,6 @@
 @font-face {
     font-family: 'mianfeiziti';
-    src: url('../../ttf/dundun.xHd_Ee5-.woff2') format('woff2'),
-         url('../../ttf/dundun.BCbg_KoL.ttf') format('truetype');
+    src: url('../../ttf/dundun.xHd_Ee5-.woff2') format('woff2');
     font-display: swap;
 }
 

package/lib/render-templates/menu/index.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="zh-CN">
 <head>
   <meta charset="utf-8">
@@ -8,7 +8,7 @@
 </head>
 <body class="page-out-client">
   <div class="menu-cont page-section-main">
-    <img class="xiaoluoke-overlay" src="{{_res_path}}img/小洛克.png" onerror="this.style.display='none'">
+    <img class="xiaoluoke-overlay" src="{{_res_path}}img/xueyingwawa.png" onerror="this.style.display='none'">
     <div class="menu-page">
       <div class="header-center">
         <div class="page-title">{{pageTitle}}</div>
@@ -29,7 +29,7 @@
         </div>
         {{/each}}
       </main>
-      <div class="footer">AstrBot &amp; WeGame Locke Kingdom Plugin</div>
+      <div class="footer">Koishi &amp; WeGame Locke Kingdom Plugin</div>
     </div>
   </div>
 </body>

package/lib/render-templates/package/style.css

@@ -1,7 +1,6 @@
 @font-face {
     font-family: 'mianfeiziti';
-    src: url('../../ttf/dundun.xHd_Ee5-.woff2') format('woff2'),
-         url('../../ttf/dundun.BCbg_KoL.ttf') format('truetype');
+    src: url('../../ttf/dundun.xHd_Ee5-.woff2') format('woff2');
     font-display: swap;
 }
 

package/lib/render-templates/personal-card/style.css

@@ -5,7 +5,7 @@ html { font-size: 100px !important; }
 }
 
 @font-face {
-    font-family:mianfeiziti;src:url(../../ttf/dundun.xHd_Ee5-.woff2) format("woff2"),url(../../ttf/dundun.BCbg_KoL.ttf) format("truetype");font-display:swap
+    font-family:mianfeiziti;src:url(../../ttf/dundun.xHd_Ee5-.woff2) format("woff2");font-display:swap
 }
 
 :root {

package/lib/render-templates/record/style.css

@@ -5,8 +5,7 @@
 
 @font-face {
     font-family: 'mianfeiziti';
-    src: url('../../ttf/dundun.xHd_Ee5-.woff2') format('woff2'),
-         url('../../ttf/dundun.BCbg_KoL.ttf') format('truetype');
+    src: url('../../ttf/dundun.xHd_Ee5-.woff2') format('woff2');
     font-display: swap;
 }
 
@@ -319,4 +318,4 @@ img {
     font-family: var(--helper-font-family-mianfeiziti);
     font-size: 0.14rem;
     color: #9e8e76;
-}
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-rocom",
   "description": "洛克王国查询与订阅插件",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "homepage": "https://github.com/staytomorrow/koishi-plugin-rocom",
@@ -17,7 +17,7 @@
   "license": "MIT",
   "scripts": {
     "build": "tsc -p tsconfig.json --emitDeclarationOnly false --module commonjs --moduleResolution node",
-    "postbuild": "node -e \"const fs=require('fs');fs.rmSync('lib/render-templates',{recursive:true,force:true});fs.cpSync('src/render-templates','lib/render-templates',{recursive:true});\"",
+    "postbuild": "node -e \"const fs=require('fs');for (const dir of ['render-templates','img','ttf']) { fs.rmSync('lib/'+dir,{recursive:true,force:true}); fs.cpSync('src/'+dir,'lib/'+dir,{recursive:true}); }\"",
     "check": "tsc -p tsconfig.json --noEmit --pretty false",
     "pack:dry": "npm pack --dry-run",
     "prepack": "npm run build"