koishi-plugin-dew-bot 1.0.244 → 1.0.246

package/README.md

@@ -21,3 +21,33 @@ plugins:
 | 服务器地址 | 游戏服 WebSocket 地址 | `ws://dew-v7-test:3021` |
 
 插件会忽略机器人自己发出的消息，避免回显再次上传形成循环。
+
+## 发布到 npm
+
+在 `bot/external/dew-bot` 目录执行：
+
+```bash
+npm run release
+```
+
+脚本会先从 `bot` 工作区执行 `npm run build -- dew-bot`，构建成功后运行 `npm version patch --no-git-tag-version --workspaces=false`，再以 `public` 权限和 `latest` 标签发布到 `https://registry.npmjs.org`。例如 `1.0.245` 会提升为 `1.0.246`，不会创建 Git 提交或标签。发布前需已安装工作区依赖，并登录有该包发布权限的 npm 账号：
+
+```bash
+npm login --registry=https://registry.npmjs.org
+```
+
+仅构建并检查包内容，执行：
+
+```bash
+npm run release:check
+```
+
+这相当于 `npm run release -- --dry-run`，会真实构建并执行 `npm pack --dry-run`，不会提升版本号、生成压缩包或发布到 npm。
+
+构建失败时脚本会停止，版本不递增。若递增后发布失败，本地保留新版本，脚本会以非零退出码结束并打印当前版本及重试命令；在插件目录确认该版本的发布状态后，可重试同一版本：
+
+```bash
+npm publish --workspaces=false --access=public --tag=latest --registry=https://registry.npmjs.org
+```
+
+重试发布时不要再次运行 `npm run release`，否则会再次递增版本。

package/lib/index.js

@@ -721,6 +721,11 @@ function pageCommand(command) {
   return command.startsWith("/") ? command : `/${command}`;
 }
 __name(pageCommand, "pageCommand");
