@zhin.js/plugin-roulette 0.1.0 → 0.1.2

package/CHANGELOG.md

@@ -0,0 +1,27 @@
+# @zhin.js/plugin-roulette
+
+## 0.1.2
+
+### Patch Changes
+
+- Updated dependencies [db06de8]
+  - @zhin.js/core@1.1.48
+  - @zhin.js/game-kit@1.1.13
+
+## 0.1.1
+
+### Patch Changes
+
+- e40899f: Adapters now project group owners and admins onto the canonical `sender.roles` names `owner` / `admin` (Telegram creator/administrator, KOOK guild owner and admin-permission roles, Lark chat owner/managers, QQ official guild owner/admin identities). KOOK numeric role ids moved from `roles` to `permissions` (`role:<id>`). `@zhin.js/command` exports `canManageConversation` ("private chat or owner/admin/master"), now shared by the Bilibili and earthquake subscription commands; Roulette lets owners and admins toggle the mute penalty and cancel a game.
+- 84520a3: New game: Russian roulette (`轮盘` / `roulette`) for game-hub. Players join a lobby, take turns pulling the trigger on a cylinder with one bullet, and whoever is shot loses; turn and lobby timeouts are enforced by a schedule job, and results feed `战绩` / `排行 轮盘`. Groups can opt in to muting the loser; support is read from the Endpoint's declared `muteGroupMember` capability, so platforms that cannot mute only keep score.
+- 37f79a1: 轮盘超时扫描：先读取禁言惩罚设置再提交状态流转，单个对局失败只记录日志并留待下次重试，结果在产生时即刻公布，不再丢失其他对局的通知或输家的惩罚。
+- Updated dependencies [5be09ae]
+- Updated dependencies [a3ab153]
+- Updated dependencies [e8f7309]
+- Updated dependencies [5afc18f]
+- Updated dependencies [d3563d9]
+- Updated dependencies [53d5bd7]
+- Updated dependencies [c618eb7]
+- Updated dependencies [fbfefb7]
+  - @zhin.js/core@1.1.47
+  - @zhin.js/game-kit@1.1.12

package/README.md

@@ -25,10 +25,10 @@ database:
 | `轮盘 开始` | 房主开局，至少 2 人 |
 | `开枪`（或 `轮盘 开枪`） | 轮到你时扣动扳机；没轮到你时「开枪」只是普通聊天 |
 | `轮盘 退出` | 等待时离开；对局中离开算认输 |
-| `轮盘 取消` | 房主或机器人管理员取消本局，不计分 |
+| `轮盘 取消` | 房主、群主、群管理员或机器人管理员取消本局，不计分 |
 | `轮盘 状态` | 查看当前对局 |
 | `轮盘 禁言` | 查看本群禁言惩罚和平台是否支持禁言 |
-| `轮盘 开启禁言` / `轮盘 关闭禁言` | 机器人主人（`master`）或受信任用户（`trusted`）切换本群禁言惩罚 |
+| `轮盘 开启禁言` / `轮盘 关闭禁言` | 群主（`owner`）、群管理员（`admin`）、机器人主人（`master`）或受信任用户（`trusted`）切换本群禁言惩罚 |
 
 `/轮盘赌`、`roulette` 是同一组命令的别名；也可以从 `/游戏` 大厅进入。
 
@@ -43,7 +43,7 @@ database:
 
 ## 禁言惩罚
 
-- 按群开关，默认关闭。只有机器人主人或受信任用户可以切换，判断的是框架角色，不读取平台的群管理员身份。
+- 按群开关，默认关闭。只有群主、群管理员、机器人主人或受信任用户可以切换；判断的是适配器投影到消息上的规范角色（`owner` / `admin` / `master` / `trusted`），不额外请求平台。
 - 插件不判断平台名称。每次需要时，用消息自带的 `conversation.endpoint`（适配器插件和 Endpoint 能力 id）走 `project(adapterFeatureId).connection(adapter, endpointId)`，再看 `resolveEndpointManagement(endpoint)?.muteGroupMember` 是否存在。存在就能禁言，不存在（或运行时没有 Adapter Feature）就只计分。
 - 超时判负由 `schedules/deadlines` 每 5 秒检查一次，它拿到的也是同样的能力上下文，所以超时的输家同样会按上面的规则处理。
 - 平台不支持禁言时无法开启；开启后平台失去这项能力，或禁言被拒绝（例如机器人不是群管理员），这一局照常结算，只是不禁言。

