koishi-plugin-prism 0.1.3 → 0.1.5

package/README.md

@@ -24,7 +24,7 @@
 | `provider` | `string` | `"qq"` | 当前绑定的账号提供商平台名称（如 `"qq"`，`"discord"`）。 |
 | `autoRegister` | `boolean` | `true` | 当玩家未注册时，是否在首次操作（如入场/查钱包）时自动在 PRiSM 中创建新玩家。 |
 | `loginPricingConfigIds` | `string[]` | `[]` | 默认入场计费规则 ID 列表。 |
-| `loginSessionLabel` | `string` | - | 默认入场会话的备注文本（如 `"音游区间"`）。 |
+| `loginSessionLabel` | `string` | `"音游区间"` | 默认入场会话的标签文本。后端会按该标签对同一玩家的活跃会话去重，重复入场会被拒绝并提示。留空则不启用去重。 |
 | `defaultDoorDeviceId` | `string` | - | 默认门锁设备的 ID，用于开门指令。 |
 | `defaultScanProvider` | `string` | `"aime"` | 默认模拟刷卡时的读卡器协议提供商（如 `"aime"`）。 |
 | `currencyName` | `string` | `"金币"` | 账户货币在显示时的自定义单位名称。 |

package/lib/index.d.ts

@@ -58,6 +58,12 @@ export type KoishiActionContext = {
         userId: string;
         senderId?: string;
         senderName?: string;
+        username?: string;
+        bot?: {
+            getUser?(id: string): Promise<{
+                name?: string;
+            }>;
+        };
     };
 };
 export declare function applyPrismKoishiPlugin(ctx: KoishiLikeContext, config: PrismKoishiPluginConfig): void;

package/lib/index.js

