@zhin.js/plugin-rps 1.1.18 → 1.1.20

package/commands/rps/[[action]]/index.js

@@ -1,17 +1,18 @@
 // Generated by build-plugin-runtime-entries.mjs. Do not edit.
+import { replyGameOperation, gamePlayerFromInput, normalizeRpsAction } from '@zhin.js/game-kit';
 import { defineCommand } from 'zhin.js/command';
-import { messageFromCommandInput, normalizeRpsAction } from '@zhin.js/game-kit';
 import { getRpsHelp, runRpsCommand } from "../../../lib/rps-command.js";
 import { resolveGameServices } from "../../../lib/runtime-store.js";
 export default defineCommand({
     description: 'RPS',
     params: { action: { type: 'string', default: '' } },
-    async execute({ params, input, use, locale, formatCommand }) {
+    async execute({ params, input, use, locale, formatCommand, session }) {
         const action = normalizeRpsAction(String(params.action ?? ''));
         if (!action || action === 'help')
             return getRpsHelp({ locale, formatCommand });
         const services = resolveGameServices({ use });
-        const message = messageFromCommandInput(input, { locale, formatCommand });
-        return runRpsCommand(services, message, action);
+        const message = gamePlayerFromInput(input, { locale, formatCommand });
+        await replyGameOperation({ session: services, player: message, reply: session?.reply,
+            run: () => runRpsCommand(services, message, action) });
     },
 });

package/commands/rps/[[action]]/index.ts

@@ -1,16 +1,17 @@
+import { replyGameOperation, gamePlayerFromInput, normalizeRpsAction } from '@zhin.js/game-kit';
 import { defineCommand } from 'zhin.js/command';
-import { messageFromCommandInput, normalizeRpsAction } from '@zhin.js/game-kit';
 import { getRpsHelp, runRpsCommand } from '../../../src/rps-command.js';
 import { resolveGameServices } from '../../../src/runtime-store.js';
 
 export default defineCommand({
   description: 'RPS',
   params: { action: { type: 'string', default: '' } },
-  async execute({ params, input, use, locale, formatCommand }) {
+  async execute({ params, input, use, locale, formatCommand, session }) {
     const action = normalizeRpsAction(String(params.action ?? ''));
     if (!action || action === 'help') return getRpsHelp({ locale, formatCommand });
     const services = resolveGameServices({ use });
-    const message = messageFromCommandInput(input, { locale, formatCommand });
-    return runRpsCommand(services, message, action);
+    const message = gamePlayerFromInput(input, { locale, formatCommand });
+    await replyGameOperation({ session: services, player: message, reply: session?.reply,
+      run: () => runRpsCommand(services, message, action) });
   },
 });

package/lib/game-flow.d.ts

@@ -1,7 +1,7 @@
-import type { GameMessageLike, GameReply } from '@zhin.js/game-kit';
+import { type GamePlayer, type GameReply } from '@zhin.js/game-kit';
 import { RPS_PREFIX } from './engine.js';
 import type { SessionService } from './session-service.js';
-export declare function startGame(services: SessionService, message: GameMessageLike): Promise<GameReply | undefined>;
-export declare function handleChoice(services: SessionService, message: GameMessageLike, sessionId: string, choiceId: string): Promise<GameReply | null>;
-export declare function continueGame(services: SessionService, message: GameMessageLike): Promise<GameReply>;
+export declare function startGame(services: SessionService, message: GamePlayer): Promise<GameReply | undefined>;
+export declare function handleChoice(services: SessionService, message: GamePlayer, sessionId: string, choiceId: string): Promise<GameReply | null>;
+export declare function continueGame(services: SessionService, message: GamePlayer): Promise<GameReply>;
 export { RPS_PREFIX };

package/lib/game-flow.js

@@ -1,4 +1,5 @@
 import { createMessages, resolveLocale } from 'zhin.js/i18n';
+import { channelKey } from '@zhin.js/game-kit';
 import { RPS_PREFIX, WIN_TARGET, randomBotMove, resolveRound, } from './engine.js';
 import { buildRpsView } from './view.js';
 /**
@@ -7,70 +8,76 @@ import { buildRpsView } from './view.js';
  * and the choice middleware return fresh text each turn.
  */
 function renderView(session, message, lastRound) {
-    return buildRpsView(session, lastRound, message.$channel.type);
+    return buildRpsView(session, lastRound, message.target.kind);
 }
 export async function startGame(services, message) {
-    const ch = `${message.$adapter}-${message.$endpoint}-${message.$channel.type}:${message.$channel.id}`;
-    const active = await services.getActiveByChannel(ch);
-    const locale = resolveLocale(active ? active.locale : message.locale);
-    if (active) {
-        if (active.player_id === message.$sender.id) {
-            return messages(locale, 'text1');
-        }
-        return messages(locale, 'text2', { p0: active.player_name });
-    }
-    const session = await services.createSession(message);
-    return renderView(session, message);
+    return services.runInScope({ scope: channelKey(message), run: async () => {
+            const ch = channelKey(message);
+            const active = await services.getActiveByChannel(ch);
+            const locale = resolveLocale(active ? active.locale : message.locale);
+            if (active) {
+                if (active.player_id === message.sender.id) {
+                    return messages(locale, 'text1');
+                }
+                return messages(locale, 'text2', { p0: active.player_name });
+            }
+            const session = await services.createSession(message);
+            return renderView(session, message);
+        } });
 }
 export async function handleChoice(services, message, sessionId, choiceId) {
-    const session = await services.getById(sessionId);
-    const locale = resolveLocale(session ? session.locale : message.locale);
-    if (!session)
-        return messages(locale, 'text3');
-    if (session.status !== 'active' && choiceId !== 'restart') {
-        return messages(locale, 'text4');
-    }
-    if (session.player_id !== message.$sender.id)
-        return messages(locale, 'text5');
-    if (choiceId === 'restart') {
-        await services.updateSession(session.id, { status: 'aborted' });
-        return (await startGame(services, message)) ?? null;
-    }
-    if (choiceId === 'quit') {
-        await services.updateSession(session.id, { status: 'aborted' });
-        return renderView((await services.getById(session.id)), message);
-    }
-    const player = choiceId;
-    if (!['rock', 'paper', 'scissors'].includes(player))
-        return messages(locale, 'text6');
-    const bot = randomBotMove();
-    const result = resolveRound(player, bot);
-    let playerWins = session.player_wins;
-    let botWins = session.bot_wins;
-    if (result === 1)
-        playerWins++;
-    if (result === 2)
-        botWins++;
-    let status = 'active';
-    if (playerWins >= WIN_TARGET)
-        status = 'won';
-    else if (botWins >= WIN_TARGET)
-        status = 'lost';
-    await services.updateSession(session.id, {
-        player_wins: playerWins,
-        bot_wins: botWins,
-        round: session.round + 1,
-        status,
-    });
-    const updated = (await services.getById(session.id));
-    return renderView(updated, message, { player, bot, result });
+    return services.runInScope({ scope: channelKey(message), run: async () => {
+            const session = await services.getById(sessionId);
+            const locale = resolveLocale(session ? session.locale : message.locale);
+            if (!session)
+                return messages(locale, 'text3');
+            if (session.status !== 'active' && choiceId !== 'restart') {
+                return messages(locale, 'text4');
+            }
+            if (session.player_id !== message.sender.id)
+                return messages(locale, 'text5');
+            if (choiceId === 'restart') {
+                await services.updateSession(session.id, { status: 'aborted' });
+                return (await startGame(services, message)) ?? null;
+            }
+            if (choiceId === 'quit') {
+                await services.updateSession(session.id, { status: 'aborted' });
+                return renderView((await services.getById(session.id)), message);
+            }
+            const player = choiceId;
+            if (!['rock', 'paper', 'scissors'].includes(player))
+                return messages(locale, 'text6');
+            const bot = randomBotMove();
+            const result = resolveRound(player, bot);
+            let playerWins = session.player_wins;
+            let botWins = session.bot_wins;
+            if (result === 1)
+                playerWins++;
+            if (result === 2)
+                botWins++;
+            let status = 'active';
+            if (playerWins >= WIN_TARGET)
+                status = 'won';
+            else if (botWins >= WIN_TARGET)
+                status = 'lost';
+            await services.updateSession(session.id, {
+                player_wins: playerWins,
+                bot_wins: botWins,
+                round: session.round + 1,
+                status,
+            });
+            const updated = (await services.getById(session.id));
+            return renderView(updated, message, { player, bot, result });
+        } });
 }
 export async function continueGame(services, message) {
-    const session = await services.getActiveForUser(`${message.$adapter}-${message.$endpoint}-${message.$channel.type}:${message.$channel.id}`, message.$sender.id);
-    const locale = resolveLocale(session ? session.locale : message.locale);
-    if (!session)
-        return messages(locale, 'text7');
-    return renderView(session, message);
+    return services.runInScope({ scope: channelKey(message), run: async () => {
+            const session = await services.getActiveForUser(channelKey(message), message.sender.id);
+            const locale = resolveLocale(session ? session.locale : message.locale);
+            if (!session)
+                return messages(locale, 'text7');
+            return renderView(session, message);
+        } });
 }
 export { RPS_PREFIX };
 const messages = createMessages({

package/lib/game-flow.js.map

@@ -1 +1 @@
-{"version":3,"file":"game-flow.js","sourceRoot":"","sources":["../src/game-flow.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"game-flow.js","sourceRoot":"","sources":["../src/game-flow.ts"],"names":[],"mappings":"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"}

package/lib/rps-command.d.ts

@@ -1,5 +1,5 @@
-import { type GameMessageLike, type GameReply } from '@zhin.js/game-kit';
+import { type GamePlayer, type GameReply } from '@zhin.js/game-kit';
 import type { SessionService } from './session-service.js';
-export declare function getRpsHelp(message?: Pick<GameMessageLike, 'locale' | 'formatCommand'>): string;
+export declare function getRpsHelp(message?: Pick<GamePlayer, 'locale' | 'formatCommand'>): string;
 export declare const RPS_HELP: string;
-export declare function runRpsCommand(services: SessionService, message: GameMessageLike, action: string): Promise<GameReply>;
+export declare function runRpsCommand(services: SessionService, message: GamePlayer, action: string): Promise<GameReply>;

package/lib/rps-command.js

@@ -2,34 +2,36 @@ import { formatGameHelp, gameCommandFeedback, gameCommandHint, channelKey } from
 import { createMessages } from 'zhin.js/i18n';
 import { continueGame, handleChoice, startGame } from './game-flow.js';
 export function getRpsHelp(message = {}) {
-    return formatGameHelp(message, { 'zh-CN': "✊✋✌️ 猜拳对决（三局两胜）", en: "✊✋✌️ Rock Paper Scissors (best of three)" }, 'rps', ['start', 'continue', 'quit'], { 'zh-CN': "点击按钮或回复选项数字出拳。", en: "Choose a button or reply with its option number." });
+    return formatGameHelp({ presentation: message, title: { 'zh-CN': "✊✋✌️ 猜拳对决（三局两胜）", en: "✊✋✌️ Rock Paper Scissors (best of three)" }, commandPath: 'rps', actions: ['start', 'continue', 'quit'], footer: { 'zh-CN': "点击按钮或回复选项数字出拳。", en: "Choose a button or reply with its option number." } });
 }
 export const RPS_HELP = getRpsHelp();
 export async function runRpsCommand(services, message, action) {
-    const ch = channelKey(message);
-    const userId = message.$sender.id;
-    if (!action || action === 'help') {
-        const active = await services.getActiveByChannel(ch);
-        const lines = [getRpsHelp(message), ''];
-        if (active) {
-            lines.push(messages(active.locale ?? undefined, 'text1', { p0: active.player_name, p1: active.player_wins, p2: active.bot_wins }));
-        }
-        else {
-            lines.push(gameCommandFeedback(message, 'noGame'), gameCommandHint(message, 'rps'));
-        }
-        return lines.join('\n');
-    }
-    if (action === 'start')
-        return (await startGame(services, message)) ?? '';
-    if (action === 'continue')
-        return continueGame(services, message);
-    if (action === 'quit') {
-        const row = await services.getActiveForUser(ch, userId);
-        if (!row)
-            return gameCommandFeedback(message, 'noGame');
-        return (await handleChoice(services, message, row.id, 'quit')) ?? '';
-    }
-    return gameCommandFeedback(message, 'unknown', action) + '\n\n' + getRpsHelp(message);
+    return services.runInScope({ scope: channelKey(message), run: async () => {
+            const ch = channelKey(message);
+            const userId = message.sender.id;
+            if (!action || action === 'help') {
+                const active = await services.getActiveByChannel(ch);
+                const lines = [getRpsHelp(message), ''];
+                if (active) {
+                    lines.push(messages(active.locale ?? undefined, 'text1', { p0: active.player_name, p1: active.player_wins, p2: active.bot_wins }));
+                }
+                else {
+                    lines.push(gameCommandFeedback(message, 'noGame'), gameCommandHint(message, 'rps'));
+                }
+                return lines.join('\n');
+            }
+            if (action === 'start')
+                return (await startGame(services, message)) ?? '';
+            if (action === 'continue')
+                return continueGame(services, message);
+            if (action === 'quit') {
+                const row = await services.getActiveForUser(ch, userId);
+                if (!row)
+                    return gameCommandFeedback(message, 'noGame');
+                return (await handleChoice(services, message, row.id, 'quit')) ?? '';
+            }
+            return gameCommandFeedback(message, 'unknown', action) + '\n\n' + getRpsHelp(message);
+        } });
 }
 const messages = createMessages({
     text1: { 'zh-CN': "进行中：{p0} · {p1}:{p2}", en: "Playing: {p0} · {p1}:{p2}" },

package/lib/rps-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"rps-command.js","sourceRoot":"","sources":["../src/rps-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,eAAe,EAAE,UAAU,EAAwC,MAAM,mBAAmB,CAAC;AAC3I,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAGvE,MAAM,UAAU,UAAU,CAAC,UAA6D,EAAE;IACxF,OAAO,cAAc,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,iBAAiB,EAAE,EAAE,EAAE,0CAA0C,EAAE,EAAE,KAAK,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,EACjJ,EAAE,OAAO,EAAE,gBAAgB,EAAE,EAAE,EAAE,kDAAkD,EAAE,CAAC,CAAC;AAC3F,CAAC;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,UAAU,EAAE,CAAC;AAErC,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,QAAwB,EACxB,OAAwB,EACxB,MAAc;IAEd,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;IAC/B,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;IAElC,IAAI,CAAC,MAAM,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;QACjC,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QACrD,MAAM,KAAK,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QACxC,IAAI,MAAM,EAAE,CAAC;YACX,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,IAAI,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,WAAW,EAAE,EAAE,EAAE,MAAM,CAAC,WAAW,EAAE,EAAE,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QACrI,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;QACtF,CAAC;QACD,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,IAAI,MAAM,KAAK,OAAO;QAAE,OAAO,CAAC,MAAM,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;IAC1E,IAAI,MAAM,KAAK,UAAU;QAAE,OAAO,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAElE,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;QACtB,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QACxD,IAAI,CAAC,GAAG;YAAE,OAAO,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACxD,OAAO,CAAC,MAAM,YAAY,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;IACvE,CAAC;IAED,OAAO,mBAAmB,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,GAAG,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;AACxF,CAAC;AAED,MAAM,QAAQ,GAAG,cAAc,CAAC;IAC9B,KAAK,EAAE,EAAE,OAAO,EAAE,sBAAsB,EAAE,EAAE,EAAE,2BAA2B,EAAE;CAC5E,CAAC,CAAC"}
+{"version":3,"file":"rps-command.js","sourceRoot":"","sources":["../src/rps-command.ts"],"names":[],"mappings":"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"}

package/lib/session-service.d.ts

@@ -1,9 +1,9 @@
 import type { Database, Models } from '@zhin.js/core';
-import { BaseSessionService, type GameMessageLike } from '@zhin.js/game-kit';
+import { BaseSessionService, type GamePlayer } from '@zhin.js/game-kit';
 import type { RpsSessionRow } from './models.js';
 export type RpsDatabase = Database<unknown, Models, string>;
 export declare class SessionService extends BaseSessionService<RpsSessionRow> {
     constructor(db: RpsDatabase);
-    createSession(message: GameMessageLike): Promise<RpsSessionRow>;
+    createSession(message: GamePlayer): Promise<RpsSessionRow>;
 }
 export declare function createServices(db: RpsDatabase): SessionService;

package/lib/session-service.js

@@ -1,4 +1,4 @@
-import { BaseSessionService, channelKey, generateSessionId, } from '@zhin.js/game-kit';
+import { BaseSessionService, generateSessionId, } from '@zhin.js/game-kit';
 export class SessionService extends BaseSessionService {
     constructor(db) {
         super(db, {
@@ -26,13 +26,8 @@ export class SessionService extends BaseSessionService {
         const row = {
             id: generateSessionId(),
             locale: message.locale ?? 'zh-CN',
-            adapter: String(message.$adapter),
-            endpoint: message.$endpoint,
-            channel_type: message.$channel.type,
-            channel_id: message.$channel.id,
-            channel_key: channelKey(message),
-            player_id: message.$sender.id,
-            player_name: message.$sender.name?.trim() || message.$sender.id,
+            player_id: message.sender.id,
+            player_name: message.sender.name?.trim() || message.sender.id,
             player_wins: 0,
             bot_wins: 0,
             round: 0,
@@ -40,7 +35,7 @@ export class SessionService extends BaseSessionService {
             updated_at: now,
             created_at: now,
         };
-        return this.createRow(row);
+        return this.createRow({ target: message.target, fields: row });
     }
 }
 export function createServices(db) {

package/lib/session-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-service.js","sourceRoot":"","sources":["../src/session-service.ts"],"names":[],"mappings":"AACA,OAAO,EACL,kBAAkB,EAClB,UAAU,EACV,iBAAiB,GAGlB,MAAM,mBAAmB,CAAC;AAK3B,MAAM,OAAO,cAAe,SAAQ,kBAAiC;IACnE,YAAY,EAAe;QACzB,KAAK,CAAC,EAAmD,EAAE;YACzD,MAAM,EAAE,KAAK;YACb,KAAK,EAAE,cAAc;YACrB,UAAU,EAAE,CAAC,WAAW,CAAC;YACzB,eAAe,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,KAAK,KAAK;gBACpD,CAAC,CAAC,CAAC;wBACC,MAAM,EAAE,OAAO,CAAC,SAAS;wBACzB,QAAQ,EAAE,OAAO,CAAC,WAAW;wBAC7B,MAAM,EAAE,KAAK;wBACb,KAAK,EAAE,OAAO,CAAC,WAAW,GAAG,EAAE;qBAChC,CAAC;gBACJ,CAAC,CAAC,OAAO,CAAC,MAAM,KAAK,MAAM;oBACzB,CAAC,CAAC,CAAC;4BACC,MAAM,EAAE,OAAO,CAAC,SAAS;4BACzB,QAAQ,EAAE,OAAO,CAAC,WAAW;4BAC7B,MAAM,EAAE,MAAM;yBACf,CAAC;oBACJ,CAAC,CAAC,EAAE;SACT,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,OAAwB;QAC1C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,GAAG,GAAkB;YACzB,EAAE,EAAE,iBAAiB,EAAE;YACvB,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,OAAO;YACjC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC;YACjC,QAAQ,EAAE,OAAO,CAAC,SAAS;YAC3B,YAAY,EAAE,OAAO,CAAC,QAAQ,CAAC,IAAI;YACnC,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC,EAAE;YAC/B,WAAW,EAAE,UAAU,CAAC,OAAO,CAAC;YAChC,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE;YAC7B,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;YAC/D,WAAW,EAAE,CAAC;YACd,QAAQ,EAAE,CAAC;YACX,KAAK,EAAE,CAAC;YACR,MAAM,EAAE,QAAQ;YAChB,UAAU,EAAE,GAAG;YACf,UAAU,EAAE,GAAG;SAChB,CAAC;QACF,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;CACF;AAED,MAAM,UAAU,cAAc,CAAC,EAAe;IAC5C,OAAO,IAAI,cAAc,CAAC,EAAE,CAAC,CAAC;AAChC,CAAC"}
+{"version":3,"file":"session-service.js","sourceRoot":"","sources":["../src/session-service.ts"],"names":[],"mappings":"AACA,OAAO,EACL,kBAAkB,EAClB,iBAAiB,GAGlB,MAAM,mBAAmB,CAAC;AAK3B,MAAM,OAAO,cAAe,SAAQ,kBAAiC;IACnE,YAAY,EAAe;QACzB,KAAK,CAAC,EAAmD,EAAE;YACzD,MAAM,EAAE,KAAK;YACb,KAAK,EAAE,cAAc;YACrB,UAAU,EAAE,CAAC,WAAW,CAAC;YACzB,eAAe,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,KAAK,KAAK;gBACpD,CAAC,CAAC,CAAC;wBACC,MAAM,EAAE,OAAO,CAAC,SAAS;wBACzB,QAAQ,EAAE,OAAO,CAAC,WAAW;wBAC7B,MAAM,EAAE,KAAK;wBACb,KAAK,EAAE,OAAO,CAAC,WAAW,GAAG,EAAE;qBAChC,CAAC;gBACJ,CAAC,CAAC,OAAO,CAAC,MAAM,KAAK,MAAM;oBACzB,CAAC,CAAC,CAAC;4BACC,MAAM,EAAE,OAAO,CAAC,SAAS;4BACzB,QAAQ,EAAE,OAAO,CAAC,WAAW;4BAC7B,MAAM,EAAE,MAAM;yBACf,CAAC;oBACJ,CAAC,CAAC,EAAE;SACT,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,OAAmB;QACrC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,GAAG,GAAgG;YACvG,EAAE,EAAE,iBAAiB,EAAE;YACvB,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,OAAO;YACjC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE;YAC5B,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,OAAO,CAAC,MAAM,CAAC,EAAE;YAC7D,WAAW,EAAE,CAAC;YACd,QAAQ,EAAE,CAAC;YACX,KAAK,EAAE,CAAC;YACR,MAAM,EAAE,QAAQ;YAChB,UAAU,EAAE,GAAG;YACf,UAAU,EAAE,GAAG;SAChB,CAAC;QACF,OAAO,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IACjE,CAAC;CACF;AAED,MAAM,UAAU,cAAc,CAAC,EAAe;IAC5C,OAAO,IAAI,cAAc,CAAC,EAAE,CAAC,CAAC;AAChC,CAAC"}

package/middlewares/rps-alias/index.js

@@ -1,20 +1,24 @@
 // Generated by build-plugin-runtime-entries.mjs. Do not edit.
-import { defineGameCommandAliasMiddleware, isRpsAction, messageFromCommandInput, normalizeRpsAction, } from '@zhin.js/game-kit';
+import { replyGameOperation, defineGameCommandAliasMiddleware, isRpsAction, gamePlayerFromInput, normalizeRpsAction } from '@zhin.js/game-kit';
 import { getRpsHelp, runRpsCommand } from "../../lib/rps-command.js";
 import { resolveGameServices } from "../../lib/runtime-store.js";
 export default defineGameCommandAliasMiddleware({
     aliases: ['猜拳', 'rps'],
     async run(action, input, context) {
-        const message = messageFromCommandInput(input, {
-            formatCommand: (path) => context.input.formatCommand?.(path, context.owner.id),
-        });
+        const presentation = { locale: context.input.locale,
+            formatCommand: (path) => context.input.formatCommand?.(path, context.owner.id) };
         const normalized = normalizeRpsAction(String(action ?? ''));
-        if (normalized === 'help')
-            return getRpsHelp(message);
+        if (normalized === 'help') {
+            await context.input.$reply(getRpsHelp(presentation));
+            return true;
+        }
         // action 无法识别：放行给后续中间件，避免劫持普通聊天
         if (!isRpsAction(normalized))
-            return null;
+            return false;
+        const message = gamePlayerFromInput(input, presentation);
         const services = resolveGameServices(context);
-        return runRpsCommand(services, message, normalized);
+        await replyGameOperation({ session: services, player: message, reply: content => context.input.$reply(content),
+            run: () => runRpsCommand(services, message, normalized) });
+        return true;
     },
 });

package/middlewares/rps-alias/index.ts

@@ -1,23 +1,21 @@
-import {
-  defineGameCommandAliasMiddleware,
-  isRpsAction,
-  messageFromCommandInput,
-  normalizeRpsAction,
-} from '@zhin.js/game-kit';
+import { replyGameOperation, defineGameCommandAliasMiddleware, isRpsAction, gamePlayerFromInput, normalizeRpsAction } from '@zhin.js/game-kit';
 import { getRpsHelp, runRpsCommand } from '../../src/rps-command.js';
 import { resolveGameServices } from '../../src/runtime-store.js';
 
 export default defineGameCommandAliasMiddleware({
   aliases: ['猜拳', 'rps'],
   async run(action, input, context) {
-    const message = messageFromCommandInput(input, {
-      formatCommand: (path) => context.input.formatCommand?.(path, context.owner.id),
-    });
+    const presentation = { locale: context.input.locale,
+      formatCommand: (path: string) => context.input.formatCommand?.(path, context.owner.id) };
+
     const normalized = normalizeRpsAction(String(action ?? ''));
-    if (normalized === 'help') return getRpsHelp(message);
+    if (normalized === 'help') { await context.input.$reply(getRpsHelp(presentation)); return true; }
     // action 无法识别：放行给后续中间件，避免劫持普通聊天
-    if (!isRpsAction(normalized)) return null;
+    if (!isRpsAction(normalized)) return false;
+    const message = gamePlayerFromInput(input, presentation);
     const services = resolveGameServices(context);
-    return runRpsCommand(services, message, normalized);
+    await replyGameOperation({ session: services, player: message, reply: content => context.input.$reply(content),
+      run: () => runRpsCommand(services, message, normalized) });
+    return true;
   },
 });

package/middlewares/rps-choice/index.js

@@ -1,6 +1,6 @@
 // Generated by build-plugin-runtime-entries.mjs. Do not edit.
+import { replyGameOperation, buildChoiceFallbackMap, channelKey, gamePlayerFromInput, parseChoicePayload, resolveGameTextPayload, } from '@zhin.js/game-kit';
 import { defineMiddleware } from 'zhin.js/middleware';
-import { buildChoiceFallbackMap, channelKey, messageFromCommandInput, parseChoicePayload, resolveGameTextPayload, } from '@zhin.js/game-kit';
 import { resolveGameServices } from "../../lib/runtime-store.js";
 import { handleChoice, RPS_PREFIX } from "../../lib/game-flow.js";
 /**
@@ -10,13 +10,17 @@ import { handleChoice, RPS_PREFIX } from "../../lib/game-flow.js";
 export default defineMiddleware({
     target: 'inbound',
     async handle(context, next) {
+        if (!context.input.sender?.id) {
+            await next();
+            return;
+        }
         const raw = context.input.content?.trim() ?? '';
         if (!raw) {
             await next();
             return;
         }
         const services = resolveGameServices(context);
-        const message = messageFromCommandInput(context.input);
+        const message = gamePlayerFromInput(context.input);
         const ch = channelKey(message);
         // 直接 payload（QQ 指令预填 / Sandbox action→text）
         const payloadFromText = resolveGameTextPayload(raw);
@@ -25,16 +29,15 @@ export default defineMiddleware({
             if (parsed) {
                 const session = await services.getById(parsed.sessionId);
                 if (session?.channel_key === ch) {
-                    const reply = await handleChoice(services, message, parsed.sessionId, parsed.choiceId);
-                    if (reply)
-                        await context.input.$reply(reply);
+                    await replyGameOperation({ session: services, player: message, reply: content => context.input.$reply(content),
+                        run: () => handleChoice(services, message, parsed.sessionId, parsed.choiceId) });
                     return;
                 }
             }
             await next();
             return;
         }
-        const session = await services.getActiveForUser(ch, message.$sender.id);
+        const session = await services.getActiveForUser(ch, message.sender.id);
         if (!session || session.status !== 'active') {
             await next();
             return;
@@ -51,8 +54,7 @@ export default defineMiddleware({
             await next();
             return;
         }
-        const reply = await handleChoice(services, message, session.id, parsed.choiceId);
-        if (reply)
-            await context.input.$reply(reply);
+        await replyGameOperation({ session: services, player: message, reply: content => context.input.$reply(content),
+            run: () => handleChoice(services, message, session.id, parsed.choiceId) });
     },
 });

package/middlewares/rps-choice/index.ts

@@ -1,12 +1,13 @@
-import { defineMiddleware } from 'zhin.js/middleware';
-import type { Message } from '@zhin.js/core/runtime';
 import {
+  replyGameOperation,
   buildChoiceFallbackMap,
   channelKey,
-  messageFromCommandInput,
+  gamePlayerFromInput,
   parseChoicePayload,
   resolveGameTextPayload,
 } from '@zhin.js/game-kit';
+import { defineMiddleware } from 'zhin.js/middleware';
+import type { Message } from '@zhin.js/core/runtime';
 import { resolveGameServices } from '../../src/runtime-store.js';
 import { handleChoice, RPS_PREFIX } from '../../src/game-flow.js';
 
@@ -17,13 +18,14 @@ import { handleChoice, RPS_PREFIX } from '../../src/game-flow.js';
 export default defineMiddleware<Message>({
   target: 'inbound',
   async handle(context, next) {
+    if (!context.input.sender?.id) { await next(); return; }
     const raw = context.input.content?.trim() ?? '';
     if (!raw) {
       await next();
       return;
     }
     const services = resolveGameServices(context);
-    const message = messageFromCommandInput(context.input);
+    const message = gamePlayerFromInput(context.input);
     const ch = channelKey(message);
 
     // 直接 payload（QQ 指令预填 / Sandbox action→text）
@@ -33,8 +35,8 @@ export default defineMiddleware<Message>({
       if (parsed) {
         const session = await services.getById(parsed.sessionId);
         if (session?.channel_key === ch) {
-          const reply = await handleChoice(services, message, parsed.sessionId, parsed.choiceId);
-          if (reply) await context.input.$reply(reply);
+          await replyGameOperation({ session: services, player: message, reply: content => context.input.$reply(content),
+      run: () => handleChoice(services, message, parsed.sessionId, parsed.choiceId) });
           return;
         }
       }
@@ -42,7 +44,7 @@ export default defineMiddleware<Message>({
       return;
     }
 
-    const session = await services.getActiveForUser(ch, message.$sender.id);
+    const session = await services.getActiveForUser(ch, message.sender.id);
     if (!session || session.status !== 'active') {
       await next();
       return;
@@ -61,7 +63,7 @@ export default defineMiddleware<Message>({
       return;
     }
 
-    const reply = await handleChoice(services, message, session.id, parsed.choiceId);
-    if (reply) await context.input.$reply(reply);
+    await replyGameOperation({ session: services, player: message, reply: content => context.input.$reply(content),
+      run: () => handleChoice(services, message, session.id, parsed.choiceId) });
   },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/plugin-rps",
-  "version": "1.1.18",
+  "version": "1.1.20",
   "description": "Zhin.js 猜拳游戏 — 石头剪刀布三局两胜 (Plugin Runtime)",
   "type": "module",
   "main": "./lib/index.js",
@@ -23,13 +23,13 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@zhin.js/core": "1.1.53",
-    "@zhin.js/game-kit": "1.1.18"
+    "@zhin.js/game-kit": "1.1.20",
+    "@zhin.js/core": "1.1.55"
   },
   "devDependencies": {
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
-    "zhin.js": "1.1.18"
+    "zhin.js": "1.1.20"
   },
   "repository": {
     "type": "git",
@@ -66,9 +66,9 @@
     "plugins": []
   },
   "peerDependencies": {
-    "@zhin.js/command": "^1.1.11",
-    "@zhin.js/middleware": "^1.1.10",
-    "zhin.js": "^1.1.18"
+    "@zhin.js/command": "^1.1.13",
+    "@zhin.js/middleware": "^1.1.12",
+    "zhin.js": "^1.1.20"
   },
   "peerDependenciesMeta": {
     "@zhin.js/command": {

package/src/game-flow.ts

@@ -1,5 +1,5 @@
 import { createMessages, resolveLocale } from 'zhin.js/i18n';
-import type { GameMessageLike, GameReply } from '@zhin.js/game-kit';
+import { channelKey, type GamePlayer, type GameReply } from '@zhin.js/game-kit';
 import type { RpsSessionRow } from './models.js';
 import {
   RPS_PREFIX,
@@ -18,88 +18,94 @@ import { buildRpsView } from './view.js';
  */
 function renderView(
   session: RpsSessionRow,
-  message: GameMessageLike,
+  message: GamePlayer,
   lastRound?: { player: RpsMove; bot: RpsMove; result: 0 | 1 | 2 },
 ): GameReply {
-  return buildRpsView(session, lastRound, message.$channel.type);
+  return buildRpsView(session, lastRound, message.target.kind);
 }
 
 export async function startGame(
   services: SessionService,
-  message: GameMessageLike,
+  message: GamePlayer,
 ): Promise<GameReply | undefined> {
-  const ch = `${message.$adapter}-${message.$endpoint}-${message.$channel.type}:${message.$channel.id}`;
-  const active = await services.getActiveByChannel(ch);
-  const locale = resolveLocale(active ? active.locale : message.locale);
-  if (active) {
-    if (active.player_id === message.$sender.id) {
-      return messages(locale, 'text1');
+  return services.runInScope({ scope: channelKey(message), run: async () => {
+    const ch = channelKey(message);
+    const active = await services.getActiveByChannel(ch);
+    const locale = resolveLocale(active ? active.locale : message.locale);
+    if (active) {
+      if (active.player_id === message.sender.id) {
+        return messages(locale, 'text1');
+      }
+      return messages(locale, 'text2', { p0: active.player_name });
     }
-    return messages(locale, 'text2', { p0: active.player_name });
-  }
-  const session = await services.createSession(message);
-  return renderView(session, message);
+    const session = await services.createSession(message);
+    return renderView(session, message);
+  } });
 }
 
 export async function handleChoice(
   services: SessionService,
-  message: GameMessageLike,
+  message: GamePlayer,
   sessionId: string,
   choiceId: string,
 ): Promise<GameReply | null> {
-  const session = await services.getById(sessionId);
-  const locale = resolveLocale(session ? session.locale : message.locale);
-  if (!session) return messages(locale, 'text3');
-  if (session.status !== 'active' && choiceId !== 'restart') {
-    return messages(locale, 'text4');
-  }
-  if (session.player_id !== message.$sender.id) return messages(locale, 'text5');
+  return services.runInScope({ scope: channelKey(message), run: async () => {
+    const session = await services.getById(sessionId);
+    const locale = resolveLocale(session ? session.locale : message.locale);
+    if (!session) return messages(locale, 'text3');
+    if (session.status !== 'active' && choiceId !== 'restart') {
+      return messages(locale, 'text4');
+    }
+    if (session.player_id !== message.sender.id) return messages(locale, 'text5');
 
-  if (choiceId === 'restart') {
-    await services.updateSession(session.id, { status: 'aborted' });
-    return (await startGame(services, message)) ?? null;
-  }
-  if (choiceId === 'quit') {
-    await services.updateSession(session.id, { status: 'aborted' });
-    return renderView((await services.getById(session.id))!, message);
-  }
+    if (choiceId === 'restart') {
+      await services.updateSession(session.id, { status: 'aborted' });
+      return (await startGame(services, message)) ?? null;
+    }
+    if (choiceId === 'quit') {
+      await services.updateSession(session.id, { status: 'aborted' });
+      return renderView((await services.getById(session.id))!, message);
+    }
 
-  const player = choiceId as RpsMove;
-  if (!['rock', 'paper', 'scissors'].includes(player)) return messages(locale, 'text6');
+    const player = choiceId as RpsMove;
+    if (!['rock', 'paper', 'scissors'].includes(player)) return messages(locale, 'text6');
 
-  const bot = randomBotMove();
-  const result = resolveRound(player, bot);
-  let playerWins = session.player_wins;
-  let botWins = session.bot_wins;
-  if (result === 1) playerWins++;
-  if (result === 2) botWins++;
+    const bot = randomBotMove();
+    const result = resolveRound(player, bot);
+    let playerWins = session.player_wins;
+    let botWins = session.bot_wins;
+    if (result === 1) playerWins++;
+    if (result === 2) botWins++;
 
-  let status: RpsSessionRow['status'] = 'active';
-  if (playerWins >= WIN_TARGET) status = 'won';
-  else if (botWins >= WIN_TARGET) status = 'lost';
+    let status: RpsSessionRow['status'] = 'active';
+    if (playerWins >= WIN_TARGET) status = 'won';
+    else if (botWins >= WIN_TARGET) status = 'lost';
 
-  await services.updateSession(session.id, {
-    player_wins: playerWins,
-    bot_wins: botWins,
-    round: session.round + 1,
-    status,
-  });
+    await services.updateSession(session.id, {
+      player_wins: playerWins,
+      bot_wins: botWins,
+      round: session.round + 1,
+      status,
+    });
 
-  const updated = (await services.getById(session.id))!;
-  return renderView(updated, message, { player, bot, result });
+    const updated = (await services.getById(session.id))!;
+    return renderView(updated, message, { player, bot, result });
+  } });
 }
 
 export async function continueGame(
   services: SessionService,
-  message: GameMessageLike,
+  message: GamePlayer,
 ): Promise<GameReply> {
-  const session = await services.getActiveForUser(
-    `${message.$adapter}-${message.$endpoint}-${message.$channel.type}:${message.$channel.id}`,
-    message.$sender.id,
-  );
-  const locale = resolveLocale(session ? session.locale : message.locale);
-  if (!session) return messages(locale, 'text7');
-  return renderView(session, message);
+  return services.runInScope({ scope: channelKey(message), run: async () => {
+    const session = await services.getActiveForUser(
+      channelKey(message),
+      message.sender.id,
+    );
+    const locale = resolveLocale(session ? session.locale : message.locale);
+    if (!session) return messages(locale, 'text7');
+    return renderView(session, message);
+  } });
 }
 
 export { RPS_PREFIX };

package/src/rps-command.ts

@@ -1,44 +1,45 @@
-import { formatGameHelp, gameCommandFeedback, gameCommandHint, channelKey, type GameMessageLike, type GameReply } from '@zhin.js/game-kit';
+import { formatGameHelp, gameCommandFeedback, gameCommandHint, channelKey, type GamePlayer, type GameReply } from '@zhin.js/game-kit';
 import { createMessages } from 'zhin.js/i18n';
 import { continueGame, handleChoice, startGame } from './game-flow.js';
 import type { SessionService } from './session-service.js';
 
-export function getRpsHelp(message: Pick<GameMessageLike, 'locale' | 'formatCommand'> = {}): string {
-  return formatGameHelp(message, { 'zh-CN': "✊✋✌️ 猜拳对决（三局两胜）", en: "✊✋✌️ Rock Paper Scissors (best of three)" }, 'rps', ['start', 'continue', 'quit'],
-    { 'zh-CN': "点击按钮或回复选项数字出拳。", en: "Choose a button or reply with its option number." });
+export function getRpsHelp(message: Pick<GamePlayer, 'locale' | 'formatCommand'> = {}): string {
+  return formatGameHelp({ presentation: message, title: { 'zh-CN': "✊✋✌️ 猜拳对决（三局两胜）", en: "✊✋✌️ Rock Paper Scissors (best of three)" }, commandPath: 'rps', actions: ['start', 'continue', 'quit'], footer: { 'zh-CN': "点击按钮或回复选项数字出拳。", en: "Choose a button or reply with its option number." } });
 }
 
 export const RPS_HELP = getRpsHelp();
 
 export async function runRpsCommand(
   services: SessionService,
-  message: GameMessageLike,
+  message: GamePlayer,
   action: string,
 ): Promise<GameReply> {
-  const ch = channelKey(message);
-  const userId = message.$sender.id;
-
-  if (!action || action === 'help') {
-    const active = await services.getActiveByChannel(ch);
-    const lines = [getRpsHelp(message), ''];
-    if (active) {
-      lines.push(messages(active.locale ?? undefined, 'text1', { p0: active.player_name, p1: active.player_wins, p2: active.bot_wins }));
-    } else {
-      lines.push(gameCommandFeedback(message, 'noGame'), gameCommandHint(message, 'rps'));
+  return services.runInScope({ scope: channelKey(message), run: async () => {
+    const ch = channelKey(message);
+    const userId = message.sender.id;
+
+    if (!action || action === 'help') {
+      const active = await services.getActiveByChannel(ch);
+      const lines = [getRpsHelp(message), ''];
+      if (active) {
+        lines.push(messages(active.locale ?? undefined, 'text1', { p0: active.player_name, p1: active.player_wins, p2: active.bot_wins }));
+      } else {
+        lines.push(gameCommandFeedback(message, 'noGame'), gameCommandHint(message, 'rps'));
+      }
+      return lines.join('\n');
     }
-    return lines.join('\n');
-  }
 
-  if (action === 'start') return (await startGame(services, message)) ?? '';
-  if (action === 'continue') return continueGame(services, message);
+    if (action === 'start') return (await startGame(services, message)) ?? '';
+    if (action === 'continue') return continueGame(services, message);
 
-  if (action === 'quit') {
-    const row = await services.getActiveForUser(ch, userId);
-    if (!row) return gameCommandFeedback(message, 'noGame');
-    return (await handleChoice(services, message, row.id, 'quit')) ?? '';
-  }
+    if (action === 'quit') {
+      const row = await services.getActiveForUser(ch, userId);
+      if (!row) return gameCommandFeedback(message, 'noGame');
+      return (await handleChoice(services, message, row.id, 'quit')) ?? '';
+    }
 
-  return gameCommandFeedback(message, 'unknown', action) + '\n\n' + getRpsHelp(message);
+    return gameCommandFeedback(message, 'unknown', action) + '\n\n' + getRpsHelp(message);
+  } });
 }
 
 const messages = createMessages({

package/src/session-service.ts

@@ -1,9 +1,8 @@
 import type { Database, Models } from '@zhin.js/core';
 import {
   BaseSessionService,
-  channelKey,
   generateSessionId,
-  type GameMessageLike,
+  type GamePlayer,
   type GameSessionDatabase,
 } from '@zhin.js/game-kit';
 import type { RpsSessionRow } from './models.js';
@@ -33,18 +32,13 @@ export class SessionService extends BaseSessionService<RpsSessionRow> {
     });
   }
 
-  async createSession(message: GameMessageLike): Promise<RpsSessionRow> {
+  async createSession(message: GamePlayer): Promise<RpsSessionRow> {
     const now = Date.now();
-    const row: RpsSessionRow = {
+    const row: Omit<RpsSessionRow, 'channel_key' | 'adapter' | 'endpoint' | 'channel_type' | 'channel_id'> = {
       id: generateSessionId(),
       locale: message.locale ?? 'zh-CN',
-      adapter: String(message.$adapter),
-      endpoint: message.$endpoint,
-      channel_type: message.$channel.type,
-      channel_id: message.$channel.id,
-      channel_key: channelKey(message),
-      player_id: message.$sender.id,
-      player_name: message.$sender.name?.trim() || message.$sender.id,
+      player_id: message.sender.id,
+      player_name: message.sender.name?.trim() || message.sender.id,
       player_wins: 0,
       bot_wins: 0,
       round: 0,
@@ -52,7 +46,7 @@ export class SessionService extends BaseSessionService<RpsSessionRow> {
       updated_at: now,
       created_at: now,
     };
-    return this.createRow(row);
+    return this.createRow({ target: message.target, fields: row });
   }
 }