Merge pull request #110 from ut-code/judge-agari

アガり判定 & 流局

Author: tknkaa

.envrc

@@ -0,0 +1 @@
+use flake

.gitignore

@@ -16,3 +16,5 @@ worker-configuration.d.ts
 
 !.dev.vars.example
 !.env.example
+
+.direnv

…d-workspaces/web/src/utils/judgeAgari.ts app/lib/hai/judgeAgari.tsold-workspaces/web/src/utils/judgeAgari.ts renamed to app/lib/hai/judgeAgari.ts old-workspaces/web/src/utils/judgeAgari.ts renamed to app/lib/hai/judgeAgari.ts

@@ -1,4 +1,4 @@
-import { type Hai, haiToIndex } from "shared/hai.ts";
+import { type Hai, haiToIndex } from "./utils";
 
 function deleteSyuntsu(remainingTehai: TehaiIndex): number {
 	let extractCount = 0;

app/lib/hai.ts app/lib/hai/utils.tsapp/lib/hai.ts renamed to app/lib/hai/utils.ts

@@ -1,6 +1,6 @@
 import { createClient } from "redis";
-import type { Hai } from "./hai";
-import { sortTehai } from "./hai";
+import type { Hai } from "./hai/utils";
+import { sortTehai } from "./hai/utils";
 
 export function getRedisClient(env: Env) {
 	const client = createClient({
@@ -73,8 +73,9 @@ export const tedashi = async (
 	if (index < 0 || 12 < index) {
 		throw new Error("index out of tehai length");
 	}
-	const deletedTehai = state.tehai.filter((_, i) => i !== index);
-	const discardedHai = state.tehai[index];
+	const sortedTehai = sortTehai(state.tehai);
+	const deletedTehai = sortedTehai.filter((_, i) => i !== index);
+	const discardedHai = sortedTehai[index];
 
 	const newGameState: GameState = {
 		...state,

app/lib/redis.ts

@@ -1,32 +1,14 @@
-import { drizzle as drizzleNeon } from "drizzle-orm/neon-http";
-import { drizzle as drizzlePg } from "drizzle-orm/node-postgres";
-import type { c } from "node_modules/better-auth/dist/shared/better-auth.C9FmyZ5W.cjs";
 import { Link, useNavigate } from "react-router";
 import { authClient } from "~/lib/auth-client";
-import { getRedisClient } from "~/lib/redis";
-import type { Route } from "./+types/_index";
-
-export async function loader({ context }: Route.LoaderArgs) {
-	const { env } = context.cloudflare;
-	const db =
-		env.NODE_ENV === "development"
-			? drizzlePg(env.DATABASE_URL)
-			: drizzleNeon(env.DATABASE_URL);
-	const redisClient = getRedisClient(env);
-	redisClient.on("error", (err) => console.log("Redis Client Error", err));
-	await redisClient.connect();
-	await redisClient.set("key", "value");
-	const value = await redisClient.get("key");
-	console.log(value);
-}
 
 export default function Page() {
 	const navigate = useNavigate();
 	const anonymousLoginAndStart = async () => {
 		const user = await authClient.getSession();
-		if (!user) {
-			const _user = await authClient.signIn.anonymous();
+		if (user.data) {
+			const _user = await authClient.signOut();
 		}
+		const _user = await authClient.signIn.anonymous();
 		navigate("/play");
 	};
 	return (

app/routes/_index.tsx

@@ -3,7 +3,8 @@ import { Form } from "react-router";
 import { getAuth } from "~/lib/auth";
 import { getDB } from "~/lib/db";
 import { hai, haiyama } from "~/lib/db/schema";
-import { dbHaiToHai, sortTehai } from "~/lib/hai";
+import judgeAgari from "~/lib/hai/judgeAgari";
+import { dbHaiToHai, sortTehai } from "~/lib/hai/utils";
 import { type GameState, getRedisClient, init } from "~/lib/redis";
 import type { Route } from "./+types/play";
 
@@ -73,6 +74,9 @@ export async function loader({
 export default function Page({ loaderData }: Route.ComponentProps) {
 	let { haiyama, sutehai, tsumohai, junme, kyoku, tehai } = loaderData;
 	tehai = sortTehai(tehai);
+	const isAgari =
+		tehai && tsumohai ? judgeAgari(sortTehai([...tehai, tsumohai])) : false;
+	const isRyukyoku = junme === 19;
 	const indexedSutehai = sutehai.map((hai, index) => ({
 		...hai,
 		index: index,
@@ -84,6 +88,36 @@ export default function Page({ loaderData }: Route.ComponentProps) {
 
 	return (
 		<div className="p-4">
+			{isAgari && (
+				<dialog id="agari_modal" className="modal" open>
+					<div className="modal-box">
+						<h3 className="font-bold text-lg">ツモ！</h3>
+						<div className="modal-action">
+							<form method="post" action="/play/agari">
+								<input type="hidden" value={junme} name="junme" />
+								<button className="btn" type="submit">
+									確認
+								</button>
+							</form>
+						</div>
+					</div>
+				</dialog>
+			)}
+			{isRyukyoku && (
+				<dialog id="ryukyoku_modal" className="modal" open>
+					<div className="modal-box">
+						<h3 className="font-bold text-lg">流局</h3>
+						<div className="modal-action">
+							<form method="post" action="/play/ryukyoku">
+								<button className="btn" type="submit">
+									確認
+								</button>
+							</form>
+						</div>
+					</div>
+				</dialog>
+			)}
+
 			<p className="text-xl mb-4">
 				Play Page - 局 {kyoku} 巡目 {junme}
 			</p>