koishi-plugin-prism 0.1.31 → 0.1.33

package/lib/index.js

@@ -641,11 +641,14 @@ class PrismKoishiService {
         const { value, error } = parsePositiveInt(rawCount, "prism_coin", "数量", 1);
         if (error)
             return error;
-        await this.client.requestDeviceCommandByIdentity(this.identity(sender), {
+        const result = await this.client.requestDeviceCommandByIdentity(this.identity(sender), {
             type: "coin",
             target: { kind: "game_machine", id: deviceId },
             payload: { count: value },
         });
+        const failure = this.getCommandFailureMessage(result);
+        if (failure)
+            return `❌ 执行失败：${failure}`;
         return `🪙 已为 ${deviceId} 投入 ${value} 个币`;
     }
     async scan(sender, rawDeviceId, rawSubject) {
@@ -653,11 +656,14 @@ class PrismKoishiService {
         const subject = cleanText(rawSubject);
         if (!deviceId || !subject)
             return commandUsage("prism_scan");
-        await this.client.requestScanByIdentity(this.identity(sender), {
+        const result = await this.client.requestScanByIdentity(this.identity(sender), {
             deviceId,
             provider: this.config.defaultScanProvider || "aime",
             subject,
         });
+        const failure = this.getCommandFailureMessage(result);
+        if (failure)
+            return `❌ 执行失败：${failure}`;
         return `💳 使用尾号为 ${subject.slice(-4)} 的卡刷卡成功`;
     }
     async redeem(sender, rawCode) {
@@ -683,6 +689,28 @@ class PrismKoishiService {
         this.mergeWaitingSeats(groups);
         return formatPlayerGroups(groups, this.config.mahjongTableSize ?? 4, this.config.mahjongLabelPrefix ?? "麻将桌");
     }
+    parseDeviceStateValue(stateVal) {
+        if (!stateVal)
+            return "unknown";
+        if (typeof stateVal === "string") {
+            try {
+                const decoded = JSON.parse(stateVal);
+                if (typeof decoded === "string") {
+                    return decoded;
+                }
+                if (decoded && typeof decoded.state === "string") {
+                    return decoded.state;
+                }
+            }
+            catch {
+                return stateVal;
+            }
+        }
+        if (typeof stateVal === "object" && stateVal !== null) {
+            return stateVal.state ?? "unknown";
+        }
+        return "unknown";
+    }
     async listDeviceStates(rawAlias) {
         const alias = cleanText(rawAlias);
         const result = (await this.client.listDeviceStates());
@@ -693,11 +721,11 @@ class PrismKoishiService {
             const matched = states.find((d) => d.deviceId === alias || d.label === alias);
             if (!matched)
                 return `找不到设备: ${alias}`;
-            const stateVal = matched.state?.state ?? "unknown";
+            const stateVal = this.parseDeviceStateValue(matched.state);
             return `${matched.label || matched.deviceId}: ${stateVal}`;
         }
         return states
-            .map((d) => `${d.label || d.deviceId}: ${d.state?.state ?? "unknown"}`)
+            .map((d) => `${d.label || d.deviceId}: ${this.parseDeviceStateValue(d.state)}`)
             .join("\n");
     }
     async autoPowerOffLoop() {
@@ -710,7 +738,7 @@ class PrismKoishiService {
             return;
         const statesResult = (await this.client.listDeviceStates());
         const states = (statesResult?.deviceStates ?? []);
-        const anyOn = states.some((d) => d.state?.state !== "off");
+        const anyOn = states.some((d) => this.parseDeviceStateValue(d.state) !== "off");
         if (!anyOn)
             return;
         const dummySender = { id: "system", name: "system" };
@@ -718,16 +746,27 @@ class PrismKoishiService {
     }
     /* ---------------------------- helpers ---------------------------------- */
     async power(sender, deviceId, state) {
-        await this.client.requestDeviceCommandByIdentity(this.identity(sender), {
+        const result = await this.client.requestDeviceCommandByIdentity(this.identity(sender), {
             type: state === "on" ? "power.on" : "power.off",
             target: { kind: "facility", id: deviceId },
             payload: { state },
         });
+        const failure = this.getCommandFailureMessage(result);
+        if (failure)
+            return `❌ 执行失败：${failure}`;
+        const displayName = result?.action?.payload?.deviceLabel || deviceId;
         if (state === "on")
-            return `✅ ${deviceId} 启动成功`;
+            return `✅ ${displayName} 启动成功`;
         if (deviceId === "all")
             return `🛑 全部机器关闭成功`;
-        return `🛑 ${deviceId} 关闭成功`;
+        return `🛑 ${displayName} 关闭成功`;
+    }
+    getCommandFailureMessage(result) {
+        const action = result?.action;
+        if (action?.status === "expired" || action?.status === "rejected") {
+            return action.payload?.executorFailure?.message || "命令执行被拒绝或超时";
+        }
+        return null;
     }
     async resolvePlatformName(subject) {
         if (!this.config.resolveDisplayName)

package/package.json

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