koishi-plugin-prism 0.1.10 → 0.1.13

package/README.md

@@ -31,10 +31,9 @@
 | `resolveDisplayName` | `function` | - | 可选。自定义用于获取群内昵称作为玩家注册名的异步逻辑。 |
 | `enableStaffCommands` | `boolean` | `false` | 是否开启管理员快捷指令。 |
 | `staffUserIds` | `string[]` | `[]` | 允许执行管理员快捷指令的平台用户 ID（如 QQ 号）白名单。空列表不授予目标用户操作权限。 |
-| `staffSessionToken` | `string` | - | 管理员写操作所需的 Staff 管理 Token。 |
 | `logoutNotifyUserIds` | `string[]` | `[]` | 结账成功后额外私聊完整账单的平台用户 ID。通知收件人为该列表与 `staffUserIds` 的去重并集。 |
 
-管理员快捷指令必须同时配置 `enableStaffCommands: true`、`staffUserIds` 和 `staffSessionToken`。目标用户参数使用 Koishi 的 `user` 选择器；只有白名单内的管理员可以操作其他用户。
+管理员快捷指令必须同时配置 `enableStaffCommands: true` 与 `staffUserIds`。它们使用现有 `integrationToken` 调用受限的余额调整和立即结账接口；目标用户参数使用 Koishi 的 `user` 选择器，只有白名单内的管理员可以操作其他用户。
 
 ## 📝 机器人指令列表
 

package/lib/index.d.ts

@@ -40,7 +40,6 @@ export type PrismKoishiPluginConfig = {
     now?: () => Date;
     baseUrl?: string;
     integrationToken?: string;
-    staffSessionToken?: string;
     client?: any;
 };
 export type KoishiCommandRegistration = {

package/lib/index.js

@@ -12,7 +12,6 @@ exports.Config = koishi_1.Schema.object({
     autoRegister: koishi_1.Schema.boolean().default(true).description("是否自动注册"),
     baseUrl: koishi_1.Schema.string().description("PRiSM 后端 API Base URL"),
     integrationToken: koishi_1.Schema.string().role("secret").description("集成 API Token"),
-    staffSessionToken: koishi_1.Schema.string().role("secret").description("Staff 管理 Token (可选)"),
     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("默认刷卡提供商"),
@@ -67,27 +66,27 @@ function applyPrismKoishiPlugin(ctx, config) {
         }
     };
     ctx.command("register", "绑定或注册当前平台用户到 PRiSM").action(wrap(async (context) => service.register(await service.sender(context))));
-    ctx.command("login [target:user]", "开启玩家计费场次").action(wrap(async (context, target) => service.loginForTarget(await service.sender(context), target)));
-    ctx.command("入场 [target:user]", "入场").action(wrap(async (context, target) => service.loginForTarget(await service.sender(context), target)));
+    ctx.command("login [target:user]", "开启玩家计费场次").action(wrap(async (context, target) => service.loginForTarget(await service.sender(context), target, context.session?.bot)));
+    ctx.command("入场 [target:user]", "入场").action(wrap(async (context, target) => service.loginForTarget(await service.sender(context), target, context.session?.bot)));
     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 [target:user]", "结算玩家计费场次").action(wrap(async (context, target) => service.withTarget(await service.sender(context), target, (sender) => service.logout(sender, context.session?.bot))));
-    ctx.command("billing [target:user]", "预览玩家结账费用").action(wrap(async (context, target) => service.withTarget(await service.sender(context), target, (sender) => service.billing(sender))));
-    ctx.command("wallet [target:user]", "查看玩家钱包").action(wrap(async (context, target) => service.withTarget(await service.sender(context), target, (sender) => service.wallet(sender))));
-    ctx.command("items [target:user]", "查看玩家资产").action(wrap(async (context, target) => service.withTarget(await service.sender(context), target, (sender) => service.items(sender))));
+    ctx.command("logout [target:user]", "结算玩家计费场次").action(wrap(async (context, target) => service.withTarget(await service.sender(context), target, (sender) => service.logout(sender, context.session?.bot), context.session?.bot)));
+    ctx.command("billing [target:user]", "预览玩家结账费用").action(wrap(async (context, target) => service.withTarget(await service.sender(context), target, (sender) => service.billing(sender), context.session?.bot)));
+    ctx.command("wallet [target:user]", "查看玩家钱包").action(wrap(async (context, target) => service.withTarget(await service.sender(context), target, (sender) => service.wallet(sender), context.session?.bot)));
+    ctx.command("items [target:user]", "查看玩家资产").action(wrap(async (context, target) => service.withTarget(await service.sender(context), target, (sender) => service.items(sender), context.session?.bot)));
     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 [target:user]", "查看玩家历史").action(wrap(async (context, target) => service.withTarget(await service.sender(context), target, (sender) => service.history(sender))));
+    ctx.command("history [target:user]", "查看玩家历史").action(wrap(async (context, target) => service.withTarget(await service.sender(context), target, (sender) => service.history(sender), context.session?.bot)));
     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)));