+function inlineCommandUrl(command) {
+  const encoded = encodeURIComponent(pageCommand(command)).replace(/[!'()*]/g, (character) => `%${character.charCodeAt(0).toString(16).toUpperCase()}`);
+  return `mqqapi://aio/inlinecmd?command=${encoded}&enter=true&reply=false`;
+}
+__name(inlineCommandUrl, "inlineCommandUrl");
 function pageCommandLines(nav) {
   return [
     ...nav.previousCommand ? [`上一页：${pageCommand(nav.previousCommand)}`] : [],
@@ -729,23 +734,90 @@ function pageCommandLines(nav) {
 }
 __name(pageCommandLines, "pageCommandLines");
 function renderQQPageMarkdown(data, showGreeting, showCommands) {
+  const nav = data.pageNav;
+  const entryCommands = new Map(nav?.entries?.map((entry) => [entry.lineIndex, entry.viewCommand]) ?? []);
+  const listPattern = /^\[(\d+)\]\s*([^\r\n]+)$/;
+  const pagePattern = /^第\s*\d+\s*\/\s*\d+\s*页(?:\s*[｜|]\s*共\s*(\d+)\s*([项条]))?$/;
+  const title = data.line.find((item) => item.type === 0 /* title */);
+  const summaryLine = data.line.find((item) => item.type === 1 /* line */ && pagePattern.test(item.content));
+  const summary = summaryLine && pagePattern.exec(summaryLine.content);
+  const listCount = data.line.filter((item) => item.type === 1 /* line */ && listPattern.test(item.content)).length;
+  const count = summary?.[1] ?? (nav?.total === 1 ? String(listCount) : void 0);
+  const countUnit = summary?.[2] ?? "项";
+  const isLeaderboardDirectory = !!nav?.entries?.length && nav.entries.every((entry) => /^排行榜查看\s/.test(entry.viewCommand));
   const sections = [];
+  const bodyLines = [];
+  const listLines = [];
+  const flushBody = /* @__PURE__ */ __name(() => {
+    if (bodyLines.length) sections.push(bodyLines.splice(0).join("  \n"));
+  }, "flushBody");
+  const flushList = /* @__PURE__ */ __name(() => {
+    if (listLines.length) sections.push(listLines.splice(0).join("  \n"));
+  }, "flushList");
+  const flush = /* @__PURE__ */ __name(() => {
+    flushList();
+    flushBody();
+  }, "flush");
+  let hasPageSummary = false;
+  let hasHelp = false;
+  let pageFooter;
   if (showGreeting) sections.push(escapeMarkdown("Ciallo～(∠・ω< )"));
-  for (const item of data.line) {
+  for (const [lineIndex, item] of data.line.entries()) {
     switch (item.type) {
       case 0 /* title */:
-        sections.push(`### ${escapeMarkdown(item.content)}`);
+        flush();
+        if (isLeaderboardDirectory) {
+          sections.push(`## ${item.content.includes("🏆") ? "" : "🏆 "}${escapeMarkdown(item.content)}`);
+          sections.push(`> 共 ${nav.entries.length} 个榜单 · 点击榜名查看`);
+        } else {
+          sections.push(`**${escapeMarkdown(item.content)}${count !== void 0 ? ` · ${count} ${countUnit}` : ""}**`);
+        }
         break;
-      case 1 /* line */:
-        sections.push(escapeMarkdown(item.content));
+      case 1 /* line */: {
+        const listEntry = listPattern.exec(item.content);
+        if (listEntry) {
+          flushBody();
+          const command = entryCommands.get(lineIndex);
+          const label = escapeMarkdown(listEntry[2]);
+          const name2 = command ? `[${label}](${inlineCommandUrl(command)})` : label;
+          listLines.push(`${escapeMarkdown(`[${listEntry[1]}]`)} ${name2}`);
+          break;
+        }
+        flushList();
+        if (/^\[指令\]相关指令$/.test(item.content)) {
+          flushBody();
+          hasHelp = true;
+          break;
+        }
+        const page = pagePattern.exec(item.content);
+        if (page && nav) {
+          flushBody();
+          pageFooter = `**第 ${nav.current} / ${nav.total} 页${!title && page[1] ? ` · 共 ${page[1]} ${page[2]}` : ""}**`;
+          hasPageSummary = true;
+          break;
+        }
+        bodyLines.push(escapeMarkdown(item.content));
         break;
+      }
       case 2 /* error */:
+        flush();
         sections.push(`❌ 出错了！错误原因：${escapeMarkdown(item.content)}，请反馈至联系开发者`);
         break;
     }
   }
-  if (showCommands && data.pageNav) {
-    sections.push(...pageCommandLines(data.pageNav).map(escapeMarkdown));
+  flush();
+  if (nav && !hasPageSummary && (nav.total > 1 || nav.previousCommand || nav.nextCommand))
+    pageFooter = `**第 ${nav.current} / ${nav.total} 页**`;
+  const helpLink = hasHelp ? `[指令](${inlineCommandUrl("指令")})` : void 0;
+  const footer = pageFooter ? [pageFooter, helpLink].filter(Boolean).join(" · ") : helpLink ? `更多操作：${helpLink}` : void 0;
+  if (footer) {
+    if (isLeaderboardDirectory) sections.push("***");
+    sections.push(footer);
+  }
+  if (showCommands && nav) {
+    const commands = pageCommandLines(nav);
+    if (commands.length) sections.push(`**翻页指令**  
+${commands.map(escapeMarkdown).join("  \n")}`);
   }
   return sections.join("\n\n") || " ";
 }
@@ -783,14 +855,16 @@ async function sendQQPage(session, data, withKeyboard) {
   const nav = data.pageNav;
   const buttons = withKeyboard ? buttonsFor(nav, data.userId, session.isDirect) : [];
   const markdown = renderQQPageMarkdown(data, session.event?.channel?.type === 0, buttons.length === 0);
+  const hasEntries = !!nav.entries?.length;
+  const hasInlineHelp = data.line.some((item) => item.type === 1 /* line */ && item.content === "[指令]相关指令");
   const request = {
     // With msg_type=2, QQ requires the ordinary content field to be empty.
     content: "",
     msg_type: 2,
     markdown: {
-      content: buttons.length && !session.isDirect ? `${markdown}
+      content: !session.isDirect && (buttons.length || hasEntries || hasInlineHelp) ? `${markdown}
 
-群聊中点击按钮后，请发送已填入的指令。` : markdown
+点击后如未自动发送，请点发送。` : markdown
     },
     ...buttons.length ? { keyboard: { content: { rows: [{ buttons }] } } } : {}
   };
@@ -912,7 +986,7 @@ var import_tsrpc = require("tsrpc");
 
 // src/shared/bot/serviceProto.ts
 var serviceProto = {
-  "version": 9,
+  "version": 10,
   "services": [
     {
       "id": 0,
@@ -1665,6 +1739,33 @@ var serviceProto = {
             "type": "String"
           },
           "optional": true
+        },
+        {
+          "id": 4,
+          "name": "entries",
+          "type": {
+            "type": "Array",
+            "elementType": {
+              "type": "Interface",
+              "properties": [
+                {
+                  "id": 0,
+                  "name": "lineIndex",
+                  "type": {
+                    "type": "Number"
+                  }
+                },
+                {
+                  "id": 1,
+                  "name": "viewCommand",
+                  "type": {
+                    "type": "String"
+                  }
+                }
+              ]
+            }
+          },
+          "optional": true
         }
       ]
     },

package/lib/shared/face/index.d.ts

@@ -114,6 +114,11 @@ export interface PageNavData {
     total: number;
     previousCommand?: string;
     nextCommand?: string;
+    /** 可点击的列表行；lineIndex 是 IMessage.line 的零起始位置。 */
+    entries?: Array<{
+        lineIndex: number;
+        viewCommand: string;
+    }>;
 }
 /** 下发给客户端的消息主体 **/
 export interface IMessage {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-dew-bot",
   "description": "连游戏服，把聊天消息交给服务器处理",
-  "version": "1.0.244",
+  "version": "1.0.246",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -9,6 +9,10 @@
     "src",
     "assets"
   ],
+  "scripts": {
+    "release": "node scripts/release.cjs",
+    "release:check": "node scripts/release.cjs --dry-run"
+  },
   "license": "MIT",
   "keywords": [
     "chatbot",

package/src/plugin/serverHandel/qqPageMessage.ts

@@ -44,6 +44,14 @@ export function pageCommand(command: string): string {
   return command.startsWith('/') ? command : `/${command}`
 }
 
+function inlineCommandUrl(command: string): string {
+  // encodeURIComponent leaves parentheses unescaped, which would close the
+  // surrounding Markdown link if an item ID ever contained one.
+  const encoded = encodeURIComponent(pageCommand(command)).replace(/[!'()*]/g, character =>
+    `%${character.charCodeAt(0).toString(16).toUpperCase()}`)
+  return `mqqapi://aio/inlinecmd?command=${encoded}&enter=true&reply=false`
+}
+
 export function pageCommandLines(nav: PageNavData): string[] {
   return [
     ...(nav.previousCommand ? [`上一页：${pageCommand(nav.previousCommand)}`] : []),
@@ -52,23 +60,91 @@ export function pageCommandLines(nav: PageNavData): string[] {
 }
 
 export function renderQQPageMarkdown(data: MsgMessage, showGreeting: boolean, showCommands: boolean): string {
+  const nav = data.pageNav
+  const entryCommands = new Map(nav?.entries?.map(entry => [entry.lineIndex, entry.viewCommand]) ?? [])
+  const listPattern = /^\[(\d+)\]\s*([^\r\n]+)$/
+  const pagePattern = /^第\s*\d+\s*\/\s*\d+\s*页(?:\s*[｜|]\s*共\s*(\d+)\s*([项条]))?$/
+  const title = data.line.find(item => item.type === MessageType.title)
+  const summaryLine = data.line.find(item => item.type === MessageType.line && pagePattern.test(item.content))
+  const summary = summaryLine && pagePattern.exec(summaryLine.content)
+  const listCount = data.line.filter(item => item.type === MessageType.line && listPattern.test(item.content)).length
+  const count = summary?.[1] ?? (nav?.total === 1 ? String(listCount) : undefined)
+  const countUnit = summary?.[2] ?? '项'
+  const isLeaderboardDirectory = !!nav?.entries?.length
+    && nav.entries.every(entry => /^排行榜查看\s/.test(entry.viewCommand))
   const sections: string[] = []
+  const bodyLines: string[] = []
+  const listLines: string[] = []
+  const flushBody = () => {
+    if (bodyLines.length) sections.push(bodyLines.splice(0).join('  \n'))
+  }
+  const flushList = () => {
+    if (listLines.length) sections.push(listLines.splice(0).join('  \n'))
+  }
+  const flush = () => { flushList(); flushBody() }
+  let hasPageSummary = false
+  let hasHelp = false
+  let pageFooter: string | undefined
   if (showGreeting) sections.push(escapeMarkdown('Ciallo～(∠・ω< )'))
-  for (const item of data.line) {
+  for (const [lineIndex, item] of data.line.entries()) {
     switch (item.type) {
       case MessageType.title:
-        sections.push(`### ${escapeMarkdown(item.content)}`)
+        flush()
+        if (isLeaderboardDirectory) {
+          sections.push(`## ${item.content.includes('🏆') ? '' : '🏆 '}${escapeMarkdown(item.content)}`)
+          sections.push(`> 共 ${nav!.entries!.length} 个榜单 · 点击榜名查看`)
+        } else {
+          sections.push(`**${escapeMarkdown(item.content)}${count !== undefined ? ` · ${count} ${countUnit}` : ''}**`)
+        }
         break
-      case MessageType.line:
-        sections.push(escapeMarkdown(item.content))
+      case MessageType.line: {
+        const listEntry = listPattern.exec(item.content)
+        if (listEntry) {
+          flushBody()
+          const command = entryCommands.get(lineIndex)
+          const label = escapeMarkdown(listEntry[2])
+          const name = command
+            ? `[${label}](${inlineCommandUrl(command)})`
+            : label
+          listLines.push(`${escapeMarkdown(`[${listEntry[1]}]`)} ${name}`)
+          break
+        }
+        flushList()
+        if (/^\[指令\]相关指令$/.test(item.content)) {
+          flushBody()
+          hasHelp = true
+          break
+        }
+        const page = pagePattern.exec(item.content)
+        if (page && nav) {
+          flushBody()
+          pageFooter = `**第 ${nav.current} / ${nav.total} 页${!title && page[1] ? ` · 共 ${page[1]} ${page[2]}` : ''}**`
+          hasPageSummary = true
+          break
+        }
+        bodyLines.push(escapeMarkdown(item.content))
         break
+      }
       case MessageType.error:
+        flush()
         sections.push(`❌ 出错了！错误原因：${escapeMarkdown(item.content)}，请反馈至联系开发者`)
         break
     }
   }
-  if (showCommands && data.pageNav) {
-    sections.push(...pageCommandLines(data.pageNav).map(escapeMarkdown))
+  flush()
+  if (nav && !hasPageSummary && (nav.total > 1 || nav.previousCommand || nav.nextCommand))
+    pageFooter = `**第 ${nav.current} / ${nav.total} 页**`
+  const helpLink = hasHelp ? `[指令](${inlineCommandUrl('指令')})` : undefined
+  const footer = pageFooter
+    ? [pageFooter, helpLink].filter(Boolean).join(' · ')
+    : helpLink ? `更多操作：${helpLink}` : undefined
+  if (footer) {
+    if (isLeaderboardDirectory) sections.push('***')
+    sections.push(footer)
+  }
+  if (showCommands && nav) {
+    const commands = pageCommandLines(nav)
+    if (commands.length) sections.push(`**翻页指令**  \n${commands.map(escapeMarkdown).join('  \n')}`)
   }
   return sections.join('\n\n') || ' '
 }
@@ -108,13 +184,15 @@ export async function sendQQPage(session: Session, data: MsgMessage, withKeyboar
   const nav = data.pageNav!
   const buttons = withKeyboard ? buttonsFor(nav, data.userId, session.isDirect) : []
   const markdown = renderQQPageMarkdown(data, session.event?.channel?.type === 0, buttons.length === 0)
+  const hasEntries = !!nav.entries?.length
+  const hasInlineHelp = data.line.some(item => item.type === MessageType.line && item.content === '[指令]相关指令')
   const request: QQRequest = {
     // With msg_type=2, QQ requires the ordinary content field to be empty.
     content: '',
     msg_type: 2,
     markdown: {
-      content: buttons.length && !session.isDirect
-        ? `${markdown}\n\n群聊中点击按钮后，请发送已填入的指令。`
+      content: !session.isDirect && (buttons.length || hasEntries || hasInlineHelp)
+        ? `${markdown}\n\n点击后如未自动发送，请点发送。`
         : markdown,
     },
     ...(buttons.length ? { keyboard: { content: { rows: [{ buttons }] } } } : {}),

package/src/shared/bot/serviceProto.ts

@@ -20,7 +20,7 @@ export interface ServiceType {
 }
 
 export const serviceProto: ServiceProto<ServiceType> = {
-    "version": 9,
+    "version": 10,
     "services": [
         {
             "id": 0,
@@ -773,6 +773,33 @@ export const serviceProto: ServiceProto<ServiceType> = {
                         "type": "String"
                     },
                     "optional": true
+                },
+                {
+                    "id": 4,
+                    "name": "entries",
+                    "type": {
+                        "type": "Array",
+                        "elementType": {
+                            "type": "Interface",
+                            "properties": [
+                                {
+                                    "id": 0,
+                                    "name": "lineIndex",
+                                    "type": {
+                                        "type": "Number"
+                                    }
+                                },
+                                {
+                                    "id": 1,
+                                    "name": "viewCommand",
+                                    "type": {
+                                        "type": "String"
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    "optional": true
                 }
             ]
         },

package/src/shared/face/index.ts

@@ -89,6 +89,8 @@ export interface PageNavData {
     total: number;
     previousCommand?: string;
     nextCommand?: string;
+    /** 可点击的列表行；lineIndex 是 IMessage.line 的零起始位置。 */
+    entries?: Array<{ lineIndex: number; viewCommand: string }>;
 }
 
 /** 下发给客户端的消息主体 **/