koishi-plugin-prism 0.1.29 → 0.1.31

package/README.md

@@ -58,7 +58,7 @@ pricingConfigIds: [pricing-mahjong-a]
 玩家在未产生任何费用时退场，机器人会简洁显示“本次未产生费用”和当前余额；存在收费或优惠明细时仍显示完整结算账单。
 结账成功回执中的余额为后端已经完成扣款后的余额；只有 `/billing` 预览会显示当前余额与预计结账后余额。
 方案内区间封顶直接计入对应计时费用；全局封顶按日期和时段逐条列出，不合并、不截断，并直接形成计费总价，不作为优惠。若旧后端未返回结构化封顶窗口，插件会用封顶历史恢复原价与计入金额，不会显示内部 adjustment 差额。只作用于整次结账的资产优惠直接列在计费总价下方，不显示额外标题或 emoji，也不会误归属到最后一个 session。
-结账成功后，机器人会向 `staffUserIds` 与 `logoutNotifyUserIds` 中的用户私聊同一份账单，账单会明确显示结账玩家身份。
+在玩家退场或管理员覆盖结账成功后，机器人会向 `staffUserIds` 与 `logoutNotifyUserIds` 中的用户私聊同一份账单，账单会明确显示结账玩家身份。
 同一玩家在前一次退场结账尚未完成时重复发送 `/logout` 或 `/退场`，机器人会复用同一次结账请求与账单，避免重复扣款。
 账单和管理员代操作回执均使用“平台昵称（QQ：号码）”称呼玩家；平台暂时无法提供昵称时显示“未知昵称（QQ：号码）”，不会显示内部玩家 ID。
 管理员 `/add` 增加免费余额；`/del` 按结账相同的顺序从可用免费余额、再从付费余额扣除，余额不足时会返回余额不足提示。

package/lib/index.js

@@ -388,9 +388,12 @@ class PrismKoishiService {
             const total = Number(rawAmount);
             if (!Number.isFinite(total) || total < 0)
                 return "金额必须为非负数";
-            const reason = cleanText(rawReason) || "Koishi 管理员手动调价";
-            await this.client.checkoutWithOverrideByIdentity(this.identity(sender), total, reason);
-            return `✅ 已为用户 ${formatPlayerReference(sender, this.config.provider)} 覆盖结账为 ${formatNumber(total)} ${this.config.currencyName}`;
+            const reason = cleanText(rawReason) || "管理员调价";
+            const result = (await this.client.checkoutWithOverrideByIdentity(this.identity(sender), total, reason));
+            const playerId = String(result?.playerSettlement?.playerId ?? result?.settlement?.playerId ?? "");
+            if (playerId)
+                this.removeMahjongPlayer(playerId);
+            return this.formatAndNotifyCheckout(result, sender, "✅ 覆盖结账成功 · 结算账单", bot);
         }, bot);
     }
     async mahjongJoin(sender, rawTableId) {
@@ -524,6 +527,12 @@ class PrismKoishiService {
     }
     async performLogout(sender, bot) {
         const result = (await this.client.confirmCheckoutByIdentity(this.identity(sender), false));
+        const playerId = String(result?.playerSettlement?.playerId ?? result?.settlement?.playerId ?? "");
+        if (playerId)
+            this.removeMahjongPlayer(playerId);
+        return this.formatAndNotifyCheckout(result, sender, "✅ 退场成功 · 结算账单", bot);
+    }
+    async formatAndNotifyCheckout(result, sender, title, bot) {
         const settlement = result?.playerSettlement ?? result?.settlement ?? {};
         const records = result?.settlements ?? [];
         const checkoutAdjustments = (result?.checkoutAdjustments ?? []);
@@ -565,10 +574,11 @@ class PrismKoishiService {
             globalCapWindows: result?.globalCapWindows ?? [],
             assetHoldings: result?.assetHoldings ?? [],
         };
-        const receipt = await this.formatCheckoutPreview(synthetic, sender, "✅ 退场成功 · 结算账单");
+        const receipt = await this.formatCheckoutPreview(synthetic, sender, title);
         const recipients = [...new Set([...(this.config.staffUserIds ?? []), ...(this.config.logoutNotifyUserIds ?? [])])];
         if (recipients.length > 0 && bot?.broadcast) {
-            await bot.broadcast(recipients, receipt);
+            const channelIds = recipients.map((id) => (id.includes(":") ? id : `private:${id}`));
+            await bot.broadcast(channelIds, receipt);
         }
         return receipt;
     }
@@ -808,6 +818,12 @@ class PrismKoishiService {
         }
         return null;
     }
