Commit pour resoudre le problème de single prediction2
This commit is contained in:
parent
005f79ac83
commit
8cb6152518
@ -1 +1 @@
|
||||
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/domain/candle-predict/index.ts"],"names":[],"mappings":"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"}
|
||||
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/domain/candle-predict/index.ts"],"names":[],"mappings":"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"}
|
||||
23
backend/dist/domain/candle-predict/index.js
vendored
23
backend/dist/domain/candle-predict/index.js
vendored
@ -642,13 +642,9 @@ async function getGameState(userId, intervalMinutes, opts) {
|
||||
if (!includeInternal && playerRoundDto && timing.openMs) {
|
||||
const cached = await (0, roundCache_1.loadCachedRound)(selected.intervalMinutes, timing.openMs);
|
||||
if (cached) {
|
||||
// Never reopen betting from a stale Redis snapshot after the window closed.
|
||||
const cachedStatus = timing.phase !== 'betting' && cached.status === 'betting'
|
||||
? playerRoundDto.status
|
||||
: cached.status;
|
||||
// Timing fields come from mapRound (authoritative). Cache only enriches pools/OHLC.
|
||||
playerRoundDto = {
|
||||
...playerRoundDto,
|
||||
status: cachedStatus,
|
||||
outcome: cached.outcome,
|
||||
openPrice: cached.openPrice,
|
||||
highPrice: cached.highPrice,
|
||||
@ -657,11 +653,6 @@ async function getGameState(userId, intervalMinutes, opts) {
|
||||
settledAt: cached.settledAt,
|
||||
shortPoolPercent: cached.shortPoolPercent,
|
||||
longPoolPercent: cached.longPoolPercent,
|
||||
serverNowMs: cached.serverNowMs,
|
||||
secondsToBettingEnd: timing.phase === 'betting' ? cached.secondsToBettingEnd : playerRoundDto.secondsToBettingEnd,
|
||||
secondsToBettingStart: timing.phase === 'betting'
|
||||
? cached.secondsToBettingStart
|
||||
: playerRoundDto.secondsToBettingStart,
|
||||
secondsToClose: cached.secondsToClose,
|
||||
};
|
||||
}
|
||||
@ -819,6 +810,18 @@ async function tickIntervalEngine(cfg, interval, nowMs) {
|
||||
if (round.status === 'betting' && timing.phase === 'locked') {
|
||||
await repo.updateRoundStatus(round.id, 'locked');
|
||||
await settleMaturityAtOpenMs(Number(round.candle_open_ms), cfg);
|
||||
const lockedRound = await repo.getRoundByOpenMs(timing.openMs, interval.intervalMinutes);
|
||||
if (lockedRound) {
|
||||
const timingNow = (0, gameTimingService_1.getActiveRoundTiming)(nowMs, interval.intervalMinutes, interval.predictionWindowSeconds);
|
||||
const livePools = await resolveLivePoolTotals(timing.openMs, timingNow.phase, lockedRound);
|
||||
const dto = mapRoundForPlayer(mapRound(lockedRound, nowMs, interval.predictionWindowSeconds, timingNow, livePools));
|
||||
await (0, publishRoundState_1.publishRoundState)({
|
||||
intervalMinutes: interval.intervalMinutes,
|
||||
openMs: timing.openMs,
|
||||
round: dto,
|
||||
pools: { short: livePools.shortPool, long: livePools.longPool },
|
||||
});
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (round.status !== timing.phase && round.status !== 'settled') {
|
||||
|
||||
File diff suppressed because one or more lines are too long
4
backend/dist/services/gameTimingService.js
vendored
4
backend/dist/services/gameTimingService.js
vendored
@ -55,8 +55,8 @@ function resolveDisplayStatus(dbStatus, timingPhase, candleOpenMs, intervalMinut
|
||||
if (timingPhase === 'betting' && dbStatus !== 'settled') {
|
||||
return 'betting';
|
||||
}
|
||||
if (timingPhase === 'locked' && dbStatus !== 'settled') {
|
||||
return dbStatus === 'betting' ? 'betting' : 'locked';
|
||||
if (timingPhase === 'locked') {
|
||||
return 'locked';
|
||||
}
|
||||
if (timingPhase === 'waiting') {
|
||||
return 'waiting';
|
||||
|
||||
@ -1 +1 @@
|
||||
{"version":3,"file":"gameTimingService.js","sourceRoot":"","sources":["../../src/services/gameTimingService.ts"],"names":[],"mappings":"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"}
|
||||
{"version":3,"file":"gameTimingService.js","sourceRoot":"","sources":["../../src/services/gameTimingService.ts"],"names":[],"mappings":";AAAA;;GAEG;;AAEH,kDAGC;AAGD,sEAMC;AAKD,gEAGC;AAGD,4EAKC;AAED,oDAuBC;AAGD,oDAqBC;AA7ED,SAAgB,mBAAmB,CAAC,KAAa,EAAE,eAAuB;IACxE,MAAM,UAAU,GAAG,eAAe,GAAG,EAAE,GAAG,IAAI,CAAC;IAC/C,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC,GAAG,UAAU,CAAC;AACrD,CAAC;AAED,8EAA8E;AAC9E,SAAgB,6BAA6B,CAC3C,YAAoB,EACpB,eAAuB;IAEvB,MAAM,UAAU,GAAG,eAAe,GAAG,EAAE,GAAG,IAAI,CAAC;IAC/C,OAAO,YAAY,GAAG,UAAU,KAAK,CAAC,CAAC;AACzC,CAAC;AAID,yFAAyF;AACzF,SAAgB,0BAA0B,CAAC,eAAuB;IAChE,MAAM,WAAW,GAAG,eAAe,GAAG,EAAE,CAAC;IACzC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,GAAG,CAAC,CAAC,CAAC;AACtC,CAAC;AAED,wFAAwF;AACxF,SAAgB,gCAAgC,CAC9C,eAAuB,EACvB,uBAA+B;IAE/B,OAAO,IAAI,CAAC,GAAG,CAAC,uBAAuB,EAAE,0BAA0B,CAAC,eAAe,CAAC,CAAC,CAAC;AACxF,CAAC;AAED,SAAgB,oBAAoB,CAClC,KAAa,EACb,eAAuB,EACvB,uBAA+B;IAE/B,MAAM,SAAS,GAAG,gCAAgC,CAAC,eAAe,EAAE,uBAAuB,CAAC,CAAC;IAC7F,MAAM,UAAU,GAAG,eAAe,GAAG,EAAE,GAAG,IAAI,CAAC;IAC/C,MAAM,WAAW,GAAG,mBAAmB,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;IAChE,MAAM,QAAQ,GAAG,WAAW,GAAG,UAAU,CAAC;IAC1C,MAAM,YAAY,GAAG,QAAQ,GAAG,SAAS,GAAG,IAAI,CAAC;IAEjD,IAAI,KAAK,IAAI,YAAY,IAAI,KAAK,GAAG,QAAQ,EAAE,CAAC;QAC9C,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,kBAAkB,EAAE,YAAY,EAAE,CAAC;IACxG,CAAC;IACD,IAAI,KAAK,IAAI,WAAW,IAAI,KAAK,GAAG,QAAQ,EAAE,CAAC;QAC7C,OAAO;YACL,MAAM,EAAE,WAAW;YACnB,KAAK,EAAE,QAAQ;YACf,UAAU,EAAE,QAAQ;YACpB,kBAAkB,EAAE,YAAY;SACjC,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,kBAAkB,EAAE,YAAY,EAAE,CAAC;AACxG,CAAC;AAED,yFAAyF;AACzF,SAAgB,oBAAoB,CAClC,QAAsD,EACtD,WAAuB,EACvB,YAAoB,EACpB,eAAuB,EACvB,KAAa;IAEb,MAAM,OAAO,GAAG,YAAY,GAAG,eAAe,GAAG,EAAE,GAAG,IAAI,CAAC;IAC3D,IAAI,QAAQ,KAAK,SAAS,IAAI,KAAK,GAAG,OAAO,EAAE,CAAC;QAC9C,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,IAAI,WAAW,KAAK,SAAS,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QACxD,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,WAAW,KAAK,QAAQ,EAAE,CAAC;QAC7B,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;QAC9B,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
||||
@ -815,14 +815,9 @@ export async function getGameState(
|
||||
if (!includeInternal && playerRoundDto && timing.openMs) {
|
||||
const cached = await loadCachedRound(selected.intervalMinutes, timing.openMs);
|
||||
if (cached) {
|
||||
// Never reopen betting from a stale Redis snapshot after the window closed.
|
||||
const cachedStatus =
|
||||
timing.phase !== 'betting' && cached.status === 'betting'
|
||||
? playerRoundDto.status
|
||||
: (cached.status as typeof playerRoundDto.status);
|
||||
// Timing fields come from mapRound (authoritative). Cache only enriches pools/OHLC.
|
||||
playerRoundDto = {
|
||||
...playerRoundDto,
|
||||
status: cachedStatus,
|
||||
outcome: cached.outcome as typeof playerRoundDto.outcome,
|
||||
openPrice: cached.openPrice,
|
||||
highPrice: cached.highPrice,
|
||||
@ -831,13 +826,6 @@ export async function getGameState(
|
||||
settledAt: cached.settledAt,
|
||||
shortPoolPercent: cached.shortPoolPercent,
|
||||
longPoolPercent: cached.longPoolPercent,
|
||||
serverNowMs: cached.serverNowMs,
|
||||
secondsToBettingEnd:
|
||||
timing.phase === 'betting' ? cached.secondsToBettingEnd : playerRoundDto.secondsToBettingEnd,
|
||||
secondsToBettingStart:
|
||||
timing.phase === 'betting'
|
||||
? cached.secondsToBettingStart
|
||||
: playerRoundDto.secondsToBettingStart,
|
||||
secondsToClose: cached.secondsToClose,
|
||||
};
|
||||
}
|
||||
@ -1042,6 +1030,28 @@ async function tickIntervalEngine(
|
||||
if (round.status === 'betting' && timing.phase === 'locked') {
|
||||
await repo.updateRoundStatus(round.id, 'locked');
|
||||
await settleMaturityAtOpenMs(Number(round.candle_open_ms), cfg);
|
||||
const lockedRound = await repo.getRoundByOpenMs(timing.openMs, interval.intervalMinutes);
|
||||
if (lockedRound) {
|
||||
const timingNow = getActiveRoundTiming(
|
||||
nowMs,
|
||||
interval.intervalMinutes,
|
||||
interval.predictionWindowSeconds
|
||||
);
|
||||
const livePools = await resolveLivePoolTotals(
|
||||
timing.openMs,
|
||||
timingNow.phase,
|
||||
lockedRound
|
||||
);
|
||||
const dto = mapRoundForPlayer(
|
||||
mapRound(lockedRound, nowMs, interval.predictionWindowSeconds, timingNow, livePools)
|
||||
);
|
||||
await publishRoundState({
|
||||
intervalMinutes: interval.intervalMinutes,
|
||||
openMs: timing.openMs,
|
||||
round: dto,
|
||||
pools: { short: livePools.shortPool, long: livePools.longPool },
|
||||
});
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@ -72,8 +72,8 @@ export function resolveDisplayStatus(
|
||||
if (timingPhase === 'betting' && dbStatus !== 'settled') {
|
||||
return 'betting';
|
||||
}
|
||||
if (timingPhase === 'locked' && dbStatus !== 'settled') {
|
||||
return dbStatus === 'betting' ? 'betting' : 'locked';
|
||||
if (timingPhase === 'locked') {
|
||||
return 'locked';
|
||||
}
|
||||
if (timingPhase === 'waiting') {
|
||||
return 'waiting';
|
||||
|
||||
@ -435,6 +435,10 @@ docker compose restart backend
|
||||
|
||||
Le pari manuel **single** passe par une file Redis (`BET_ASYNC=true`) traitée par **`backend-worker-bets`**, puis une confirmation WebSocket. L’auto et le multi contournent ce flux (exécution directe ou synchrone).
|
||||
|
||||
**Cause fréquente (VPS)** : l’interface affichait encore « fenêtre ouverte » via WebSocket/Redis alors que le serveur avait déjà fermé la fenêtre → le pari manuel était rejeté (`Prediction window is closed`) sans message clair. L’auto (déclenchée par le moteur) et le multi (réponse HTTP immédiate) continuaient de fonctionner.
|
||||
|
||||
**Correctifs** : publication WS à la fermeture de fenêtre, statut UI basé sur l’horloge serveur, cache Redis n’écrase plus le statut, `BET_ASYNC` lu depuis `.env`.
|
||||
|
||||
**Vérifications sur le VPS :**
|
||||
|
||||
```bash
|
||||
|
||||
@ -7,6 +7,7 @@ import { useState } from 'react';
|
||||
import type { CandleDirection, CandlePredictConfig, CandlePredictInterval, CandlePredictRound, StakeAccountKind } from '../types';
|
||||
import { CustomStakeAmountField } from './CustomStakeAmountField';
|
||||
import { StakeWalletSelector } from './StakeWalletSelector';
|
||||
import { useServerAdjustedCountdown } from '../hooks/useServerAdjustedCountdown';
|
||||
|
||||
type Props = {
|
||||
config: CandlePredictConfig;
|
||||
@ -52,10 +53,12 @@ export function BettingPanel({
|
||||
}: Props) {
|
||||
const theme = useTheme();
|
||||
const isCompact = useMediaQuery(theme.breakpoints.down('sm'));
|
||||
const { secondsToBettingEnd, secondsToBettingStart, bettingOpen: liveBettingOpen } =
|
||||
useServerAdjustedCountdown(round);
|
||||
|
||||
const predictionOpen = round?.status === 'betting' && !hasPrediction && config.isActive;
|
||||
const countdown = round?.secondsToBettingEnd ?? 0;
|
||||
const untilOpen = round?.secondsToBettingStart ?? 0;
|
||||
const predictionOpen = liveBettingOpen && !hasPrediction && config.isActive;
|
||||
const countdown = secondsToBettingEnd;
|
||||
const untilOpen = secondsToBettingStart;
|
||||
const minStake = config.minStakeAmount;
|
||||
const maxStake = config.maxStakeAmount;
|
||||
const [customStakeValid, setCustomStakeValid] = useState(true);
|
||||
@ -90,7 +93,7 @@ export function BettingPanel({
|
||||
</Typography>
|
||||
</Box>
|
||||
|
||||
{round?.status === 'betting' && (
|
||||
{round?.status === 'betting' && predictionOpen && (
|
||||
<Chip
|
||||
color="warning"
|
||||
label={`Target round ${new Date(round.candleOpenMs).toLocaleTimeString()} · closes in ${formatWait(countdown)}`}
|
||||
|
||||
@ -206,8 +206,13 @@ export function usePlaceCandleBet() {
|
||||
const idempotencyKey = input.idempotencyKey ?? crypto.randomUUID();
|
||||
const res = await api.post(
|
||||
gameApiPath(CANDLE_PREDICT_SLUG, 'bets'),
|
||||
input,
|
||||
{ headers: { 'Idempotency-Key': idempotencyKey } }
|
||||
{
|
||||
direction: input.direction,
|
||||
stakeAmount: input.stakeAmount,
|
||||
intervalMinutes: input.intervalMinutes,
|
||||
stakeAccountKind: input.stakeAccountKind,
|
||||
idempotencyKey,
|
||||
}
|
||||
);
|
||||
if (res.status === 202 || res.data?.status === 'queued') {
|
||||
return {
|
||||
|
||||
@ -7,6 +7,18 @@ import { emitBetOutcome } from '../ws/betOutcomeBus';
|
||||
import { gameSocketClient } from '../ws/GameSocketClient';
|
||||
import { isWsEnabled, type WsServerMessage } from '../ws/protocol';
|
||||
|
||||
function effectiveRoundStatus(
|
||||
round: GameState['round'] | Record<string, unknown>
|
||||
): NonNullable<GameState['round']>['status'] {
|
||||
const status = String((round as { status?: string }).status ?? 'waiting');
|
||||
if (status !== 'betting') return status as NonNullable<GameState['round']>['status'];
|
||||
const serverNowMs = Number((round as { serverNowMs?: number }).serverNowMs ?? Date.now());
|
||||
const secondsToBettingEnd = Number((round as { secondsToBettingEnd?: number }).secondsToBettingEnd ?? 0);
|
||||
const elapsedSec = Math.max(0, Math.floor((Date.now() - serverNowMs) / 1000));
|
||||
if (Math.max(0, secondsToBettingEnd - elapsedSec) <= 0) return 'locked';
|
||||
return 'betting';
|
||||
}
|
||||
|
||||
function mergeRound(
|
||||
prev: GameState['round'],
|
||||
incoming: GameState['round'] | Record<string, unknown> | null | undefined
|
||||
@ -33,6 +45,8 @@ function mergeRound(
|
||||
merged.longPoolPercent = inLongPct;
|
||||
}
|
||||
|
||||
merged.status = effectiveRoundStatus(merged);
|
||||
|
||||
return merged;
|
||||
}
|
||||
|
||||
|
||||
@ -0,0 +1,34 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
|
||||
import type { CandlePredictRound } from '../types';
|
||||
|
||||
/** Live countdown using serverNowMs skew — avoids stale WS/cache betting windows. */
|
||||
export function useServerAdjustedCountdown(round: CandlePredictRound | null | undefined): {
|
||||
secondsToBettingEnd: number;
|
||||
secondsToBettingStart: number;
|
||||
bettingOpen: boolean;
|
||||
} {
|
||||
const [clientNowMs, setClientNowMs] = useState(() => Date.now());
|
||||
|
||||
useEffect(() => {
|
||||
const id = window.setInterval(() => setClientNowMs(Date.now()), 1000);
|
||||
return () => window.clearInterval(id);
|
||||
}, []);
|
||||
|
||||
const serverNowMs = round?.serverNowMs ?? clientNowMs;
|
||||
const elapsedSec = Math.max(0, Math.floor((clientNowMs - serverNowMs) / 1000));
|
||||
|
||||
const secondsToBettingEnd =
|
||||
round?.status === 'betting'
|
||||
? Math.max(0, (round.secondsToBettingEnd ?? 0) - elapsedSec)
|
||||
: 0;
|
||||
|
||||
const secondsToBettingStart =
|
||||
round?.status !== 'betting'
|
||||
? Math.max(0, (round?.secondsToBettingStart ?? 0) - elapsedSec)
|
||||
: 0;
|
||||
|
||||
const bettingOpen = round?.status === 'betting' && secondsToBettingEnd > 0;
|
||||
|
||||
return { secondsToBettingEnd, secondsToBettingStart, bettingOpen };
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user