koishi-plugin-prism 0.1.13 → 0.1.18

package/README.md

@@ -8,7 +8,7 @@
 
 * 🎮 **玩家入场与结算**：通过 `/login` 和 `/logout` 指令开启或结算计费场次，支持 `/入场` 别名；命令回复会引用触发消息，结账账单可私聊通知管理员与指定用户。
 * 💳 **账户钱包与资产管理**：支持查询钱包余额（`/wallet`）和持有的道具资产（`/items`）。
-* 🀄 **麻将桌位集成**：包含 `/mahjong <tableId>` 以及便捷的 `/上桌` / `/下桌` 控制。`上桌` 仅允许已通过 `login`/`入场` 开启默认入场会话的玩家使用。`list` 会按音乐游戏和麻将桌分组，并对同一玩家的多个计时会话去重；麻将桌显示当前人数和容量。未满桌候座由机器人进程暂存，机器人重启后不会保留。
+* 🀄 **麻将桌位集成**：包含 `/mahjong <tableId>` 以及便捷的 `/上桌` / `/下桌` 控制。`上桌` 仅允许已通过 `login`/`入场` 开启默认入场会话的玩家使用。`list` 按 session 标签分组：有非音乐游戏 session 的玩家归入最新的非音乐标签，纯音乐玩家归入音乐标签；麻将桌额外显示当前人数和容量。已开局桌位会从后端活跃 session 自动恢复，未满桌候座仍由机器人进程暂存，重启后不会保留。
 * 🔌 **硬件设备状态与电源管理**：可直接在聊天中查看设备状态（`/show`）、远程开启/关闭电源（`/on`、`/off`）、远程投币（`/coin`）和模拟刷卡（`/scan`）。
 * 🎟️ **礼物兑换码**：使用 `/redeem <code>` 兑换系统发放的福利礼包。
 * 🛠️ **管理员快捷指令**：允许管理员为指定平台用户增加或扣除余额，并覆盖结账金额后立即结账。
@@ -32,6 +32,20 @@
 | `enableStaffCommands` | `boolean` | `false` | 是否开启管理员快捷指令。 |
 | `staffUserIds` | `string[]` | `[]` | 允许执行管理员快捷指令的平台用户 ID（如 QQ 号）白名单。空列表不授予目标用户操作权限。 |
 | `logoutNotifyUserIds` | `string[]` | `[]` | 结账成功后额外私聊完整账单的平台用户 ID。通知收件人为该列表与 `staffUserIds` 的去重并集。 |
+| `mahjongTableConfigs` | `object[]` | `[]` | 推荐的结构化麻将桌列表。每项填写显示名称、命令别名列表与计费方案 ID 列表。显示名称同时作为内部桌位锚点与 session 标签。 |
+| `mahjongTables` | `string` | - | 旧版文本配置，仅在 `mahjongTableConfigs` 为空时读取；建议迁移到结构化列表。 |
+
+### 麻将桌配置
+
+在 Koishi 配置页的 `mahjongTableConfigs` 中新增桌位，每一项填写：
+
+```yaml
+displayName: "🀄️ M.LEAGUE联名比赛专用机"
+aliases: [a, 四麻A, 比赛机]
+pricingConfigIds: [pricing-mahjong-a]
+```
+
+`displayName` 是该桌的稳定锚点和 session 标签；玩家输入的桌号、简称等均写入 `aliases`（至少一个）。结构化配置有内容时优先于旧 `mahjongTables` 文本；已有旧配置不会失效，可逐桌迁移。
 
 管理员快捷指令必须同时配置 `enableStaffCommands: true` 与 `staffUserIds`。它们使用现有 `integrationToken` 调用受限的余额调整和立即结账接口；目标用户参数使用 Koishi 的 `user` 选择器，只有白名单内的管理员可以操作其他用户。
 
@@ -43,10 +57,11 @@
 * `logout` - 结算当前玩家的计费场次。
 玩家在未产生任何费用时退场，机器人会简洁显示“本次未产生费用”和当前余额；存在收费或优惠明细时仍显示完整结算账单。
 结账成功后，机器人会向 `staffUserIds` 与 `logoutNotifyUserIds` 中的用户私聊同一份账单，账单会明确显示结账玩家身份。
