Update CI node versions, enhance .gitignore, and refine type handling in API client and storage functions

Author: chrisreddington

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [20, 22]
+        node-version: [22, 24]
 
     steps:
       - name: Checkout code

.gitignore

@@ -144,4 +144,8 @@ vite.config.js.timestamp-*
 vite.config.ts.timestamp-*
 
 # Database
-*.db
+*.db
+
+# OS files
+.DS_Store
+Thumbs.db

shared/src/storage/mcp-api-client.ts

@@ -6,7 +6,7 @@ import { httpGet, httpPost, WEB_API_BASE } from '../utils/http-client'
 export async function getTicTacToeGameForMCP(gameId: string): Promise<GameSession<TicTacToeGameState> | undefined> {
   try {
     // Get all games and find the one we want
-    const games = await httpGet(`${WEB_API_BASE}/api/games/tic-tac-toe`)
+    const games = await httpGet<GameSession<TicTacToeGameState>[]>(`${WEB_API_BASE}/api/games/tic-tac-toe`)
     return games.find((game: GameSession<TicTacToeGameState>) => game.gameState?.id === gameId)
   } catch (error) {
     console.error('Error fetching tic-tac-toe game via API:', error)
@@ -35,7 +35,7 @@ export async function makeTicTacToeMove(gameId: string, move: TicTacToeMove, pla
 
 export async function getRPSGameForMCP(gameId: string): Promise<GameSession<RPSGameState> | undefined> {
   try {
-    const games = await httpGet(`${WEB_API_BASE}/api/games/rock-paper-scissors/mcp`)
+    const games = await httpGet<GameSession<RPSGameState>[]>(`${WEB_API_BASE}/api/games/rock-paper-scissors/mcp`)
     return games.find((game: GameSession<RPSGameState>) => game.gameState?.id === gameId)
   } catch (error) {
     console.error('Error fetching RPS game via API:', error)

shared/src/storage/sqlite-storage.ts

@@ -126,7 +126,7 @@ async function initializeDatabase(): Promise<sqlite3.Database> {
 }
 
 // Helper function to run database queries
-async function runQuery(sql: string, params: any[] = []): Promise<any> {
+async function runQuery(sql: string, params: unknown[] = []): Promise<{ lastID: number | null; changes: number }> {
   try {
     const database = await initializeDatabase()
     if (!database) {
@@ -151,7 +151,7 @@ async function runQuery(sql: string, params: any[] = []): Promise<any> {
 }
 
 // Helper function to get single row
-async function getRow(sql: string, params: any[] = []): Promise<any> {
+async function getRow(sql: string, params: unknown[] = []): Promise<Record<string, unknown> | undefined> {
   try {
     const database = await initializeDatabase()
     if (!database) {
@@ -162,7 +162,7 @@ async function getRow(sql: string, params: any[] = []): Promise<any> {
         if (err) {
           reject(err)
         } else {
-          resolve(row)
+          resolve(row as Record<string, unknown> | undefined)
         }
       })
     })
@@ -176,7 +176,7 @@ async function getRow(sql: string, params: any[] = []): Promise<any> {
 }
 
 // Helper function to get all rows
-async function getAllRows(sql: string, params: any[] = []): Promise<any[]> {
+async function getAllRows(sql: string, params: unknown[] = []): Promise<Record<string, unknown>[]> {
   try {
     const database = await initializeDatabase()
     if (!database) {
@@ -187,7 +187,7 @@ async function getAllRows(sql: string, params: any[] = []): Promise<any[]> {
         if (err) {
           reject(err)
         } else {
-          resolve(rows || [])
+          resolve((rows || []) as Record<string, unknown>[])
         }
       })
     })
@@ -205,7 +205,7 @@ export async function getTicTacToeGame(gameId: string): Promise<GameSession<TicT
   try {
     const row = await getRow('SELECT game_session FROM tic_tac_toe_games WHERE id = ?', [gameId])
     if (row) {
-      return JSON.parse(row.game_session)
+      return JSON.parse(row.game_session as string)
     }
     return undefined
   } catch (error) {
@@ -234,7 +234,7 @@ export async function setTicTacToeGame(gameId: string, gameSession: GameSession<
 export async function getAllTicTacToeGames(): Promise<GameSession<TicTacToeGameState>[]> {
   try {
     const rows = await getAllRows('SELECT game_session FROM tic_tac_toe_games ORDER BY updated_at DESC')
-    return rows.map(row => JSON.parse(row.game_session))
+    return rows.map(row => JSON.parse(row.game_session as string))
   } catch (error) {
     if (process.env.NODE_ENV !== 'test') {
       console.error('Error getting all tic-tac-toe games:', error)
@@ -260,7 +260,7 @@ export async function getRPSGame(gameId: string): Promise<GameSession<RPSGameSta
   try {
     const row = await getRow('SELECT game_session FROM rps_games WHERE id = ?', [gameId])
     if (row) {
-      return JSON.parse(row.game_session)
+      return JSON.parse(row.game_session as string)
     }
     return undefined
   } catch (error) {
@@ -289,7 +289,7 @@ export async function setRPSGame(gameId: string, gameSession: GameSession<RPSGam
 export async function getAllRPSGames(): Promise<GameSession<RPSGameState>[]> {
   try {
     const rows = await getAllRows('SELECT game_session FROM rps_games ORDER BY updated_at DESC')
-    return rows.map(row => JSON.parse(row.game_session))
+    return rows.map(row => JSON.parse(row.game_session as string))
   } catch (error) {
     if (process.env.NODE_ENV !== 'test') {
       console.error('Error getting all RPS games:', error)

shared/src/testing/api-test-utils.ts

@@ -102,16 +102,16 @@ export function createMockGameSession<T extends BaseGameState>(gameState: T, gam
  * Use this to create consistent mocks across API route tests
  */
 export function createSharedGameMocks(gameClass: string): {
-  mockImplementation: Record<string, unknown>;
+  mockImplementation: () => Promise<Record<string, unknown>>;
   mockGame: ReturnType<typeof createGameMock>;
 } {
   const mockGame = createGameMock()
 
   return {
-    mockImplementation: {
-      ...vi.importActual('@turn-based-mcp/shared'),
+    mockImplementation: async () => ({
+      ...await vi.importActual('@turn-based-mcp/shared/constants'),
       [gameClass]: vi.fn().mockImplementation(() => mockGame)
-    },
+    }),
     mockGame
   }
 }

shared/src/utils/http-client.ts

@@ -15,7 +15,7 @@ export const WEB_API_BASE = process.env.WEB_API_BASE || 'http://localhost:3000'
  * @returns Promise resolving to the JSON response
  * @throws Error if the request fails or returns non-2xx status
  */
-export async function httpGet<T = any>(url: string): Promise<T> {
+export async function httpGet<T = unknown>(url: string): Promise<T> {
   const response = await fetch(url)
   if (!response.ok) {
     throw new Error(`HTTP ${response.status}: ${response.statusText}`)
@@ -31,7 +31,7 @@ export async function httpGet<T = any>(url: string): Promise<T> {
  * @returns Promise resolving to the JSON response
  * @throws Error if the request fails or returns non-2xx status
  */
-export async function httpPost<T = any>(url: string, data: unknown): Promise<T> {
+export async function httpPost<T = unknown>(url: string, data: unknown): Promise<T> {
   const response = await fetch(url, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },

web/next-env.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
+import "./.next/types/routes.d.ts";
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

web/src/app/api/games/rock-paper-scissors/[id]/move/route.test.ts

@@ -4,7 +4,7 @@ import type { GameSession, RPSGameState, RPSMove } from '@turn-based-mcp/shared'
 
 // Mock dependencies BEFORE importing the route - use factory functions for proper setup
 // In vitest v4, mocks used as constructors must use 'function' syntax
-vi.mock('@turn-based-mcp/shared', () => {
+vi.mock('@turn-based-mcp/shared', async () => {
   const mockGame = {
     getInitialState: vi.fn(),
     validateMove: vi.fn(),
@@ -14,7 +14,7 @@ vi.mock('@turn-based-mcp/shared', () => {
   };
 
   return {
-    ...vi.importActual('@turn-based-mcp/shared'),
+    ...await vi.importActual('@turn-based-mcp/shared/constants'),
     RockPaperScissorsGame: vi.fn(function() { return mockGame; }),
     __mockGameInstance: mockGame
   };

web/src/app/api/games/rock-paper-scissors/route.test.ts

@@ -14,8 +14,8 @@ const mockGame = vi.hoisted(() => ({
 
 // Mock dependencies BEFORE importing the route
 // In vitest v4, mocks used as constructors must use 'function' syntax
-vi.mock('@turn-based-mcp/shared', () => ({
-  ...vi.importActual('@turn-based-mcp/shared'),
+vi.mock('@turn-based-mcp/shared', async () => ({
+  ...await vi.importActual('@turn-based-mcp/shared/constants'),
   RockPaperScissorsGame: vi.fn(function() { return mockGame; })
 }));
 

web/src/app/api/games/tic-tac-toe/[id]/move/route.test.ts

@@ -4,7 +4,7 @@ import type { GameSession, TicTacToeGameState, TicTacToeMove } from '@turn-based
 
 // Mock dependencies BEFORE importing the route - use factory functions for proper setup
 // In vitest v4, mocks used as constructors must use 'function' syntax
-vi.mock('@turn-based-mcp/shared', () => {
+vi.mock('@turn-based-mcp/shared', async () => {
   const mockGame = {
     getInitialState: vi.fn(),
     validateMove: vi.fn(),
@@ -14,7 +14,7 @@ vi.mock('@turn-based-mcp/shared', () => {
   };
 
   return {
-    ...vi.importActual('@turn-based-mcp/shared'),
+    ...await vi.importActual('@turn-based-mcp/shared/constants'),
     TicTacToeGame: vi.fn(function() { return mockGame; }),
     getTicTacToeGame: vi.fn(),
     setTicTacToeGame: vi.fn(),