feat(multi): add configurable time limit per round with countdown display
This commit is contained in:
File diff suppressed because one or more lines are too long
@@ -864,6 +864,7 @@ export const RoomScalarFieldEnum = {
|
||||
maxPlayers: 'maxPlayers',
|
||||
gameMode: 'gameMode',
|
||||
searchAllowed: 'searchAllowed',
|
||||
timeLimit: 'timeLimit',
|
||||
startArticle: 'startArticle',
|
||||
targetArticle: 'targetArticle',
|
||||
roundWinner: 'roundWinner',
|
||||
|
||||
@@ -121,6 +121,7 @@ export const RoomScalarFieldEnum = {
|
||||
maxPlayers: 'maxPlayers',
|
||||
gameMode: 'gameMode',
|
||||
searchAllowed: 'searchAllowed',
|
||||
timeLimit: 'timeLimit',
|
||||
startArticle: 'startArticle',
|
||||
targetArticle: 'targetArticle',
|
||||
roundWinner: 'roundWinner',
|
||||
|
||||
@@ -30,6 +30,7 @@ export type RoomAvgAggregateOutputType = {
|
||||
round: number | null
|
||||
totalRounds: number | null
|
||||
maxPlayers: number | null
|
||||
timeLimit: number | null
|
||||
countdownStart: number | null
|
||||
roundStart: number | null
|
||||
createdAt: number | null
|
||||
@@ -39,6 +40,7 @@ export type RoomSumAggregateOutputType = {
|
||||
round: number | null
|
||||
totalRounds: number | null
|
||||
maxPlayers: number | null
|
||||
timeLimit: number | null
|
||||
countdownStart: bigint | null
|
||||
roundStart: bigint | null
|
||||
createdAt: bigint | null
|
||||
@@ -52,6 +54,7 @@ export type RoomMinAggregateOutputType = {
|
||||
maxPlayers: number | null
|
||||
gameMode: string | null
|
||||
searchAllowed: boolean | null
|
||||
timeLimit: number | null
|
||||
startArticle: string | null
|
||||
targetArticle: string | null
|
||||
roundWinner: string | null
|
||||
@@ -69,6 +72,7 @@ export type RoomMaxAggregateOutputType = {
|
||||
maxPlayers: number | null
|
||||
gameMode: string | null
|
||||
searchAllowed: boolean | null
|
||||
timeLimit: number | null
|
||||
startArticle: string | null
|
||||
targetArticle: string | null
|
||||
roundWinner: string | null
|
||||
@@ -87,6 +91,7 @@ export type RoomCountAggregateOutputType = {
|
||||
maxPlayers: number
|
||||
gameMode: number
|
||||
searchAllowed: number
|
||||
timeLimit: number
|
||||
startArticle: number
|
||||
targetArticle: number
|
||||
roundWinner: number
|
||||
@@ -102,6 +107,7 @@ export type RoomAvgAggregateInputType = {
|
||||
round?: true
|
||||
totalRounds?: true
|
||||
maxPlayers?: true
|
||||
timeLimit?: true
|
||||
countdownStart?: true
|
||||
roundStart?: true
|
||||
createdAt?: true
|
||||
@@ -111,6 +117,7 @@ export type RoomSumAggregateInputType = {
|
||||
round?: true
|
||||
totalRounds?: true
|
||||
maxPlayers?: true
|
||||
timeLimit?: true
|
||||
countdownStart?: true
|
||||
roundStart?: true
|
||||
createdAt?: true
|
||||
@@ -124,6 +131,7 @@ export type RoomMinAggregateInputType = {
|
||||
maxPlayers?: true
|
||||
gameMode?: true
|
||||
searchAllowed?: true
|
||||
timeLimit?: true
|
||||
startArticle?: true
|
||||
targetArticle?: true
|
||||
roundWinner?: true
|
||||
@@ -141,6 +149,7 @@ export type RoomMaxAggregateInputType = {
|
||||
maxPlayers?: true
|
||||
gameMode?: true
|
||||
searchAllowed?: true
|
||||
timeLimit?: true
|
||||
startArticle?: true
|
||||
targetArticle?: true
|
||||
roundWinner?: true
|
||||
@@ -159,6 +168,7 @@ export type RoomCountAggregateInputType = {
|
||||
maxPlayers?: true
|
||||
gameMode?: true
|
||||
searchAllowed?: true
|
||||
timeLimit?: true
|
||||
startArticle?: true
|
||||
targetArticle?: true
|
||||
roundWinner?: true
|
||||
@@ -264,6 +274,7 @@ export type RoomGroupByOutputType = {
|
||||
maxPlayers: number
|
||||
gameMode: string
|
||||
searchAllowed: boolean
|
||||
timeLimit: number
|
||||
startArticle: string
|
||||
targetArticle: string
|
||||
roundWinner: string | null
|
||||
@@ -305,6 +316,7 @@ export type RoomWhereInput = {
|
||||
maxPlayers?: Prisma.IntFilter<"Room"> | number
|
||||
gameMode?: Prisma.StringFilter<"Room"> | string
|
||||
searchAllowed?: Prisma.BoolFilter<"Room"> | boolean
|
||||
timeLimit?: Prisma.IntFilter<"Room"> | number
|
||||
startArticle?: Prisma.StringFilter<"Room"> | string
|
||||
targetArticle?: Prisma.StringFilter<"Room"> | string
|
||||
roundWinner?: Prisma.StringNullableFilter<"Room"> | string | null
|
||||
@@ -323,6 +335,7 @@ export type RoomOrderByWithRelationInput = {
|
||||
maxPlayers?: Prisma.SortOrder
|
||||
gameMode?: Prisma.SortOrder
|
||||
searchAllowed?: Prisma.SortOrder
|
||||
timeLimit?: Prisma.SortOrder
|
||||
startArticle?: Prisma.SortOrder
|
||||
targetArticle?: Prisma.SortOrder
|
||||
roundWinner?: Prisma.SortOrderInput | Prisma.SortOrder
|
||||
@@ -344,6 +357,7 @@ export type RoomWhereUniqueInput = Prisma.AtLeast<{
|
||||
maxPlayers?: Prisma.IntFilter<"Room"> | number
|
||||
gameMode?: Prisma.StringFilter<"Room"> | string
|
||||
searchAllowed?: Prisma.BoolFilter<"Room"> | boolean
|
||||
timeLimit?: Prisma.IntFilter<"Room"> | number
|
||||
startArticle?: Prisma.StringFilter<"Room"> | string
|
||||
targetArticle?: Prisma.StringFilter<"Room"> | string
|
||||
roundWinner?: Prisma.StringNullableFilter<"Room"> | string | null
|
||||
@@ -362,6 +376,7 @@ export type RoomOrderByWithAggregationInput = {
|
||||
maxPlayers?: Prisma.SortOrder
|
||||
gameMode?: Prisma.SortOrder
|
||||
searchAllowed?: Prisma.SortOrder
|
||||
timeLimit?: Prisma.SortOrder
|
||||
startArticle?: Prisma.SortOrder
|
||||
targetArticle?: Prisma.SortOrder
|
||||
roundWinner?: Prisma.SortOrderInput | Prisma.SortOrder
|
||||
@@ -388,6 +403,7 @@ export type RoomScalarWhereWithAggregatesInput = {
|
||||
maxPlayers?: Prisma.IntWithAggregatesFilter<"Room"> | number
|
||||
gameMode?: Prisma.StringWithAggregatesFilter<"Room"> | string
|
||||
searchAllowed?: Prisma.BoolWithAggregatesFilter<"Room"> | boolean
|
||||
timeLimit?: Prisma.IntWithAggregatesFilter<"Room"> | number
|
||||
startArticle?: Prisma.StringWithAggregatesFilter<"Room"> | string
|
||||
targetArticle?: Prisma.StringWithAggregatesFilter<"Room"> | string
|
||||
roundWinner?: Prisma.StringNullableWithAggregatesFilter<"Room"> | string | null
|
||||
@@ -406,6 +422,7 @@ export type RoomCreateInput = {
|
||||
maxPlayers?: number
|
||||
gameMode?: string
|
||||
searchAllowed?: boolean
|
||||
timeLimit?: number
|
||||
startArticle?: string
|
||||
targetArticle?: string
|
||||
roundWinner?: string | null
|
||||
@@ -424,6 +441,7 @@ export type RoomUncheckedCreateInput = {
|
||||
maxPlayers?: number
|
||||
gameMode?: string
|
||||
searchAllowed?: boolean
|
||||
timeLimit?: number
|
||||
startArticle?: string
|
||||
targetArticle?: string
|
||||
roundWinner?: string | null
|
||||
@@ -442,6 +460,7 @@ export type RoomUpdateInput = {
|
||||
maxPlayers?: Prisma.IntFieldUpdateOperationsInput | number
|
||||
gameMode?: Prisma.StringFieldUpdateOperationsInput | string
|
||||
searchAllowed?: Prisma.BoolFieldUpdateOperationsInput | boolean
|
||||
timeLimit?: Prisma.IntFieldUpdateOperationsInput | number
|
||||
startArticle?: Prisma.StringFieldUpdateOperationsInput | string
|
||||
targetArticle?: Prisma.StringFieldUpdateOperationsInput | string
|
||||
roundWinner?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
|
||||
@@ -460,6 +479,7 @@ export type RoomUncheckedUpdateInput = {
|
||||
maxPlayers?: Prisma.IntFieldUpdateOperationsInput | number
|
||||
gameMode?: Prisma.StringFieldUpdateOperationsInput | string
|
||||
searchAllowed?: Prisma.BoolFieldUpdateOperationsInput | boolean
|
||||
timeLimit?: Prisma.IntFieldUpdateOperationsInput | number
|
||||
startArticle?: Prisma.StringFieldUpdateOperationsInput | string
|
||||
targetArticle?: Prisma.StringFieldUpdateOperationsInput | string
|
||||
roundWinner?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
|
||||
@@ -478,6 +498,7 @@ export type RoomCreateManyInput = {
|
||||
maxPlayers?: number
|
||||
gameMode?: string
|
||||
searchAllowed?: boolean
|
||||
timeLimit?: number
|
||||
startArticle?: string
|
||||
targetArticle?: string
|
||||
roundWinner?: string | null
|
||||
@@ -496,6 +517,7 @@ export type RoomUpdateManyMutationInput = {
|
||||
maxPlayers?: Prisma.IntFieldUpdateOperationsInput | number
|
||||
gameMode?: Prisma.StringFieldUpdateOperationsInput | string
|
||||
searchAllowed?: Prisma.BoolFieldUpdateOperationsInput | boolean
|
||||
timeLimit?: Prisma.IntFieldUpdateOperationsInput | number
|
||||
startArticle?: Prisma.StringFieldUpdateOperationsInput | string
|
||||
targetArticle?: Prisma.StringFieldUpdateOperationsInput | string
|
||||
roundWinner?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
|
||||
@@ -514,6 +536,7 @@ export type RoomUncheckedUpdateManyInput = {
|
||||
maxPlayers?: Prisma.IntFieldUpdateOperationsInput | number
|
||||
gameMode?: Prisma.StringFieldUpdateOperationsInput | string
|
||||
searchAllowed?: Prisma.BoolFieldUpdateOperationsInput | boolean
|
||||
timeLimit?: Prisma.IntFieldUpdateOperationsInput | number
|
||||
startArticle?: Prisma.StringFieldUpdateOperationsInput | string
|
||||
targetArticle?: Prisma.StringFieldUpdateOperationsInput | string
|
||||
roundWinner?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
|
||||
@@ -532,6 +555,7 @@ export type RoomCountOrderByAggregateInput = {
|
||||
maxPlayers?: Prisma.SortOrder
|
||||
gameMode?: Prisma.SortOrder
|
||||
searchAllowed?: Prisma.SortOrder
|
||||
timeLimit?: Prisma.SortOrder
|
||||
startArticle?: Prisma.SortOrder
|
||||
targetArticle?: Prisma.SortOrder
|
||||
roundWinner?: Prisma.SortOrder
|
||||
@@ -545,6 +569,7 @@ export type RoomAvgOrderByAggregateInput = {
|
||||
round?: Prisma.SortOrder
|
||||
totalRounds?: Prisma.SortOrder
|
||||
maxPlayers?: Prisma.SortOrder
|
||||
timeLimit?: Prisma.SortOrder
|
||||
countdownStart?: Prisma.SortOrder
|
||||
roundStart?: Prisma.SortOrder
|
||||
createdAt?: Prisma.SortOrder
|
||||
@@ -558,6 +583,7 @@ export type RoomMaxOrderByAggregateInput = {
|
||||
maxPlayers?: Prisma.SortOrder
|
||||
gameMode?: Prisma.SortOrder
|
||||
searchAllowed?: Prisma.SortOrder
|
||||
timeLimit?: Prisma.SortOrder
|
||||
startArticle?: Prisma.SortOrder
|
||||
targetArticle?: Prisma.SortOrder
|
||||
roundWinner?: Prisma.SortOrder
|
||||
@@ -575,6 +601,7 @@ export type RoomMinOrderByAggregateInput = {
|
||||
maxPlayers?: Prisma.SortOrder
|
||||
gameMode?: Prisma.SortOrder
|
||||
searchAllowed?: Prisma.SortOrder
|
||||
timeLimit?: Prisma.SortOrder
|
||||
startArticle?: Prisma.SortOrder
|
||||
targetArticle?: Prisma.SortOrder
|
||||
roundWinner?: Prisma.SortOrder
|
||||
@@ -588,6 +615,7 @@ export type RoomSumOrderByAggregateInput = {
|
||||
round?: Prisma.SortOrder
|
||||
totalRounds?: Prisma.SortOrder
|
||||
maxPlayers?: Prisma.SortOrder
|
||||
timeLimit?: Prisma.SortOrder
|
||||
countdownStart?: Prisma.SortOrder
|
||||
roundStart?: Prisma.SortOrder
|
||||
createdAt?: Prisma.SortOrder
|
||||
@@ -624,6 +652,7 @@ export type RoomSelect<ExtArgs extends runtime.Types.Extensions.InternalArgs = r
|
||||
maxPlayers?: boolean
|
||||
gameMode?: boolean
|
||||
searchAllowed?: boolean
|
||||
timeLimit?: boolean
|
||||
startArticle?: boolean
|
||||
targetArticle?: boolean
|
||||
roundWinner?: boolean
|
||||
@@ -642,6 +671,7 @@ export type RoomSelectCreateManyAndReturn<ExtArgs extends runtime.Types.Extensio
|
||||
maxPlayers?: boolean
|
||||
gameMode?: boolean
|
||||
searchAllowed?: boolean
|
||||
timeLimit?: boolean
|
||||
startArticle?: boolean
|
||||
targetArticle?: boolean
|
||||
roundWinner?: boolean
|
||||
@@ -660,6 +690,7 @@ export type RoomSelectUpdateManyAndReturn<ExtArgs extends runtime.Types.Extensio
|
||||
maxPlayers?: boolean
|
||||
gameMode?: boolean
|
||||
searchAllowed?: boolean
|
||||
timeLimit?: boolean
|
||||
startArticle?: boolean
|
||||
targetArticle?: boolean
|
||||
roundWinner?: boolean
|
||||
@@ -678,6 +709,7 @@ export type RoomSelectScalar = {
|
||||
maxPlayers?: boolean
|
||||
gameMode?: boolean
|
||||
searchAllowed?: boolean
|
||||
timeLimit?: boolean
|
||||
startArticle?: boolean
|
||||
targetArticle?: boolean
|
||||
roundWinner?: boolean
|
||||
@@ -687,7 +719,7 @@ export type RoomSelectScalar = {
|
||||
updatedAt?: boolean
|
||||
}
|
||||
|
||||
export type RoomOmit<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetOmit<"code" | "players" | "phase" | "round" | "totalRounds" | "maxPlayers" | "gameMode" | "searchAllowed" | "startArticle" | "targetArticle" | "roundWinner" | "countdownStart" | "roundStart" | "createdAt" | "updatedAt", ExtArgs["result"]["room"]>
|
||||
export type RoomOmit<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetOmit<"code" | "players" | "phase" | "round" | "totalRounds" | "maxPlayers" | "gameMode" | "searchAllowed" | "timeLimit" | "startArticle" | "targetArticle" | "roundWinner" | "countdownStart" | "roundStart" | "createdAt" | "updatedAt", ExtArgs["result"]["room"]>
|
||||
|
||||
export type $RoomPayload<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
|
||||
name: "Room"
|
||||
@@ -701,6 +733,7 @@ export type $RoomPayload<ExtArgs extends runtime.Types.Extensions.InternalArgs =
|
||||
maxPlayers: number
|
||||
gameMode: string
|
||||
searchAllowed: boolean
|
||||
timeLimit: number
|
||||
startArticle: string
|
||||
targetArticle: string
|
||||
roundWinner: string | null
|
||||
@@ -1139,6 +1172,7 @@ export interface RoomFieldRefs {
|
||||
readonly maxPlayers: Prisma.FieldRef<"Room", 'Int'>
|
||||
readonly gameMode: Prisma.FieldRef<"Room", 'String'>
|
||||
readonly searchAllowed: Prisma.FieldRef<"Room", 'Boolean'>
|
||||
readonly timeLimit: Prisma.FieldRef<"Room", 'Int'>
|
||||
readonly startArticle: Prisma.FieldRef<"Room", 'String'>
|
||||
readonly targetArticle: Prisma.FieldRef<"Room", 'String'>
|
||||
readonly roundWinner: Prisma.FieldRef<"Room", 'String'>
|
||||
|
||||
@@ -30,6 +30,8 @@ export function useMultiGame() {
|
||||
const timerStartedRef = useRef(false);
|
||||
|
||||
const [countdown, setCountdown] = useState<number | null>(null);
|
||||
const [timeLeft, setTimeLeft] = useState<number | null>(null);
|
||||
const timeLimitTimerRef = useRef<ReturnType<typeof setInterval> | null>(null);
|
||||
const countdownRef = useRef<ReturnType<typeof setInterval> | null>(null);
|
||||
const pollRef = useRef<ReturnType<typeof setInterval> | null>(null);
|
||||
const prevPhaseRef = useRef<string | null>(null);
|
||||
@@ -145,9 +147,23 @@ export function useMultiGame() {
|
||||
historyRef.current = [room.startArticle];
|
||||
setHistory([room.startArticle]);
|
||||
loadArticle(room.startArticle);
|
||||
// Démarrer le timer de temps limité si configuré
|
||||
if (timeLimitTimerRef.current) clearInterval(timeLimitTimerRef.current);
|
||||
if (room.timeLimit > 0) {
|
||||
const tick = () => {
|
||||
const left = Math.ceil(((room.roundStart ?? Date.now()) + room.timeLimit * 1000 - Date.now()) / 1000);
|
||||
setTimeLeft(left <= 0 ? 0 : left);
|
||||
};
|
||||
tick();
|
||||
timeLimitTimerRef.current = setInterval(tick, 200);
|
||||
} else {
|
||||
setTimeLeft(null);
|
||||
}
|
||||
}
|
||||
if (room.phase === "results" && prevPhase !== "results") {
|
||||
timer.stop();
|
||||
if (timeLimitTimerRef.current) { clearInterval(timeLimitTimerRef.current); timeLimitTimerRef.current = null; }
|
||||
setTimeLeft(null);
|
||||
}
|
||||
if (room.round !== prevRound && room.phase === "playing") {
|
||||
loadArticle(room.startArticle);
|
||||
@@ -155,6 +171,19 @@ export function useMultiGame() {
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [room]);
|
||||
|
||||
// Temps limité : envoie timeUp quand le compteur atteint 0
|
||||
useEffect(() => {
|
||||
if (timeLeft !== 0 || !room || room.phase !== "playing" || !playerId || !room.timeLimit) return;
|
||||
fetch(`/api/rooms/${room.code}`, {
|
||||
method: "PATCH",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({ action: "timeUp", playerId }),
|
||||
}).then((r) => r.json()).then((d) => {
|
||||
if ((d as { room: Room }).room) setRoom((d as { room: Room }).room);
|
||||
}).catch(() => {});
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [timeLeft]);
|
||||
|
||||
// Countdown -> playing transition
|
||||
useEffect(() => {
|
||||
if (!room || room.phase !== "countdown" || !playerId) return;
|
||||
@@ -332,6 +361,16 @@ export function useMultiGame() {
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [room, playerId]);
|
||||
|
||||
async function setTimeLimit(value: number) {
|
||||
if (!room || !playerId) return;
|
||||
const res = await fetch(`/api/rooms/${room.code}`, {
|
||||
method: "PATCH",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({ action: "setTimeLimit", playerId, value }),
|
||||
});
|
||||
if (res.ok) setRoom((await res.json() as { room: Room }).room);
|
||||
}
|
||||
|
||||
async function setSearchAllowed(value: boolean) {
|
||||
if (!room || !playerId) return;
|
||||
const res = await fetch(`/api/rooms/${room.code}`, {
|
||||
@@ -428,6 +467,8 @@ export function useMultiGame() {
|
||||
goBack,
|
||||
canGoBack: historyRef.current.length > 1,
|
||||
surrender,
|
||||
timeLeft,
|
||||
setTimeLimit,
|
||||
setSearchAllowed,
|
||||
restore,
|
||||
retryLoad: () => title && loadArticle(title),
|
||||
|
||||
Reference in New Issue
Block a user