@zhin.js/plugin-tic-tac-toe 1.0.3 → 1.0.5

package/lib/ttt-command.js

@@ -1,4 +1,4 @@
-import { channelKey } from '@zhin.js/game-kit';
+import { channelKey, } from '@zhin.js/game-kit';
 import { formatPlayerWithMark, formatRosterLine } from './player-label.js';
 import { startBotGame, startPvpGame } from './game-flow.js';
 export const TTT_HELP = [
@@ -10,7 +10,7 @@ export const TTT_HELP = [
     '井字棋 认输 — 结束当前局',
     '井字棋 观战 — 订阅观战推送',
 ].join('\n');
-export async function runTttCommand(plugin, services, message, action) {
+export async function runTttCommand(services, message, action) {
     const ch = channelKey(message);
     const userId = message.$sender.id;
     if (!action || action === 'help') {
@@ -36,9 +36,13 @@ export async function runTttCommand(plugin, services, message, action) {
         const pair = await services.queue.tryMatch(ch);
         if (pair) {
             const [px, po] = pair;
-            const board = await startPvpGame(plugin, services, message, px, po);
+            const board = await startPvpGame(services, message, px, po);
             const matchLine = `匹配成功！${formatPlayerWithMark(px.id, px.displayName, '✕')} vs ${formatPlayerWithMark(po.id, po.displayName, '○')}`;
-            return board ? `${matchLine}\n\n${board}` : matchLine;
+            return board
+                ? Array.isArray(board)
+                    ? [matchLine, '\n\n', ...board]
+                    : [matchLine, '\n\n', board]
+                : matchLine;
         }
         return `已加入排队（第 ${position} 位），凑满 2 人自动开局。`;
     }
@@ -47,7 +51,7 @@ export async function runTttCommand(plugin, services, message, action) {
         return ok ? '已离开排队。' : '你不在排队中。';
     }
     if (action === 'bot') {
-        return startBotGame(plugin, services, message);
+        return startBotGame(services, message);
     }
     if (action === 'quit') {
         const row = await services.session.getActiveForUser(ch, userId);
@@ -65,8 +69,4 @@ export async function runTttCommand(plugin, services, message, action) {
     }
     return `未知子命令：${action}\n\n${TTT_HELP}`;
 }
-/** Plugin Runtime / smoke: text-only, no Adapter.editMessage. */
-export async function runTttCommandText(services, message, action) {
-    return (await runTttCommand(null, services, message, action)) ?? '';
-}
 //# sourceMappingURL=ttt-command.js.map

package/lib/ttt-command.js.map

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

package/middlewares/ttt-alias.js

@@ -0,0 +1,18 @@
+// Generated by build-plugin-runtime-entries.mjs. Do not edit.
+import { defineGameCommandAliasMiddleware, isTttAction, messageFromCommandInput, normalizeTttAction, } from '@zhin.js/game-kit';
+import { TTT_HELP, runTttCommand } from "../lib/ttt-command.js";
+import { resolveGameServices } from "../lib/runtime-store.js";
+export default defineGameCommandAliasMiddleware({
+    aliases: ['井字棋', 'ttt'],
+    async run(action, input, context) {
+        const normalized = normalizeTttAction(String(action ?? ''));
+        if (normalized === 'help')
+            return TTT_HELP;
+        // action 无法识别：放行给后续中间件，避免劫持普通聊天
+        if (!isTttAction(normalized))
+            return null;
+        const services = resolveGameServices(context);
+        const message = messageFromCommandInput(input);
+        return runTttCommand(services, message, normalized);
+    },
+});

package/middlewares/ttt-alias.ts

@@ -1,18 +1,21 @@
 import {
   defineGameCommandAliasMiddleware,
+  isTttAction,
   messageFromCommandInput,
   normalizeTttAction,
 } from '@zhin.js/game-kit';
-import { TTT_HELP, runTttCommandText } from '../src/ttt-command.js';
+import { TTT_HELP, runTttCommand } from '../src/ttt-command.js';
 import { resolveGameServices } from '../src/runtime-store.js';
 
 export default defineGameCommandAliasMiddleware({
   aliases: ['井字棋', 'ttt'],
   async run(action, input, context) {
     const normalized = normalizeTttAction(String(action ?? ''));
-    if (!normalized || normalized === 'help') return TTT_HELP;
+    if (normalized === 'help') return TTT_HELP;
+    // action 无法识别：放行给后续中间件，避免劫持普通聊天
+    if (!isTttAction(normalized)) return null;
     const services = resolveGameServices(context);
     const message = messageFromCommandInput(input);
-    return runTttCommandText(services, message, normalized);
+    return runTttCommand(services, message, normalized);
   },
 });

package/middlewares/ttt-choice.js

@@ -0,0 +1,66 @@
+// Generated by build-plugin-runtime-entries.mjs. Do not edit.
+import { defineMiddleware } from '@zhin.js/middleware';
+import { channelKey, messageFromCommandInput, parseChoicePayload, resolveGameTextPayload, } from '@zhin.js/game-kit';
+import { resolveGameServices } from "../lib/runtime-store.js";
+import { buildFallbackMap, TTT_PREFIX, parseTttPayload } from "../lib/board-view.js";
+import { parseBoard } from "../lib/engine.js";
+import { handleMove, restartFromTerminal } from "../lib/game-flow.js";
+/**
+ * 文本入口：按钮 payload（`ttt:session:0-8` 或 `ttt:session:restart`）
+ * 与裸数字 fallback（按空格 1-9 编号落子，对应视图『落子：回复数字 1-9（仅空格）』）。
+ */
+export default defineMiddleware({
+    target: 'inbound',
+    async handle(context, next) {
+        const raw = context.input.content?.trim() ?? '';
+        if (!raw) {
+            await next();
+            return;
+        }
+        const services = resolveGameServices(context);
+        const message = messageFromCommandInput(context.input);
+        const ch = channelKey(message);
+        // 直接 payload（QQ 指令预填 / Sandbox action→text）
+        const payload = resolveGameTextPayload(raw);
+        if (payload?.startsWith(`${TTT_PREFIX}:`)) {
+            const restart = parseChoicePayload(payload, TTT_PREFIX);
+            if (restart?.choiceId === 'restart') {
+                const session = await services.session.getById(restart.sessionId);
+                if (session?.channel_key === ch) {
+                    const reply = await restartFromTerminal(services, message, restart.sessionId);
+                    if (reply)
+                        await context.input.$reply(reply);
+                    return;
+                }
+            }
+            const move = parseTttPayload(payload);
+            if (move) {
+                const session = await services.session.getById(move.sessionId);
+                if (session?.channel_key === ch) {
+                    const reply = await handleMove(services, message, move.sessionId, move.cell);
+                    if (reply)
+                        await context.input.$reply(reply);
+                    return;
+                }
+            }
+            await next();
+            return;
+        }
+        // 裸数字：按当前棋盘空格编号映射落子
+        const session = await services.session.getActiveForUser(ch, message.$sender.id);
+        if (!session || session.channel_key !== ch) {
+            await next();
+            return;
+        }
+        const map = buildFallbackMap(session.id, parseBoard(session.board));
+        const payloadFromDigit = resolveGameTextPayload(raw, map);
+        const move = payloadFromDigit ? parseTttPayload(payloadFromDigit) : null;
+        if (!move || move.sessionId !== session.id) {
+            await next();
+            return;
+        }
+        const reply = await handleMove(services, message, session.id, move.cell);
+        if (reply)
+            await context.input.$reply(reply);
+    },
+});

package/middlewares/ttt-choice.ts

@@ -34,7 +34,7 @@ export default defineMiddleware<Message>({
       if (restart?.choiceId === 'restart') {
         const session = await services.session.getById(restart.sessionId);
         if (session?.channel_key === ch) {
-          const reply = await restartFromTerminal(null, services, message, restart.sessionId);
+          const reply = await restartFromTerminal(services, message, restart.sessionId);
           if (reply) await context.input.$reply(reply);
           return;
         }
@@ -43,7 +43,7 @@ export default defineMiddleware<Message>({
       if (move) {
         const session = await services.session.getById(move.sessionId);
         if (session?.channel_key === ch) {
-          const reply = await handleMove(null, services, message, move.sessionId, move.cell);
+          const reply = await handleMove(services, message, move.sessionId, move.cell);
           if (reply) await context.input.$reply(reply);
           return;
         }
@@ -65,7 +65,7 @@ export default defineMiddleware<Message>({
       await next();
       return;
     }
-    const reply = await handleMove(null, services, message, session.id, move.cell);
+    const reply = await handleMove(services, message, session.id, move.cell);
     if (reply) await context.input.$reply(reply);
   },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/plugin-tic-tac-toe",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Zhin.js 跨平台井字棋 (Plugin Runtime)",
   "type": "module",
   "main": "./lib/index.js",
@@ -14,7 +14,7 @@
     "./package.json": "./package.json"
   },
   "files": [
-    "plugin.ts",
+    "plugin.js",
     "schema.json",
     "commands",
     "middlewares",
@@ -24,11 +24,11 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@zhin.js/command": "1.0.2",
-    "@zhin.js/core": "1.4.0",
-    "@zhin.js/game-kit": "2.0.0",
-    "@zhin.js/middleware": "1.0.2",
-    "@zhin.js/plugin-runtime": "1.1.0"
+    "@zhin.js/command": "1.0.4",
+    "@zhin.js/core": "1.4.2",
+    "@zhin.js/game-kit": "2.0.2",
+    "@zhin.js/middleware": "1.0.4",
+    "@zhin.js/plugin-runtime": "1.1.1"
   },
   "devDependencies": {
     "typescript": "^6.0.3",
@@ -49,7 +49,7 @@
   "zhin": {
     "protocol": 1,
     "type": "plugin",
-    "entry": "./plugin.ts",
+    "entry": "./plugin.js",
     "engine": "^1.0.0",
     "runtime": "trusted",
     "features": [

package/plugin.js

@@ -0,0 +1,84 @@
+// Generated by build-plugin-runtime-entries.mjs. Do not edit.
+import { defineGamePlugin, gameEvents, plainTextFromSendContent, } from '@zhin.js/game-kit';
+import { outboundHostToken } from '@zhin.js/plugin-runtime';
+import { defineHostTables } from "./lib/models.js";
+import { gameServicesToken } from "./lib/runtime-store.js";
+import { renderBoard } from "./lib/game-flow.js";
+import { formatTurnStatus, formatWinHeadline, } from "./lib/player-label.js";
+import { createServices, } from "./lib/session-service.js";
+/**
+ * Plugin Runtime:
+ * - Commands under `commands/` are authoritative (help + bot/join/…).
+ * - DB: prefer databaseHostToken; else in-memory SessionServices.
+ * - Choice middleware under `middlewares/` handles ttt grid / restart payloads (Sandbox action→text).
+ */
+export default defineGamePlugin({
+    name: 'tic-tac-toe',
+    metadata: {
+        displayName: 'Tic Tac Toe',
+    },
+    game: {
+        id: 'ttt',
+        title: '井字棋',
+        icon: '♟️',
+        description: '三子连珠，群聊排队或人机对战',
+        commandPrefix: '/井字棋',
+        quickStart: '人机',
+        aliases: ['ttt'],
+        menus: [
+            { id: 'bot', label: '🤖 人机对战' },
+            { id: 'join', label: '👥 加入排队' },
+            { id: 'spectate', label: '👀 观战' },
+            { id: 'help', label: '📖 玩法说明' },
+        ],
+    },
+    tables: ['ttt_sessions', 'ttt_queue', 'ttt_moves', 'ttt_spectators'],
+    servicesToken: gameServicesToken,
+    defineHostTables,
+    createServices: (database) => createServices(database),
+    session: (services) => services.session,
+    setup(context, services) {
+        if (!context.resources.has(outboundHostToken))
+            return;
+        const outbound = context.resources.use(outboundHostToken);
+        const notify = async (raw, terminal) => {
+            const session = raw;
+            if (!session.adapter || !session.endpoint)
+                return;
+            const spectators = await services.session.listSpectators(session.id);
+            if (spectators.length === 0)
+                return;
+            const status = session.status === 'draw'
+                ? '平局。'
+                : terminal && (session.winner === 1 || session.winner === 2)
+                    ? formatWinHeadline(session, session.winner)
+                    : formatTurnStatus(session, session.move_count);
+            const content = plainTextFromSendContent(renderBoard({
+                $adapter: session.adapter,
+                $endpoint: session.endpoint,
+                $channel: { type: 'private', id: '' },
+                $sender: { id: '' },
+            }, session, status, terminal));
+            await Promise.all(spectators.map((userId) => outbound.send({
+                adapter: session.adapter,
+                endpointId: session.endpoint,
+                channelType: 'private',
+                channelId: userId,
+                content,
+            })));
+        };
+        const disposeTurn = gameEvents.on('turn:change', async (event) => {
+            if (event.gameId === 'ttt' && event.session.status === 'active') {
+                await notify(event.session, false);
+            }
+        });
+        const disposeEnd = gameEvents.on('game:end', async (event) => {
+            if (event.gameId === 'ttt')
+                await notify(event.session, true);
+        });
+        return () => {
+            disposeEnd();
+            disposeTurn();
+        };
+    },
+});

package/src/board-view.ts

@@ -1,4 +1,4 @@
-import type { Message, SendContent } from '@zhin.js/core';
+import type { SendContent } from '@zhin.js/core';
 import {
   buildGridKeyboard,
   buildGridFallbackMap,

package/src/game-flow.ts

@@ -1,5 +1,4 @@
-import type { Adapter, Message, Plugin } from '@zhin.js/core';
-import { plainTextFromSendContent, recordGameOutcome } from '@zhin.js/game-kit';
+import type { GameMessageLike, GameReply } from '@zhin.js/game-kit';
 import type { TttSessionRow } from './models.js';
 import { buildBoardInteractive } from './board-view.js';
 import {
@@ -32,15 +31,14 @@ export function isBotSession(session: TttSessionRow): boolean {
   return session.player_o === BOT_ID || session.player_x === BOT_ID;
 }
 
-export async function sendOrEditBoard(
-  plugin: Plugin | null,
-  services: SessionServices,
-  message: Message<any>,
+/** Render the canonical board reply; delivery belongs to the Runtime Host. */
+export function renderBoard(
+  message: GameMessageLike,
   session: TttSessionRow,
   statusLine: string,
   terminal = false,
   highlight?: number[],
-): Promise<string> {
+): GameReply {
   const board = parseBoard(session.board);
   const content = buildBoardInteractive({
     sessionId: session.id,
@@ -53,50 +51,37 @@ export async function sendOrEditBoard(
     channelType: message.$channel.type,
   });
 
-  if (!plugin) return plainTextFromSendContent(content);
-
-  const adapter = plugin.root.inject(message.$adapter) as Adapter;
-
-  if (session.board_message_id) {
-    const msgId = await adapter.editMessage({
-      messageId: session.board_message_id,
-      context: String(message.$adapter),
-      endpoint: message.$endpoint,
-      id: message.$channel.id,
-      type: message.$channel.type,
-      content,
-    });
-    if (msgId !== session.board_message_id) {
-      await services.session.updateSession(session.id, { board_message_id: msgId });
-    }
-    return msgId;
-  }
-
-  const msgId = await message.$reply?.(content);
-  if (msgId) {
-    await services.session.updateSession(session.id, { board_message_id: msgId });
-  }
-  return msgId ?? '';
+  return content;
 }
 
 export async function restartFromTerminal(
-  plugin: Plugin | null,
   services: SessionServices,
-  message: Message<any>,
+  message: GameMessageLike,
   sessionId: string,
-): Promise<string | null> {
+): Promise<GameReply | null> {
   const session = await services.session.getById(sessionId);
   if (!session) return '对局不存在。';
+  if (session.status === 'active') return '对局尚未结束，无法重开。';
   const mark = playerMark(message.$sender.id, {
     playerX: session.player_x,
     playerO: session.player_o,
   });
   if (!mark) return '你不是本局玩家。';
   await services.session.updateSession(session.id, { status: 'aborted', winner: 0 });
-  const hint = await startBotGame(plugin, services, message);
-  if (hint.includes('已有')) return hint;
-  // text-only 模式（plugin===null）下 startBotGame 的唯一输出就是返回文本
-  return plugin ? null : hint;
+  // PvP 局重开仍是 PvP（原班人马），不静默降级为人机
+  if (!isBotSession(session)) {
+    const board = await startPvpGame(
+      services,
+      message,
+      { id: session.player_x, displayName: session.player_x_name },
+      { id: session.player_o, displayName: session.player_o_name },
+    );
+    if (typeof board === 'string' && board.includes('已有')) return board;
+    return board;
+  }
+  const hint = await startBotGame(services, message);
+  if (typeof hint === 'string' && hint.includes('已有')) return hint;
+  return hint;
 }
 
 function turnCell(session: TttSessionRow): Cell {
@@ -108,12 +93,11 @@ function playerIdForTurn(session: TttSessionRow): string {
 }
 
 export async function handleMove(
-  plugin: Plugin | null,
   services: SessionServices,
-  message: Message<any>,
+  message: GameMessageLike,
   sessionId: string,
   cell: number,
-): Promise<string | null> {
+): Promise<GameReply | null> {
   const session = await services.session.getById(sessionId);
   if (!session || session.status !== 'active') {
     return '对局不存在或已结束。';
@@ -156,56 +140,28 @@ export async function handleMove(
 
   const updated = (await services.session.getById(session.id))!;
 
-  if (win || draw) {
-    const humanId = isBotSession(updated)
-      ? (updated.player_x === BOT_ID ? updated.player_o : updated.player_x)
-      : message.$sender.id;
-    const humanName = isBotSession(updated)
-      ? (updated.player_x === BOT_ID ? updated.player_o_name : updated.player_x_name)
-      : String(message.$sender.name ?? message.$sender.id);
-    const humanMsg = {
-      ...message,
-      $sender: { ...message.$sender, id: humanId, name: humanName },
-    } as Message<any>;
-    if (win) {
-      const humanMark = playerMark(humanId, {
-        playerX: updated.player_x,
-        playerO: updated.player_o,
-      });
-      const humanWon = humanMark === win.winner;
-      void recordGameOutcome(humanMsg, 'ttt', humanWon ? 'won' : 'lost', humanWon ? 20 : 0);
-    } else {
-      void recordGameOutcome(humanMsg, 'ttt', 'draw');
-    }
-  }
-
   if (win) {
     const status = formatWinHeadline(updated, win.winner);
-    const text = await sendOrEditBoard(plugin, services, message, updated, status, true, win.line);
-    // text-only 模式（plugin===null）下 sendOrEditBoard 的唯一输出就是返回文本
-    return plugin ? null : text;
+    return renderBoard(message, updated, status, true, win.line);
   }
   if (draw) {
-    const text = await sendOrEditBoard(plugin, services, message, updated, '平局。', true);
-    return plugin ? null : text;
+    return renderBoard(message, updated, '平局。', true);
   }
 
   // 人机：玩家落子后立刻由服务端代下，避免先发「轮到机器人」再发终盘（QQ 被动消息多耗一次）
   if (isBotSession(updated) && playerIdForTurn(updated) === BOT_ID) {
-    return runBotMove(plugin, services, message, updated);
+    return runBotMove(services, message, updated);
   }
 
   const status = formatTurnStatus(updated, moveCount);
-  const text = await sendOrEditBoard(plugin, services, message, updated, status, false);
-  return plugin ? null : text;
+  return renderBoard(message, updated, status, false);
 }
 
 async function runBotMove(
-  plugin: Plugin | null,
   services: SessionServices,
-  message: Message<any>,
+  message: GameMessageLike,
   session: TttSessionRow,
-): Promise<string | null> {
+): Promise<GameReply | null> {
   const board = parseBoard(session.board);
   const aiMark = session.player_o === BOT_ID ? O : X;
   const cell = bestMove(board, aiMark);
@@ -214,16 +170,15 @@ async function runBotMove(
   const fakeMessage = {
     ...message,
     $sender: { ...message.$sender, id: BOT_ID, name: '机器人' },
-  } as Message<any>;
+  } as GameMessageLike;
 
-  return handleMove(plugin, services, fakeMessage, session.id, cell);
+  return handleMove(services, fakeMessage, session.id, cell);
 }
 
 export async function startBotGame(
-  plugin: Plugin | null,
   services: SessionServices,
-  message: Message<any>,
-): Promise<string> {
+  message: GameMessageLike,
+): Promise<GameReply> {
   const ch = `${message.$adapter}-${message.$endpoint}-${message.$channel.type}:${message.$channel.id}`;
   const active = await services.session.getActiveByChannel(ch);
   if (active) return '当前频道已有进行中的对局。';
@@ -238,20 +193,21 @@ export async function startBotGame(
   });
 
   const status = `${formatRosterLine(session)} · 你先手 (✕)`;
-  const boardText = await sendOrEditBoard(plugin, services, message, session, status, false);
-  if (!plugin) {
-    return `${boardText}\n\n开局成功！回复数字 1–9 落子。`;
-  }
-  return '开局成功！点击棋盘或回复数字落子。';
+  const board = renderBoard(message, session, status, false);
+  const success = '\n\n开局成功！点击空格或回复数字 1–9 落子。';
+  return Array.isArray(board) ? [...board, success] : [board, success];
 }
 
 export async function startPvpGame(
-  plugin: Plugin | null,
   services: SessionServices,
-  message: Message<any>,
+  message: GameMessageLike,
   playerX: TttPlayerRef,
   playerO: TttPlayerRef,
-): Promise<string | void> {
+): Promise<GameReply> {
+  const ch = `${message.$adapter}-${message.$endpoint}-${message.$channel.type}:${message.$channel.id}`;
+  const active = await services.session.getActiveByChannel(ch);
+  if (active) return '当前频道已有进行中的对局。';
+
   const session = await services.session.createSession({
     message,
     playerX: playerX.id,
@@ -262,6 +218,5 @@ export async function startPvpGame(
   });
   const opener = formatPlayerWithMark(session.player_x, session.player_x_name, '✕');
   const status = `${formatRosterLine(session)} · 先手：${opener}`;
-  const boardText = await sendOrEditBoard(plugin, services, message, session, status, false);
-  if (!plugin) return boardText;
+  return renderBoard(message, session, status, false);
 }

package/src/index.ts

@@ -1,6 +1,5 @@
 export { TTT_HELP } from './ttt-command.js';
 export { gameServicesToken, resolveGameServices } from './runtime-store.js';
-export { createInMemoryTttDb, mountTttMemoryServices } from './memory-db.js';
 
 /**
  * 已由 plugin.ts 接线：commands/ 命令、middlewares/ 文本与选项中间件、

package/src/models.ts

@@ -19,7 +19,6 @@ declare module '@zhin.js/core' {
       turn: number;
       status: TttSessionStatus;
       winner: number;
-      board_message_id: string;
       move_count: number;
       updated_at: number;
       created_at: number;
@@ -75,7 +74,6 @@ export function defineHostTables(
     turn: { type: 'integer', default: 1 },
     status: { type: 'text', default: 'active' },
     winner: { type: 'integer', default: 0 },
-    board_message_id: { type: 'text', default: '' },
     move_count: { type: 'integer', default: 0 },
     updated_at: { type: 'integer', default: 0 },
     created_at: { type: 'integer', default: 0 },