@@ -16,7 +16,10 @@ exports.Config = koishi_1.Schema.object({
     currencyName: koishi_1.Schema.string().default("猫粮").description("代币名称"),
     defaultDoorDeviceId: koishi_1.Schema.string().default("front-door").description("默认开门设备ID"),
     defaultScanProvider: koishi_1.Schema.string().default("aime").description("默认刷卡提供商"),
+    loginPricingConfigIds: koishi_1.Schema.array(koishi_1.Schema.string()).default([]).description("默认入场绑定的计费策略ID"),
+    loginSessionLabel: koishi_1.Schema.string().default("音游区间").description("默认入场场次标签 (防重复入场)"),
     enableStaffCommands: koishi_1.Schema.boolean().default(false).description("是否启用管理员指令"),
+    staffUserIds: 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("麻将桌配置"),
     mahjongTableSize: koishi_1.Schema.number().default(4).description("麻将桌人数限制"),
@@ -64,31 +67,31 @@ function applyPrismKoishiPlugin(ctx, config) {
             return service.handleCommandError(error);
         }
     };
-    ctx.command("register", "绑定或注册当前平台用户到 PRiSM").action(wrap(async (context) => service.register(service.sender(context))));
-    ctx.command("login", "开启当前玩家的计费场次").action(async (context) => service.login(service.sender(context)));
-    ctx.command("入场", "入场 (alias of login)").action(wrap(async (context) => service.login(service.sender(context))));
-    ctx.command("mahjong <tableId>", "加入指定麻将桌").action(wrap(async (context, tableId) => service.mahjongJoin(service.sender(context), tableId)));
-    ctx.command("上桌 <tableId>", "加入指定麻将桌").action(wrap(async (context, tableId) => service.mahjongJoin(service.sender(context), tableId)));
-    ctx.command("下桌 <tableId>", "离开指定麻将桌").action(wrap(async (context, tableId) => service.mahjongLeave(service.sender(context), tableId)));
-    ctx.command("logout", "结算当前玩家的计费场次").action(wrap(async (context) => service.logout(service.sender(context))));
-    ctx.command("billing", "预览当前玩家的结账费用").action(wrap(async (context) => service.billing(service.sender(context))));
-    ctx.command("wallet", "查看当前玩家钱包余额").action(wrap(async (context) => service.wallet(service.sender(context))));
-    ctx.command("items", "查看当前玩家持有资产").action(wrap(async (context) => service.items(service.sender(context))));
-    ctx.command("list", "查看当前在线玩家列表").action(wrap(async (context) => service.listActiveSessions(service.sender(context))));
+    ctx.command("register", "绑定或注册当前平台用户到 PRiSM").action(wrap(async (context) => service.register(await service.sender(context))));
+    ctx.command("login", "开启当前玩家的计费场次").action(wrap(async (context) => service.login(await service.sender(context))));
+    ctx.command("入场", "入场 (alias of login)").action(wrap(async (context) => service.login(await service.sender(context))));
+    ctx.command("mahjong <tableId>", "加入指定麻将桌").action(wrap(async (context, tableId) => service.mahjongJoin(await service.sender(context), tableId)));
+    ctx.command("上桌 <tableId>", "加入指定麻将桌").action(wrap(async (context, tableId) => service.mahjongJoin(await service.sender(context), tableId)));
+    ctx.command("下桌 <tableId>", "离开指定麻将桌").action(wrap(async (context, tableId) => service.mahjongLeave(await service.sender(context), tableId)));
+    ctx.command("logout", "结算当前玩家的计费场次").action(wrap(async (context) => service.logout(await service.sender(context))));
+    ctx.command("billing", "预览当前玩家的结账费用").action(wrap(async (context) => service.billing(await service.sender(context))));
+    ctx.command("wallet", "查看当前玩家钱包余额").action(wrap(async (context) => service.wallet(await service.sender(context))));
+    ctx.command("items", "查看当前玩家持有资产").action(wrap(async (context) => service.items(await service.sender(context))));
+    ctx.command("list", "查看当前在线玩家列表").action(wrap(async (context) => service.listActiveSessions(await service.sender(context))));
     ctx.command("show [deviceId]", "查看设备电源状态").action(wrap(async (context, deviceId) => service.listDeviceStates(deviceId)));
-    ctx.command("history", "查看当前玩家历史场次").action(wrap(async (context) => service.history(service.sender(context))));
-    ctx.command("lock", "向默认门锁设备发送开门指令").action(wrap(async (context) => service.lock(service.sender(context))));
-    ctx.command("on <deviceId>", "请求启动指定设备电源").action(wrap(async (context, deviceId) => service.powerOn(service.sender(context), deviceId)));
-    ctx.command("off <deviceId>", "请求关闭指定设备电源").action(wrap(async (context, deviceId) => service.powerOff(service.sender(context), deviceId)));
-    ctx.command("coin <deviceId> [count]", "请求向指定设备投币").action(wrap(async (context, deviceId, count) => service.coin(service.sender(context), deviceId, count)));
-    ctx.command("scan <deviceId> <subject>", "请求指定设备模拟刷卡").action(wrap(async (context, deviceId, subject) => service.scan(service.sender(context), deviceId, subject)));
-    ctx.command("redeem <code>", "兑换 PRiSM 礼物码").action(wrap(async (context, code) => service.redeem(service.sender(context), code)));
+    ctx.command("history", "查看当前玩家历史场次").action(wrap(async (context) => service.history(await service.sender(context))));
+    ctx.command("lock", "向默认门锁设备发送开门指令").action(wrap(async (context) => service.lock(await service.sender(context))));
+    ctx.command("on <deviceId>", "请求启动指定设备电源").action(wrap(async (context, deviceId) => service.powerOn(await service.sender(context), deviceId)));
+    ctx.command("off <deviceId>", "请求关闭指定设备电源").action(wrap(async (context, deviceId) => service.powerOff(await service.sender(context), deviceId)));
+    ctx.command("coin <deviceId> [count]", "请求向指定设备投币").action(wrap(async (context, deviceId, count) => service.coin(await service.sender(context), deviceId, count)));
+    ctx.command("scan <deviceId> <subject>", "请求指定设备模拟刷卡").action(wrap(async (context, deviceId, subject) => service.scan(await service.sender(context), deviceId, subject)));
+    ctx.command("redeem <code>", "兑换 PRiSM 礼物码").action(wrap(async (context, code) => service.redeem(await service.sender(context), code)));
     if (config.enableStaffCommands) {
-        ctx.command("admin.players", "列出 PRiSM 玩家").action(wrap(async (context) => service.staffPlayers(service.sender(context))));
-        ctx.command("admin.create-player <displayName>", "创建 PRiSM 玩家").action(wrap(async (context, displayName) => service.staffCreatePlayer(service.sender(context), displayName)));
-        ctx.command("admin.grant-balance <playerId> <amount>", "给指定玩家发放充值余额").action(wrap(async (context, playerId, amount) => service.staffGrantBalance(service.sender(context), playerId, amount)));
-        ctx.command("admin.redeem-code <code> <presentId>", "创建单次使用兑换码").action(wrap(async (context, code, presentId) => service.staffRedeemCode(service.sender(context), code, presentId)));
-        ctx.command("admin.checkout <playerId>", "替指定玩家结账").action(wrap(async (context, playerId) => service.staffCheckout(service.sender(context), playerId)));
+        ctx.command("admin.players", "列出 PRiSM 玩家").action(wrap(async (context) => service.staffPlayers(await service.sender(context))));
+        ctx.command("admin.create-player <displayName>", "创建 PRiSM 玩家").action(wrap(async (context, displayName) => service.staffCreatePlayer(await service.sender(context), displayName)));
+        ctx.command("admin.grant-balance <playerId> <amount>", "给指定玩家发放充值余额").action(wrap(async (context, playerId, amount) => service.staffGrantBalance(await service.sender(context), playerId, amount)));
+        ctx.command("admin.redeem-code <code> <presentId>", "创建单次使用兑换码").action(wrap(async (context, code, presentId) => service.staffRedeemCode(await service.sender(context), code, presentId)));
+        ctx.command("admin.checkout <playerId>", "替指定玩家结账").action(wrap(async (context, playerId) => service.staffCheckout(await service.sender(context), playerId)));
     }
     const intervalMs = (config.powerOffInterval ?? 0) * 1000;
     if (intervalMs > 0 && typeof ctx.setInterval === "function") {
@@ -351,9 +354,20 @@ class PrismKoishiService {
             });
         }
     }
