koishi-plugin-dew-bot 1.0.245 → 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

@@ -736,47 +736,63 @@ __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 numberedLines = [];
+  const listLines = [];
   const flushBody = /* @__PURE__ */ __name(() => {
     if (bodyLines.length) sections.push(bodyLines.splice(0).join("  \n"));
   }, "flushBody");
-  const flushNumbered = /* @__PURE__ */ __name(() => {
-    if (numberedLines.length) sections.push(numberedLines.splice(0).join("\n"));
-  }, "flushNumbered");
+  const flushList = /* @__PURE__ */ __name(() => {
+    if (listLines.length) sections.push(listLines.splice(0).join("  \n"));
+  }, "flushList");
   const flush = /* @__PURE__ */ __name(() => {
-    flushNumbered();
+    flushList();
     flushBody();
   }, "flush");
   let hasPageSummary = false;
+  let hasHelp = false;
+  let pageFooter;
   if (showGreeting) sections.push(escapeMarkdown("Ciallo～(∠・ω< )"));
   for (const [lineIndex, item] of data.line.entries()) {
     switch (item.type) {
       case 0 /* title */:
         flush();
-        sections.push(`### ${escapeMarkdown(item.content)}`);
+        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 */: {
-        const numbered = /^\[(\d+)\]\s*([^\r\n]+)$/.exec(item.content);
-        if (numbered) {
+        const listEntry = listPattern.exec(item.content);
+        if (listEntry) {
           flushBody();
           const command = entryCommands.get(lineIndex);
-          const label = escapeMarkdown(numbered[2]);
+          const label = escapeMarkdown(listEntry[2]);
           const name2 = command ? `[${label}](${inlineCommandUrl(command)})` : label;
-          numberedLines.push(`${numbered[1]}. ${name2}`);
+          listLines.push(`${escapeMarkdown(`[${listEntry[1]}]`)} ${name2}`);
           break;
         }
-        flushNumbered();
+        flushList();
         if (/^\[指令\]相关指令$/.test(item.content)) {
           flushBody();
-          sections.push(`更多操作：[指令](${inlineCommandUrl("指令")})`);
+          hasHelp = true;
           break;
         }
-        const page = /^第\s*\d+\s*\/\s*\d+\s*页(?:\s*[｜|]\s*共\s*(\d+)\s*([项条]))?$/.exec(item.content);
+        const page = pagePattern.exec(item.content);
         if (page && nav) {
           flushBody();
-          sections.push(`**第 ${nav.current} / ${nav.total} 页${page[1] ? ` · 共 ${page[1]} ${page[2]}` : ""}**`);
+          pageFooter = `**第 ${nav.current} / ${nav.total} 页${!title && page[1] ? ` · 共 ${page[1]} ${page[2]}` : ""}**`;
           hasPageSummary = true;
           break;
         }
@@ -790,7 +806,14 @@ function renderQQPageMarkdown(data, showGreeting, showCommands) {
     }
   }
   flush();
-  if (nav && !hasPageSummary) sections.push(`**第 ${nav.current} / ${nav.total} 页**`);
+  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(`**翻页指令**  

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-dew-bot",
   "description": "连游戏服，把聊天消息交给服务器处理",
-  "version": "1.0.245",
+  "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

@@ -62,46 +62,63 @@ 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 numberedLines: string[] = []
+  const listLines: string[] = []
   const flushBody = () => {
     if (bodyLines.length) sections.push(bodyLines.splice(0).join('  \n'))
   }
-  const flushNumbered = () => {
-    if (numberedLines.length) sections.push(numberedLines.splice(0).join('\n'))
+  const flushList = () => {
+    if (listLines.length) sections.push(listLines.splice(0).join('  \n'))
   }
-  const flush = () => { flushNumbered(); flushBody() }
+  const flush = () => { flushList(); flushBody() }
   let hasPageSummary = false
+  let hasHelp = false
+  let pageFooter: string | undefined
   if (showGreeting) sections.push(escapeMarkdown('Ciallo～(∠・ω< )'))
   for (const [lineIndex, item] of data.line.entries()) {
     switch (item.type) {
       case MessageType.title:
         flush()
-        sections.push(`### ${escapeMarkdown(item.content)}`)
+        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: {
-        const numbered = /^\[(\d+)\]\s*([^\r\n]+)$/.exec(item.content)
-        if (numbered) {
+        const listEntry = listPattern.exec(item.content)
+        if (listEntry) {
           flushBody()
           const command = entryCommands.get(lineIndex)
-          const label = escapeMarkdown(numbered[2])
+          const label = escapeMarkdown(listEntry[2])
           const name = command
             ? `[${label}](${inlineCommandUrl(command)})`
             : label
-          numberedLines.push(`${numbered[1]}. ${name}`)
+          listLines.push(`${escapeMarkdown(`[${listEntry[1]}]`)} ${name}`)
           break
         }
-        flushNumbered()
+        flushList()
         if (/^\[指令\]相关指令$/.test(item.content)) {
           flushBody()
-          sections.push(`更多操作：[指令](${inlineCommandUrl('指令')})`)
+          hasHelp = true
           break
         }
-        const page = /^第\s*\d+\s*\/\s*\d+\s*页(?:\s*[｜|]\s*共\s*(\d+)\s*([项条]))?$/.exec(item.content)
+        const page = pagePattern.exec(item.content)
         if (page && nav) {
           flushBody()
-          sections.push(`**第 ${nav.current} / ${nav.total} 页${page[1] ? ` · 共 ${page[1]} ${page[2]}` : ''}**`)
+          pageFooter = `**第 ${nav.current} / ${nav.total} 页${!title && page[1] ? ` · 共 ${page[1]} ${page[2]}` : ''}**`
           hasPageSummary = true
           break
         }
@@ -115,7 +132,16 @@ export function renderQQPageMarkdown(data: MsgMessage, showGreeting: boolean, sh
     }
   }
   flush()
-  if (nav && !hasPageSummary) sections.push(`**第 ${nav.current} / ${nav.total} 页**`)
+  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')}`)