migrate to durable object

Author: tknkaa

app/lib/db/schema-do.ts

@@ -1,9 +1,26 @@
-import { int, sqliteTable, text } from "drizzle-orm/sqlite-core";
+import { customType, int, sqliteTable } from "drizzle-orm/sqlite-core";
+import type { Hai } from "../hai/utils";
+import { haiArray } from "./schema";
 
-export const usersTable = sqliteTable("users_table", {
-	id: int().primaryKey({ autoIncrement: true }),
-	name: text().notNull(),
-	age: int().notNull(),
-	email: text().notNull().unique(),
-	gender: text().notNull(),
+export const hai = customType<{ data: Hai; driverData: string }>({
+	dataType() {
+		return "text";
+	},
+	toDriver(value: Hai) {
+		return JSON.stringify(value);
+	},
+	fromDriver(value: string) {
+		return JSON.parse(value) as Hai;
+	},
+});
+
+export const gameState = sqliteTable("game_state", {
+	// 1行しか使わないので、IDを固定
+	id: int("id").primaryKey().default(1),
+	kyoku: int("kyoku").notNull(),
+	junme: int("junme").notNull(),
+	haiyama: haiArray("haiyama").notNull(),
+	sutehai: haiArray("sutehai").notNull(),
+	tehai: haiArray("tehai").notNull(),
+	tsumohai: hai("tsumohai"),
 });

app/lib/db/schema.ts

@@ -1,4 +1,3 @@
-import type { string } from "better-auth";
 import { sql } from "drizzle-orm";
 import {
 	check,
@@ -11,7 +10,7 @@ import {
 } from "drizzle-orm/sqlite-core";
 import type { Hai } from "../hai/utils";
 
-const haiArray = customType<{ data: Hai[]; driverData: string }>({
+export const haiArray = customType<{ data: Hai[]; driverData: string }>({
 	dataType() {
 		return "text";
 	},

app/lib/do.ts

@@ -0,0 +1,16 @@
+import type { Hai } from "./hai/utils";
+
+export interface GameState {
+	kyoku: number;
+	junme: number;
+	haiyama: Hai[];
+	sutehai: Hai[];
+	tehai: Hai[];
+	tsumohai: Hai | null;
+}
+
+export default function getDOStub(env: Env, userId: string) {
+	const id = env.DO.idFromName(userId);
+	const stub = env.DO.get(id);
+	return stub;
+}

app/lib/redis.ts

@@ -1,6 +1,6 @@
 import { redirect } from "react-router";
 import { getAuth } from "~/lib/auth";
-import { type GameState, getRedisClient, tedashi } from "~/lib/redis";
+import getDOStub from "~/lib/do";
 import type { Route } from "./+types/play.tedashi";
 
 export async function action({ context, request }: Route.ActionArgs) {
@@ -20,18 +20,13 @@ export async function action({ context, request }: Route.ActionArgs) {
 		throw new Response("Invalid index", { status: 400 });
 	}
 
-	const redisClient = getRedisClient(env);
-	await redisClient.connect();
+	const stub = getDOStub(env, userId);
 
 	try {
-		await tedashi(redisClient, userId, index);
-		const gameStateJSON = await redisClient.get(`user:${userId}:game`);
-		const gameState = gameStateJSON ? JSON.parse(gameStateJSON) : null;
+		await stub.tedashi(index);
 
-		await redisClient.quit();
 		return redirect("/play");
 	} catch (error) {
-		await redisClient.quit();
 		const errorMessage = error instanceof Error ? error.message : String(error);
 		throw new Response(errorMessage, { status: 400 });
 	}

app/routes/api.do.ts

@@ -1,6 +1,6 @@
 import { redirect } from "react-router";
 import { getAuth } from "~/lib/auth";
-import { type GameState, getRedisClient, tsumogiri } from "~/lib/redis";
+import getDOStub from "~/lib/do";
 import type { Route } from "./+types/play.tsumogiri";
 
 export async function action({ context, request }: Route.ActionArgs) {
@@ -13,18 +13,13 @@ export async function action({ context, request }: Route.ActionArgs) {
 	}
 	const userId = session.user.id;
 
-	const redisClient = getRedisClient(env);
-	await redisClient.connect();
+	const stub = getDOStub(env, userId);
 
 	try {
-		await tsumogiri(redisClient, userId);
-		const gameStateJSON = await redisClient.get(`user:${userId}:game`);
-		const gameState = gameStateJSON ? JSON.parse(gameStateJSON) : null;
+		await stub.tsumogiri();
 
-		await redisClient.quit();
 		return redirect("/play");
 	} catch (error) {
-		await redisClient.quit();
 		const errorMessage = error instanceof Error ? error.message : String(error);
 		throw new Response(errorMessage, { status: 400 });
 	}

app/routes/play.tedashi.ts

@@ -3,9 +3,10 @@ import { Form } from "react-router";
 import { getAuth } from "~/lib/auth";
 import { getDB } from "~/lib/db";
 import { haiyama } from "~/lib/db/schema";
+import type { GameState } from "~/lib/do";
+import getDOStub from "~/lib/do";
 import judgeAgari from "~/lib/hai/judgeAgari";
 import { sortTehai } from "~/lib/hai/utils";
-import { type GameState, getRedisClient, init } from "~/lib/redis";
 import type { Route } from "./+types/play";
 
 export async function loader({
@@ -23,16 +24,14 @@ export async function loader({
 	const userId = session.user.id;
 
 	// Check if game state already exists in Redis
-	const redisClient = getRedisClient(env);
-	await redisClient.connect();
+	const stub = getDOStub(env, userId);
 
 	try {
-		const existingGameState = await redisClient.get(`user:${userId}:game`);
+		const existingGameState = await stub.getCurrentGameState();
 
 		if (existingGameState) {
 			// Return existing game state from Redis
-			await redisClient.quit();
-			return JSON.parse(existingGameState);
+			return existingGameState;
 		}
 
 		// No existing game state, so initialize from PostgreSQL
@@ -43,22 +42,20 @@ export async function loader({
 			.limit(1);
 
 		if (randomHaiyama.length === 0) {
-			await redisClient.quit();
 			throw new Response("No haiyama found", { status: 404 });
 		}
 
 		const haiData = randomHaiyama[0].tiles;
 		// Initialize game state in Redis
-		await init(redisClient, userId, haiData);
+		await stub.init(haiData);
 
 		// Get the initialized game state to return
-		const gameStateJSON = await redisClient.get(`user:${userId}:game`);
-		const gameState = gameStateJSON ? JSON.parse(gameStateJSON) : null;
-
-		await redisClient.quit();
+		const gameState = await stub.getCurrentGameState();
+		if (!gameState) {
+			throw new Error("Failed to get current game state");
+		}
 		return gameState;
 	} catch (error) {
-		await redisClient.quit();
 		throw error instanceof Error ? error : new Error(String(error));
 	}
 }

app/routes/play.tsumogiri.ts

@@ -0,0 +1,11 @@
+CREATE TABLE `game_state` (
+	`id` integer PRIMARY KEY DEFAULT 1 NOT NULL,
+	`kyoku` integer NOT NULL,
+	`junme` integer NOT NULL,
+	`haiyama` text NOT NULL,
+	`sutehai` text NOT NULL,
+	`tehai` text NOT NULL,
+	`tsumohai` text
+);
+--> statement-breakpoint
+DROP TABLE `users_table`;