koishi-plugin-dew-bot 1.0.260 → 1.0.261

package/lib/index.d.ts

@@ -3,7 +3,7 @@ export declare const inject: {
     optional: string[];
 };
 export declare const name = "dew-bot";
-export declare const usage: string;
+export declare const filter = false;
 export interface Config {
     服务器地址: string;
 }

package/lib/index.js

@@ -2374,9 +2374,9 @@ var src_exports = {};
 __export(src_exports, {
   Config: () => Config,
   apply: () => apply2,
+  filter: () => filter,
   inject: () => inject,
-  name: () => name,
-  usage: () => usage
+  name: () => name
 });
 module.exports = __toCommonJS(src_exports);
 var import_koishi2 = require("koishi");
@@ -3945,6 +3945,52 @@ function renderQQTitle(content) {
 }
 __name(renderQQTitle, "renderQQTitle");
 
+// src/plugin/serverHandel/qqBattleLogLinks.ts
+function battleLogLinkSpans(content) {
+  const links = [];
+  const pattern = /\[([^\[\]\r\n]+)\]\((https?:\/\/[^\s<>()]+)\)/g;
+  for (const match of content.matchAll(pattern)) {
+    try {
+      const url = new URL(match[2]);
+      const id = url.searchParams.get("id") ?? "";
+      if (!["http:", "https:"].includes(url.protocol) || url.username || url.password || url.hash || url.pathname !== "/battlelog" || [...url.searchParams].length !== 1 || !/^[1-9]\d{0,15}$/.test(id) || !Number.isSafeInteger(Number(id))) continue;
+      links.push({ start: match.index, end: match.index + match[0].length, label: match[1], url: url.href, id });
+    } catch {
+    }
+  }
+  return links;
+}
+__name(battleLogLinkSpans, "battleLogLinkSpans");
+function renderBattleLogLink(link) {
+  return "[" + escapeMarkdown(link.label) + "](" + link.url + ")";
+}
+__name(renderBattleLogLink, "renderBattleLogLink");
+function renderBattleLogLinkText(content) {
+  const parts = [];
+  let offset = 0;
+  for (const link of battleLogLinkSpans(content)) {
+    parts.push(escapeMarkdown(content.slice(offset, link.start)), renderBattleLogLink(link));
+    offset = link.end;
+  }
+  parts.push(escapeMarkdown(content.slice(offset)));
+  return parts.join("");
+}
+__name(renderBattleLogLinkText, "renderBattleLogLinkText");
+function battleLogMessageLinks(data) {
+  const links = /* @__PURE__ */ new Map();
+  for (const line of data.line) {
+    if (line.type !== 1 /* line */ || line.codeBlock || line.mailPart === "body") continue;
+    for (const link of battleLogLinkSpans(line.content)) if (!links.has(link.url)) links.set(link.url, link);
+  }
+  return [...links.values()];
+}
+__name(battleLogMessageLinks, "battleLogMessageLinks");
+function appendMissingBattleLogLinks(markdown, data) {
+  const missing = battleLogMessageLinks(data).map(renderBattleLogLink).filter((link) => !markdown.includes(link));
+  return [markdown, ...missing].filter(Boolean).join("\n\n");
+}
+__name(appendMissingBattleLogLinks, "appendMissingBattleLogLinks");
+
 // src/plugin/serverHandel/qqRewardMessage.ts
 function hasRewardLines(data) {
   return data.line.some((item) => item.type === 1 /* line */ && item.reward === true);
@@ -4005,9 +4051,9 @@ function renderQQMailMarkdown(data) {
 }
 __name(renderQQMailMarkdown, "renderQQMailMarkdown");
 function renderQQRewardMarkdown(data, showGreeting) {
-  if (data.mail) return renderQQMailMarkdown(data);
+  if (data.mail) return appendMissingBattleLogLinks(renderQQMailMarkdown(data), data);
   const rewards = data.line.filter((item) => item.type === 1 /* line */ && item.reward).map((item) => renderRewardLine(item.content)).filter(Boolean);
-  if (rewards.length && !data.mail) return "🎁获得奖励\n\n" + rewards.join("  \n");
+  if (rewards.length && !data.mail) return appendMissingBattleLogLinks("🎁获得奖励\n\n" + rewards.join("  \n"), data);
   const sections = [];
   const bodyLines = [];
   const flushBody = /* @__PURE__ */ __name(() => {
@@ -4022,7 +4068,7 @@ function renderQQRewardMarkdown(data, showGreeting) {
     } else if (item.type === 1 /* line */) {
       for (const line of item.content.replace(/\r\n?/g, "\n").split("\n")) {
         if (!line.trim()) flushBody();
-        else bodyLines.push(escapeMarkdown(line));
+        else bodyLines.push(renderBattleLogLinkText(line));
       }
     } else if (item.type === 2 /* error */) {
       bodyLines.push(`❌ ${escapeMarkdown(item.content)}`);
@@ -4030,7 +4076,7 @@ function renderQQRewardMarkdown(data, showGreeting) {
   }
   flushBody();
   if (rewards.length) sections.push("🎁获得奖励\n\n" + rewards.join("  \n"));
-  return sections.join("\n\n") || " ";
+  return appendMissingBattleLogLinks(sections.join("\n\n") || " ", data);
 }
 __name(renderQQRewardMarkdown, "renderQQRewardMarkdown");
 
@@ -4070,7 +4116,8 @@ function inlineCommandSpans(content) {
       if (command) spans.push({ start, end: index + 1, label, command });
     }
   }
-  return spans;
+  const logLinks = battleLogLinkSpans(content);
+  return spans.filter((span) => !logLinks.some((link) => span.start < link.end && span.end > link.start));
 }
 __name(inlineCommandSpans, "inlineCommandSpans");
 function hasInlineCommands(content) {
@@ -4080,9 +4127,12 @@ __name(hasInlineCommands, "hasInlineCommands");
 function renderInlineCommands(content) {
   const parts = [];
   let offset = 0;
-  for (const span of inlineCommandSpans(content)) {
-    parts.push(escapeMarkdown(content.slice(offset, span.start)));
-    parts.push("[" + escapeMarkdown(span.label) + "](" + inlineCommandUrl(span.command) + ")");
+  const spans = [
+    ...inlineCommandSpans(content).map((span) => ({ ...span, rendered: "[" + escapeMarkdown(span.label) + "](" + inlineCommandUrl(span.command) + ")" })),
+    ...battleLogLinkSpans(content).map((span) => ({ ...span, rendered: renderBattleLogLink(span) }))
+  ].sort((a, b) => a.start - b.start);
+  for (const span of spans) {
+    parts.push(escapeMarkdown(content.slice(offset, span.start)), span.rendered);
     offset = span.end;
   }
   parts.push(escapeMarkdown(content.slice(offset)));
@@ -4592,14 +4642,14 @@ function renderQQStoryMarkdown(data, showGreeting) {
         } else {
           for (const line of item.content.replace(/\r\n?/g, "\n").split("\n")) {
             if (!line.trim()) flushBody();
-            else bodyLines.push(data.reward ? escapeMarkdown(line) : renderInlineCommands(line));
+            else bodyLines.push(data.reward ? renderBattleLogLinkText(line) : renderInlineCommands(line));
           }
         }
         break;
       case 2 /* error */:
         flushBody();
         if (!data.reward) flushRewards();
-        sections.push("❌ 出错了！错误原因：" + (data.reward ? escapeMarkdown(item.content) : renderInlineCommands(item.content)) + "，请反馈至联系开发者");
+        sections.push("❌ 出错了！错误原因：" + (data.reward ? renderBattleLogLinkText(item.content) : renderInlineCommands(item.content)) + "，请反馈至联系开发者");
         break;
     }
   }
@@ -4619,7 +4669,7 @@ function renderQQMessagePreview(data, showGreeting = false) {
   if (data.transaction) return { kind: "transaction", markdown: renderQQTransactionMarkdown(data, showGreeting), text };
   if (data.pageNav) return { kind: "page", markdown: renderQQPageMarkdown(data, showGreeting), text };
   if (isRewardMessage(data)) return { kind: "reward", markdown: renderQQRewardMarkdown(data, showGreeting), text };
-  if (data.line.some((item) => (item.type === 1 /* line */ || item.type === 2 /* error */) && hasInlineCommands(item.content))) {
+  if (battleLogMessageLinks(data).length || data.line.some((item) => (item.type === 1 /* line */ || item.type === 2 /* error */) && hasInlineCommands(item.content))) {
     return { kind: "command", markdown: renderQQCommandMarkdown(data, showGreeting), text };
   }
   return { kind: "text", text };
@@ -4814,10 +4864,7 @@ __name(apply, "apply");
 var import_node_path2 = require("node:path");
 var inject = { optional: ["puppeteer", "console"] };
 var name = "dew-bot";
-var usage = `
-## 🌀 达尔文进化岛 · 文字RPG机器人
-**一款基于《无限恐怖》的文字RPG**
-`;
+var filter = false;
 var Config = import_koishi2.Schema.object({
   服务器地址: import_koishi2.Schema.string().default("ws://dew-v7-test:3021").description("DEW 游戏服")
 });
@@ -4836,7 +4883,7 @@ __name(apply2, "apply");
 0 && (module.exports = {
   Config,
   apply,
+  filter,
   inject,
-  name,
-  usage
+  name
 });

package/lib/plugin/serverHandel/qqBattleLogLinks.d.ts

@@ -0,0 +1,16 @@
+import { type IMessage } from '../../shared/face';
+export type BattleLogLinkSpan = {
+    start: number;
+    end: number;
+    label: string;
+    url: string;
+    id: string;
+};
+/** Only the dedicated battle-log route can carry server-supplied external links. */
+export declare function battleLogLinkSpans(content: string): BattleLogLinkSpan[];
+export declare function renderBattleLogLink(link: BattleLogLinkSpan): string;
+/** Keep every other Markdown token literal while preserving verified log links. */
+export declare function renderBattleLogLinkText(content: string): string;
+export declare function battleLogMessageLinks(data: Pick<IMessage, 'line'>): BattleLogLinkSpan[];
+/** Compact reward cards omit ordinary details, so add their log links explicitly. */
+export declare function appendMissingBattleLogLinks(markdown: string, data: Pick<IMessage, 'line'>): string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-dew-bot",
   "description": "基于《无限恐怖》小说改编的 RPG 机器人。踏入主神空间，与伙伴迎接轮回试炼，书写属于你的无限冒险。",
-  "version": "1.0.260",
+  "version": "1.0.261",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/src/index.ts

@@ -6,11 +6,7 @@ import type {} from '@koishijs/plugin-console'
 export const inject = { optional: ['puppeteer', 'console'] }
 
 export const name = 'dew-bot'
-
-export const usage: string = `
-## 🌀 达尔文进化岛 · 文字RPG机器人
-**一款基于《无限恐怖》的文字RPG**
-`
+export const filter = false
 
 export interface Config {
   服务器地址: string

package/src/plugin/serverHandel/qqBattleLogLinks.ts

@@ -0,0 +1,52 @@
+import { MessageType, type IMessage } from '../../shared/face'
+import { escapeMarkdown } from './qqMarkdownHelpers'
+
+export type BattleLogLinkSpan = { start: number; end: number; label: string; url: string; id: string }
+
+/** Only the dedicated battle-log route can carry server-supplied external links. */
+export function battleLogLinkSpans(content: string): BattleLogLinkSpan[] {
+  const links: BattleLogLinkSpan[] = []
+  const pattern = /\[([^\[\]\r\n]+)\]\((https?:\/\/[^\s<>()]+)\)/g
+  for (const match of content.matchAll(pattern)) {
+    try {
+      const url = new URL(match[2])
+      const id = url.searchParams.get('id') ?? ''
+      if (!['http:', 'https:'].includes(url.protocol) || url.username || url.password || url.hash
+        || url.pathname !== '/battlelog' || [...url.searchParams].length !== 1
+        || !/^[1-9]\d{0,15}$/.test(id) || !Number.isSafeInteger(Number(id))) continue
+      links.push({ start: match.index!, end: match.index! + match[0].length, label: match[1], url: url.href, id })
+    } catch { /* Ordinary prose and malformed links remain escaped text. */ }
+  }
+  return links
+}
+
+export function renderBattleLogLink(link: BattleLogLinkSpan): string {
+  return '[' + escapeMarkdown(link.label) + '](' + link.url + ')'
+}
+
+/** Keep every other Markdown token literal while preserving verified log links. */
+export function renderBattleLogLinkText(content: string): string {
+  const parts: string[] = []
+  let offset = 0
+  for (const link of battleLogLinkSpans(content)) {
+    parts.push(escapeMarkdown(content.slice(offset, link.start)), renderBattleLogLink(link))
+    offset = link.end
+  }
+  parts.push(escapeMarkdown(content.slice(offset)))
+  return parts.join('')
+}
+
+export function battleLogMessageLinks(data: Pick<IMessage, 'line'>): BattleLogLinkSpan[] {
+  const links = new Map<string, BattleLogLinkSpan>()
+  for (const line of data.line) {
+    if (line.type !== MessageType.line || line.codeBlock || line.mailPart === 'body') continue
+    for (const link of battleLogLinkSpans(line.content)) if (!links.has(link.url)) links.set(link.url, link)
+  }
+  return [...links.values()]
+}
+
+/** Compact reward cards omit ordinary details, so add their log links explicitly. */
+export function appendMissingBattleLogLinks(markdown: string, data: Pick<IMessage, 'line'>): string {
+  const missing = battleLogMessageLinks(data).map(renderBattleLogLink).filter(link => !markdown.includes(link))
+  return [markdown, ...missing].filter(Boolean).join('\n\n')
+}

package/src/plugin/serverHandel/qqMessagePreview.ts

@@ -4,6 +4,7 @@ import { hasInlineCommands, renderQQPageMarkdown } from './qqPageMessage'
 import { renderQQCommandMarkdown } from './qqCommandMessage'
 import { renderQQTransactionMarkdown } from './qqTransactionMessage'
 import { hasStoryCodeBlock, renderQQStoryMarkdown } from './qqStoryMessage'
+import { battleLogMessageLinks } from './qqBattleLogLinks'
 import { isRewardMessage, renderQQRewardMarkdown } from './qqRewardMessage'
 
 export type QQMessageKind = 'text' | 'story' | 'command' | 'transaction' | 'page' | 'reward'
@@ -26,7 +27,7 @@ export function renderQQMessagePreview(data: IMessage, showGreeting = false): QQ
   if (data.transaction) return { kind: 'transaction', markdown: renderQQTransactionMarkdown(data, showGreeting), text }
   if (data.pageNav) return { kind: 'page', markdown: renderQQPageMarkdown(data, showGreeting), text }
   if (isRewardMessage(data)) return { kind: 'reward', markdown: renderQQRewardMarkdown(data, showGreeting), text }
-  if (data.line.some(item => (item.type === MessageType.line || item.type === MessageType.error) && hasInlineCommands(item.content))) {
+  if (battleLogMessageLinks(data).length || data.line.some(item => (item.type === MessageType.line || item.type === MessageType.error) && hasInlineCommands(item.content))) {
     return { kind: 'command', markdown: renderQQCommandMarkdown(data, showGreeting), text }
   }
   return { kind: 'text', text }

package/src/plugin/serverHandel/qqPageMessage.ts

@@ -4,6 +4,7 @@ import type { MsgMessage } from '../../shared/bot/MsgMessage'
 import { compactDisplayText, escapeMarkdown, renderQQTitle } from './qqMarkdownHelpers'
 import { isRewardMessage, renderRewardLine, renderRewardTitle } from './qqRewardMessage'
 import { artworkIdentity } from '../skillArtwork'
+import { battleLogLinkSpans, renderBattleLogLink } from './qqBattleLogLinks'
 
 export { escapeMarkdown, renderQQTitle } from './qqMarkdownHelpers'
 
@@ -74,7 +75,8 @@ function inlineCommandSpans(content: string): InlineCommandSpan[] {
       if (command) spans.push({ start, end: index + 1, label, command })
     }
   }
-  return spans
+  const logLinks = battleLogLinkSpans(content)
+  return spans.filter(span => !logLinks.some(link => span.start < link.end && span.end > link.start))
 }
 
 export function hasInlineCommands(content: string): boolean {
@@ -85,9 +87,12 @@ export function hasInlineCommands(content: string): boolean {
 export function renderInlineCommands(content: string): string {
   const parts: string[] = []
   let offset = 0
-  for (const span of inlineCommandSpans(content)) {
-    parts.push(escapeMarkdown(content.slice(offset, span.start)))
-    parts.push('[' + escapeMarkdown(span.label) + '](' + inlineCommandUrl(span.command) + ')')
+  const spans = [
+    ...inlineCommandSpans(content).map(span => ({ ...span, rendered: '[' + escapeMarkdown(span.label) + '](' + inlineCommandUrl(span.command) + ')' })),
+    ...battleLogLinkSpans(content).map(span => ({ ...span, rendered: renderBattleLogLink(span) })),
+  ].sort((a, b) => a.start - b.start)
+  for (const span of spans) {
+    parts.push(escapeMarkdown(content.slice(offset, span.start)), span.rendered)
     offset = span.end
   }
   parts.push(escapeMarkdown(content.slice(offset)))

package/src/plugin/serverHandel/qqRewardMessage.ts

@@ -1,5 +1,6 @@
 import { MessageType, type IMessage } from '../../shared/face'
 import { compactDisplayText, escapeMarkdown } from './qqMarkdownHelpers'
+import { appendMissingBattleLogLinks, renderBattleLogLinkText } from './qqBattleLogLinks'
 
 export function hasRewardLines(data: Pick<IMessage, 'line'>): boolean {
   return data.line.some(item => item.type === MessageType.line && item.reward === true)
@@ -67,10 +68,10 @@ function renderQQMailMarkdown(data: IMessage): string {
 
 /** Reward cards stay compact; mail keeps its content before the attachment quote. */
 export function renderQQRewardMarkdown(data: IMessage, showGreeting: boolean): string {
-  if (data.mail) return renderQQMailMarkdown(data)
+  if (data.mail) return appendMissingBattleLogLinks(renderQQMailMarkdown(data), data)
   const rewards = data.line.filter(item => item.type === MessageType.line && item.reward)
     .map(item => renderRewardLine(item.content)).filter(Boolean)
-  if (rewards.length && !data.mail) return '🎁获得奖励\n\n' + rewards.join('  \n')
+  if (rewards.length && !data.mail) return appendMissingBattleLogLinks('🎁获得奖励\n\n' + rewards.join('  \n'), data)
 
   const sections: string[] = []
   const bodyLines: string[] = []
@@ -86,7 +87,7 @@ export function renderQQRewardMarkdown(data: IMessage, showGreeting: boolean): s
     } else if (item.type === MessageType.line) {
       for (const line of item.content.replace(/\r\n?/g, '\n').split('\n')) {
         if (!line.trim()) flushBody()
-        else bodyLines.push(escapeMarkdown(line))
+        else bodyLines.push(renderBattleLogLinkText(line))
       }
     } else if (item.type === MessageType.error) {
       bodyLines.push(`❌ ${escapeMarkdown(item.content)}`)
@@ -94,5 +95,5 @@ export function renderQQRewardMarkdown(data: IMessage, showGreeting: boolean): s
   }
   flushBody()
   if (rewards.length) sections.push('🎁获得奖励\n\n' + rewards.join('  \n'))
-  return sections.join('\n\n') || ' '
+  return appendMissingBattleLogLinks(sections.join('\n\n') || ' ', data)
 }

package/src/plugin/serverHandel/qqStoryMessage.ts

@@ -2,6 +2,7 @@ import type { Session } from 'koishi'
 import { MessageType, type IMessage } from '../../shared/face'
 import type { MsgMessage } from '../../shared/bot/MsgMessage'
 import { escapeMarkdown, renderInlineCommands, renderQQTitle, sendQQMarkdown } from './qqPageMessage'
+import { renderBattleLogLinkText } from './qqBattleLogLinks'
 import { isRewardMessage, renderQQRewardMarkdown, renderRewardLine, renderRewardTitle } from './qqRewardMessage'
 
 export function hasStoryCodeBlock(data: Pick<IMessage, 'line'>): boolean {
@@ -57,14 +58,14 @@ export function renderQQStoryMarkdown(data: IMessage, showGreeting: boolean): st
         } else {
           for (const line of item.content.replace(/\r\n?/g, '\n').split('\n')) {
             if (!line.trim()) flushBody()
-            else bodyLines.push(data.reward ? escapeMarkdown(line) : renderInlineCommands(line))
+            else bodyLines.push(data.reward ? renderBattleLogLinkText(line) : renderInlineCommands(line))
           }
         }
         break
       case MessageType.error:
         flushBody()
         if (!data.reward) flushRewards()
-        sections.push('❌ 出错了！错误原因：' + (data.reward ? escapeMarkdown(item.content) : renderInlineCommands(item.content)) + '，请反馈至联系开发者')
+        sections.push('❌ 出错了！错误原因：' + (data.reward ? renderBattleLogLinkText(item.content) : renderInlineCommands(item.content)) + '，请反馈至联系开发者')
         break
     }
   }