-    sender(context) {
+    async sender(context) {
         const id = context.session?.senderId || context.session?.userId || "";
-        const name = context.session?.senderName || id;
+        let name = id;
+        try {
+            if (context.session?.bot?.getUser) {
+                const user = await context.session.bot.getUser(id);
+                if (user?.name) {
+                    name = user.name;
+                }
+            }
+        }
+        catch {
+            name = context.session?.username || context.session?.senderName || id;
+        }
         return { id, name };
     }
     async register(sender) {
@@ -835,6 +849,18 @@ class PrismKoishiService {
     }
 }
 function humanReadableBotError(error) {
+    if (error.code === "DUPLICATE_SESSION_LABEL") {
+        return "❌ 您已经处于入场状态，请勿重复发送入场命令。";
+    }
+    if (error.code === "PLAYER_HAS_NO_UNSETTLED_SESSIONS") {
+        return "您当前没有未结算的账单，无需结账。";
+    }
+    if (error.code === "ACTIVE_SESSION_NOT_FOUND") {
+        return "您当前没有进行中的计费场次。";
+    }
+    if (error.code === "PLAYER_IDENTITY_NOT_FOUND") {
+        return "未找到您的玩家身份，请先注册或绑定账号。";
+    }
     if (error.code === "INSUFFICIENT_BALANCE") {
         return "余额不足，暂时不能结账。请先充值，或由店员在后台改价后再结账。";
     }

package/package.json

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