+账单和管理员代操作回执均使用“平台昵称（QQ：号码）”称呼玩家；平台暂时无法提供昵称时显示“未知昵称（QQ：号码）”，不会显示内部玩家 ID。
 * `billing` - 预览当前玩家本场计费的消费费用。
 * `wallet` - 查看当前玩家的钱包余额。
 * `items` - 查看当前玩家持有的道具或资产。
-* `list` - 查看当前在线/在店游玩玩家的列表，按音乐游戏和麻将桌分组并对同一玩家的多个计时会话去重；麻将桌显示当前人数和容量。未满桌候座由机器人进程暂存，机器人重启后不会保留。
+* `list` - 查看当前在线/在店游玩玩家的列表，按 session 标签分组并对同一玩家去重；存在非音乐游戏 session 时取最新的非音乐标签，麻将桌显示当前人数和容量。已开局桌位由后端 session 恢复；未满桌候座由机器人进程暂存，机器人重启后不会保留。
 * `show [deviceId]` - 查看设备电源与连接状态。
 * `history` - 查看自己的历史游玩记录。
 * `lock` - 发送开门指令。

package/lib/index.d.ts

@@ -14,6 +14,7 @@ export type MahjongTableConfig = {
     aliases: string[];
     pricingConfigIds: string[];
 };
