koishi-plugin-dew-bot 1.0.258 → 1.0.259

package/lib/index.js

@@ -1422,6 +1422,7 @@ async function renderUncached(ctx, card, leaderboard, itemCard, characterCard, e
   let timeout;
   let workPromise;
   let expired = false;
+  let finished = false;
   const release = /* @__PURE__ */ __name(() => {
     const next = waiting.shift();
     if (next) next();
@@ -1429,12 +1430,26 @@ async function renderUncached(ctx, card, leaderboard, itemCard, characterCard, e
   }, "release");
   try {
     const work = /* @__PURE__ */ __name(async () => {
-      const entryArtworkPromise = loadCardEntryArtwork(!titleCard && !bloodlineCard && !equipmentCard ? companionCard : void 0);
       const remoteAddress = titleCard ? titleCard.artworkUrl : bloodlineCard ? bloodlineCard.artworkUrl : equipmentCard ? equipmentCard.artworkUrl : companionCard ? companionCard.artworkUrl : characterCard ? characterCard.artworkUrl : itemCard ? itemCard.artworkUrl : leaderboard ? leaderboard.backgroundUrl : card?.artworkUrl;
-      const dedicatedArt = !titleCard && !bloodlineCard && equipmentCard ? await loadSkillArtwork(equipmentCard.artworkUrl) : void 0;
-      const unknownArt = !titleCard && !bloodlineCard && equipmentCard && !dedicatedArt ? await equipmentFallback() : void 0;
-      const art = !titleCard && !bloodlineCard && equipmentCard ? dedicatedArt ?? unknownArt : await loadSkillArtwork(remoteAddress);
-      const entryArtwork = await entryArtworkPromise;
+      const isEquipment = !titleCard && !bloodlineCard && Boolean(equipmentCard);
+      const isCharacter = !titleCard && !bloodlineCard && !equipmentCard && !companionCard && Boolean(characterCard);
+      const [remoteArt, fallbackArt, entryArtwork, characterAssets, header] = await Promise.all([
+        loadSkillArtwork(remoteAddress),
+        isEquipment ? equipmentFallback() : void 0,
+        loadCardEntryArtwork(!titleCard && !bloodlineCard && !equipmentCard ? companionCard : void 0),
+        isCharacter ? Promise.all([characterAsset(), loadSkillArtwork(characterCard.titleImageUrl)]) : void 0,
+        !titleCard && !bloodlineCard && !equipmentCard && !companionCard && !characterCard && !itemCard && leaderboard ? leaderboardHeader() : void 0,
+        ctx.puppeteer.page().then(async (created) => {
+          if (expired || finished) {
+            await created.close();
+            throw new Error(expired ? "绘图超时" : "绘图已结束");
+          }
+          page = created;
+        })
+      ]);
+      const dedicatedArt = isEquipment ? remoteArt : void 0;
+      const unknownArt = isEquipment && !dedicatedArt ? fallbackArt : void 0;
+      const art = isEquipment ? dedicatedArt ?? unknownArt : remoteArt;
       let html;
       let loadedCharacterTitle;
       let localAssetsReady = true;
@@ -1448,27 +1463,19 @@ async function renderUncached(ctx, card, leaderboard, itemCard, characterCard, e
       } else if (companionCard) {
         html = companionCardHtml(companionCard, art, entryArtwork.icons);
       } else if (characterCard) {
-        const [defaultArtwork, titleArtwork] = await Promise.all([
-          characterAsset(),
-          loadSkillArtwork(characterCard.titleImageUrl)
-        ]);
+        const [defaultArtwork, titleArtwork] = characterAssets;
         loadedCharacterTitle = titleArtwork;
         localAssetsReady = Boolean(art || defaultArtwork) && (!characterCard.titleImageUrl || Boolean(titleArtwork));
         html = characterCardHtml(characterCard, art, void 0, defaultArtwork, titleArtwork, entryArtwork.icons);
       } else if (itemCard) {
         html = itemCard.type === "形象卡" ? appearanceCardHtml(itemCard, art) : itemCardHtml(itemCard, art);
       } else if (leaderboard) {
-        html = leaderboardHtml(leaderboard, await leaderboardHeader(), art);
+        html = leaderboardHtml(leaderboard, header, art);
       } else {
         html = skillCardHtml(card, "", art);
       }
       if (expired) throw new Error("绘图超时");
-      page = await ctx.puppeteer.page();
-      if (expired) {
-        await page.close();
-        page = void 0;
-        throw new Error("绘图超时");
-      }
+      if (!page) throw new Error("卡片页面缺失");
       await page.setViewport({ width: 760, height: 1107, deviceScaleFactor: titleCard || (companionCard || characterCard) && !bloodlineCard && !equipmentCard ? 2 : 1 });
       await page.setJavaScriptEnabled(false);
       await page.setRequestInterception(true);
@@ -1518,6 +1525,7 @@ async function renderUncached(ctx, card, leaderboard, itemCard, characterCard, e
       }, 15e3);
     })]);
   } finally {
+    finished = true;
     if (timeout) clearTimeout(timeout);
     try {
       await page?.close();
@@ -1851,7 +1859,7 @@ function renderQQInventoryMarkdown(data, showGreeting) {
   const sections = [];
   const items = [];
   const flushItems = /* @__PURE__ */ __name(() => {
-    if (items.length) sections.push(items.splice(0).map((line) => "> " + line).join("  \n"));
+    if (items.length) sections.push(...items.splice(0));
   }, "flushItems");
   if (showGreeting) sections.push(escapeMarkdown("Ciallo～(∠・ω< )"));
   for (const [lineIndex, item] of data.line.entries()) {
@@ -4455,6 +4463,7 @@ var Server = class {
   ctx;
   onConnectedCallback;
   messageListenerSetup = false;
+  lastUserMessageAt = /* @__PURE__ */ new Map();
   _init = false;
   async init(ctx, config) {
     this.ctx = ctx;
@@ -4464,6 +4473,12 @@ var Server = class {
     if (this.wsClient) {
       await this.dispose();
     }
+    ctx.setInterval(() => {
+      const now = performance.now();
+      for (const [key, lastMessageAt] of this.lastUserMessageAt) {
+        if (now - lastMessageAt > 500) this.lastUserMessageAt.delete(key);
+      }
+    }, 6e4);
     const serverUrl = config.服务器地址;
     if (!serverUrl || serverUrl.trim() === "") {
       throw new Error("服务器地址不能为空");
@@ -4481,6 +4496,7 @@ var Server = class {
   }
   async dispose() {
     this._init = false;
+    this.lastUserMessageAt.clear();
     if (this.wsClient) {
       this.wsClient.unlistenMsgAll(/.*/);
       this.wsClient.disconnect();
@@ -4556,7 +4572,7 @@ var Server = class {
     }
     this.ctx.logger.warn("请求出错", apiName, req.err.message);
   }
-  /** 过滤机器人发送者后，缓存会话并把原始内容交给游戏服。 **/
+  /** 过滤机器人发送者和用户连续消息后，缓存会话并把原始内容交给游戏服。 **/
   uploadMessage(session) {
     if (isBotMessage(session, this.ctx.bots)) return;
     const userId = session.userId;
@@ -4565,6 +4581,11 @@ var Server = class {
       this.ctx.logger.warn("消息缺少 userId 或 channelId，已忽略");
       return;
     }
+    const userKey = JSON.stringify([session.platform ?? session.bot.platform, userId]);
+    const now = performance.now();
+    const lastMessageAt = this.lastUserMessageAt.get(userKey);
+    this.lastUserMessageAt.set(userKey, now);
+    if (lastMessageAt !== void 0 && now - lastMessageAt <= 500) return;
     sessions_default.set(sessionKey(session.bot.userId, userId, channelId), session);
     this.api("Message", {
       bot: {

package/lib/plugin/server.d.ts

@@ -6,6 +6,7 @@ declare class Server {
     private ctx;
     private onConnectedCallback?;
     private messageListenerSetup;
+    private readonly lastUserMessageAt;
     _init: boolean;
     init(ctx: Context, config: Config): Promise<void>;
     onConnected(callback: () => void): void;
@@ -14,7 +15,7 @@ declare class Server {
     setWsUrl(link: string, maxRetries?: number): Promise<void>;
     private reconnect;
     api<T extends keyof ServiceType['api']>(apiName: T, posData: ServiceType['api'][T]['req']): Promise<ServiceType['api'][T]['res'] | undefined>;
-    /** 过滤机器人发送者后，缓存会话并把原始内容交给游戏服。 **/
+    /** 过滤机器人发送者和用户连续消息后，缓存会话并把原始内容交给游戏服。 **/
     uploadMessage(session: Session): void;
 }
 declare const _default: Server;

package/package.json

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

package/src/plugin/server.ts

@@ -10,6 +10,7 @@ class Server {
   private ctx!: Context
   private onConnectedCallback?: () => void
   private messageListenerSetup = false
+  private readonly lastUserMessageAt = new Map<string, number>()
   _init = false
 
   async init(ctx: Context, config: Config) {
@@ -20,6 +21,12 @@ class Server {
     if (this.wsClient) {
       await this.dispose()
     }
+    ctx.setInterval(() => {
+      const now = performance.now()
+      for (const [key, lastMessageAt] of this.lastUserMessageAt) {
+        if (now - lastMessageAt > 500) this.lastUserMessageAt.delete(key)
+      }
+    }, 60_000)
     const serverUrl = config.服务器地址
     if (!serverUrl || serverUrl.trim() === '') {
       throw new Error('服务器地址不能为空')
@@ -39,6 +46,7 @@ class Server {
 
   async dispose() {
     this._init = false
+    this.lastUserMessageAt.clear()
     if (this.wsClient) {
       this.wsClient.unlistenMsgAll(/.*/)
       this.wsClient.disconnect()
@@ -125,7 +133,7 @@ class Server {
     this.ctx.logger.warn('请求出错', apiName, req.err.message)
   }
 
-  /** 过滤机器人发送者后，缓存会话并把原始内容交给游戏服。 **/
+  /** 过滤机器人发送者和用户连续消息后，缓存会话并把原始内容交给游戏服。 **/
   uploadMessage(session: Session) {
     if (isBotMessage(session, this.ctx.bots)) return
     const userId = session.userId
@@ -134,6 +142,13 @@ class Server {
       this.ctx.logger.warn('消息缺少 userId 或 channelId，已忽略')
       return
     }
+    const userKey = JSON.stringify([session.platform ?? session.bot.platform, userId])
+    const now = performance.now()
+    const lastMessageAt = this.lastUserMessageAt.get(userKey)
+    // 被忽略的消息也计入上一条，连续快速发送时只有第一条上传。
+    this.lastUserMessageAt.set(userKey, now)
+    if (lastMessageAt !== undefined && now - lastMessageAt <= 500) return
+
     sessions.set(sessionKey(session.bot.userId, userId, channelId), session)
     this.api('Message', {
       bot: {

package/src/plugin/serverHandel/qqPageMessage.ts

@@ -155,7 +155,7 @@ function renderQQTaskMarkdown(data: IMessage): string {
   return sections.join('\n\n') || ' '
 }
 
-/** Backpack cards use a compact filter row and one quoted, clickable item list. */
+/** Backpack cards use a compact filter row and separate clickable item paragraphs. */
 const inventoryFilterCategories = [
   { name: '装备', emoji: '⚔️' },
   { name: '装备图纸', emoji: '📐' },
@@ -193,7 +193,9 @@ function renderQQInventoryMarkdown(data: IMessage, showGreeting: boolean): strin
   const sections: string[] = []
   const items: string[] = []
   const flushItems = () => {
-    if (items.length) sections.push(items.splice(0).map(line => '> ' + line).join('  \n'))
+    // Avoid a shared blockquote/paragraph around mobile QQ command links.
+    // Each item keeps its image and single command in an independent paragraph.
+    if (items.length) sections.push(...items.splice(0))
   }
   if (showGreeting) sections.push(escapeMarkdown('Ciallo～(∠・ω< )'))
   for (const [lineIndex, item] of data.line.entries()) {

package/src/plugin/skillCard.ts

@@ -126,17 +126,29 @@ async function renderUncached(ctx: Context, card?: SkillCardData, leaderboard?:
   let timeout: ReturnType<typeof setTimeout> | undefined
   let workPromise: Promise<{ image: Buffer; cacheable: boolean }> | undefined
   let expired = false
+  let finished = false
   const release = () => { const next = waiting.shift(); if (next) next(); else running-- }
   try {
     const work = async () => {
-      const entryArtworkPromise = loadCardEntryArtwork(!titleCard && !bloodlineCard && !equipmentCard ? companionCard : undefined)
       const remoteAddress = titleCard ? titleCard.artworkUrl : bloodlineCard ? bloodlineCard.artworkUrl : equipmentCard ? equipmentCard.artworkUrl : companionCard ? companionCard.artworkUrl : characterCard ? characterCard.artworkUrl : itemCard ? itemCard.artworkUrl : leaderboard ? leaderboard.backgroundUrl : card?.artworkUrl
-      const dedicatedArt = !titleCard && !bloodlineCard && equipmentCard ? await loadSkillArtwork(equipmentCard.artworkUrl) : undefined
-      const unknownArt = !titleCard && !bloodlineCard && equipmentCard && !dedicatedArt ? await equipmentFallback() : undefined
-      const art = !titleCard && !bloodlineCard && equipmentCard
-        ? dedicatedArt ?? unknownArt
-        : await loadSkillArtwork(remoteAddress)
-      const entryArtwork = await entryArtworkPromise
+      const isEquipment = !titleCard && !bloodlineCard && Boolean(equipmentCard)
+      const isCharacter = !titleCard && !bloodlineCard && !equipmentCard && !companionCard && Boolean(characterCard)
+      // Download independent artwork and open the browser together. A cold portrait
+      // must not postpone its title download or browser startup.
+      const [remoteArt, fallbackArt, entryArtwork, characterAssets, header] = await Promise.all([
+        loadSkillArtwork(remoteAddress),
+        isEquipment ? equipmentFallback() : undefined,
+        loadCardEntryArtwork(!titleCard && !bloodlineCard && !equipmentCard ? companionCard : undefined),
+        isCharacter ? Promise.all([characterAsset(), loadSkillArtwork(characterCard!.titleImageUrl)]) : undefined,
+        !titleCard && !bloodlineCard && !equipmentCard && !companionCard && !characterCard && !itemCard && leaderboard ? leaderboardHeader() : undefined,
+        ctx.puppeteer.page().then(async created => {
+          if (expired || finished) { await created.close(); throw new Error(expired ? '绘图超时' : '绘图已结束') }
+          page = created
+        }),
+      ])
+      const dedicatedArt = isEquipment ? remoteArt : undefined
+      const unknownArt = isEquipment && !dedicatedArt ? fallbackArt : undefined
+      const art = isEquipment ? dedicatedArt ?? unknownArt : remoteArt
       let html: string
       let loadedCharacterTitle: string | undefined
       let localAssetsReady = true
@@ -150,23 +162,19 @@ async function renderUncached(ctx: Context, card?: SkillCardData, leaderboard?:
       } else if (companionCard) {
         html = companionCardHtml(companionCard, art, entryArtwork.icons)
       } else if (characterCard) {
-        const [defaultArtwork, titleArtwork] = await Promise.all([
-          characterAsset(),
-          loadSkillArtwork(characterCard.titleImageUrl),
-        ])
+        const [defaultArtwork, titleArtwork] = characterAssets!
         loadedCharacterTitle = titleArtwork
         localAssetsReady = Boolean(art || defaultArtwork) && (!characterCard.titleImageUrl || Boolean(titleArtwork))
         html = characterCardHtml(characterCard, art, undefined, defaultArtwork, titleArtwork, entryArtwork.icons)
       } else if (itemCard) {
         html = itemCard.type === '形象卡' ? appearanceCardHtml(itemCard, art) : itemCardHtml(itemCard, art)
       } else if (leaderboard) {
-        html = leaderboardHtml(leaderboard, await leaderboardHeader(), art)
+        html = leaderboardHtml(leaderboard, header, art)
       } else {
         html = skillCardHtml(card!, '', art)
       }
       if (expired) throw new Error('绘图超时')
-      page = await ctx.puppeteer.page()
-      if (expired) { await page.close(); page = undefined; throw new Error('绘图超时') }
+      if (!page) throw new Error('卡片页面缺失')
       await page.setViewport({ width:760,height:1107,deviceScaleFactor:titleCard || (companionCard || characterCard) && !bloodlineCard && !equipmentCard ? 2 : 1 })
       await page.setJavaScriptEnabled(false)
       await page.setRequestInterception(true)
@@ -206,6 +214,7 @@ async function renderUncached(ctx: Context, card?: SkillCardData, leaderboard?:
     workPromise = work()
     return await Promise.race([workPromise, new Promise<never>((_,reject) => {timeout=setTimeout(()=>{ expired=true; reject(new Error('绘图超时')) },15000)})])
   } finally {
+    finished = true
     if(timeout) clearTimeout(timeout)
     try { await page?.close() } catch {}
     if (expired && workPromise) {