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

package/src/session-service.ts

@@ -1,6 +1,13 @@
-import type { Database, Message, Models, RelatedModel } from '@zhin.js/core';
-import { channelKey, boardMessageMatches, generateCompactId } from '@zhin.js/game-kit';
+import type { Database, Models, RelatedModel } from '@zhin.js/core';
+import {
+  BaseSessionService,
+  channelKey,
+  generateCompactId,
+  type GameMessageLike,
+  type GameSessionDatabase,
+} from '@zhin.js/game-kit';
 import type { TttModelName, TttSessionRow } from './models.js';
+import { BOT_ID } from './player-label.js';
 
 /** 井字棋服务使用的数据库实例（Models 经 models.ts 模块增强） */
 export type TttDatabase = Database<unknown, Models, string>;
@@ -9,6 +16,9 @@ type TttModel<K extends TttModelName> = RelatedModel<unknown, Models, K>;
 
 export type TttPlayerRef = { id: string; displayName: string };
 
+/** 排队行过期时间（超时未匹配的排队视为失效） */
+export const QUEUE_TTL_MS = 10 * 60 * 1000;
+
 function getModel<K extends TttModelName>(db: TttDatabase, name: K): TttModel<K> {
   const model = db.models.get(name);
   if (!model) {
@@ -20,12 +30,25 @@ function getModel<K extends TttModelName>(db: TttDatabase, name: K): TttModel<K>
 export class QueueService {
   constructor(private readonly db: TttDatabase) {}
 
+  /** 清掉频道内过期排队行（ttt_queue 无 TTL，靠 join 时顺带清理） */
+  private async pruneExpired(channel: string): Promise<void> {
+    const q = getModel(this.db, 'ttt_queue');
+    const cutoff = Date.now() - QUEUE_TTL_MS;
+    const rows = await q.findAll({ channel_key: channel });
+    for (const row of rows) {
+      if (row.joined_at < cutoff) {
+        await q.deleteWhere({ channel_key: channel, user_id: row.user_id });
+      }
+    }
+  }
+
   async join(
     channel: string,
     userId: string,
     displayName?: string,
   ): Promise<{ queued: boolean; position: number }> {
     const q = getModel(this.db, 'ttt_queue');
+    await this.pruneExpired(channel);
     const existing = await q.findAll({ channel_key: channel, user_id: userId });
     const all = await q.findAll({ channel_key: channel });
     all.sort((a, b) => a.joined_at - b.joined_at);
@@ -57,7 +80,9 @@ export class QueueService {
     const rows = await q.findAll({ channel_key: channel });
     rows.sort((a, b) => a.joined_at - b.joined_at);
     if (rows.length < 2) return null;
-    await q.deleteWhere({ channel_key: channel });
+    // 只删除匹配到的两人，保留队列中其余的等待者
+    await q.deleteWhere({ channel_key: channel, user_id: rows[0]!.user_id });
+    await q.deleteWhere({ channel_key: channel, user_id: rows[1]!.user_id });
     const toRef = (userId: string, userName: string) => ({
       id: userId,
       displayName: userName.trim() || userId,
@@ -78,40 +103,45 @@ export function sessionId(): string {
   return generateCompactId('s');
 }
 
-export class SessionService {
-  constructor(private readonly db: TttDatabase) {}
-
-  async getActiveByChannel(channel: string): Promise<TttSessionRow | null> {
-    const rows = await getModel(this.db, 'ttt_sessions').findAll({
-      channel_key: channel,
-      status: 'active',
+export class SessionService extends BaseSessionService<TttSessionRow> {
+  constructor(private readonly db: TttDatabase) {
+    super(db as unknown as GameSessionDatabase<TttSessionRow>, {
+      gameId: 'ttt',
+      table: 'ttt_sessions',
+      userFields: ['player_x', 'player_o'],
+      projectOutcomes: (session) => {
+        if (session.status !== 'won' && session.status !== 'draw') return [];
+        return [
+          {
+            id: session.player_x,
+            name: session.player_x_name,
+            mark: 1,
+          },
+          {
+            id: session.player_o,
+            name: session.player_o_name,
+            mark: 2,
+          },
+        ]
+          .filter((player) => player.id !== BOT_ID)
+          .map((player) => ({
+            userId: player.id,
+            userName: player.name,
+            result: session.status === 'draw'
+              ? 'draw' as const
+              : session.winner === player.mark
+                ? 'won' as const
+                : 'lost' as const,
+            score: session.status === 'won' && session.winner === player.mark
+              ? 20
+              : undefined,
+          }));
+      },
     });
-    return rows[0] ?? null;
-  }
-
-  async getById(id: string): Promise<TttSessionRow | null> {
-    return getModel(this.db, 'ttt_sessions').findOne({ id });
-  }
-
-  async getActiveForUser(channel: string, userId: string): Promise<TttSessionRow | null> {
-    const row = await this.getActiveByChannel(channel);
-    if (!row) return null;
-    if (row.player_x === userId || row.player_o === userId) return row;
-    return null;
-  }
-
-  /** 根据棋盘消息 ID 查找进行中的局（QQ 等 action 带 sourceMessageId） */
-  async getActiveByBoardMessageId(messageId: string): Promise<TttSessionRow | null> {
-    if (!messageId) return null;
-    const rows = await getModel(this.db, 'ttt_sessions').findAll({});
-    for (const row of rows) {
-      if (boardMessageMatches(row.board_message_id ?? '', messageId)) return row;
-    }
-    return null;
   }
 
   async createSession(input: {
-    message: Message<any>;
+    message: GameMessageLike;
     playerX: string;
     playerO: string;
     playerXName?: string;
@@ -136,20 +166,11 @@ export class SessionService {
       turn: 1,
       status: 'active',
       winner: 0,
-      board_message_id: '',
       move_count: 0,
       updated_at: now,
       created_at: now,
     };
-    await getModel(this.db, 'ttt_sessions').create(row);
-    return row;
-  }
-
-  async updateSession(id: string, patch: Partial<TttSessionRow>): Promise<void> {
-    await getModel(this.db, 'ttt_sessions').updateWhere(
-      { id },
-      { ...patch, updated_at: Date.now() },
-    );
+    return this.createRow(row);
   }
 
   async recordMove(sessionId: string, playerId: string, cell: number, moveIndex: number): Promise<void> {
@@ -174,19 +195,6 @@ export class SessionService {
     return rows.map((r) => r.user_id);
   }
 
-  async abortStale(idleMs: number): Promise<number> {
-    const cutoff = Date.now() - idleMs;
-    const sessions = getModel(this.db, 'ttt_sessions');
-    const rows = await sessions.findAll({ status: 'active' });
-    let n = 0;
-    for (const row of rows) {
-      if (row.updated_at < cutoff) {
-        await sessions.updateWhere({ id: row.id }, { status: 'aborted', updated_at: Date.now() });
-        n++;
-      }
-    }
-    return n;
-  }
 }
 
 export type SessionServices = { queue: QueueService; session: SessionService };
@@ -194,4 +202,3 @@ export type SessionServices = { queue: QueueService; session: SessionService };
 export function createServices(db: TttDatabase): SessionServices {
   return { queue: new QueueService(db), session: new SessionService(db) };
 }
-

package/src/ttt-command.ts

@@ -1,5 +1,8 @@
-import type { Message, Plugin } from '@zhin.js/core';
-import { channelKey } from '@zhin.js/game-kit';
+import {
+  channelKey,
+  type GameMessageLike,
+  type GameReply,
+} from '@zhin.js/game-kit';
 import { formatPlayerWithMark, formatRosterLine } from './player-label.js';
 import { startBotGame, startPvpGame } from './game-flow.js';
 import type { SessionServices } from './session-service.js';
@@ -15,11 +18,10 @@ export const TTT_HELP = [
 ].join('\n');
 
 export async function runTttCommand(
-  plugin: Plugin | null,
   services: SessionServices,
-  message: Message<any>,
+  message: GameMessageLike,
   action: string,
-): Promise<string | undefined> {
+): Promise<GameReply> {
   const ch = channelKey(message);
   const userId = message.$sender.id;
 
@@ -43,9 +45,13 @@ export async function runTttCommand(
     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 人自动开局。`;
   }
@@ -56,7 +62,7 @@ export async function runTttCommand(
   }
 
   if (action === 'bot') {
-    return startBotGame(plugin, services, message);
+    return startBotGame(services, message);
   }
 
   if (action === 'quit') {
@@ -75,12 +81,3 @@ export async function runTttCommand(
 
   return `未知子命令：${action}\n\n${TTT_HELP}`;
 }
-
-/** Plugin Runtime / smoke: text-only, no Adapter.editMessage. */
-export async function runTttCommandText(
-  services: SessionServices,
-  message: Message<any>,
-  action: string,
-): Promise<string> {
-  return (await runTttCommand(null, services, message, action)) ?? '';
-}

package/lib/memory-db.d.ts

@@ -1,6 +0,0 @@
-import type { DatabaseHost } from '@zhin.js/plugin-runtime';
-import { type TttDatabase, type SessionServices } from './session-service.js';
-/** In-memory ttt tables for Plugin Runtime slice-2 (no DatabaseFeature). */
-export declare function createInMemoryTttDb(): TttDatabase;
-export declare function mountTttMemoryServices(): SessionServices;
-export declare function mountTttHostServices(host: DatabaseHost): SessionServices;

package/lib/memory-db.js

@@ -1,18 +0,0 @@
-import { createHostGameDb, createInMemoryGameDb } from '@zhin.js/game-kit';
-import { defineHostTables } from './models.js';
-import { createServices } from './session-service.js';
-const TTT_TABLES = ['ttt_sessions', 'ttt_queue', 'ttt_moves', 'ttt_spectators'];
-/** In-memory ttt tables for Plugin Runtime slice-2 (no DatabaseFeature). */
-export function createInMemoryTttDb() {
-    return createInMemoryGameDb(TTT_TABLES);
-}
-export function mountTttMemoryServices() {
-    const services = createServices(createInMemoryTttDb());
-    return services;
-}
-export function mountTttHostServices(host) {
-    defineHostTables(host);
-    const services = createServices(createHostGameDb(host, TTT_TABLES));
-    return services;
-}
-//# sourceMappingURL=memory-db.js.map

package/lib/memory-db.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"memory-db.js","sourceRoot":"","sources":["../src/memory-db.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAE3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,cAAc,EAA0C,MAAM,sBAAsB,CAAC;AAE9F,MAAM,UAAU,GAAG,CAAC,cAAc,EAAE,WAAW,EAAE,WAAW,EAAE,gBAAgB,CAAU,CAAC;AAEzF,4EAA4E;AAC5E,MAAM,UAAU,mBAAmB;IACjC,OAAO,oBAAoB,CAAC,UAAU,CAA2B,CAAC;AACpE,CAAC;AAED,MAAM,UAAU,sBAAsB;IACpC,MAAM,QAAQ,GAAG,cAAc,CAAC,mBAAmB,EAAE,CAAC,CAAC;IACvD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,IAAkB;IACrD,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACvB,MAAM,QAAQ,GAAG,cAAc,CAAC,gBAAgB,CAAC,IAAI,EAAE,UAAU,CAA2B,CAAC,CAAC;IAC9F,OAAO,QAAQ,CAAC;AAClB,CAAC"}

package/plugin.ts

@@ -1,64 +0,0 @@
-import { definePlugin, databaseHostToken, scheduleHostToken } from '@zhin.js/plugin-runtime';
-import {
-  registerRuntimeGame,
-  initGameRecordHost,
-  DEFAULT_GAME_STALE_CRON,
-  DEFAULT_GAME_STALE_IDLE_MS,
-} from '@zhin.js/game-kit';
-import { mountTttHostServices, mountTttMemoryServices } from './src/memory-db.js';
-import { gameServicesToken } from './src/runtime-store.js';
-import type { SessionServices } from './src/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 definePlugin({
-  name: 'tic-tac-toe',
-  metadata: {
-    displayName: 'Tic Tac Toe',
-  },
-  setup(context) {
-    let services: SessionServices;
-    if (context.resources.has(databaseHostToken)) {
-      const host = context.resources.use(databaseHostToken);
-      services = mountTttHostServices(host);
-      context.lifecycle.add(initGameRecordHost(host));
-    } else {
-      services = mountTttMemoryServices();
-    }
-    context.resources.provide(gameServicesToken, services);
-    const disposeHub = registerRuntimeGame({
-      id: 'ttt',
-      title: '井字棋',
-      icon: '♟️',
-      description: '三子连珠，群聊排队或人机对战',
-      commandPrefix: '/井字棋',
-      quickStart: '人机',
-      aliases: ['ttt'],
-      menus: [
-        { id: 'bot', label: '🤖 人机对战' },
-        { id: 'join', label: '👥 加入排队' },
-        { id: 'spectate', label: '👀 观战' },
-        { id: 'help', label: '📖 玩法说明' },
-      ],
-    });
-    context.lifecycle.add(disposeHub);
-
-    if (context.resources.has(scheduleHostToken)) {
-      const schedule = context.resources.use(scheduleHostToken);
-      const disposeCron = schedule.register({
-        id: 'ttt/abort-stale',
-        cron: DEFAULT_GAME_STALE_CRON,
-        description: 'Abort stale tic-tac-toe sessions',
-        async execute() {
-          if (!services.session.abortStale) return;
-          await services.session.abortStale(DEFAULT_GAME_STALE_IDLE_MS);
-        },
-      });
-      context.lifecycle.add(disposeCron);
-    }
-  },
-});

package/src/memory-db.ts

@@ -1,22 +0,0 @@
-import { createHostGameDb, createInMemoryGameDb } from '@zhin.js/game-kit';
-import type { DatabaseHost } from '@zhin.js/plugin-runtime';
-import { defineHostTables } from './models.js';
-import { createServices, type TttDatabase, type SessionServices } from './session-service.js';
-
-const TTT_TABLES = ['ttt_sessions', 'ttt_queue', 'ttt_moves', 'ttt_spectators'] as const;
-
-/** In-memory ttt tables for Plugin Runtime slice-2 (no DatabaseFeature). */
-export function createInMemoryTttDb(): TttDatabase {
-  return createInMemoryGameDb(TTT_TABLES) as unknown as TttDatabase;
-}
-
-export function mountTttMemoryServices(): SessionServices {
-  const services = createServices(createInMemoryTttDb());
-  return services;
-}
-
-export function mountTttHostServices(host: DatabaseHost): SessionServices {
-  defineHostTables(host);
-  const services = createServices(createHostGameDb(host, TTT_TABLES) as unknown as TttDatabase);
-  return services;
-}