@zhin.js/plugin-tic-tac-toe 1.0.0 → 1.0.2

package/middlewares/ttt-alias.ts

@@ -0,0 +1,18 @@
+import {
+  defineGameCommandAliasMiddleware,
+  messageFromCommandInput,
+  normalizeTttAction,
+} from '@zhin.js/game-kit';
+import { TTT_HELP, runTttCommandText } 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;
+    const services = resolveGameServices(context);
+    const message = messageFromCommandInput(input);
+    return runTttCommandText(services, message, normalized);
+  },
+});

package/middlewares/ttt-choice.ts

@@ -0,0 +1,71 @@
+import { defineMiddleware } from '@zhin.js/middleware';
+import type { Message } from '@zhin.js/core/runtime';
+import {
+  channelKey,
+  messageFromCommandInput,
+  parseChoicePayload,
+  resolveGameTextPayload,
+} from '@zhin.js/game-kit';
+import { resolveGameServices } from '../src/runtime-store.js';
+import { buildFallbackMap, TTT_PREFIX, parseTttPayload } from '../src/board-view.js';
+import { parseBoard } from '../src/engine.js';
+import { handleMove, restartFromTerminal } from '../src/game-flow.js';
+
+/**
+ * 文本入口：按钮 payload（`ttt:session:0-8` 或 `ttt:session:restart`）
+ * 与裸数字 fallback（按空格 1-9 编号落子，对应视图『落子：回复数字 1-9（仅空格）』）。
+ */
+export default defineMiddleware<Message>({
+  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(null, 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(null, 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(null, services, message, session.id, move.cell);
+    if (reply) await context.input.$reply(reply);
+  },
+});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zhin.js/plugin-tic-tac-toe",
-  "version": "1.0.0",
-  "description": "Zhin.js 跨平台井字棋 — 按钮/文本双模式，群聊排队与人机对战",
+  "version": "1.0.2",
+  "description": "Zhin.js 跨平台井字棋 (Plugin Runtime)",
   "type": "module",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -14,29 +14,25 @@
     "./package.json": "./package.json"
   },
   "files": [
+    "plugin.ts",
+    "schema.json",
+    "commands",
+    "middlewares",
     "src",
     "lib",
-    "plugin.yml",
     "README.md"
   ],
-  "keywords": [
-    "zhin",
-    "zhin.js",
-    "bot",
-    "plugin",
-    "game",
-    "tic-tac-toe"
-  ],
   "license": "MIT",
-  "peerDependencies": {
-    "zhin.js": "4.1.0"
-  },
   "dependencies": {
-    "@zhin.js/game-shared": "1.0.0"
+    "@zhin.js/command": "1.0.1",
+    "@zhin.js/core": "1.3.5",
+    "@zhin.js/game-kit": "1.0.2",
+    "@zhin.js/middleware": "1.0.1",
+    "@zhin.js/plugin-runtime": "1.0.1"
   },
   "devDependencies": {
     "typescript": "^6.0.3",
-    "zhin.js": "4.1.0"
+    "vitest": "^4.1.10"
   },
   "repository": {
     "type": "git",
@@ -47,8 +43,30 @@
     "access": "public",
     "registry": "https://registry.npmjs.org"
   },
+  "engines": {
+    "node": "^20.19.0 || >=22.12.0"
+  },
+  "zhin": {
+    "protocol": 1,
+    "type": "plugin",
+    "entry": "./plugin.ts",
+    "engine": "^1.0.0",
+    "runtime": "trusted",
+    "features": [
+      {
+        "package": "@zhin.js/command",
+        "api": "^1.0.0"
+      },
+      {
+        "package": "@zhin.js/middleware",
+        "api": "^1.0.0"
+      }
+    ],
+    "plugins": []
+  },
   "scripts": {
-    "build": "tsc --build",
-    "clean": "rimraf lib"
+    "build": "tsc",
+    "clean": "rimraf lib",
+    "test": "NODE_OPTIONS=--experimental-strip-types vitest run --root ../../.. plugins/games/tic-tac-toe/tests"
   }
 }

package/plugin.ts

@@ -0,0 +1,64 @@
+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/schema.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "type": "object",
+  "additionalProperties": false,
+  "properties": {}
+}

package/src/board-view.ts