-    ctx.command("add <target:user> <amount:number>", "增加玩家余额").action(wrap(async (context, target, amount) => service.adjustTargetBalance(await service.sender(context), target, amount, 1)));
-    ctx.command("del <target:user> <amount:number>", "扣除玩家余额").action(wrap(async (context, target, amount) => service.adjustTargetBalance(await service.sender(context), target, amount, -1)));
-    ctx.command("overwrite <target:user> <amount:number> [reason:text]", "覆盖结账金额并立即结账").action(wrap(async (context, target, amount, reason) => service.overwriteTargetCheckout(await service.sender(context), target, amount, reason)));
+    ctx.command("add <target:user> <amount:number>", "增加玩家余额").action(wrap(async (context, target, amount) => service.adjustTargetBalance(await service.sender(context), target, amount, 1, context.session?.bot)));
+    ctx.command("del <target:user> <amount:number>", "扣除玩家余额").action(wrap(async (context, target, amount) => service.adjustTargetBalance(await service.sender(context), target, amount, -1, context.session?.bot)));
+    ctx.command("overwrite <target:user> <amount:number> [reason:text]", "覆盖结账金额并立即结账").action(wrap(async (context, target, amount, reason) => service.overwriteTargetCheckout(await service.sender(context), target, amount, reason, context.session?.bot)));
     const intervalMs = (config.powerOffInterval ?? 0) * 1000;
     if (intervalMs > 0 && typeof ctx.setInterval === "function") {
         ctx.setInterval(() => {
@@ -150,12 +149,6 @@ class PrismApiClient {
             throw new PrismBotClientError(error.message || "Network error", "NETWORK_ERROR", 500, {});
         }
     }
-    requireStaffSessionToken() {
-        if (!this.config.staffSessionToken) {
-            throw new PrismBotClientError("Staff session token is required for this Bot shortcut.", "STAFF_TOKEN_REQUIRED", 0, {});
-        }
-        return this.config.staffSessionToken;
-    }
     identityBody(identity) {
         return {
             identity: {
@@ -273,18 +266,16 @@ class PrismApiClient {
             token: this.config.integrationToken,
         });
     }
-    async adjustStaffAssets(playerId, adjustments) {
-        return this.request("POST", "/rpc/staff/players/:playerId/assets/adjustments", {
-            token: this.requireStaffSessionToken(),
-            params: { playerId },
-            body: { adjustments },
+    async adjustAssetsByIdentity(identity, adjustments) {
+        return this.request("POST", "/rpc/integration/players/by-identity/assets/adjustments", {
+            token: this.config.integrationToken,
+            body: { ...this.identityBody(identity), adjustments },
         });
     }
-    async checkoutWithOverride(playerId, total, reason) {
-        return this.request("POST", "/rpc/staff/players/:playerId/checkout/override", {
-            token: this.requireStaffSessionToken(),
-            params: { playerId },
-            body: { total, reason },
+    async checkoutWithOverrideByIdentity(identity, total, reason) {
+        return this.request("POST", "/rpc/integration/players/by-identity/checkout/override", {
+            token: this.config.integrationToken,
+            body: { ...this.identityBody(identity), total, reason },
         });
     }
 }
@@ -328,7 +319,6 @@ class PrismKoishiService {
             this.client = new PrismApiClient(http, {
                 baseUrl: config.baseUrl,
                 integrationToken: config.integrationToken,
-                staffSessionToken: config.staffSessionToken,
             });
         }
     }
@@ -352,54 +342,46 @@ class PrismKoishiService {
         await this.client.resolveOrRegisterIdentity(this.identity(sender));
         return "注册成功";
     }
-    async loginForTarget(actor, targetSubject) {
+    async loginForTarget(actor, targetSubject, bot) {
         return this.withTarget(actor, targetSubject, async (sender, isTargeted) => {
             await this.client.startSessionByIdentity(this.identity(sender), this.loginSessionBody());
-            return isTargeted ? `✅ 已为用户 ${sender.id} 入场成功` : "✅ 入场成功";
-        });
+            return isTargeted ? `✅ 已为用户 ${formatPlayerReference(sender)} 入场成功` : "✅ 入场成功";
+        }, bot);
     }
     async login(sender) {
         await this.client.startSessionByIdentity(this.identity(sender), this.loginSessionBody());
         return "✅ 入场成功";
     }
-    async withTarget(actor, targetSubject, action) {
-        const target = this.targetSender(actor, targetSubject);
+    async withTarget(actor, targetSubject, action, bot) {
+        const target = await this.targetSender(actor, targetSubject, bot);
         if (typeof target === "string")
             return target;
         return action(target, target !== actor);
     }
-    async adjustTargetBalance(actor, targetSubject, rawAmount, direction) {
+    async adjustTargetBalance(actor, targetSubject, rawAmount, direction, bot) {
         return this.withTarget(actor, targetSubject, async (sender) => {
             const amount = Number(rawAmount);
             if (!Number.isFinite(amount) || amount <= 0)
                 return "金额必须大于 0";
-            const player = await this.resolvePlayer(sender);
-            const playerId = String(player.id ?? "");
-            if (!playerId)
-                return "找不到玩家";
             const isAddition = direction === 1;
-            await this.client.adjustStaffAssets(playerId, [{
+            await this.client.adjustAssetsByIdentity(this.identity(sender), [{
                     assetType: "currency",
                     assetCode: "paid",
                     quantityDelta: amount * direction,
                     reason: isAddition ? "Koishi 管理员增加余额" : "Koishi 管理员扣除余额",
                 }]);
             return `✅ 已为用户 ${sender.id}${isAddition ? "增加" : "扣除"} ${formatNumber(amount)} ${this.config.currencyName}`;
-        });
+        }, bot);
     }
-    async overwriteTargetCheckout(actor, targetSubject, rawAmount, rawReason) {
+    async overwriteTargetCheckout(actor, targetSubject, rawAmount, rawReason, bot) {
         return this.withTarget(actor, targetSubject, async (sender) => {
             const total = Number(rawAmount);
             if (!Number.isFinite(total) || total < 0)
                 return "金额必须为非负数";
-            const player = await this.resolvePlayer(sender);
-            const playerId = String(player.id ?? "");
-            if (!playerId)
-                return "找不到玩家";
             const reason = cleanText(rawReason) || "Koishi 管理员手动调价";
-            await this.client.checkoutWithOverride(playerId, total, reason);
-            return `✅ 已为用户 ${sender.id} 覆盖结账为 ${formatNumber(total)} ${this.config.currencyName}`;
-        });
+            await this.client.checkoutWithOverrideByIdentity(this.identity(sender), total, reason);
+            return `✅ 已为用户 ${formatPlayerReference(sender)} 覆盖结账为 ${formatNumber(total)} ${this.config.currencyName}`;
+        }, bot);
     }
     async mahjongJoin(sender, rawTableId) {
         const tableId = cleanText(rawTableId);
@@ -744,14 +726,20 @@ class PrismKoishiService {
             displayName: sender.name || `${this.config.provider.toUpperCase()} ${sender.id}`,
         };
     }
-    targetSender(actor, targetSubject) {
-        const subject = cleanText(targetSubject);
+    async targetSender(actor, targetSubject, bot) {
+        const subject = normalizeTargetSubject(targetSubject);
         if (!subject)
             return actor;
         const denied = this.targetStaffDenied(actor);
         if (denied)
             return denied;
-        return { id: subject, name: subject };
+        try {
+            const user = await bot?.getUser?.(subject);
+            return { id: subject, name: user?.name || subject };
+        }
+        catch {
+            return { id: subject, name: subject };
+        }
     }
     loginSessionBody() {
         const pricingConfigIds = (this.config.loginPricingConfigIds ?? [])
@@ -1012,6 +1000,16 @@ function parsePositiveInt(value, command, label, fallback) {
 function cleanText(value) {
     return value == null ? "" : String(value).trim();
 }
+function normalizeTargetSubject(value) {
+    const subject = cleanText(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 toNumber(value) {
     if (value == null)
         return 0;

package/package.json

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