+    removeMahjongPlayer(playerId) {
+        for (const state of this.mahjongTables.values()) {
+            delete state.activeSessions[playerId];
+            state.waiting = state.waiting.filter((seat) => seat.playerId !== playerId);
+        }
+    }
     mahjongTableConfigs() {
         return resolveMahjongTableConfigs(this.config.mahjongTableConfigs ?? [], this.config.mahjongTables ?? "", this.config.mahjongLabelPrefix ?? "麻将桌");
     }
@@ -817,6 +833,9 @@ class PrismKoishiService {
             mahjongSessionLabel(table, this.config.mahjongLabelPrefix ?? "麻将桌"),
             table,
         ]));
+        // All playerIds that still have at least one active session in the backend.
+        // Used to evict waiting seats for players who have fully checked out externally.
+        const allActivePlayerIds = new Set(sessions.map((s) => String(s.playerId ?? "")).filter(Boolean));
         const activeByTable = new Map();
         for (const session of sessions) {
             const table = tableByLabel.get(session.label ?? "");
@@ -831,7 +850,9 @@ class PrismKoishiService {
         for (const table of tables) {
             const state = this.mahjongTables.get(table.tableId) ?? { waiting: [], activeSessions: {} };
             state.activeSessions = activeByTable.get(table.tableId) ?? {};
-            state.waiting = state.waiting.filter((seat) => !state.activeSessions[seat.playerId]);
+            // Remove seats that have been promoted to active, or whose players have
+            // fully left the backend (no entry session remaining — orphan eviction).
+            state.waiting = state.waiting.filter((seat) => !state.activeSessions[seat.playerId] && allActivePlayerIds.has(seat.playerId));
             if (state.waiting.length > 0 || Object.keys(state.activeSessions).length > 0 || this.mahjongTables.has(table.tableId)) {
                 this.mahjongTables.set(table.tableId, state);
             }
@@ -1014,11 +1035,15 @@ class PrismKoishiService {
                 }
             }
         }
-        const visibleCheckoutAdjustments = checkoutAdjustments.filter((adjustment) => toNumber(firstDefined(adjustment ?? {}, "amount", "saved", 0)) !== 0);
+        const visibleCheckoutAdjustments = checkoutAdjustments.filter((adjustment) => {
+            const amount = toNumber(firstDefined(adjustment ?? {}, "amount", "saved", 0));
+            const isOverride = cleanText(adjustment?.source).startsWith("staff.override:");
+            return amount !== 0 && !isOverride;
+        });
         lines.push("");
         const cappedTotal = Math.max(0, toNumber(subtotal) + pricingCapAdjustments.reduce((sum, adjustment) => sum + toNumber(adjustment?.amount ?? 0), 0));
         lines.push(`计费总价：${formatNumber(cappedTotal)}${currency}`);
-        const hasManualAdjustment = visibleCheckoutAdjustments.some((adjustment) => cleanText(adjustment?.source).startsWith("staff.override:"));
+        const hasManualAdjustment = checkoutAdjustments.some((adjustment) => cleanText(adjustment?.source).startsWith("staff.override:"));
         if (visibleCheckoutAdjustments.length > 0) {
             lines.push("");
             for (const adjustment of visibleCheckoutAdjustments) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-prism",
-  "version": "0.1.29",
+  "version": "0.1.31",
   "description": "PRiSM Next 计费与设备管理系统的 Koishi 机器人集成插件",
   "main": "./lib/index.js",
   "exports": {