@@ -1,4 +1,4 @@
-import type { Message, SendContent } from 'zhin.js';
+import type { Message, SendContent } from '@zhin.js/core';
 import {
   buildGridKeyboard,
   buildGridFallbackMap,
@@ -6,7 +6,7 @@ import {
   parseCellButtonId as parseButtonId,
   channelKey,
   type GridCell,
-} from '@zhin.js/game-shared';
+} from '@zhin.js/game-kit';
 import {
   asciiBoard,
   cellLabel,
@@ -52,8 +52,9 @@ export function buildBoardInteractive(options: {
   terminal?: boolean;
   omitAsciiBoard?: boolean;
   highlight?: number[];
+  channelType?: string;
 }): SendContent {
-  const { sessionId, board, statusLine, terminal, omitAsciiBoard, highlight } = options;
+  const { sessionId, board, statusLine, terminal, omitAsciiBoard, highlight, channelType } = options;
 
   return buildGridKeyboard({
     gamePrefix: TTT_PREFIX,
@@ -67,6 +68,10 @@ export function buildBoardInteractive(options: {
     renderAscii: renderTttAscii,
     highlight,
     fallbackHint: '落子：回复数字 1-9（仅空格）',
+    postChoices: terminal
+      ? [{ id: 'restart', label: '🔄 再来一局', style: 'primary' }]
+      : undefined,
+    channelType,
   });
 }
 

package/src/game-flow.ts

@@ -1,4 +1,5 @@
-import type { Adapter, Message, Plugin } from 'zhin.js';
+import type { Adapter, Message, Plugin } from '@zhin.js/core';
+import { plainTextFromSendContent, recordGameOutcome } from '@zhin.js/game-kit';
 import type { TttSessionRow } from './models.js';
 import { buildBoardInteractive } from './board-view.js';
 import {
@@ -32,7 +33,7 @@ export function isBotSession(session: TttSessionRow): boolean {
 }
 
 export async function sendOrEditBoard(
-  plugin: Plugin,
+  plugin: Plugin | null,
   services: SessionServices,
   message: Message<any>,
   session: TttSessionRow,
@@ -49,8 +50,11 @@ export async function sendOrEditBoard(
     terminal,
     omitAsciiBoard: message.$adapter === 'qq',
     highlight,
+    channelType: message.$channel.type,
   });
 
+  if (!plugin) return plainTextFromSendContent(content);
+
   const adapter = plugin.root.inject(message.$adapter) as Adapter;
 
   if (session.board_message_id) {
@@ -75,6 +79,26 @@ export async function sendOrEditBoard(
   return msgId ?? '';
 }
 
+export async function restartFromTerminal(
+  plugin: Plugin | null,
+  services: SessionServices,
+  message: Message<any>,
+  sessionId: string,
+): Promise<string | null> {
+  const session = await services.session.getById(sessionId);
+  if (!session) 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;
+}
+
 function turnCell(session: TttSessionRow): Cell {
   return session.turn === 1 ? X : O;
 }
@@ -84,7 +108,7 @@ function playerIdForTurn(session: TttSessionRow): string {
 }
 
 export async function handleMove(
-  plugin: Plugin,
+  plugin: Plugin | null,
   services: SessionServices,
   message: Message<any>,
   sessionId: string,
@@ -132,49 +156,71 @@ 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);
-    await sendOrEditBoard(plugin, services, message, updated, status, true, win.line);
-    return null;
+    const text = await sendOrEditBoard(plugin, services, message, updated, status, true, win.line);
+    // text-only 模式（plugin===null）下 sendOrEditBoard 的唯一输出就是返回文本
+    return plugin ? null : text;
   }
   if (draw) {
-    await sendOrEditBoard(plugin, services, message, updated, '平局。', true);
-    return null;
+    const text = await sendOrEditBoard(plugin, services, message, updated, '平局。', true);
+    return plugin ? null : text;
   }
 
   // 人机：玩家落子后立刻由服务端代下，避免先发「轮到机器人」再发终盘（QQ 被动消息多耗一次）
   if (isBotSession(updated) && playerIdForTurn(updated) === BOT_ID) {
-    await runBotMove(plugin, services, message, updated);
-    return null;
+    return runBotMove(plugin, services, message, updated);
   }
 
   const status = formatTurnStatus(updated, moveCount);
-  await sendOrEditBoard(plugin, services, message, updated, status, false);
-
-  return null;
+  const text = await sendOrEditBoard(plugin, services, message, updated, status, false);
+  return plugin ? null : text;
 }
 
 async function runBotMove(
-  plugin: Plugin,
+  plugin: Plugin | null,
   services: SessionServices,
   message: Message<any>,
   session: TttSessionRow,
-): Promise<void> {
+): Promise<string | null> {
   const board = parseBoard(session.board);
   const aiMark = session.player_o === BOT_ID ? O : X;
   const cell = bestMove(board, aiMark);
-  if (cell < 0) return;
+  if (cell < 0) return null;
 
   const fakeMessage = {
     ...message,
     $sender: { ...message.$sender, id: BOT_ID, name: '机器人' },
   } as Message<any>;
 
-  await handleMove(plugin, services, fakeMessage, session.id, cell);
+  return handleMove(plugin, services, fakeMessage, session.id, cell);
 }
 
 export async function startBotGame(
-  plugin: Plugin,
+  plugin: Plugin | null,
   services: SessionServices,
   message: Message<any>,
 ): Promise<string> {
@@ -192,17 +238,20 @@ export async function startBotGame(
   });
 
   const status = `${formatRosterLine(session)} · 你先手 (✕)`;
-  await sendOrEditBoard(plugin, services, message, session, status, false);
+  const boardText = await sendOrEditBoard(plugin, services, message, session, status, false);
+  if (!plugin) {
+    return `${boardText}\n\n开局成功！回复数字 1–9 落子。`;
+  }
   return '开局成功！点击棋盘或回复数字落子。';
 }
 
 export async function startPvpGame(
-  plugin: Plugin,
+  plugin: Plugin | null,
   services: SessionServices,
   message: Message<any>,
   playerX: TttPlayerRef,
   playerO: TttPlayerRef,
-): Promise<void> {
+): Promise<string | void> {
   const session = await services.session.createSession({
     message,
     playerX: playerX.id,
@@ -213,5 +262,6 @@ export async function startPvpGame(
   });
   const opener = formatPlayerWithMark(session.player_x, session.player_x_name, '✕');
   const status = `${formatRosterLine(session)} · 先手：${opener}`;
-  await sendOrEditBoard(plugin, services, message, session, status, false);
+  const boardText = await sendOrEditBoard(plugin, services, message, session, status, false);
+  if (!plugin) return boardText;
 }

package/src/index.ts

@@ -1,43 +1,9 @@
+export { TTT_HELP } from './ttt-command.js';
+export { gameServicesToken, resolveGameServices } from './runtime-store.js';
+export { createInMemoryTttDb, mountTttMemoryServices } from './memory-db.js';
+
 /**
- * @zhin.js/plugin-tic-tac-toe — 跨平台井字棋
- *
- * ```yaml
- * plugins:
- *   - "@zhin.js/plugin-tic-tac-toe"
- * database:
- *   dialect: sqlite
- *   storage: ./data/zhin.db
- * ```
+ * 已由 plugin.ts 接线：commands/ 命令、middlewares/ 文本与选项中间件、
+ * 游戏大厅注册（registerRuntimeGame）、过期会话 cron（scheduleHostToken）、
+ * host DatabaseHost（databaseHostToken）。仍未接：interactive 按钮回调。
  */
-import { Cron, formatCompact, usePlugin, type DatabaseFeature } from 'zhin.js';
-import { registerModels } from './models.js';
-import { createServices, resolveGameDatabase, type SessionServices } from './session-service.js';
-import { registerCommands, registerInteractive, registerTextFallback } from './commands.js';
-import { registerTttHub } from './hub-register.js';
-
-const plugin = usePlugin();
-const { logger, useContext, addCron } = plugin;
-
-registerModels(plugin);
-
-let services: SessionServices | null = null;
-
-useContext('database', (dbFeature: DatabaseFeature) => {
-  services = createServices(resolveGameDatabase(dbFeature));
-  logger.info(formatCompact({ 模块: '井字棋', 数据模型: '已就绪' }));
-});
-
-registerTttHub(() => services);
-registerCommands(plugin, () => services);
-registerInteractive(plugin, () => services);
-registerTextFallback(plugin, () => services);
-
-addCron(
-  new Cron('0 */10 * * * *', async () => {
-    if (!services) return;
-    const n = await services.session.abortStale(30 * 60 * 1000);
-    if (n > 0) logger.debug(formatCompact({ 井字棋: '清理超时局', count: n }));
-  }),
-);
-
-logger.info(formatCompact({ 模块: '井字棋', 状态: '已加载' }));

package/src/memory-db.ts

@@ -0,0 +1,22 @@
+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;
+}

package/src/models.ts

@@ -1,8 +1,8 @@
-import type { Models, Plugin } from 'zhin.js';
+import type { Models } from '@zhin.js/core';
 
 export type TttSessionStatus = 'active' | 'won' | 'draw' | 'aborted';
 
-declare module 'zhin.js' {
+declare module '@zhin.js/core' {
   interface Models {
     ttt_sessions: {
       id: string;
@@ -56,8 +56,11 @@ export type TttSpectatorRow = Models['ttt_spectators'];
 /** 井字棋插件注册的表名 */
 export type TttModelName = 'ttt_sessions' | 'ttt_queue' | 'ttt_moves' | 'ttt_spectators';
 
-export function registerModels(plugin: Plugin): void {
-  plugin.defineModel('ttt_sessions', {
+
+export function defineHostTables(
+  db: { define: (name: string, definition: Record<string, unknown>) => void },
+): void {
+  db.define('ttt_sessions', {
     id: { type: 'text', primary: true },
     adapter: { type: 'text', nullable: false },
     endpoint: { type: 'text', nullable: false },
@@ -77,16 +80,14 @@ export function registerModels(plugin: Plugin): void {
     updated_at: { type: 'integer', default: 0 },
     created_at: { type: 'integer', default: 0 },
   });
-
-  plugin.defineModel('ttt_queue', {
+  db.define('ttt_queue', {
     id: { type: 'integer', primary: true },
     channel_key: { type: 'text', nullable: false },
     user_id: { type: 'text', nullable: false },
     user_name: { type: 'text', default: '' },
     joined_at: { type: 'integer', default: 0 },
   });
-
-  plugin.defineModel('ttt_moves', {
+  db.define('ttt_moves', {
     id: { type: 'integer', primary: true },
     session_id: { type: 'text', nullable: false },
     player_id: { type: 'text', nullable: false },
@@ -94,8 +95,7 @@ export function registerModels(plugin: Plugin): void {
     move_index: { type: 'integer', nullable: false },
     created_at: { type: 'integer', default: 0 },
   });
-
-  plugin.defineModel('ttt_spectators', {
+  db.define('ttt_spectators', {
     id: { type: 'integer', primary: true },
     session_id: { type: 'text', nullable: false },
     user_id: { type: 'text', nullable: false },

package/src/player-label.ts

@@ -1,4 +1,4 @@
-import type { MessageSender } from 'zhin.js';
+import type { MessageSender } from '@zhin.js/core';
 import type { TttSessionRow } from './models.js';
 import { X, O, type Cell, cellLabel } from './engine.js';
 

package/src/runtime-store.ts

@@ -0,0 +1,9 @@
+import { createToken } from '@zhin.js/plugin-runtime';
+import type { SessionServices } from './session-service.js';
+
+/** Owner-scoped service consumed by discovered commands and middleware. */
+export const gameServicesToken = createToken<SessionServices>('zhin.game.tic-tac-toe.services');
+
+export function resolveGameServices(context: { use<T>(token: typeof gameServicesToken): T }): SessionServices {
+  return context.use(gameServicesToken) as SessionServices;
+}

package/src/session-service.ts

@@ -1,5 +1,5 @@
-import type { Database, DatabaseFeature, Message, Models, RelatedModel } from 'zhin.js';
-import { channelKey } from '@zhin.js/game-shared';
+import type { Database, Message, Models, RelatedModel } from '@zhin.js/core';
+import { channelKey, boardMessageMatches, generateCompactId } from '@zhin.js/game-kit';
 import type { TttModelName, TttSessionRow } from './models.js';
 
 /** 井字棋服务使用的数据库实例（Models 经 models.ts 模块增强） */
@@ -75,7 +75,7 @@ export class QueueService {
 }
 
 export function sessionId(): string {
-  return `s${Date.now().toString(36)}${Math.random().toString(36).slice(2, 6)}`;
+  return generateCompactId('s');
 }
 
 export class SessionService {
@@ -103,14 +103,9 @@ export class SessionService {
   /** 根据棋盘消息 ID 查找进行中的局（QQ 等 action 带 sourceMessageId） */
   async getActiveByBoardMessageId(messageId: string): Promise<TttSessionRow | null> {
     if (!messageId) return null;
-    const rows = await getModel(this.db, 'ttt_sessions').findAll({ status: 'active' });
+    const rows = await getModel(this.db, 'ttt_sessions').findAll({});
     for (const row of rows) {
-      const stored = row.board_message_id;
-      if (!stored) continue;
-      if (stored === messageId) return row;
-      if (stored.endsWith(`:${messageId}`)) return row;
-      const tail = stored.split(':').pop();
-      if (tail && messageId.endsWith(tail)) return row;
+      if (boardMessageMatches(row.board_message_id ?? '', messageId)) return row;
     }
     return null;
   }
@@ -200,6 +195,3 @@ export function createServices(db: TttDatabase): SessionServices {
   return { queue: new QueueService(db), session: new SessionService(db) };
 }
 
-export function resolveGameDatabase(feature: DatabaseFeature): TttDatabase {
-  return feature.db;
-}