package/lib/deadline-job.js

@@ -10,13 +10,11 @@ export const DEADLINE_CRON = '*/5 * * * * *';
  */
 export async function runDeadlineSweep(context, now) {
     const flow = resolveRouletteFlow(context);
-    const notices = await expireOverdueSessions(flow, now);
     const outbound = readOutbound(context);
-    if (!outbound)
-        return;
-    for (const notice of notices) {
-        await announce(outbound, notice);
-    }
+    await expireOverdueSessions(flow, now, (notice) => {
+        if (outbound)
+            return announce(outbound, notice);
+    });
 }
 function readOutbound(context) {
     try {

package/lib/game-flow.d.ts

@@ -22,5 +22,5 @@ export interface ExpiredSessionNotice {
 }
 export declare function runRouletteAction(flow: RouletteFlow, actor: RouletteActor, action: RouletteCommandAction): Promise<string>;
 /** Called by the deadline schedule; each returned notice still has to be delivered. */
-export declare function expireOverdueSessions(flow: RouletteFlow, now: number): Promise<readonly ExpiredSessionNotice[]>;
+export declare function expireOverdueSessions(flow: RouletteFlow, now: number, onNotice?: (notice: ExpiredSessionNotice) => Promise<void> | void): Promise<readonly ExpiredSessionNotice[]>;
 export declare function conversationOfSession(session: RouletteSessionRow): PenaltyConversation;

package/lib/game-flow.js

@@ -4,7 +4,7 @@ import { ROULETTE_HELP } from './roulette-actions.js';
 import { playerFromMessage, stateOf, } from './session-service.js';
 import { describeAbort, describeClick, describeEnding, describeLobby, describeRoundStart, describeStatus, } from './view.js';
 const DEADLINE_ACTOR = 'deadline';
-const MANAGER_ROLES = ['master', 'trusted'];
+const MANAGER_ROLES = ['master', 'trusted', 'owner', 'admin'];
 const NO_GAME_TEXT = '本群没有进行中的轮盘，发送「轮盘 开局」创建一局。';
 export async function runRouletteAction(flow, actor, action) {
     const message = actor.message;
@@ -27,13 +27,25 @@ export async function runRouletteAction(flow, actor, action) {
     return [...notices, reply].join('\n\n');
 }
 /** Called by the deadline schedule; each returned notice still has to be delivered. */
-export async function expireOverdueSessions(flow, now) {
+export async function expireOverdueSessions(flow, now, onNotice) {
     const overdue = await flow.services.sessions.listOverdue(now);
     const notices = [];
     for (const session of overdue) {
-        const text = await expireSession(flow, session);
-        if (text)
-            notices.push({ session, text });
+        try {
+            const text = await expireSession(flow, session);
+            if (!text)
+                continue;
+            const notice = { session, text };
+            notices.push(notice);
+            // Announce as soon as the result is stored, so a later failure cannot drop it.
+            if (onNotice)
+                await onNotice(notice);
+        }
+        catch (error) {
+            // The session stays active when anything before the commit failed; the next sweep retries it.
+            const reason = error instanceof Error ? error.message : String(error);
+            console.warn(`[roulette] 处理超时对局 ${session.id} 失败，下次扫描重试：${reason}`);
+        }
     }
     return notices;
 }
@@ -46,7 +58,7 @@ async function handleGameAction(flow, actor, action, session) {
     if (action === 'status')
         return describeStatus(stateOf(session), flow.config);
     if (action === 'cancel' && !mayCancel(session, message, actor.roles)) {
-        return '只有开局的人或机器人管理员可以取消本局。';
+        return '只有开局的人、群主、群管理员或机器人管理员可以取消本局。';
     }
     const gameAction = toGameAction(action, message);
     if (!gameAction)
@@ -98,12 +110,17 @@ async function describeResult(flow, action, result, message) {
     return describeLobby(state, flow.config);
 }
 async function expireSession(flow, session) {
+    // Read everything that can fail before the state transition is committed: once the
+    // session is stored as finished it is no longer overdue and would never be retried.
+    const penaltyEnabled = stateOf(session).phase === 'playing'
+        ? await flow.services.settings.isMutePenaltyEnabled(session.channel_key)
+        : false;
     try {
         const result = await flow.services.sessions.applyAction(session, DEADLINE_ACTOR, { type: 'expire' }, flow.config);
         if (!result.applied)
             return '';
         if (result.state.phase === 'finished')
-            return finishText(flow, result.session, result.state);
+            return finishText(flow, result.session, result.state, penaltyEnabled);
         return describeAbort(result.state);
     }
     catch (error) {
@@ -113,16 +130,17 @@ async function expireSession(flow, session) {
         throw error;
     }
 }
-async function finishText(flow, session, state) {
-    const penalty = await applyLoserPenalty(flow, session, state);
+async function finishText(flow, session, state, penaltyEnabled) {
+    const penalty = await applyLoserPenalty(flow, session, state, penaltyEnabled);
     return [describeEnding(state), penalty].filter(Boolean).join('\n');
 }
 /** Mute the loser only when this group opted in and the Endpoint declares muting. */
-async function applyLoserPenalty(flow, session, state) {
+async function applyLoserPenalty(flow, session, state, penaltyEnabled) {
     const loser = loserOf(state);
     if (!loser)
         return '';
-    const enabled = await flow.services.settings.isMutePenaltyEnabled(session.channel_key);
+    const enabled = penaltyEnabled
+        ?? await flow.services.settings.isMutePenaltyEnabled(session.channel_key);
     if (!enabled)
         return '';
     const conversation = conversationOfSession(session);
@@ -149,7 +167,7 @@ async function handlePenaltySetting(flow, actor, action) {
         return describePenaltyStatus(enabled, support === 'supported', flow.config);
     }
     if (!isManager(actor.roles))
-        return '只有机器人主人或受信任用户可以修改禁言惩罚。';
+        return '只有群主、群管理员、机器人主人或受信任用户可以修改禁言惩罚。';
     if (action === 'penalty-off') {
         await settings.setMutePenalty(key, false, message.$sender.id);
         return '已关闭禁言惩罚，本群轮盘只计分。';

package/lib/roulette-actions.js

@@ -42,7 +42,7 @@ export const ROULETTE_HELP = [
     '轮盘 开始 — 房主开局（弹巢随机装 1 发子弹）',
     '开枪 / 轮盘 开枪 — 轮到你时扣动扳机',
     '轮盘 退出 — 等待时离开；对局中离开算认输',
-    '轮盘 取消 — 房主或机器人管理员取消本局（不计分）',
+    '轮盘 取消 — 房主、群主、群管理员或机器人管理员取消本局（不计分）',
     '轮盘 状态 — 查看当前对局',
     '轮盘 禁言 / 开启禁言 / 关闭禁言 — 查看或切换本群的禁言惩罚（默认关闭）',
     '',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/plugin-roulette",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Zhin.js 俄罗斯轮盘 — 多人轮流开枪，可按群开启禁言惩罚 (Plugin Runtime)",
   "type": "module",
   "main": "./lib/index.js",
@@ -30,15 +30,15 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@zhin.js/core": "1.1.46",
-    "@zhin.js/game-kit": "1.1.11"
+    "@zhin.js/core": "1.1.48",
+    "@zhin.js/game-kit": "1.1.13"
   },
   "devDependencies": {
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
-    "@zhin.js/schedule-feature": "1.1.6",
-    "zhin.js": "1.1.11",
-    "@zhin.js/testing": "1.0.4"
+    "@zhin.js/schedule-feature": "1.1.7",
+    "@zhin.js/testing": "1.0.5",
+    "zhin.js": "1.1.13"
   },
   "repository": {
     "type": "git",
@@ -79,10 +79,10 @@
     "plugins": []
   },
   "peerDependencies": {
-    "@zhin.js/middleware": "^1.1.7",
-    "zhin.js": "^1.1.11",
-    "@zhin.js/command": "^1.1.8",
-    "@zhin.js/schedule-feature": "^1.1.6"
+    "@zhin.js/command": "^1.1.9",
+    "@zhin.js/middleware": "^1.1.8",
+    "zhin.js": "^1.1.13",
+    "@zhin.js/schedule-feature": "^1.1.7"
   },
   "peerDependenciesMeta": {
     "@zhin.js/command": {