+export type MahjongTableConfigInput = Omit<MahjongTableConfig, "tableId">;
 export type PrismKoishiPluginConfig = {
     provider: string;
     autoRegister: boolean;
@@ -25,6 +26,7 @@ export type PrismKoishiPluginConfig = {
     enableStaffCommands?: boolean;
     staffUserIds?: string[];
     logoutNotifyUserIds?: string[];
+    mahjongTableConfigs?: MahjongTableConfigInput[];
     mahjongTables?: string;
     mahjongTableSize?: number;
     mahjongLabelPrefix?: string;
@@ -75,6 +77,7 @@ export type Sender = {
 };
 export declare function humanReadableBotError(error: PrismBotClientError): string;
 export declare function parseMahjongTables(value: string, labelPrefix: string): Map<string, MahjongTableConfig>;
+export declare function resolveMahjongTableConfigs(structured: readonly MahjongTableConfigInput[], legacyValue: string, labelPrefix: string): Map<string, MahjongTableConfig>;
 declare const _default: {
     name: string;
     Config: Schema<PrismKoishiPluginConfig>;

package/lib/index.js

@@ -5,6 +5,7 @@ exports.apply = apply;
 exports.applyPrismKoishiPlugin = applyPrismKoishiPlugin;
 exports.humanReadableBotError = humanReadableBotError;
 exports.parseMahjongTables = parseMahjongTables;
+exports.resolveMahjongTableConfigs = resolveMahjongTableConfigs;
 const koishi_1 = require("koishi");
 exports.name = "prism";
 exports.Config = koishi_1.Schema.object({
@@ -21,7 +22,12 @@ exports.Config = koishi_1.Schema.object({
     staffUserIds: koishi_1.Schema.array(koishi_1.Schema.string()).default([]).description("允许执行管理员指令的平台用户ID列表"),
     logoutNotifyUserIds: koishi_1.Schema.array(koishi_1.Schema.string()).default([]).description("结账账单私聊通知的平台用户ID列表"),
     powerOffInterval: koishi_1.Schema.number().default(0).description("无人自动关机等待秒数 (0为禁用)"),
-    mahjongTables: koishi_1.Schema.string().description("麻将桌配置"),
+    mahjongTableConfigs: koishi_1.Schema.array(koishi_1.Schema.object({
+        displayName: koishi_1.Schema.string().required().description("桌位显示名称和 session 标签"),
+        aliases: koishi_1.Schema.array(koishi_1.Schema.string()).default([]).description("命令别名（至少一个），例如 a、四麻A"),
+        pricingConfigIds: koishi_1.Schema.array(koishi_1.Schema.string()).default([]).description("开局时绑定的计费方案 ID"),
+    })).default([]).description("麻将桌配置"),
+    mahjongTables: koishi_1.Schema.string().description("旧版麻将桌文本配置（已废弃；仅在结构化配置为空时使用）"),
     mahjongTableSize: koishi_1.Schema.number().default(4).description("麻将桌人数限制"),
     mahjongLabelPrefix: koishi_1.Schema.string().default("麻将桌").description("麻将账单前缀"),
 });
@@ -324,7 +330,7 @@ class PrismKoishiService {
     }
     async sender(context) {
         const id = context.session?.senderId || context.session?.userId || "";
-        let name = id;
+        let name = context.session?.username || context.session?.senderName || id;
         try {
             if (context.session?.bot?.getUser) {
                 const user = await context.session.bot.getUser(id);
@@ -333,9 +339,7 @@ class PrismKoishiService {
                 }
             }
         }
-        catch {
-            name = context.session?.username || context.session?.senderName || id;
-        }
+        catch { }
         return { id, name };
     }
     async register(sender) {
@@ -345,7 +349,7 @@ class PrismKoishiService {
     async loginForTarget(actor, targetSubject, bot) {
         return this.withTarget(actor, targetSubject, async (sender, isTargeted) => {
             await this.client.startSessionByIdentity(this.identity(sender), this.loginSessionBody());
-            return isTargeted ? `✅ 已为用户 ${formatPlayerReference(sender)} 入场成功` : "✅ 入场成功";
+            return isTargeted ? `✅ 已为用户 ${formatPlayerReference(sender, this.config.provider)} 入场成功` : "✅ 入场成功";
         }, bot);
     }
     async login(sender) {
@@ -370,7 +374,7 @@ class PrismKoishiService {
                     quantityDelta: amount * direction,
                     reason: isAddition ? "Koishi 管理员增加余额" : "Koishi 管理员扣除余额",
                 }]);
-            return `✅ 已为用户 ${sender.id}${isAddition ? "增加" : "扣除"} ${formatNumber(amount)} ${this.config.currencyName}`;
+            return `✅ 已为用户 ${formatPlayerReference(sender, this.config.provider)}${isAddition ? "增加" : "扣除"} ${formatNumber(amount)} ${this.config.currencyName}`;
         }, bot);
     }
     async overwriteTargetCheckout(actor, targetSubject, rawAmount, rawReason, bot) {
@@ -380,7 +384,7 @@ class PrismKoishiService {
                 return "金额必须为非负数";
             const reason = cleanText(rawReason) || "Koishi 管理员手动调价";
             await this.client.checkoutWithOverrideByIdentity(this.identity(sender), total, reason);
-            return `✅ 已为用户 ${formatPlayerReference(sender)} 覆盖结账为 ${formatNumber(total)} ${this.config.currencyName}`;
+            return `✅ 已为用户 ${formatPlayerReference(sender, this.config.provider)} 覆盖结账为 ${formatNumber(total)} ${this.config.currencyName}`;
         }, bot);
     }
     async mahjongJoin(sender, rawTableId) {
@@ -396,6 +400,7 @@ class PrismKoishiService {
         const playerId = String(player.id ?? "");
         const activeResult = (await this.client.listActiveSessions());
         const activeSessions = (activeResult.sessions ?? []);
+        this.syncMahjongTableStates(activeSessions);
         if (!this.hasEntrySession(playerId, activeSessions)) {
             return "请先入场后再上桌。";
         }
@@ -439,6 +444,8 @@ class PrismKoishiService {
         const tableConfig = this.mahjongTableConfigs().get(tableId);
         const tableKey = tableConfig?.tableId ?? tableId;
         const tableSubject = tableConfig?.displayName || `${tableId} 桌`;
+        const activeResult = (await this.client.listActiveSessions());
+        this.syncMahjongTableStates((activeResult.sessions ?? []));
         const state = this.mahjongTables.get(tableKey);
         if (!state)
             return `你不在 ${tableSubject}。`;
@@ -567,6 +574,7 @@ class PrismKoishiService {
     async listActiveSessions(sender) {
         const result = (await this.client.listActiveSessions());
         const sessions = (result?.sessions ?? []);
+        this.syncMahjongTableStates(sessions);
         const tableByLabel = new Map(uniqueMahjongConfigs(this.mahjongTableConfigs()).map((table) => [
             mahjongSessionLabel(table, this.config.mahjongLabelPrefix ?? "麻将桌"),
             table,
@@ -650,41 +658,44 @@ class PrismKoishiService {
             || "未知玩家";
     }
     async buildPlayerGroups(players, tableByLabel) {
-        const groups = {
-            music: [],
-            mahjong: uniqueMahjongConfigs(this.mahjongTableConfigs()).map((table) => ({ table, players: [] })),
-        };
-        const groupForTable = new Map(groups.mahjong.map((group) => [group.table.tableId, group]));
+        const groups = { groups: [] };
+        const groupByLabel = new Map();
+        const musicLabel = this.config.loginSessionLabel?.trim() || "音游区间";
         for (const player of players.values()) {
             player.displayName = await this.displayNameForPlayer(player);
-            const table = player.sessions
-                .map((session) => tableByLabel.get(session.label ?? ""))
-                .find((value) => Boolean(value));
-            if (table) {
-                groupForTable.get(table.tableId)?.players.push(player);
-            }
-            else {
-                groups.music.push(player);
+            const nonMusic = player.sessions.filter((session) => Boolean(session.label) && session.label !== musicLabel);
+            const source = nonMusic.length > 0 ? nonMusic : player.sessions;
+            const selected = source.reduce((latest, session) => !latest || sessionStartedAt(session) > sessionStartedAt(latest) ? session : latest, undefined);
+            const label = selected?.label || musicLabel;
+            let group = groupByLabel.get(label);
+            if (!group) {
+                group = { label, table: tableByLabel.get(label), players: [] };
+                groupByLabel.set(label, group);
+                groups.groups.push(group);
             }
+            group.players.push(player);
         }
         return groups;
     }
     mergeWaitingSeats(groups) {
         for (const [tableId, state] of this.mahjongTables) {
-            const group = groups.mahjong.find((candidate) => candidate.table.tableId === tableId);
-            if (!group)
+            const table = uniqueMahjongConfigs(this.mahjongTableConfigs()).find((candidate) => candidate.tableId === tableId);
+            if (!table)
                 continue;
+            const label = mahjongSessionLabel(table, this.config.mahjongLabelPrefix ?? "麻将桌");
+            let group = groups.groups.find((candidate) => candidate.label === label);
+            if (!group) {
+                group = { label, table, players: [] };
+                groups.groups.push(group);
+            }
             for (const seat of state.waiting) {
                 if (group.players.some((player) => player.playerId === seat.playerId))
                     continue;
-                const existing = [groups.music, ...groups.mahjong.map((candidate) => candidate.players)]
-                    .flat()
+                const existing = groups.groups.flatMap((candidate) => candidate.players)
                     .find((player) => player.playerId === seat.playerId);
-                groups.music = groups.music.filter((player) => player.playerId !== seat.playerId);
-                for (const candidate of groups.mahjong) {
-                    if (candidate !== group) {
+                for (const candidate of groups.groups) {
+                    if (candidate !== group)
                         candidate.players = candidate.players.filter((player) => player.playerId !== seat.playerId);
-                    }
                 }
                 group.players.push(existing ?? { playerId: seat.playerId, sessions: [], displayName: seat.displayName });
             }
@@ -695,8 +706,8 @@ class PrismKoishiService {
             return playerId || "未知玩家";
         const platformName = await this.resolvePlatformName(sender.id);
         const name = platformName
-            || (sender.name && sender.name !== sender.id ? sender.name : playerId)
-            || sender.id;
+            || (sender.name && sender.name !== sender.id ? sender.name : "")
+            || "未知昵称";
         return `玩家：${name}（${this.config.provider.toUpperCase()}：${sender.id}）`;
     }
     mahjongTableForPlayer(playerId) {
@@ -709,7 +720,33 @@ class PrismKoishiService {
         return null;
     }
     mahjongTableConfigs() {
-        return parseMahjongTables(this.config.mahjongTables ?? "", this.config.mahjongLabelPrefix ?? "麻将桌");
+        return resolveMahjongTableConfigs(this.config.mahjongTableConfigs ?? [], this.config.mahjongTables ?? "", this.config.mahjongLabelPrefix ?? "麻将桌");
+    }
+    syncMahjongTableStates(sessions) {
+        const tables = uniqueMahjongConfigs(this.mahjongTableConfigs());
+        const tableByLabel = new Map(tables.map((table) => [
+            mahjongSessionLabel(table, this.config.mahjongLabelPrefix ?? "麻将桌"),
+            table,
+        ]));
+        const activeByTable = new Map();
+        for (const session of sessions) {
+            const table = tableByLabel.get(session.label ?? "");
+            const playerId = String(session.playerId ?? "");
+            const sessionId = String(session.id ?? "");
+            if (!table || !playerId || !sessionId)
+                continue;
+            const active = activeByTable.get(table.tableId) ?? {};
+            active[playerId] = sessionId;
+            activeByTable.set(table.tableId, active);
+        }
+        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]);
+            if (state.waiting.length > 0 || Object.keys(state.activeSessions).length > 0 || this.mahjongTables.has(table.tableId)) {
+                this.mahjongTables.set(table.tableId, state);
+            }
+        }
     }
     async resolvePlayer(sender) {
         return (await this.client.resolveOrRegisterIdentity(this.identity(sender)));
@@ -936,6 +973,23 @@ function parseMahjongTables(value, labelPrefix) {
     }
     return tables;
 }
+function resolveMahjongTableConfigs(structured, legacyValue, labelPrefix) {
+    if (structured.length === 0)
+        return parseMahjongTables(legacyValue, labelPrefix);
+    const tables = new Map();
+    for (const input of structured) {
+        const displayName = cleanText(input.displayName);
+        const tableId = displayName;
+        const aliases = [...new Set((input.aliases ?? []).map(cleanText).filter(Boolean))];
+        const pricingConfigIds = (input.pricingConfigIds ?? []).map(cleanText).filter(Boolean);
+        if (!tableId || !displayName || pricingConfigIds.length === 0)
+            continue;
+        const table = { tableId, displayName, aliases, pricingConfigIds };
+        for (const alias of aliases)
+            tables.set(alias, table);
+    }
+    return tables;
+}
 function uniqueMahjongConfigs(tables) {
     return [...new Map([...tables.values()].map((table) => [table.tableId, table])).values()];
 }
@@ -954,17 +1008,21 @@ function groupSessionsByPlayer(sessions) {
     }
     return players;
 }
+function sessionStartedAt(session) {
+    const value = Date.parse(session.startedAt ?? "");
+    return Number.isFinite(value) ? value : 0;
+}
 function formatPlayerGroups(groups, tableSize, mahjongLabelPrefix) {
-    const populatedMahjongGroups = groups.mahjong.filter((group) => group.players.length > 0);
-    const total = groups.music.length + populatedMahjongGroups.reduce((sum, group) => sum + group.players.length, 0);
+    const populatedGroups = groups.groups.filter((group) => group.players.length > 0);
+    const total = new Set(populatedGroups.flatMap((group) => group.players.map((player) => player.playerId))).size;
     if (total === 0)
         return "🫥 窝里目前没有玩家呢";
     const lines = [`[总计 ${total} 人]`];
-    if (groups.music.length > 0) {
-        lines.push(`🎵 音乐游戏 ( ${groups.music.length}人 )：\n${formatPlayerNames(groups.music)}`);
-    }
-    for (const group of populatedMahjongGroups) {
-        lines.push(`${formatMahjongTableLabel(group.table, mahjongLabelPrefix)} ( ${group.players.length}/${tableSize} )：\n${formatPlayerNames(group.players)}`);
+    for (const group of populatedGroups) {
+        const heading = group.table
+            ? `${formatMahjongTableLabel(group.table, mahjongLabelPrefix)} ( ${group.players.length}/${tableSize} )`
+            : `${group.label} ( ${group.players.length}人 )`;
+        lines.push(`\n${heading}：\n${formatPlayerNames(group.players)}`);
     }
     return lines.join("\n");
 }
@@ -1005,10 +1063,9 @@ function normalizeTargetSubject(value) {
     const separator = subject.indexOf(":");
     return separator > 0 ? subject.slice(separator + 1) : subject;
 }
-function formatPlayerReference(sender) {
-    return sender.name && sender.name !== sender.id
-        ? `${sender.name}（QQ：${sender.id}）`
-        : sender.id;
+function formatPlayerReference(sender, provider = "qq") {
+    const name = sender.name && sender.name !== sender.id ? sender.name : "未知昵称";
+    return `${name}（${provider.toUpperCase()}：${sender.id}）`;
 }
 function toNumber(value) {
     if (value == null)

package/package.json

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