After the improving of performance

This commit is contained in:
Your Name 2026-07-29 15:35:11 +02:00
parent faaba2230d
commit f334037861
123 changed files with 2746 additions and 444 deletions

View File

@ -1 +1 @@
{"version":3,"file":"authController.d.ts","sourceRoot":"","sources":["../../src/controllers/authController.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAI5C,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAMjD;;;;GAIG;AACH,wBAAsB,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA8CzE;AAED,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAcrF;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAOlF;AAED;;;;GAIG;AACH,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAyBtE;AAED;;;;GAIG;AACH,wBAAsB,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAaxE;AAED;;;;GAIG;AACH,wBAAsB,QAAQ,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB7E;AAED;;;;GAIG;AACH,wBAAsB,SAAS,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB9E;AAED;;GAEG;AACH,wBAAsB,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBvE;AAED;;GAEG;AACH,wBAAsB,SAAS,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAY9E;AAED,wBAAsB,UAAU,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB/E;AAED,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB5F;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBnF;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAU1F;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAW5E;AAED,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAaxF;AAED,wBAAsB,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAa/E;AAED,wBAAsB,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAa9E;AAED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAUnF"} {"version":3,"file":"authController.d.ts","sourceRoot":"","sources":["../../src/controllers/authController.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAI5C,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAMjD;;;;GAIG;AACH,wBAAsB,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA8CzE;AAED,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAcrF;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAOlF;AAED;;;;GAIG;AACH,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA+BtE;AAED;;;;GAIG;AACH,wBAAsB,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAaxE;AAED;;;;GAIG;AACH,wBAAsB,QAAQ,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB7E;AAED;;;;GAIG;AACH,wBAAsB,SAAS,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB9E;AAED;;GAEG;AACH,wBAAsB,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBvE;AAED;;GAEG;AACH,wBAAsB,SAAS,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAY9E;AAED,wBAAsB,UAAU,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB/E;AAED,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB5F;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBnF;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAU1F;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAW5E;AAED,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAaxF;AAED,wBAAsB,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAa/E;AAED,wBAAsB,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAa9E;AAED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAUnF"}

View File

@ -158,6 +158,12 @@ async function login(req, res) {
res.status(status).json({ res.status(status).json({
error: (0, safeError_1.clientErrorMessage)(e, 'Login failed'), error: (0, safeError_1.clientErrorMessage)(e, 'Login failed'),
...(code ? { code } : {}), ...(code ? { code } : {}),
...(e.lockedUntil
? { lockedUntil: e.lockedUntil }
: {}),
...(e.retryAfterMinutes != null
? { retryAfterMinutes: e.retryAfterMinutes }
: {}),
}); });
} }
} }

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
{"version":3,"file":"candlePredictController.d.ts","sourceRoot":"","sources":["../../src/controllers/candlePredictController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAqBjD,wBAAsB,QAAQ,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAsB7E;AAID,wBAAsB,UAAU,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAwC/E;AAID,wBAAsB,QAAQ,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA2D7E;AAID,wBAAsB,aAAa,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAuClF;AAED,wBAAsB,SAAS,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA+C9E;AAID,wBAAsB,eAAe,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAwBpF;AAID,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA8BvF;AAID,wBAAsB,cAAc,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBnF;AAID,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBtF;AAID,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBvF;AAID,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBxF;AAID,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAgCxF;AAID,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA0BxF;AAID,wBAAsB,aAAa,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAkFlF;AAID,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBzF;AAID,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAoB3F"} {"version":3,"file":"candlePredictController.d.ts","sourceRoot":"","sources":["../../src/controllers/candlePredictController.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAkJjD,wBAAsB,QAAQ,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA2G7E;AAID,wBAAsB,UAAU,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAwC/E;AAID,wBAAsB,QAAQ,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA2D7E;AAID,wBAAsB,aAAa,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAuClF;AAED,wBAAsB,SAAS,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA+C9E;AAID,wBAAsB,eAAe,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAwBpF;AAID,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA8BvF;AAID,wBAAsB,cAAc,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBnF;AAID,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBtF;AAID,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBvF;AAID,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBxF;AAID,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAgCxF;AAID,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA0BxF;AAID,wBAAsB,aAAa,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAkFlF;AAID,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBzF;AAID,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAoB3F"}

View File

@ -49,23 +49,216 @@ exports.deleteAdminInterval = deleteAdminInterval;
exports.placeMultiBet = placeMultiBet; exports.placeMultiBet = placeMultiBet;
exports.listAdminMultiLevels = listAdminMultiLevels; exports.listAdminMultiLevels = listAdminMultiLevels;
exports.updateAdminMultiLevels = updateAdminMultiLevels; exports.updateAdminMultiLevels = updateAdminMultiLevels;
const crypto_1 = require("crypto");
const roleAccess_1 = require("../utils/roleAccess"); const roleAccess_1 = require("../utils/roleAccess");
const candlePredictService = __importStar(require("../services/candlePredictService")); const candlePredictService = __importStar(require("../services/candlePredictService"));
const stakeAmountValidation_1 = require("../utils/stakeAmountValidation"); const stakeAmountValidation_1 = require("../utils/stakeAmountValidation");
const placeBetResponse_1 = require("../utils/placeBetResponse"); const placeBetResponse_1 = require("../utils/placeBetResponse");
const stateVersions_1 = require("../realtime/redis/stateVersions");
const STATE_CACHE_TTL_MS = 1200;
const STATE_CACHE_MAX_ENTRIES = 500;
const stateResponseCache = new Map();
function compactPart(value) {
if (value == null)
return '';
if (Array.isArray(value))
return value.map(compactPart).join(',');
if (typeof value === 'object')
return JSON.stringify(value);
return String(value);
}
function businessFingerprint(state) {
const config = state?.config ?? {};
const interval = state?.interval ?? {};
const round = state?.round ?? {};
const userBet = state?.userBet ?? {};
const userMultiBet = state?.userMultiBet ?? {};
const autoSettings = state?.autoSettings ?? {};
const intervals = Array.isArray(state?.intervals) ? state.intervals : [];
const multiLevels = Array.isArray(state?.multiLevels) ? state.multiLevels : [];
const intervalFingerprint = intervals
.map((item) => [
item?.id,
item?.intervalMinutes,
item?.isActive,
item?.isDefault,
item?.predictionWindowSeconds,
item?.chartCandleLimit,
].map(compactPart).join(':'))
.join('|');
const multiLevelFingerprint = multiLevels
.map((item) => [
item?.level,
item?.candleCount,
item?.enabled,
item?.payoutMultiplier,
item?.poolMultiplier,
item?.sortOrder,
].map(compactPart).join(':'))
.join('|');
return [
config?.updatedAt,
config?.isActive,
config?.walletTypeCode,
config?.predictionTypes ? JSON.stringify(config.predictionTypes) : '',
config?.dailyRevenueNetToday,
interval?.id,
interval?.intervalMinutes,
interval?.predictionWindowSeconds,
interval?.chartCandleLimit,
state?.selectedIntervalMinutes,
intervalFingerprint,
round?.id,
round?.status,
round?.outcome,
round?.settledAt,
round?.openPrice,
round?.highPrice,
round?.lowPrice,
round?.closePrice,
round?.shortPool,
round?.longPool,
round?.shortPoolPercent,
round?.longPoolPercent,
userBet?.id,
userBet?.roundId,
userBet?.status,
userBet?.payoutDisplay,
userBet?.stakeDisplay,
userBet?.candleOpenMs,
userMultiBet?.id,
userMultiBet?.status,
userMultiBet?.sequenceStep,
userMultiBet?.currentCandleOpenMs,
userMultiBet?.payoutDisplay,
userMultiBet?.stakeDisplay,
multiLevelFingerprint,
autoSettings?.enabled,
autoSettings?.direction,
autoSettings?.stakeDisplay,
autoSettings?.mode,
autoSettings?.periodMinutes,
autoSettings?.intervalSeconds,
autoSettings?.stakeAccountKind,
autoSettings?.lastAutoBetAt,
autoSettings?.autoBetError,
]
.map(compactPart)
.join('||');
}
function parseIntervalMinutes(value) { function parseIntervalMinutes(value) {
if (value == null || value === '') if (value == null || value === '')
return undefined; return undefined;
const n = Number(value); const n = Number(value);
return Number.isFinite(n) ? n : undefined; return Number.isFinite(n) ? n : undefined;
} }
function rememberStateCache(cacheKey, etag, body, now) {
stateResponseCache.set(cacheKey, {
etag,
body,
expiresAt: now + STATE_CACHE_TTL_MS,
});
if (stateResponseCache.size <= STATE_CACHE_MAX_ENTRIES)
return;
for (const [key, entry] of stateResponseCache) {
if (entry.expiresAt <= now)
stateResponseCache.delete(key);
}
if (stateResponseCache.size > STATE_CACHE_MAX_ENTRIES) {
const oldestKey = stateResponseCache.keys().next().value;
if (oldestKey)
stateResponseCache.delete(oldestKey);
}
}
async function getState(req, res) { async function getState(req, res) {
try { try {
const intervalMinutes = parseIntervalMinutes(req.query.intervalMinutes); const intervalMinutes = parseIntervalMinutes(req.query.intervalMinutes);
const includeInternal = req.user ? (0, roleAccess_1.hasAdminAccess)(req.user) : false; const includeInternal = req.user ? (0, roleAccess_1.hasAdminAccess)(req.user) : false;
const cacheKey = JSON.stringify({
userId: req.user?.userId ?? 'anon',
intervalMinutes: intervalMinutes ?? null,
includeInternal,
});
const ifNoneMatch = String(req.header('if-none-match') ?? '').trim();
const now = Date.now();
const cached = stateResponseCache.get(cacheKey);
res.setHeader('Cache-Control', 'private, max-age=0, must-revalidate');
res.setHeader('Vary', 'Authorization');
if (cached && cached.expiresAt > now) {
res.setHeader('ETag', cached.etag);
if (ifNoneMatch && ifNoneMatch === cached.etag) {
res.status(304).end();
return;
}
res.json(cached.body);
return;
}
// Cheap path: Redis business versions → 304 before getGameState.
// Requires an explicit interval so we do not resolve defaults from DB first.
// Any Redis failure falls through to full getGameState + fingerprint ETag.
if (intervalMinutes != null) {
try {
const versions = await (0, stateVersions_1.getStateVersions)({
userId: req.user?.userId,
intervalMinutes,
});
if (versions) {
const versionEtag = (0, stateVersions_1.buildVersionEtag)({
versions,
intervalMinutes,
includeInternal,
});
res.setHeader('X-Prediqo-State-Versions', `${versions.config}.${versions.round}.${versions.bet}.${versions.auto}`);
if (ifNoneMatch && ifNoneMatch === versionEtag) {
res.setHeader('ETag', versionEtag);
res.status(304).end();
return;
}
const state = await candlePredictService.getGameState(req.user?.userId, intervalMinutes, {
includeInternal,
});
rememberStateCache(cacheKey, versionEtag, state, now);
res.setHeader('ETag', versionEtag);
res.json(state);
return;
}
}
catch (e) {
console.error('[getState] version short-circuit failed, falling back:', e);
}
}
const state = await candlePredictService.getGameState(req.user?.userId, intervalMinutes, { const state = await candlePredictService.getGameState(req.user?.userId, intervalMinutes, {
includeInternal, includeInternal,
}); });
// Prefer version ETag when Redis answers; otherwise fingerprint (no Redis required).
const resolvedInterval = intervalMinutes ??
(typeof state.selectedIntervalMinutes === 'number'
? state.selectedIntervalMinutes
: undefined);
let etag = null;
if (resolvedInterval != null) {
const versions = await (0, stateVersions_1.getStateVersions)({
userId: req.user?.userId,
intervalMinutes: resolvedInterval,
}).catch(() => null);
if (versions) {
etag = (0, stateVersions_1.buildVersionEtag)({
versions,
intervalMinutes: resolvedInterval,
includeInternal,
});
res.setHeader('X-Prediqo-State-Versions', `${versions.config}.${versions.round}.${versions.bet}.${versions.auto}`);
}
}
if (!etag) {
etag = `"cp-state-${(0, crypto_1.createHash)('sha1').update(businessFingerprint(state)).digest('hex')}"`;
}
rememberStateCache(cacheKey, etag, state, now);
res.setHeader('ETag', etag);
if (ifNoneMatch && ifNoneMatch === etag) {
res.status(304).end();
return;
}
res.json(state); res.json(state);
} }
catch (e) { catch (e) {

File diff suppressed because one or more lines are too long

View File

@ -11,6 +11,8 @@ export declare function exportDbTamperEventsCsv(req: AuthRequest, res: Response)
export declare function dismissSpuriousTamperAlerts(req: AuthRequest, res: Response): Promise<void>; export declare function dismissSpuriousTamperAlerts(req: AuthRequest, res: Response): Promise<void>;
export declare function listAuditLogs(req: AuthRequest, res: Response): Promise<void>; export declare function listAuditLogs(req: AuthRequest, res: Response): Promise<void>;
export declare function listFailedLogins(req: AuthRequest, res: Response): Promise<void>; export declare function listFailedLogins(req: AuthRequest, res: Response): Promise<void>;
export declare function listLockedAccounts(_req: AuthRequest, res: Response): Promise<void>;
export declare function unlockAccount(req: AuthRequest, res: Response): Promise<void>;
export declare function exportAuditLogsCsv(req: AuthRequest, res: Response): Promise<void>; export declare function exportAuditLogsCsv(req: AuthRequest, res: Response): Promise<void>;
export declare function updateUserSecurity(req: AuthRequest, res: Response): Promise<void>; export declare function updateUserSecurity(req: AuthRequest, res: Response): Promise<void>;
//# sourceMappingURL=securityController.d.ts.map //# sourceMappingURL=securityController.d.ts.map

View File

@ -1 +1 @@
{"version":3,"file":"securityController.d.ts","sourceRoot":"","sources":["../../src/controllers/securityController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAwBjD,wBAAsB,UAAU,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAS/E;AAED,wBAAsB,YAAY,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA4BjF;AAED,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAQzF;AAED,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAa3F;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBvF;AAED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAUvF;AAED,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAS1F;AAED,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAa5F;AAED,wBAAsB,2BAA2B,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAQhG;AAED,wBAAsB,aAAa,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAuBlF;AAED,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAwBrF;AAED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAavF;AAED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAoFvF"} {"version":3,"file":"securityController.d.ts","sourceRoot":"","sources":["../../src/controllers/securityController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAwBjD,wBAAsB,UAAU,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAS/E;AAED,wBAAsB,YAAY,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA4BjF;AAED,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAQzF;AAED,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAa3F;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBvF;AAED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAUvF;AAED,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAS1F;AAED,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAa5F;AAED,wBAAsB,2BAA2B,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAQhG;AAED,wBAAsB,aAAa,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAuBlF;AAED,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAwBrF;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CASxF;AAED,wBAAsB,aAAa,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAqBlF;AAED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAavF;AAED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAoFvF"}

View File

@ -44,6 +44,8 @@ exports.exportDbTamperEventsCsv = exportDbTamperEventsCsv;
exports.dismissSpuriousTamperAlerts = dismissSpuriousTamperAlerts; exports.dismissSpuriousTamperAlerts = dismissSpuriousTamperAlerts;
exports.listAuditLogs = listAuditLogs; exports.listAuditLogs = listAuditLogs;
exports.listFailedLogins = listFailedLogins; exports.listFailedLogins = listFailedLogins;
exports.listLockedAccounts = listLockedAccounts;
exports.unlockAccount = unlockAccount;
exports.exportAuditLogsCsv = exportAuditLogsCsv; exports.exportAuditLogsCsv = exportAuditLogsCsv;
exports.updateUserSecurity = updateUserSecurity; exports.updateUserSecurity = updateUserSecurity;
const securityService = __importStar(require("../services/securityService")); const securityService = __importStar(require("../services/securityService"));
@ -228,6 +230,40 @@ async function listFailedLogins(req, res) {
res.status(status).json({ error: msg }); res.status(status).json({ error: msg });
} }
} }
async function listLockedAccounts(_req, res) {
try {
const loginLockoutService = await Promise.resolve().then(() => __importStar(require('../services/loginLockoutService')));
const items = await loginLockoutService.listTemporarilyLockedAccounts();
res.json({ items, total: items.length });
}
catch (e) {
const msg = e instanceof Error ? e.message : 'Failed to list locked accounts';
res.status(500).json({ error: msg });
}
}
async function unlockAccount(req, res) {
try {
const userId = req.params.userId;
if (!userId) {
res.status(400).json({ error: 'userId is required' });
return;
}
const loginLockoutService = await Promise.resolve().then(() => __importStar(require('../services/loginLockoutService')));
const { reason } = (req.body ?? {});
await loginLockoutService.adminUnlockAccount(userId, {
adminUserId: req.user.userId,
ipAddress: req.ip || undefined,
userAgent: req.get('user-agent') || undefined,
reason,
});
res.json({ ok: true });
}
catch (e) {
const msg = e instanceof Error ? e.message : 'Failed to unlock account';
const status = msg === 'User not found' ? 404 : 500;
res.status(status).json({ error: msg });
}
}
async function exportAuditLogsCsv(req, res) { async function exportAuditLogsCsv(req, res) {
try { try {
const filters = req.query; const filters = req.query;

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,7 @@
import * as repo from '../../repositories/candlePredictRepository'; import * as repo from '../../repositories/candlePredictRepository';
import * as ledgerRepository from '../../repositories/ledgerRepository'; import * as ledgerRepository from '../../repositories/ledgerRepository';
import type { AccountKind } from '../../repositories/ledgerRepository'; import type { AccountKind } from '../../repositories/ledgerRepository';
import { type DailyRevenueOverflowStrategy } from '../../services/dailyRevenueOutcomeService';
declare function mapConfig(row: repo.CandlePredictConfigRow): { declare function mapConfig(row: repo.CandlePredictConfigRow): {
stakeAmounts: number[]; stakeAmounts: number[];
minStakeAmount: number; minStakeAmount: number;
@ -14,6 +15,8 @@ declare function mapConfig(row: repo.CandlePredictConfigRow): {
basePrice: number; basePrice: number;
payoutMultiplier: number; payoutMultiplier: number;
poolMultiplier: number; poolMultiplier: number;
dailyRevenueTarget: number;
dailyRevenueOverflowStrategy: DailyRevenueOverflowStrategy;
walletTypeCode: string; walletTypeCode: string;
autoModes: string[]; autoModes: string[];
isActive: boolean; isActive: boolean;
@ -24,7 +27,7 @@ declare function mapConfig(row: repo.CandlePredictConfigRow): {
}; };
updatedAt: string; updatedAt: string;
}; };
type PlayerConfigDto = Omit<ReturnType<typeof mapConfig>, 'poolWinnerRule' | 'poolMultiplier' | 'tieTolerancePercent' | 'tieToleranceMaxPercent' | 'tieToleranceMinEnabled' | 'tieToleranceMaxEnabled'>; type PlayerConfigDto = Omit<ReturnType<typeof mapConfig>, 'poolWinnerRule' | 'poolMultiplier' | 'tieTolerancePercent' | 'tieToleranceMaxPercent' | 'tieToleranceMinEnabled' | 'tieToleranceMaxEnabled' | 'dailyRevenueTarget' | 'dailyRevenueOverflowStrategy'>;
export type ResolvedInterval = { export type ResolvedInterval = {
id: number; id: number;
intervalMinutes: number; intervalMinutes: number;
@ -62,6 +65,7 @@ declare function mapIntervalDto(interval: ResolvedInterval): {
}; };
type PlayerIntervalDto = Omit<ReturnType<typeof mapIntervalDto>, 'tieTolerancePercent' | 'tieToleranceMaxPercent' | 'tieToleranceMinEnabled' | 'tieToleranceMaxEnabled' | 'poolMultiplier'>; type PlayerIntervalDto = Omit<ReturnType<typeof mapIntervalDto>, 'tieTolerancePercent' | 'tieToleranceMaxPercent' | 'tieToleranceMinEnabled' | 'tieToleranceMaxEnabled' | 'poolMultiplier'>;
export declare function getPublicConfig(): Promise<{ export declare function getPublicConfig(): Promise<{
dailyRevenueNetToday: number;
stakeAmounts: number[]; stakeAmounts: number[];
minStakeAmount: number; minStakeAmount: number;
maxStakeAmount: number; maxStakeAmount: number;
@ -74,6 +78,8 @@ export declare function getPublicConfig(): Promise<{
basePrice: number; basePrice: number;
payoutMultiplier: number; payoutMultiplier: number;
poolMultiplier: number; poolMultiplier: number;
dailyRevenueTarget: number;
dailyRevenueOverflowStrategy: DailyRevenueOverflowStrategy;
walletTypeCode: string; walletTypeCode: string;
autoModes: string[]; autoModes: string[];
isActive: boolean; isActive: boolean;
@ -85,6 +91,7 @@ export declare function getPublicConfig(): Promise<{
updatedAt: string; updatedAt: string;
}>; }>;
export declare function updateAdminConfig(body: Record<string, unknown>): Promise<{ export declare function updateAdminConfig(body: Record<string, unknown>): Promise<{
dailyRevenueNetToday: number;
stakeAmounts: number[]; stakeAmounts: number[];
minStakeAmount: number; minStakeAmount: number;
maxStakeAmount: number; maxStakeAmount: number;
@ -97,6 +104,8 @@ export declare function updateAdminConfig(body: Record<string, unknown>): Promis
basePrice: number; basePrice: number;
payoutMultiplier: number; payoutMultiplier: number;
poolMultiplier: number; poolMultiplier: number;
dailyRevenueTarget: number;
dailyRevenueOverflowStrategy: DailyRevenueOverflowStrategy;
walletTypeCode: string; walletTypeCode: string;
autoModes: string[]; autoModes: string[];
isActive: boolean; isActive: boolean;
@ -167,7 +176,32 @@ export declare function deleteAdminInterval(id: number): Promise<{
export declare function getGameState(userId?: string, intervalMinutes?: number, opts?: { export declare function getGameState(userId?: string, intervalMinutes?: number, opts?: {
includeInternal?: boolean; includeInternal?: boolean;
}): Promise<{ }): Promise<{
config: PlayerConfigDto; config: PlayerConfigDto | {
dailyRevenueNetToday: number;
stakeAmounts: number[];
minStakeAmount: number;
maxStakeAmount: number;
poolWinnerRule: repo.PoolWinnerRule;
predictionWindowSeconds: number;
tieTolerancePercent: number;
tieToleranceMaxPercent: number;
tieToleranceMinEnabled: boolean;
tieToleranceMaxEnabled: boolean;
basePrice: number;
payoutMultiplier: number;
poolMultiplier: number;
dailyRevenueTarget: number;
dailyRevenueOverflowStrategy: DailyRevenueOverflowStrategy;
walletTypeCode: string;
autoModes: string[];
isActive: boolean;
predictionTypes: {
single: boolean;
auto: boolean;
multiCandle: boolean;
};
updatedAt: string;
};
intervals: PlayerIntervalDto[]; intervals: PlayerIntervalDto[];
selectedIntervalMinutes: number; selectedIntervalMinutes: number;
interval: PlayerIntervalDto; interval: PlayerIntervalDto;
@ -176,7 +210,7 @@ export declare function getGameState(userId?: string, intervalMinutes?: number,
candleOpenMs: number; candleOpenMs: number;
candleCloseMs: number; candleCloseMs: number;
intervalMinutes: number; intervalMinutes: number;
status: "waiting" | "betting" | "locked" | "settled"; status: "locked" | "waiting" | "betting" | "settled";
bettingStartMs: number; bettingStartMs: number;
bettingEndMs: number; bettingEndMs: number;
outcome: repo.RoundOutcomeType | null; outcome: repo.RoundOutcomeType | null;

View File

@ -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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"}

View File

@ -67,12 +67,14 @@ const predictionAuditService = __importStar(require("../../services/predictionAu
const candleGenerationService_1 = require("../../services/candleGenerationService"); const candleGenerationService_1 = require("../../services/candleGenerationService");
const gameTimingService_1 = require("../../services/gameTimingService"); const gameTimingService_1 = require("../../services/gameTimingService");
const multiService = __importStar(require("../../services/candlePredictMultiService")); const multiService = __importStar(require("../../services/candlePredictMultiService"));
const dailyRevenueOutcomeService_1 = require("../../services/dailyRevenueOutcomeService");
const publishRoundState_1 = require("./realtime/publishRoundState"); const publishRoundState_1 = require("./realtime/publishRoundState");
const pubsub_1 = require("../../realtime/redis/pubsub"); const pubsub_1 = require("../../realtime/redis/pubsub");
const roundCache_1 = require("./read/roundCache"); const roundCache_1 = require("./read/roundCache");
const config_1 = require("../../config"); const config_1 = require("../../config");
const client_1 = require("../../realtime/redis/client"); const client_1 = require("../../realtime/redis/client");
const pubsub_2 = require("../../realtime/redis/pubsub"); const pubsub_2 = require("../../realtime/redis/pubsub");
const stateVersions_1 = require("../../realtime/redis/stateVersions");
const betQueue_1 = require("../../realtime/streams/betQueue"); const betQueue_1 = require("../../realtime/streams/betQueue");
const uuid_1 = require("uuid"); const uuid_1 = require("uuid");
const DECIMALS = 6n; const DECIMALS = 6n;
@ -161,7 +163,17 @@ function parseStakeDisplay(body, fallback) {
return fallback; return fallback;
} }
function parsePoolWinnerRule(value) { function parsePoolWinnerRule(value) {
return value === 'majority' ? 'majority' : 'minority'; if (value === 'majority')
return 'majority';
if (value === 'daily_revenue')
return 'daily_revenue';
return 'minority';
}
function parseDailyRevenueOverflowStrategy(value) {
return value === 'minority' ? 'minority' : 'neutral';
}
function isRealMoneyStakeKind(kind) {
return kind === 'main' || kind === 'bonus' || kind == null;
} }
function validateNeutralityRules(input) { function validateNeutralityRules(input) {
if (input.minPercent !== undefined && (input.minPercent < 0 || input.minPercent > 50)) { if (input.minPercent !== undefined && (input.minPercent < 0 || input.minPercent > 50)) {
@ -203,6 +215,8 @@ function mapConfig(row) {
basePrice: Number(row.base_price), basePrice: Number(row.base_price),
payoutMultiplier: Number(row.payout_multiplier), payoutMultiplier: Number(row.payout_multiplier),
poolMultiplier: Number(row.pool_multiplier), poolMultiplier: Number(row.pool_multiplier),
dailyRevenueTarget: Number(row.daily_revenue_target ?? 0),
dailyRevenueOverflowStrategy: parseDailyRevenueOverflowStrategy(row.daily_revenue_overflow_strategy),
walletTypeCode: row.wallet_type_code, walletTypeCode: row.wallet_type_code,
autoModes: row.auto_modes, autoModes: row.auto_modes,
isActive: row.is_active, isActive: row.is_active,
@ -215,7 +229,7 @@ function mapConfig(row) {
}; };
} }
function mapConfigForPlayer(row) { function mapConfigForPlayer(row) {
const { poolWinnerRule: _poolWinnerRule, poolMultiplier: _poolMultiplier, tieTolerancePercent: _min, tieToleranceMaxPercent: _max, tieToleranceMinEnabled: _minEn, tieToleranceMaxEnabled: _maxEn, ...player } = mapConfig(row); const { poolWinnerRule: _poolWinnerRule, poolMultiplier: _poolMultiplier, tieTolerancePercent: _min, tieToleranceMaxPercent: _max, tieToleranceMinEnabled: _minEn, tieToleranceMaxEnabled: _maxEn, dailyRevenueTarget: _drt, dailyRevenueOverflowStrategy: _dros, ...player } = mapConfig(row);
return player; return player;
} }
function resolveInterval(global, row) { function resolveInterval(global, row) {
@ -294,6 +308,27 @@ async function loadResolvedIntervals(cfg, activeOnly = true) {
const rows = activeOnly ? await repo.listActiveIntervals() : await repo.listAllIntervals(); const rows = activeOnly ? await repo.listActiveIntervals() : await repo.listAllIntervals();
return rows.map((r) => resolveInterval(cfg, r)); return rows.map((r) => resolveInterval(cfg, r));
} }
/**
* Bump the shared config version and notify every active interval channel.
* Used by admin config / interval / multi-level mutations so clients invalidate
* `/state` consistently (version ETag + live `config.updated`).
*/
async function publishConfigUpdated(cfg) {
if (!config_1.config.redis.enabled)
return;
const configVersion = await (0, stateVersions_1.bumpConfigVersionSafe)();
const sourceCfg = cfg ?? (await repo.getConfig());
const activeIntervals = await loadResolvedIntervals(sourceCfg, true);
await Promise.all(activeIntervals
.filter((i) => i.isActive)
.map((i) => (0, pubsub_1.publishRoundEvent)(i.intervalMinutes, {
type: 'config.updated',
intervalMinutes: i.intervalMinutes,
payload: {
...(configVersion != null ? { versions: { config: configVersion } } : {}),
},
})));
}
async function resolveSelectedInterval(cfg, intervalMinutes) { async function resolveSelectedInterval(cfg, intervalMinutes) {
const intervals = await loadResolvedIntervals(cfg, true); const intervals = await loadResolvedIntervals(cfg, true);
if (!intervals.length) { if (!intervals.length) {
@ -383,7 +418,12 @@ function mapBet(row) {
} }
async function getPublicConfig() { async function getPublicConfig() {
const cfg = await repo.getConfig(); const cfg = await repo.getConfig();
return mapConfig(cfg); const mapped = mapConfig(cfg);
const netRaw = await repo.getDailyRevenueNetRaw((0, dailyRevenueOutcomeService_1.utcRevenueDate)());
return {
...mapped,
dailyRevenueNetToday: (0, dailyRevenueOutcomeService_1.usdtRawToDisplay)(netRaw),
};
} }
async function updateAdminConfig(body) { async function updateAdminConfig(body) {
const cfg = await repo.getConfig(); const cfg = await repo.getConfig();
@ -413,11 +453,28 @@ async function updateAdminConfig(body) {
}); });
let poolWinnerRule; let poolWinnerRule;
if (typeof body.poolWinnerRule === 'string') { if (typeof body.poolWinnerRule === 'string') {
if (body.poolWinnerRule !== 'minority' && body.poolWinnerRule !== 'majority') { if (body.poolWinnerRule !== 'minority' &&
throw new Error('poolWinnerRule must be minority or majority'); body.poolWinnerRule !== 'majority' &&
body.poolWinnerRule !== 'daily_revenue') {
throw new Error('poolWinnerRule must be minority, majority, or daily_revenue');
} }
poolWinnerRule = body.poolWinnerRule; poolWinnerRule = body.poolWinnerRule;
} }
let dailyRevenueTarget;
if (typeof body.dailyRevenueTarget === 'number') {
if (body.dailyRevenueTarget < 0) {
throw new Error('dailyRevenueTarget must be >= 0');
}
dailyRevenueTarget = body.dailyRevenueTarget;
}
let dailyRevenueOverflowStrategy;
if (typeof body.dailyRevenueOverflowStrategy === 'string') {
if (body.dailyRevenueOverflowStrategy !== 'minority' &&
body.dailyRevenueOverflowStrategy !== 'neutral') {
throw new Error('dailyRevenueOverflowStrategy must be minority or neutral');
}
dailyRevenueOverflowStrategy = body.dailyRevenueOverflowStrategy;
}
const updated = await repo.updateConfig({ const updated = await repo.updateConfig({
stakeAmounts, stakeAmounts,
minStakeAmount, minStakeAmount,
@ -433,6 +490,8 @@ async function updateAdminConfig(body) {
basePrice: typeof body.basePrice === 'number' ? body.basePrice : undefined, basePrice: typeof body.basePrice === 'number' ? body.basePrice : undefined,
payoutMultiplier: typeof body.payoutMultiplier === 'number' ? body.payoutMultiplier : undefined, payoutMultiplier: typeof body.payoutMultiplier === 'number' ? body.payoutMultiplier : undefined,
poolMultiplier: typeof body.poolMultiplier === 'number' ? body.poolMultiplier : undefined, poolMultiplier: typeof body.poolMultiplier === 'number' ? body.poolMultiplier : undefined,
dailyRevenueTarget,
dailyRevenueOverflowStrategy,
walletTypeCode: typeof body.walletTypeCode === 'string' ? body.walletTypeCode : undefined, walletTypeCode: typeof body.walletTypeCode === 'string' ? body.walletTypeCode : undefined,
autoModes: Array.isArray(body.autoModes) ? body.autoModes : undefined, autoModes: Array.isArray(body.autoModes) ? body.autoModes : undefined,
isActive: typeof body.isActive === 'boolean' ? body.isActive : undefined, isActive: typeof body.isActive === 'boolean' ? body.isActive : undefined,
@ -464,16 +523,14 @@ async function updateAdminConfig(body) {
await repo.clearIntervalNeutralityEnabledOverrides(); await repo.clearIntervalNeutralityEnabledOverrides();
} }
if (config_1.config.redis.enabled) { if (config_1.config.redis.enabled) {
const activeIntervals = await loadResolvedIntervals(updated, true); await publishConfigUpdated(updated);
await Promise.all(activeIntervals
.filter((i) => i.isActive)
.map((i) => (0, pubsub_1.publishRoundEvent)(i.intervalMinutes, {
type: 'config.updated',
intervalMinutes: i.intervalMinutes,
payload: {},
})));
} }
return mapConfig(updated); const mapped = mapConfig(updated);
const netRaw = await repo.getDailyRevenueNetRaw((0, dailyRevenueOutcomeService_1.utcRevenueDate)());
return {
...mapped,
dailyRevenueNetToday: (0, dailyRevenueOutcomeService_1.usdtRawToDisplay)(netRaw),
};
} }
async function listAdminIntervals() { async function listAdminIntervals() {
const cfg = await repo.getConfig(); const cfg = await repo.getConfig();
@ -534,6 +591,7 @@ async function createAdminInterval(body) {
await repo.clearDefaultIntervalExcept(row.id); await repo.clearDefaultIntervalExcept(row.id);
} }
const cfg = await repo.getConfig(); const cfg = await repo.getConfig();
await publishConfigUpdated(cfg);
return mapIntervalDto(resolveInterval(cfg, row)); return mapIntervalDto(resolveInterval(cfg, row));
} }
async function updateAdminInterval(id, body) { async function updateAdminInterval(id, body) {
@ -627,6 +685,7 @@ async function updateAdminInterval(id, body) {
throw new Error('Interval not found'); throw new Error('Interval not found');
if (updated.is_default) if (updated.is_default)
await repo.clearDefaultIntervalExcept(updated.id); await repo.clearDefaultIntervalExcept(updated.id);
await publishConfigUpdated(cfg);
return mapIntervalDto(resolveInterval(cfg, updated)); return mapIntervalDto(resolveInterval(cfg, updated));
} }
async function deleteAdminInterval(id) { async function deleteAdminInterval(id) {
@ -640,6 +699,7 @@ async function deleteAdminInterval(id) {
throw new Error('Cannot delete an interval that has game rounds — disable it instead'); throw new Error('Cannot delete an interval that has game rounds — disable it instead');
} }
await repo.deleteInterval(id); await repo.deleteInterval(id);
await publishConfigUpdated();
return { ok: true }; return { ok: true };
} }
async function getGameState(userId, intervalMinutes, opts) { async function getGameState(userId, intervalMinutes, opts) {
@ -712,7 +772,12 @@ async function getGameState(userId, intervalMinutes, opts) {
autoSettings = await getAutoSettings(userId); autoSettings = await getAutoSettings(userId);
} }
return { return {
config: includeInternal ? mapConfig(cfg) : mapConfigForPlayer(cfg), config: includeInternal
? {
...mapConfig(cfg),
dailyRevenueNetToday: (0, dailyRevenueOutcomeService_1.usdtRawToDisplay)(await repo.getDailyRevenueNetRaw((0, dailyRevenueOutcomeService_1.utcRevenueDate)())),
}
: mapConfigForPlayer(cfg),
intervals: intervals.map(includeInternal ? mapIntervalDto : mapIntervalDtoForPlayer), intervals: intervals.map(includeInternal ? mapIntervalDto : mapIntervalDtoForPlayer),
selectedIntervalMinutes: selected.intervalMinutes, selectedIntervalMinutes: selected.intervalMinutes,
interval: includeInternal ? mapIntervalDto(selected) : mapIntervalDtoForPlayer(selected), interval: includeInternal ? mapIntervalDto(selected) : mapIntervalDtoForPlayer(selected),
@ -769,6 +834,7 @@ async function tickGameEngine() {
return; return;
const intervals = await loadResolvedIntervals(cfg, true); const intervals = await loadResolvedIntervals(cfg, true);
const nowMs = Date.now(); const nowMs = Date.now();
// Settle overdue rounds — isolate each so a single failure doesn't block the rest.
const overdue = await repo.listOverdueUnsettledRounds(nowMs); const overdue = await repo.listOverdueUnsettledRounds(nowMs);
const settledMaturities = new Set(); const settledMaturities = new Set();
for (const due of overdue) { for (const due of overdue) {
@ -776,24 +842,49 @@ async function tickGameEngine() {
if (settledMaturities.has(openMs)) if (settledMaturities.has(openMs))
continue; continue;
settledMaturities.add(openMs); settledMaturities.add(openMs);
await settleMaturityAtOpenMs(openMs, cfg); try {
await settleMaturityAtOpenMs(openMs, cfg);
}
catch (e) {
console.error(`[engine] settleMaturity failed for openMs=${openMs}:`, e);
}
} }
const multiDueOpenMs = await repo.listDueMultiValidationCandleOpenMs(nowMs); const multiDueOpenMs = await repo.listDueMultiValidationCandleOpenMs(nowMs);
for (const openMs of multiDueOpenMs) { for (const openMs of multiDueOpenMs) {
if (settledMaturities.has(openMs)) if (settledMaturities.has(openMs))
continue; continue;
settledMaturities.add(openMs); settledMaturities.add(openMs);
await settleMaturityAtOpenMs(openMs, cfg); try {
await settleMaturityAtOpenMs(openMs, cfg);
}
catch (e) {
console.error(`[engine] settleMaturity (multi) failed for openMs=${openMs}:`, e);
}
} }
for (const interval of intervals) { for (const interval of intervals) {
await tickIntervalEngine(cfg, interval, nowMs); try {
} await tickIntervalEngine(cfg, interval, nowMs);
const settings = await settingsRepository.getSettings();
if (nowMs - lastBackfillRunMs >= settings.candle_predict_backfill_interval_ms) {
for (const interval of intervals) {
await backfillMissedAutoCandles(interval, nowMs, cfg, settings);
} }
lastBackfillRunMs = nowMs; catch (e) {
console.error(`[engine] tickInterval failed for ${interval.intervalMinutes}m:`, e);
}
}
try {
const settings = await settingsRepository.getSettings();
if (nowMs - lastBackfillRunMs >= settings.candle_predict_backfill_interval_ms) {
for (const interval of intervals) {
try {
await backfillMissedAutoCandles(interval, nowMs, cfg, settings);
}
catch (e) {
console.error(`[engine] backfill failed for ${interval.intervalMinutes}m:`, e);
}
}
lastBackfillRunMs = nowMs;
}
}
catch (e) {
console.error('[engine] backfill settings read failed:', e);
} }
} }
function lastCompletedCandleOpenMs(nowMs, intervalMinutes) { function lastCompletedCandleOpenMs(nowMs, intervalMinutes) {
@ -895,71 +986,165 @@ async function publishRoundSnapshot(intervalMinutes, openMs) {
pools: { short: livePools.shortPool, long: livePools.longPool }, pools: { short: livePools.shortPool, long: livePools.longPool },
}); });
} }
const _settlingInProgress = new Set();
async function settleMaturityAtOpenMs(candleOpenMs, cfg) { async function settleMaturityAtOpenMs(candleOpenMs, cfg) {
const intervals = await loadResolvedIntervals(cfg, true); if (_settlingInProgress.has(candleOpenMs))
const aligning = intervals.filter((i) => (0, gameTimingService_1.isMaturityBoundaryForInterval)(candleOpenMs, i.intervalMinutes));
if (!aligning.length)
return; return;
const pendingCount = await repo.countPendingBetsForMaturity(candleOpenMs); _settlingInProgress.add(candleOpenMs);
const multiValidationCount = await repo.countMultiBetsForValidationAtOpenMs(candleOpenMs); try {
const realMoneyPendingCount = await repo.countPendingRealMoneyBetsForMaturity(candleOpenMs); const intervals = await loadResolvedIntervals(cfg, true);
const allCandlesExist = await Promise.all(aligning.map((i) => repo.hasCandle(candleOpenMs, i.intervalMinutes))); const aligning = intervals.filter((i) => (0, gameTimingService_1.isMaturityBoundaryForInterval)(candleOpenMs, i.intervalMinutes));
if (allCandlesExist.every(Boolean) && pendingCount === 0 && multiValidationCount === 0) if (!aligning.length)
return; return;
const multiContributions = await repo.getMultiCandlePoolContributions(candleOpenMs); const pendingCount = await repo.countPendingBetsForMaturity(candleOpenMs);
const outcomeMode = multiService.resolveMaturityOutcomeMode({ const multiValidationCount = await repo.countMultiBetsForValidationAtOpenMs(candleOpenMs);
realMoneySinglePending: realMoneyPendingCount > 0, const realMoneyPendingCount = await repo.countPendingRealMoneyBetsForMaturity(candleOpenMs);
multiFinalPoolShort: multiContributions.shortPool, const allCandlesExist = await Promise.all(aligning.map((i) => repo.hasCandle(candleOpenMs, i.intervalMinutes)));
multiFinalPoolLong: multiContributions.longPool, if (allCandlesExist.every(Boolean) && pendingCount === 0 && multiValidationCount === 0)
}); return;
const { shortPool, longPool } = await multiService.buildMaturityPools(candleOpenMs); const multiContributions = await repo.getMultiCandlePoolContributions(candleOpenMs);
const primary = aligning.find((i) => i.intervalMinutes === 1) ?? const outcomeMode = multiService.resolveMaturityOutcomeMode({
aligning.sort((a, b) => a.intervalMinutes - b.intervalMinutes)[0]; realMoneySinglePending: realMoneyPendingCount > 0,
/** Shared pool outcome, or per-interval auto outcomes (5-streak rule per chart). */ multiFinalPoolShort: multiContributions.shortPool,
const outcomesByIntervalMinutes = new Map(); multiFinalPoolLong: multiContributions.longPool,
if (outcomeMode === 'pool') { });
const neutralityRules = buildPoolNeutralityRules(cfg, primary); const { shortPool, longPool } = await multiService.buildMaturityPools(candleOpenMs);
const shared = (0, candleGenerationService_1.resolvePoolOutcome)(shortPool, longPool, neutralityRules, parsePoolWinnerRule(cfg.pool_winner_rule)); const primary = aligning.find((i) => i.intervalMinutes === 1) ??
for (const interval of aligning) { aligning.sort((a, b) => a.intervalMinutes - b.intervalMinutes)[0];
outcomesByIntervalMinutes.set(interval.intervalMinutes, shared); /** Shared pool outcome, or per-interval auto outcomes (5-streak rule per chart). */
const outcomesByIntervalMinutes = new Map();
const runPoolSettlement = async () => {
const rule = parsePoolWinnerRule(cfg.pool_winner_rule);
let shared;
if (rule === 'daily_revenue') {
const neutralityRules = buildPoolNeutralityRules(cfg, primary);
shared = await resolveDailyRevenueSharedOutcome(cfg, shortPool, longPool, candleOpenMs, neutralityRules);
}
else {
const neutralityRules = buildPoolNeutralityRules(cfg, primary);
shared = (0, candleGenerationService_1.resolvePoolOutcome)(shortPool, longPool, neutralityRules, rule);
}
for (const interval of aligning) {
outcomesByIntervalMinutes.set(interval.intervalMinutes, shared);
}
const outcomeForInterval = (intervalMinutes) => outcomesByIntervalMinutes.get(intervalMinutes) ??
outcomesByIntervalMinutes.get(primary.intervalMinutes);
for (const interval of aligning) {
let round = await repo.getRoundByOpenMs(candleOpenMs, interval.intervalMinutes);
if (!round) {
round = await syncRound(interval, candleOpenMs, 'locked');
}
else if (!round.settled_at && round.status !== 'settled') {
await repo.updateRoundStatus(round.id, 'locked');
}
}
let housePnlDeltaRaw = 0n;
if (pendingCount > 0) {
housePnlDeltaRaw += await payOutBetsAtMaturity(candleOpenMs, outcomeForInterval, cfg);
}
if (multiValidationCount > 0) {
const levelRows = await repo.listMultiLevels();
const payoutMultiplierMap = new Map(levelRows.map((l) => [l.level, Number(l.payout_multiplier)]));
housePnlDeltaRaw += await multiService.processMultiBetsAtMaturity(candleOpenMs, outcomeForInterval, payoutMultiplierMap);
}
if (housePnlDeltaRaw !== 0n) {
await repo.addDailyRevenuePnl((0, dailyRevenueOutcomeService_1.utcRevenueDate)(), housePnlDeltaRaw);
}
for (const interval of aligning) {
let round = await repo.getRoundByOpenMs(candleOpenMs, interval.intervalMinutes);
if (!round) {
round = await syncRound(interval, candleOpenMs, 'locked');
}
if (round.settled_at)
continue;
await finalizeIntervalCandleAtMaturity(round, interval, outcomeForInterval(interval.intervalMinutes), shortPool, longPool);
}
};
if (outcomeMode === 'pool') {
// Serialize daily-revenue reads + settlement PnL updates across concurrent maturities.
await repo.withDailyRevenueLock(runPoolSettlement);
}
else {
// No real-money stake: each interval uses its own history so the
// max-5 consecutive same-direction rule applies on every chart.
for (const interval of aligning) {
const recentOutcomes = await repo.listRecentCandleOutcomes(interval.intervalMinutes, 10);
outcomesByIntervalMinutes.set(interval.intervalMinutes, (0, candleGenerationService_1.resolveAutoNoBetOutcome)(recentOutcomes));
}
const outcomeForInterval = (intervalMinutes) => outcomesByIntervalMinutes.get(intervalMinutes) ??
outcomesByIntervalMinutes.get(primary.intervalMinutes);
for (const interval of aligning) {
let round = await repo.getRoundByOpenMs(candleOpenMs, interval.intervalMinutes);
if (!round) {
round = await syncRound(interval, candleOpenMs, 'locked');
}
else if (!round.settled_at && round.status !== 'settled') {
await repo.updateRoundStatus(round.id, 'locked');
}
}
if (pendingCount > 0) {
await payOutBetsAtMaturity(candleOpenMs, outcomeForInterval, cfg);
}
if (multiValidationCount > 0) {
const levelRows = await repo.listMultiLevels();
const payoutMultiplierMap = new Map(levelRows.map((l) => [l.level, Number(l.payout_multiplier)]));
await multiService.processMultiBetsAtMaturity(candleOpenMs, outcomeForInterval, payoutMultiplierMap);
}
for (const interval of aligning) {
let round = await repo.getRoundByOpenMs(candleOpenMs, interval.intervalMinutes);
if (!round) {
round = await syncRound(interval, candleOpenMs, 'locked');
}
if (round.settled_at)
continue;
await finalizeIntervalCandleAtMaturity(round, interval, outcomeForInterval(interval.intervalMinutes), shortPool, longPool);
}
} }
} }
else { finally {
// No real-money stake: each interval uses its own history so the _settlingInProgress.delete(candleOpenMs);
// max-5 consecutive same-direction rule applies on every chart.
for (const interval of aligning) {
const recentOutcomes = await repo.listRecentCandleOutcomes(interval.intervalMinutes, 10);
outcomesByIntervalMinutes.set(interval.intervalMinutes, (0, candleGenerationService_1.resolveAutoNoBetOutcome)(recentOutcomes));
}
} }
const outcomeForInterval = (intervalMinutes) => outcomesByIntervalMinutes.get(intervalMinutes) ?? }
outcomesByIntervalMinutes.get(primary.intervalMinutes); async function resolveDailyRevenueSharedOutcome(cfg, shortPool, longPool, candleOpenMs, neutralityRules) {
for (const interval of aligning) { const revenueDate = (0, dailyRevenueOutcomeService_1.utcRevenueDate)();
let round = await repo.getRoundByOpenMs(candleOpenMs, interval.intervalMinutes); const dailyNetRaw = await repo.getOrCreateDailyRevenueNetRaw(revenueDate);
if (!round) { const random = (0, dailyRevenueOutcomeService_1.pickRandomDirectionalOutcome)();
round = await syncRound(interval, candleOpenMs, 'locked'); const randomWinner = random.winner ?? 'long';
} const majority = shortPool === longPool ? null : shortPool > longPool ? 'short' : 'long';
else if (!round.settled_at && round.status !== 'settled') { let projectedMajorityRoundPnlRaw = 0n;
await repo.updateRoundStatus(round.id, 'locked'); if (majority != null) {
} const allIntervals = await loadResolvedIntervals(cfg, true);
} const intervalMap = new Map(allIntervals.map((i) => [i.intervalMinutes, i]));
if (pendingCount > 0) {
await payOutBetsAtMaturity(candleOpenMs, outcomeForInterval, cfg);
}
if (multiValidationCount > 0) {
const levelRows = await repo.listMultiLevels(); const levelRows = await repo.listMultiLevels();
const payoutMultiplierMap = new Map(levelRows.map((l) => [l.level, Number(l.payout_multiplier)])); const multiMult = new Map(levelRows.map((l) => [l.level, Number(l.payout_multiplier)]));
await multiService.processMultiBetsAtMaturity(candleOpenMs, outcomeForInterval, payoutMultiplierMap); const singles = await repo.listPendingBetsForMaturity(candleOpenMs);
} const multis = await repo.listMultiBetsForValidationAtOpenMs(candleOpenMs);
for (const interval of aligning) { const projected = (0, dailyRevenueOutcomeService_1.projectMajorityWinSettlement)({
let round = await repo.getRoundByOpenMs(candleOpenMs, interval.intervalMinutes); majority,
if (!round) { singles,
round = await syncRound(interval, candleOpenMs, 'locked'); multis: multis.map((b) => ({
} sequence_directions: b.sequence_directions,
if (round.settled_at) multi_level: b.multi_level,
continue; sequence_step: b.sequence_step,
await finalizeIntervalCandleAtMaturity(round, interval, outcomeForInterval(interval.intervalMinutes), shortPool, longPool); stake_raw: b.stake_raw,
stake_display: b.stake_display,
stake_account_kind: b.stake_account_kind,
})),
singlePayoutMultiplier: (intervalMinutes) => intervalMap.get(intervalMinutes)?.payoutMultiplier ?? Number(cfg.payout_multiplier),
multiPayoutMultiplier: (level) => multiMult.get(level) ?? 1,
});
projectedMajorityRoundPnlRaw = projected.roundPnlRaw;
} }
return (0, dailyRevenueOutcomeService_1.resolveDailyRevenueOutcome)({
shortPool,
longPool,
randomWinner,
projectedMajorityRoundPnlRaw,
dailyNetRaw,
targetRaw: (0, dailyRevenueOutcomeService_1.usdtDisplayToRaw)(Number(cfg.daily_revenue_target ?? 0)),
overflowStrategy: parseDailyRevenueOverflowStrategy(cfg.daily_revenue_overflow_strategy),
neutralityRules,
});
} }
async function finalizeIntervalCandleAtMaturity(round, interval, outcome, shortPool, longPool) { async function finalizeIntervalCandleAtMaturity(round, interval, outcome, shortPool, longPool) {
if (round.settled_at) if (round.settled_at)
@ -1016,14 +1201,17 @@ async function finalizeIntervalCandleAtMaturity(round, interval, outcome, shortP
secondsToBettingStart: 0, secondsToBettingStart: 0,
secondsToClose: 0, secondsToClose: 0,
}; };
await (0, publishRoundState_1.publishRoundState)({ // Fire-and-forget Redis publish — must never block or kill the engine loop.
const PUBLISH_TIMEOUT_MS = 5000;
const withTimeout = (p) => Promise.race([p, new Promise((r) => setTimeout(r, PUBLISH_TIMEOUT_MS))]);
await withTimeout((0, publishRoundState_1.publishRoundState)({
intervalMinutes: interval.intervalMinutes, intervalMinutes: interval.intervalMinutes,
openMs, openMs,
round: settledDto, round: settledDto,
pools: { short: shortPool, long: longPool }, pools: { short: shortPool, long: longPool },
eventType: 'round.settled', eventType: 'round.settled',
}); })).catch((e) => console.error(`[engine] publishRoundState failed for ${interval.intervalMinutes}m openMs=${openMs}:`, e));
await (0, publishRoundState_1.publishCandleAppend)(interval.intervalMinutes, { await withTimeout((0, publishRoundState_1.publishCandleAppend)(interval.intervalMinutes, {
time: Math.floor(openMs / 1000), time: Math.floor(openMs / 1000),
open: candle.open, open: candle.open,
high: candle.high, high: candle.high,
@ -1032,12 +1220,13 @@ async function finalizeIntervalCandleAtMaturity(round, interval, outcome, shortP
outcome: outcome.type, outcome: outcome.type,
intervalMinutes: interval.intervalMinutes, intervalMinutes: interval.intervalMinutes,
candleOpenMs: openMs, candleOpenMs: openMs,
}); })).catch((e) => console.error(`[engine] publishCandleAppend failed for ${interval.intervalMinutes}m:`, e));
} }
async function payOutBetsAtMaturity(candleOpenMs, outcomeForInterval, cfg) { async function payOutBetsAtMaturity(candleOpenMs, outcomeForInterval, cfg) {
const bets = await repo.listPendingBetsForMaturity(candleOpenMs); const bets = await repo.listPendingBetsForMaturity(candleOpenMs);
const allIntervals = await loadResolvedIntervals(cfg, true); const allIntervals = await loadResolvedIntervals(cfg, true);
const intervalMap = new Map(allIntervals.map((i) => [i.intervalMinutes, i])); const intervalMap = new Map(allIntervals.map((i) => [i.intervalMinutes, i]));
let housePnlRaw = 0n;
for (const bet of bets) { for (const bet of bets) {
const outcome = outcomeForInterval(bet.interval_minutes); const outcome = outcomeForInterval(bet.interval_minutes);
const interval = intervalMap.get(bet.interval_minutes) ?? const interval = intervalMap.get(bet.interval_minutes) ??
@ -1047,9 +1236,12 @@ async function payOutBetsAtMaturity(candleOpenMs, outcomeForInterval, cfg) {
}; };
const multiplier = interval.payoutMultiplier; const multiplier = interval.payoutMultiplier;
const stakeRaw = BigInt(bet.stake_raw); const stakeRaw = BigInt(bet.stake_raw);
const countInDaily = isRealMoneyStakeKind(bet.stake_account_kind);
if (outcome.type === 'neutral') { if (outcome.type === 'neutral') {
await creditGameOutcome(bet, stakeRaw, 'game_refund'); await creditGameOutcome(bet, stakeRaw, 'game_refund');
await repo.updateBetOutcome(bet.id, 'refunded', stakeRaw); await repo.updateBetOutcome(bet.id, 'refunded', stakeRaw);
if (countInDaily)
housePnlRaw += 0n;
void predictionAuditService.logPredictionBetSettled({ void predictionAuditService.logPredictionBetSettled({
userId: bet.user_id, userId: bet.user_id,
betId: bet.id, betId: bet.id,
@ -1083,6 +1275,8 @@ async function payOutBetsAtMaturity(candleOpenMs, outcomeForInterval, cfg) {
const payoutRaw = BigInt(Math.round(Number(stakeRaw) * multiplier)); const payoutRaw = BigInt(Math.round(Number(stakeRaw) * multiplier));
await creditGameOutcome(bet, payoutRaw, 'game_payout'); await creditGameOutcome(bet, payoutRaw, 'game_payout');
await repo.updateBetOutcome(bet.id, 'won', payoutRaw); await repo.updateBetOutcome(bet.id, 'won', payoutRaw);
if (countInDaily)
housePnlRaw += stakeRaw - payoutRaw;
void predictionAuditService.logPredictionBetSettled({ void predictionAuditService.logPredictionBetSettled({
userId: bet.user_id, userId: bet.user_id,
betId: bet.id, betId: bet.id,
@ -1112,6 +1306,8 @@ async function payOutBetsAtMaturity(candleOpenMs, outcomeForInterval, cfg) {
} }
else { else {
await repo.updateBetOutcome(bet.id, 'lost', 0n); await repo.updateBetOutcome(bet.id, 'lost', 0n);
if (countInDaily)
housePnlRaw += stakeRaw;
void predictionAuditService.logPredictionBetSettled({ void predictionAuditService.logPredictionBetSettled({
userId: bet.user_id, userId: bet.user_id,
betId: bet.id, betId: bet.id,
@ -1127,6 +1323,17 @@ async function payOutBetsAtMaturity(candleOpenMs, outcomeForInterval, cfg) {
} }
(0, userAdminStatsService_1.queueUserAdminStatsRefresh)(bet.user_id); (0, userAdminStatsService_1.queueUserAdminStatsRefresh)(bet.user_id);
} }
if (config_1.config.redis.enabled && bets.length > 0) {
const seen = new Set();
await Promise.all(bets.map(async (bet) => {
const key = `${bet.user_id}:${bet.interval_minutes}`;
if (seen.has(key))
return;
seen.add(key);
await (0, stateVersions_1.bumpUserBetVersionSafe)(bet.user_id, bet.interval_minutes);
}));
}
return housePnlRaw;
} }
async function processAutoBets(round, interval, cfg) { async function processAutoBets(round, interval, cfg) {
if (!cfg.prediction_auto_enabled) if (!cfg.prediction_auto_enabled)
@ -1157,6 +1364,20 @@ async function processAutoBets(round, interval, cfg) {
stakeAccountKind: parseStakeAccountKind(auto.stake_account_kind), stakeAccountKind: parseStakeAccountKind(auto.stake_account_kind),
}); });
await repo.touchAutoBet(auto.user_id); await repo.touchAutoBet(auto.user_id);
const autoVersion = await (0, stateVersions_1.bumpUserAutoVersionSafe)(auto.user_id);
if (config_1.config.redis.enabled) {
await (0, pubsub_2.publishUserEvent)(auto.user_id, {
type: 'auto.updated',
payload: {
autoSettings: {
lastAutoBetAt: new Date().toISOString(),
autoBetPlaced: false,
autoBetError: null,
},
...(autoVersion != null ? { versions: { auto: autoVersion } } : {}),
},
});
}
} }
catch (e) { catch (e) {
const msg = e instanceof Error ? e.message : String(e); const msg = e instanceof Error ? e.message : String(e);
@ -1209,6 +1430,20 @@ async function processAutoBetForUser(userId, intervalMinutes) {
stakeAccountKind: parseStakeAccountKind(auto.stake_account_kind), stakeAccountKind: parseStakeAccountKind(auto.stake_account_kind),
}); });
await repo.touchAutoBet(userId); await repo.touchAutoBet(userId);
const autoVersion = await (0, stateVersions_1.bumpUserAutoVersionSafe)(userId);
if (config_1.config.redis.enabled) {
await (0, pubsub_2.publishUserEvent)(userId, {
type: 'auto.updated',
payload: {
autoSettings: {
lastAutoBetAt: new Date().toISOString(),
autoBetPlaced: false,
autoBetError: null,
},
...(autoVersion != null ? { versions: { auto: autoVersion } } : {}),
},
});
}
return { placed: true }; return { placed: true };
} }
catch (e) { catch (e) {
@ -1329,10 +1564,12 @@ async function executePlaceBetInternal(userId, input) {
(0, userAdminStatsService_1.queueUserAdminStatsRefresh)(userId); (0, userAdminStatsService_1.queueUserAdminStatsRefresh)(userId);
const mapped = mapBet(bet); const mapped = mapBet(bet);
if (config_1.config.redis.enabled) { if (config_1.config.redis.enabled) {
const betVersion = await (0, stateVersions_1.bumpUserBetVersionSafe)(userId, interval.intervalMinutes);
await (0, pubsub_2.publishUserEvent)(userId, { await (0, pubsub_2.publishUserEvent)(userId, {
type: 'bet.accepted', type: 'bet.accepted',
payload: { payload: {
bet: mapped, bet: mapped,
...(betVersion != null ? { versions: { bet: betVersion } } : {}),
}, },
}); });
} }
@ -1491,6 +1728,16 @@ async function saveAutoSettings(userId, body) {
result.lastAutoBetAt = new Date().toISOString(); result.lastAutoBetAt = new Date().toISOString();
} }
} }
const autoVersion = await (0, stateVersions_1.bumpUserAutoVersionSafe)(userId);
if (config_1.config.redis.enabled) {
await (0, pubsub_2.publishUserEvent)(userId, {
type: 'auto.updated',
payload: {
autoSettings: result,
...(autoVersion != null ? { versions: { auto: autoVersion } } : {}),
},
});
}
return result; return result;
} }
async function getAutoSettings(userId) { async function getAutoSettings(userId) {
@ -1549,6 +1796,7 @@ async function updateAdminMultiLevels(body) {
}); });
results.push(multiService.mapMultiLevel(updated)); results.push(multiService.mapMultiLevel(updated));
} }
await publishConfigUpdated();
return results; return results;
} }
async function placeMultiCandleBet(userId, input) { async function placeMultiCandleBet(userId, input) {
@ -1638,6 +1886,7 @@ async function placeMultiCandleBet(userId, input) {
}); });
(0, userAdminStatsService_1.queueUserAdminStatsRefresh)(userId); (0, userAdminStatsService_1.queueUserAdminStatsRefresh)(userId);
if (config_1.config.redis.enabled) { if (config_1.config.redis.enabled) {
const betVersion = await (0, stateVersions_1.bumpUserBetVersionSafe)(userId, interval.intervalMinutes);
await publishRoundSnapshot(interval.intervalMinutes, timing.openMs); await publishRoundSnapshot(interval.intervalMinutes, timing.openMs);
const mapped = multiService.mapMultiBet(bet); const mapped = multiService.mapMultiBet(bet);
await (0, pubsub_2.publishUserEvent)(userId, { await (0, pubsub_2.publishUserEvent)(userId, {
@ -1645,21 +1894,30 @@ async function placeMultiCandleBet(userId, input) {
payload: { payload: {
intervalMinutes: interval.intervalMinutes, intervalMinutes: interval.intervalMinutes,
userMultiBet: mapped, userMultiBet: mapped,
...(betVersion != null ? { versions: { bet: betVersion } } : {}),
}, },
}); });
} }
return multiService.mapMultiBet(bet); return multiService.mapMultiBet(bet);
} }
function startCandlePredictEngine() { function startCandlePredictEngine() {
const DEFAULT_TICK_MS = 3000;
const run = async () => { const run = async () => {
let tickMs = DEFAULT_TICK_MS;
try { try {
await tickGameEngine(); await tickGameEngine();
} }
catch (e) { catch (e) {
console.error('Candle Predict engine error:', e); console.error('Candle Predict engine error:', e);
} }
const settings = await settingsRepository.getSettings(); try {
setTimeout(run, settings.candle_predict_engine_tick_ms); const settings = await settingsRepository.getSettings();
tickMs = settings.candle_predict_engine_tick_ms || DEFAULT_TICK_MS;
}
catch (e) {
console.error('Candle Predict engine: failed to read settings, retrying in', tickMs, 'ms —', e);
}
setTimeout(run, tickMs);
}; };
setTimeout(run, 5000); setTimeout(run, 5000);
} }

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
{"version":3,"file":"roundCache.d.ts","sourceRoot":"","sources":["../../../../src/domain/candle-predict/read/roundCache.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAEnE,MAAM,MAAM,eAAe,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC,CAAC;AAExE,yEAAyE;AACzE,wBAAsB,eAAe,CACnC,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAGjC"} {"version":3,"file":"roundCache.d.ts","sourceRoot":"","sources":["../../../../src/domain/candle-predict/read/roundCache.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAEnE,MAAM,MAAM,eAAe,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC,CAAC;AAExE,yEAAyE;AACzE,wBAAsB,eAAe,CACnC,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAQjC"}

View File

@ -7,6 +7,12 @@ const roundCache_1 = require("../../../realtime/redis/roundCache");
async function loadCachedRound(intervalMinutes, openMs) { async function loadCachedRound(intervalMinutes, openMs) {
if (!config_1.config.redis.enabled || !config_1.config.redis.roundCacheEnabled) if (!config_1.config.redis.enabled || !config_1.config.redis.roundCacheEnabled)
return null; return null;
return (0, roundCache_1.getRoundCache)(intervalMinutes, openMs); try {
return await (0, roundCache_1.getRoundCache)(intervalMinutes, openMs);
}
catch (e) {
console.error('[roundCache] loadCachedRound failed, using DB state:', e);
return null;
}
} }
//# sourceMappingURL=roundCache.js.map //# sourceMappingURL=roundCache.js.map

View File

@ -1 +1 @@
{"version":3,"file":"roundCache.js","sourceRoot":"","sources":["../../../../src/domain/candle-predict/read/roundCache.ts"],"names":[],"mappings":";;AAMA,0CAMC;AAZD,4CAAyC;AACzC,mEAAmE;AAInE,yEAAyE;AAClE,KAAK,UAAU,eAAe,CACnC,eAAuB,EACvB,MAAc;IAEd,IAAI,CAAC,eAAM,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,eAAM,CAAC,KAAK,CAAC,iBAAiB;QAAE,OAAO,IAAI,CAAC;IAC1E,OAAO,IAAA,0BAAa,EAAC,eAAe,EAAE,MAAM,CAAC,CAAC;AAChD,CAAC"} {"version":3,"file":"roundCache.js","sourceRoot":"","sources":["../../../../src/domain/candle-predict/read/roundCache.ts"],"names":[],"mappings":";;AAMA,0CAWC;AAjBD,4CAAyC;AACzC,mEAAmE;AAInE,yEAAyE;AAClE,KAAK,UAAU,eAAe,CACnC,eAAuB,EACvB,MAAc;IAEd,IAAI,CAAC,eAAM,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,eAAM,CAAC,KAAK,CAAC,iBAAiB;QAAE,OAAO,IAAI,CAAC;IAC1E,IAAI,CAAC;QACH,OAAO,MAAM,IAAA,0BAAa,EAAC,eAAe,EAAE,MAAM,CAAC,CAAC;IACtD,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,KAAK,CAAC,sDAAsD,EAAE,CAAC,CAAC,CAAC;QACzE,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}

View File

@ -1 +1 @@
{"version":3,"file":"publishRoundState.d.ts","sourceRoot":"","sources":["../../../../src/domain/candle-predict/realtime/publishRoundState.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,cAAc,GAAG;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,oEAAoE;AACpE,wBAAsB,iBAAiB,CAAC,KAAK,EAAE;IAC7C,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,cAAc,CAAC;IACtB,KAAK,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACxC,SAAS,CAAC,EAAE,eAAe,GAAG,eAAe,CAAC;CAC/C,GAAG,OAAO,CAAC,IAAI,CAAC,CA8ChB;AAED,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,OAAO,CAAC,IAAI,CAAC,CAOf"} {"version":3,"file":"publishRoundState.d.ts","sourceRoot":"","sources":["../../../../src/domain/candle-predict/realtime/publishRoundState.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,cAAc,GAAG;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,oEAAoE;AACpE,wBAAsB,iBAAiB,CAAC,KAAK,EAAE;IAC7C,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,cAAc,CAAC;IACtB,KAAK,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACxC,SAAS,CAAC,EAAE,eAAe,GAAG,eAAe,CAAC;CAC/C,GAAG,OAAO,CAAC,IAAI,CAAC,CAqDhB;AAED,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,OAAO,CAAC,IAAI,CAAC,CAOf"}

View File

@ -6,6 +6,7 @@ const config_1 = require("../../../config");
const roundCache_1 = require("../../../realtime/redis/roundCache"); const roundCache_1 = require("../../../realtime/redis/roundCache");
const poolCache_1 = require("../../../realtime/redis/poolCache"); const poolCache_1 = require("../../../realtime/redis/poolCache");
const pubsub_1 = require("../../../realtime/redis/pubsub"); const pubsub_1 = require("../../../realtime/redis/pubsub");
const stateVersions_1 = require("../../../realtime/redis/stateVersions");
/** Persist round snapshot to Redis and broadcast to subscribers. */ /** Persist round snapshot to Redis and broadcast to subscribers. */
async function publishRoundState(input) { async function publishRoundState(input) {
if (!config_1.config.redis.enabled) if (!config_1.config.redis.enabled)
@ -41,10 +42,16 @@ async function publishRoundState(input) {
if (input.pools) { if (input.pools) {
await (0, poolCache_1.setPoolCache)(input.intervalMinutes, input.openMs, input.pools); await (0, poolCache_1.setPoolCache)(input.intervalMinutes, input.openMs, input.pools);
} }
// Business version for /state short-circuit (independent of per-openMs cache hash).
const roundVersion = await (0, stateVersions_1.bumpRoundVersionSafe)(input.intervalMinutes);
await (0, pubsub_1.publishRoundEvent)(input.intervalMinutes, { await (0, pubsub_1.publishRoundEvent)(input.intervalMinutes, {
type: input.eventType ?? 'round.updated', type: input.eventType ?? 'round.updated',
intervalMinutes: input.intervalMinutes, intervalMinutes: input.intervalMinutes,
payload: { round: cachePayload, pools: input.pools }, payload: {
round: cachePayload,
pools: input.pools,
...(roundVersion != null ? { versions: { round: roundVersion } } : {}),
},
version: cachePayload.version, version: cachePayload.version,
}); });
} }

View File

@ -1 +1 @@
{"version":3,"file":"publishRoundState.js","sourceRoot":"","sources":["../../../../src/domain/candle-predict/realtime/publishRoundState.ts"],"names":[],"mappings":"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"} {"version":3,"file":"publishRoundState.js","sourceRoot":"","sources":["../../../../src/domain/candle-predict/realtime/publishRoundState.ts"],"names":[],"mappings":";;AA4BA,8CA2DC;AAED,kDAUC;AAnGD,4CAAyC;AACzC,mEAAwF;AACxF,iEAAiE;AACjE,2DAAmE;AACnE,yEAA6E;AAuB7E,oEAAoE;AAC7D,KAAK,UAAU,iBAAiB,CAAC,KAMvC;IACC,IAAI,CAAC,eAAM,CAAC,KAAK,CAAC,OAAO;QAAE,OAAO;IAElC,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,EAAE,KAAK,IAAI,CAAC,CAAC;IAC1C,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC,CAAC;IACxC,MAAM,SAAS,GAAG,SAAS,GAAG,QAAQ,CAAC;IACvC,MAAM,gBAAgB,GACpB,KAAK,CAAC,KAAK,CAAC,gBAAgB;QAC5B,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,GAAG,SAAS,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACxE,MAAM,eAAe,GACnB,KAAK,CAAC,KAAK,CAAC,eAAe;QAC3B,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,GAAG,SAAS,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAEvE,MAAM,YAAY,GAAmB;QACnC,EAAE,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE;QAClB,YAAY,EAAE,KAAK,CAAC,KAAK,CAAC,YAAY;QACtC,aAAa,EAAE,KAAK,CAAC,KAAK,CAAC,aAAa;QACxC,eAAe,EAAE,KAAK,CAAC,KAAK,CAAC,eAAe;QAC5C,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM;QAC1B,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO;QAC5B,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS;QAChC,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS;QAChC,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,QAAQ;QAC9B,UAAU,EAAE,KAAK,CAAC,KAAK,CAAC,UAAU;QAClC,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS;QAChC,gBAAgB;QAChB,eAAe;QACf,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,WAAW;QACpC,mBAAmB,EAAE,KAAK,CAAC,KAAK,CAAC,mBAAmB;QACpD,qBAAqB,EAAE,KAAK,CAAC,KAAK,CAAC,qBAAqB;QACxD,cAAc,EAAE,KAAK,CAAC,KAAK,CAAC,cAAc;QAC1C,OAAO,EAAG,KAAK,CAAC,KAAwB,CAAC,OAAO,IAAI,CAAC;KACtD,CAAC;IAEF,MAAM,IAAA,0BAAa,EAAC,KAAK,CAAC,eAAe,EAAE,KAAK,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAEvE,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QAChB,MAAM,IAAA,wBAAY,EAAC,KAAK,CAAC,eAAe,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACvE,CAAC;IAED,oFAAoF;IACpF,MAAM,YAAY,GAAG,MAAM,IAAA,oCAAoB,EAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAEvE,MAAM,IAAA,0BAAiB,EAAC,KAAK,CAAC,eAAe,EAAE;QAC7C,IAAI,EAAE,KAAK,CAAC,SAAS,IAAI,eAAe;QACxC,eAAe,EAAE,KAAK,CAAC,eAAe;QACtC,OAAO,EAAE;YACP,KAAK,EAAE,YAAY;YACnB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,GAAG,CAAC,YAAY,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACvE;QACD,OAAO,EAAE,YAAY,CAAC,OAAO;KAC9B,CAAC,CAAC;AACL,CAAC;AAEM,KAAK,UAAU,mBAAmB,CACvC,eAAuB,EACvB,MAA+B;IAE/B,IAAI,CAAC,eAAM,CAAC,KAAK,CAAC,OAAO;QAAE,OAAO;IAClC,MAAM,IAAA,0BAAiB,EAAC,eAAe,EAAE;QACvC,IAAI,EAAE,eAAe;QACrB,eAAe;QACf,OAAO,EAAE,EAAE,MAAM,EAAE;KACpB,CAAC,CAAC;AACL,CAAC"}

View File

@ -7,6 +7,8 @@ export declare function getRedisClient(): Redis | null;
export declare function getRedisSubscriber(): Redis | null; export declare function getRedisSubscriber(): Redis | null;
/** Connect command + subscriber clients when Redis is enabled. */ /** Connect command + subscriber clients when Redis is enabled. */
export declare function connectRedis(): Promise<void>; export declare function connectRedis(): Promise<void>;
/** True when the shared client is connected and usable. */
export declare function isRedisReady(): boolean;
/** Graceful shutdown for tests and process exit. */ /** Graceful shutdown for tests and process exit. */
export declare function disconnectRedis(): Promise<void>; export declare function disconnectRedis(): Promise<void>;
//# sourceMappingURL=client.d.ts.map //# sourceMappingURL=client.d.ts.map

View File

@ -1 +1 @@
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/realtime/redis/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,SAAS,CAAC;AAO5B,sDAAsD;AACtD,wBAAgB,cAAc,IAAI,OAAO,CAExC;AAED,kDAAkD;AAClD,wBAAgB,cAAc,IAAI,KAAK,GAAG,IAAI,CAa7C;AAED,0DAA0D;AAC1D,wBAAgB,kBAAkB,IAAI,KAAK,GAAG,IAAI,CAajD;AAED,kEAAkE;AAClE,wBAAsB,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CASlD;AAED,oDAAoD;AACpD,wBAAsB,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC,CAWrD"} {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/realtime/redis/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,SAAS,CAAC;AAgC5B,sDAAsD;AACtD,wBAAgB,cAAc,IAAI,OAAO,CAExC;AAED,kDAAkD;AAClD,wBAAgB,cAAc,IAAI,KAAK,GAAG,IAAI,CAe7C;AAED,0DAA0D;AAC1D,wBAAgB,kBAAkB,IAAI,KAAK,GAAG,IAAI,CAcjD;AAED,kEAAkE;AAClE,wBAAsB,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CASlD;AAED,2DAA2D;AAC3D,wBAAgB,YAAY,IAAI,OAAO,CAEtC;AAED,oDAAoD;AACpD,wBAAsB,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC,CA2BrD"}

View File

@ -7,11 +7,29 @@ exports.isRedisEnabled = isRedisEnabled;
exports.getRedisClient = getRedisClient; exports.getRedisClient = getRedisClient;
exports.getRedisSubscriber = getRedisSubscriber; exports.getRedisSubscriber = getRedisSubscriber;
exports.connectRedis = connectRedis; exports.connectRedis = connectRedis;
exports.isRedisReady = isRedisReady;
exports.disconnectRedis = disconnectRedis; exports.disconnectRedis = disconnectRedis;
const ioredis_1 = __importDefault(require("ioredis")); const ioredis_1 = __importDefault(require("ioredis"));
const config_1 = require("../../config"); const config_1 = require("../../config");
let client = null; let client = null;
let subscriber = null; let subscriber = null;
const MAX_RECONNECT_ATTEMPTS = 8;
function redisBaseOptions() {
return {
// Fail fast on commands when Redis is unreachable (avoids hung HTTP handlers).
maxRetriesPerRequest: 1,
lazyConnect: true,
enableReadyCheck: true,
enableOfflineQueue: false,
connectTimeout: 2000,
// Stop reconnecting after a few attempts so Node's event loop can exit (tests).
retryStrategy(times) {
if (times > MAX_RECONNECT_ATTEMPTS)
return null;
return Math.min(times * 100, 1000);
},
};
}
/** Whether Redis is configured and should be used. */ /** Whether Redis is configured and should be used. */
function isRedisEnabled() { function isRedisEnabled() {
return config_1.config.redis.enabled; return config_1.config.redis.enabled;
@ -22,12 +40,14 @@ function getRedisClient() {
return null; return null;
if (!client) { if (!client) {
client = new ioredis_1.default(config_1.config.redis.url, { client = new ioredis_1.default(config_1.config.redis.url, {
maxRetriesPerRequest: 3, ...redisBaseOptions(),
lazyConnect: true, maxRetriesPerRequest: 1,
enableReadyCheck: true,
}); });
client.on('error', (err) => { client.on('error', (err) => {
console.error('[redis] client error:', err.message); // Keep noise low: ioredis retries briefly then stops.
if (process.env.NODE_ENV !== 'test') {
console.error('[redis] client error:', err.message);
}
}); });
} }
return client; return client;
@ -38,12 +58,13 @@ function getRedisSubscriber() {
return null; return null;
if (!subscriber) { if (!subscriber) {
subscriber = new ioredis_1.default(config_1.config.redis.url, { subscriber = new ioredis_1.default(config_1.config.redis.url, {
...redisBaseOptions(),
maxRetriesPerRequest: null, maxRetriesPerRequest: null,
lazyConnect: true,
enableReadyCheck: true,
}); });
subscriber.on('error', (err) => { subscriber.on('error', (err) => {
console.error('[redis] subscriber error:', err.message); if (process.env.NODE_ENV !== 'test') {
console.error('[redis] subscriber error:', err.message);
}
}); });
} }
return subscriber; return subscriber;
@ -51,25 +72,46 @@ function getRedisSubscriber() {
/** Connect command + subscriber clients when Redis is enabled. */ /** Connect command + subscriber clients when Redis is enabled. */
async function connectRedis() { async function connectRedis() {
const redis = getRedisClient(); const redis = getRedisClient();
if (redis && redis.status !== 'ready') { if (redis && redis.status !== 'ready' && redis.status !== 'connecting') {
await redis.connect(); await redis.connect();
} }
const sub = getRedisSubscriber(); const sub = getRedisSubscriber();
if (sub && sub.status !== 'ready') { if (sub && sub.status !== 'ready' && sub.status !== 'connecting') {
await sub.connect(); await sub.connect();
} }
} }
/** True when the shared client is connected and usable. */
function isRedisReady() {
return client?.status === 'ready';
}
/** Graceful shutdown for tests and process exit. */ /** Graceful shutdown for tests and process exit. */
async function disconnectRedis() { async function disconnectRedis() {
const tasks = []; const closing = [];
if (client) { if (client) {
tasks.push(client.quit().catch(() => client?.disconnect())); closing.push(client);
client = null; client = null;
} }
if (subscriber) { if (subscriber) {
tasks.push(subscriber.quit().catch(() => subscriber?.disconnect())); closing.push(subscriber);
subscriber = null; subscriber = null;
} }
await Promise.all(tasks); await Promise.all(closing.map(async (redis) => {
try {
if (redis.status === 'ready') {
await redis.quit();
}
else {
redis.disconnect();
}
}
catch {
try {
redis.disconnect();
}
catch {
/* ignore */
}
}
}));
} }
//# sourceMappingURL=client.js.map //# sourceMappingURL=client.js.map

View File

@ -1 +1 @@
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/realtime/redis/client.ts"],"names":[],"mappings":";;;;;AAQA,wCAEC;AAGD,wCAaC;AAGD,gDAaC;AAGD,oCASC;AAGD,0CAWC;AApED,sDAA4B;AAE5B,yCAAsC;AAEtC,IAAI,MAAM,GAAiB,IAAI,CAAC;AAChC,IAAI,UAAU,GAAiB,IAAI,CAAC;AAEpC,sDAAsD;AACtD,SAAgB,cAAc;IAC5B,OAAO,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC;AAC9B,CAAC;AAED,kDAAkD;AAClD,SAAgB,cAAc;IAC5B,IAAI,CAAC,eAAM,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,eAAM,CAAC,KAAK,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IAC5D,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,GAAG,IAAI,iBAAK,CAAC,eAAM,CAAC,KAAK,CAAC,GAAG,EAAE;YACnC,oBAAoB,EAAE,CAAC;YACvB,WAAW,EAAE,IAAI;YACjB,gBAAgB,EAAE,IAAI;SACvB,CAAC,CAAC;QACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YACzB,OAAO,CAAC,KAAK,CAAC,uBAAuB,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,0DAA0D;AAC1D,SAAgB,kBAAkB;IAChC,IAAI,CAAC,eAAM,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,eAAM,CAAC,KAAK,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IAC5D,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,UAAU,GAAG,IAAI,iBAAK,CAAC,eAAM,CAAC,KAAK,CAAC,GAAG,EAAE;YACvC,oBAAoB,EAAE,IAAI;YAC1B,WAAW,EAAE,IAAI;YACjB,gBAAgB,EAAE,IAAI;SACvB,CAAC,CAAC;QACH,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YAC7B,OAAO,CAAC,KAAK,CAAC,2BAA2B,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;IACL,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,kEAAkE;AAC3D,KAAK,UAAU,YAAY;IAChC,MAAM,KAAK,GAAG,cAAc,EAAE,CAAC;IAC/B,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;QACtC,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IACD,MAAM,GAAG,GAAG,kBAAkB,EAAE,CAAC;IACjC,IAAI,GAAG,IAAI,GAAG,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;QAClC,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;IACtB,CAAC;AACH,CAAC;AAED,oDAAoD;AAC7C,KAAK,UAAU,eAAe;IACnC,MAAM,KAAK,GAAuB,EAAE,CAAC;IACrC,IAAI,MAAM,EAAE,CAAC;QACX,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;QAC5D,MAAM,GAAG,IAAI,CAAC;IAChB,CAAC;IACD,IAAI,UAAU,EAAE,CAAC;QACf,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;QACpE,UAAU,GAAG,IAAI,CAAC;IACpB,CAAC;IACD,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AAC3B,CAAC"} {"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/realtime/redis/client.ts"],"names":[],"mappings":"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"}

View File

@ -14,6 +14,11 @@ export declare const redisKeys: {
readonly pubsubRound: (intervalMinutes: number) => string; readonly pubsubRound: (intervalMinutes: number) => string;
readonly pubsubUser: (userId: string) => string; readonly pubsubUser: (userId: string) => string;
readonly engineLeader: () => string; readonly engineLeader: () => string;
/** Monotonic business versions for cheap /state short-circuit (before full getGameState). */
readonly stateVerConfig: () => string;
readonly stateVerRound: (intervalMinutes: number) => string;
readonly stateVerUserBet: (userId: string, intervalMinutes: number) => string;
readonly stateVerUserAuto: (userId: string) => string;
}; };
export type RoundCacheHash = { export type RoundCacheHash = {
id: string; id: string;

View File

@ -1 +1 @@
{"version":3,"file":"keys.d.ts","sourceRoot":"","sources":["../../../src/realtime/redis/keys.ts"],"names":[],"mappings":"AAAA,8DAA8D;AAE9D,eAAO,MAAM,YAAY,YAAY,CAAC;AAEtC,eAAO,MAAM,SAAS;;;sCAGK,MAAM,UAAU,MAAM;sCAEtB,MAAM,UAAU,MAAM;uCAErB,MAAM;iCACZ,MAAM,mBAAmB,MAAM,UAAU,MAAM;4CAEpC,MAAM;mCACf,MAAM;;;4CAGG,MAAM;kCAChB,MAAM;;CAEnB,CAAC;AAEX,MAAM,MAAM,cAAc,GAAG;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;CACd,CAAC"} {"version":3,"file":"keys.d.ts","sourceRoot":"","sources":["../../../src/realtime/redis/keys.ts"],"names":[],"mappings":"AAAA,8DAA8D;AAE9D,eAAO,MAAM,YAAY,YAAY,CAAC;AAEtC,eAAO,MAAM,SAAS;;;sCAGK,MAAM,UAAU,MAAM;sCAEtB,MAAM,UAAU,MAAM;uCAErB,MAAM;iCACZ,MAAM,mBAAmB,MAAM,UAAU,MAAM;4CAEpC,MAAM;mCACf,MAAM;;;4CAGG,MAAM;kCAChB,MAAM;;IAE3B,6FAA6F;;8CAE5D,MAAM;uCACb,MAAM,mBAAmB,MAAM;wCAE9B,MAAM;CACzB,CAAC;AAEX,MAAM,MAAM,cAAc,GAAG;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;CACd,CAAC"}

View File

@ -17,5 +17,10 @@ exports.redisKeys = {
pubsubRound: (intervalMinutes) => `${exports.REDIS_PREFIX}:pubsub:cp:round:${intervalMinutes}m`, pubsubRound: (intervalMinutes) => `${exports.REDIS_PREFIX}:pubsub:cp:round:${intervalMinutes}m`,
pubsubUser: (userId) => `${exports.REDIS_PREFIX}:pubsub:cp:user:${userId}`, pubsubUser: (userId) => `${exports.REDIS_PREFIX}:pubsub:cp:user:${userId}`,
engineLeader: () => `${exports.REDIS_PREFIX}:engine:leader`, engineLeader: () => `${exports.REDIS_PREFIX}:engine:leader`,
/** Monotonic business versions for cheap /state short-circuit (before full getGameState). */
stateVerConfig: () => `${exports.REDIS_PREFIX}:cp:ver:config`,
stateVerRound: (intervalMinutes) => `${exports.REDIS_PREFIX}:cp:ver:round:${intervalMinutes}m`,
stateVerUserBet: (userId, intervalMinutes) => `${exports.REDIS_PREFIX}:cp:ver:bet:${userId}:${intervalMinutes}m`,
stateVerUserAuto: (userId) => `${exports.REDIS_PREFIX}:cp:ver:auto:${userId}`,
}; };
//# sourceMappingURL=keys.js.map //# sourceMappingURL=keys.js.map

View File

@ -1 +1 @@
{"version":3,"file":"keys.js","sourceRoot":"","sources":["../../../src/realtime/redis/keys.ts"],"names":[],"mappings":";AAAA,8DAA8D;;;AAEjD,QAAA,YAAY,GAAG,SAAS,CAAC;AAEzB,QAAA,SAAS,GAAG;IACvB,MAAM,EAAE,GAAG,EAAE,CAAC,GAAG,oBAAY,YAAY;IACzC,SAAS,EAAE,GAAG,EAAE,CAAC,GAAG,oBAAY,eAAe;IAC/C,KAAK,EAAE,CAAC,eAAuB,EAAE,MAAc,EAAE,EAAE,CACjD,GAAG,oBAAY,aAAa,eAAe,KAAK,MAAM,EAAE;IAC1D,KAAK,EAAE,CAAC,eAAuB,EAAE,MAAc,EAAE,EAAE,CACjD,GAAG,oBAAY,aAAa,eAAe,KAAK,MAAM,EAAE;IAC1D,MAAM,EAAE,CAAC,eAAuB,EAAE,EAAE,CAAC,GAAG,oBAAY,cAAc,eAAe,GAAG;IACpF,SAAS,EAAE,CAAC,MAAc,EAAE,eAAuB,EAAE,MAAc,EAAE,EAAE,CACrE,GAAG,oBAAY,YAAY,MAAM,UAAU,eAAe,KAAK,MAAM,EAAE;IACzE,WAAW,EAAE,CAAC,eAAuB,EAAE,EAAE,CAAC,GAAG,oBAAY,eAAe,eAAe,QAAQ;IAC/F,cAAc,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,oBAAY,gBAAgB,GAAG,EAAE;IACrE,SAAS,EAAE,GAAG,EAAE,CAAC,GAAG,oBAAY,eAAe;IAC/C,eAAe,EAAE,GAAG,EAAE,CAAC,GAAG,oBAAY,sBAAsB;IAC5D,WAAW,EAAE,CAAC,eAAuB,EAAE,EAAE,CAAC,GAAG,oBAAY,oBAAoB,eAAe,GAAG;IAC/F,UAAU,EAAE,CAAC,MAAc,EAAE,EAAE,CAAC,GAAG,oBAAY,mBAAmB,MAAM,EAAE;IAC1E,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,oBAAY,gBAAgB;CAC3C,CAAC"} {"version":3,"file":"keys.js","sourceRoot":"","sources":["../../../src/realtime/redis/keys.ts"],"names":[],"mappings":";AAAA,8DAA8D;;;AAEjD,QAAA,YAAY,GAAG,SAAS,CAAC;AAEzB,QAAA,SAAS,GAAG;IACvB,MAAM,EAAE,GAAG,EAAE,CAAC,GAAG,oBAAY,YAAY;IACzC,SAAS,EAAE,GAAG,EAAE,CAAC,GAAG,oBAAY,eAAe;IAC/C,KAAK,EAAE,CAAC,eAAuB,EAAE,MAAc,EAAE,EAAE,CACjD,GAAG,oBAAY,aAAa,eAAe,KAAK,MAAM,EAAE;IAC1D,KAAK,EAAE,CAAC,eAAuB,EAAE,MAAc,EAAE,EAAE,CACjD,GAAG,oBAAY,aAAa,eAAe,KAAK,MAAM,EAAE;IAC1D,MAAM,EAAE,CAAC,eAAuB,EAAE,EAAE,CAAC,GAAG,oBAAY,cAAc,eAAe,GAAG;IACpF,SAAS,EAAE,CAAC,MAAc,EAAE,eAAuB,EAAE,MAAc,EAAE,EAAE,CACrE,GAAG,oBAAY,YAAY,MAAM,UAAU,eAAe,KAAK,MAAM,EAAE;IACzE,WAAW,EAAE,CAAC,eAAuB,EAAE,EAAE,CAAC,GAAG,oBAAY,eAAe,eAAe,QAAQ;IAC/F,cAAc,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,oBAAY,gBAAgB,GAAG,EAAE;IACrE,SAAS,EAAE,GAAG,EAAE,CAAC,GAAG,oBAAY,eAAe;IAC/C,eAAe,EAAE,GAAG,EAAE,CAAC,GAAG,oBAAY,sBAAsB;IAC5D,WAAW,EAAE,CAAC,eAAuB,EAAE,EAAE,CAAC,GAAG,oBAAY,oBAAoB,eAAe,GAAG;IAC/F,UAAU,EAAE,CAAC,MAAc,EAAE,EAAE,CAAC,GAAG,oBAAY,mBAAmB,MAAM,EAAE;IAC1E,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,oBAAY,gBAAgB;IACnD,6FAA6F;IAC7F,cAAc,EAAE,GAAG,EAAE,CAAC,GAAG,oBAAY,gBAAgB;IACrD,aAAa,EAAE,CAAC,eAAuB,EAAE,EAAE,CAAC,GAAG,oBAAY,iBAAiB,eAAe,GAAG;IAC9F,eAAe,EAAE,CAAC,MAAc,EAAE,eAAuB,EAAE,EAAE,CAC3D,GAAG,oBAAY,eAAe,MAAM,IAAI,eAAe,GAAG;IAC5D,gBAAgB,EAAE,CAAC,MAAc,EAAE,EAAE,CAAC,GAAG,oBAAY,gBAAgB,MAAM,EAAE;CACrE,CAAC"}

View File

@ -1 +1 @@
{"version":3,"file":"onlinePresence.d.ts","sourceRoot":"","sources":["../../../src/realtime/redis/onlinePresence.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,aAAa,GAAG,MAAM,GAAG,KAAK,CAAC;AA0C3C,mEAAmE;AACnE,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAErE;AAED,6EAA6E;AAC7E,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAYpE;AAED,wCAAwC;AACxC,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAErE;AAED,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAKtE;AAED,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAMrE;AAED,yCAAyC;AACzC,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEtE;AAUD,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAMtF"} {"version":3,"file":"onlinePresence.d.ts","sourceRoot":"","sources":["../../../src/realtime/redis/onlinePresence.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,aAAa,GAAG,MAAM,GAAG,KAAK,CAAC;AA8C3C,mEAAmE;AACnE,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAErE;AAED,6EAA6E;AAC7E,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAYpE;AAED,wCAAwC;AACxC,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAErE;AAED,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAKtE;AAED,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAMrE;AAED,yCAAyC;AACzC,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEtE;AAUD,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAMtF"}

View File

@ -39,11 +39,16 @@ async function touchPresence(userId, scope) {
return; return;
const now = Date.now(); const now = Date.now();
const cutoff = now - presenceTtlMs(); const cutoff = now - presenceTtlMs();
await redis try {
.multi() await redis
.zadd(PRESENCE_KEYS[scope], now, userId) .multi()
.zremrangebyscore(PRESENCE_KEYS[scope], 0, cutoff) .zadd(PRESENCE_KEYS[scope], now, userId)
.exec(); .zremrangebyscore(PRESENCE_KEYS[scope], 0, cutoff)
.exec();
}
catch (e) {
console.warn('[presence] touch failed:', e instanceof Error ? e.message : e);
}
} }
/** Marks a user as on the game page (WebSocket Candle Predict). */ /** Marks a user as on the game page (WebSocket Candle Predict). */
async function touchGamePresence(userId) { async function touchGamePresence(userId) {

View File

@ -1 +1 @@
{"version":3,"file":"onlinePresence.js","sourceRoot":"","sources":["../../../src/realtime/redis/onlinePresence.ts"],"names":[],"mappings":"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"} {"version":3,"file":"onlinePresence.js","sourceRoot":"","sources":["../../../src/realtime/redis/onlinePresence.ts"],"names":[],"mappings":"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"}

View File

@ -1 +1 @@
{"version":3,"file":"poolCache.d.ts","sourceRoot":"","sources":["../../../src/realtime/redis/poolCache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAM5C,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,WAAW,GAAG,aAAa,CAKtE;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,WAAW,GAAG,IAAI,CAMnF;AAED,wBAAsB,YAAY,CAChC,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,WAAW,GACjB,OAAO,CAAC,IAAI,CAAC,CAMf;AAED,wBAAsB,YAAY,CAChC,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAO7B;AAED,wBAAsB,kBAAkB,CACtC,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GACvC,OAAO,CAAC,IAAI,CAAC,CAOf"} {"version":3,"file":"poolCache.d.ts","sourceRoot":"","sources":["../../../src/realtime/redis/poolCache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAM5C,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,WAAW,GAAG,aAAa,CAKtE;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,WAAW,GAAG,IAAI,CAMnF;AAED,wBAAsB,YAAY,CAChC,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,WAAW,GACjB,OAAO,CAAC,IAAI,CAAC,CAMf;AAED,wBAAsB,YAAY,CAChC,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAY7B;AAED,wBAAsB,kBAAkB,CACtC,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GACvC,OAAO,CAAC,IAAI,CAAC,CAOf"}

View File

@ -34,11 +34,17 @@ async function getPoolCache(intervalMinutes, openMs) {
const redis = (0, client_1.getRedisClient)(); const redis = (0, client_1.getRedisClient)();
if (!redis) if (!redis)
return null; return null;
const key = keys_1.redisKeys.pools(intervalMinutes, openMs); try {
const hash = await redis.hgetall(key); const key = keys_1.redisKeys.pools(intervalMinutes, openMs);
if (!hash || !Object.keys(hash).length) const hash = await redis.hgetall(key);
if (!hash || !Object.keys(hash).length)
return null;
return parsePoolsFromHash(hash);
}
catch (e) {
console.error('[poolCache] getPoolCache failed:', e);
return null; return null;
return parsePoolsFromHash(hash); }
} }
async function incrementPoolCache(intervalMinutes, openMs, delta) { async function incrementPoolCache(intervalMinutes, openMs, delta) {
const redis = (0, client_1.getRedisClient)(); const redis = (0, client_1.getRedisClient)();

View File

@ -1 +1 @@
{"version":3,"file":"poolCache.js","sourceRoot":"","sources":["../../../src/realtime/redis/poolCache.ts"],"names":[],"mappings":";;AAWA,oDAKC;AAED,gDAMC;AAED,oCAUC;AAED,oCAUC;AAED,gDAWC;AA5DD,iCAAmC;AACnC,qCAA0C;AAE1C,MAAM,gBAAgB,GAAG,KAAM,CAAC;AAOhC,SAAgB,oBAAoB,CAAC,KAAkB;IACrD,OAAO;QACL,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC;QAC1B,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;KACzB,CAAC;AACJ,CAAC;AAED,SAAgB,kBAAkB,CAAC,IAA4B;IAC7D,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI;QAAE,OAAO,IAAI,CAAC;IACzD,OAAO;QACL,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;QAC9B,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC;KAC7B,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,YAAY,CAChC,eAAuB,EACvB,MAAc,EACd,KAAkB;IAElB,MAAM,KAAK,GAAG,IAAA,uBAAc,GAAE,CAAC;IAC/B,IAAI,CAAC,KAAK;QAAE,OAAO;IACnB,MAAM,GAAG,GAAG,gBAAS,CAAC,KAAK,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;IACrD,MAAM,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAAC;IACnD,MAAM,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;AAC5C,CAAC;AAEM,KAAK,UAAU,YAAY,CAChC,eAAuB,EACvB,MAAc;IAEd,MAAM,KAAK,GAAG,IAAA,uBAAc,GAAE,CAAC;IAC/B,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACxB,MAAM,GAAG,GAAG,gBAAS,CAAC,KAAK,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;IACrD,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACtC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IACpD,OAAO,kBAAkB,CAAC,IAAI,CAAC,CAAC;AAClC,CAAC;AAEM,KAAK,UAAU,kBAAkB,CACtC,eAAuB,EACvB,MAAc,EACd,KAAwC;IAExC,MAAM,KAAK,GAAG,IAAA,uBAAc,GAAE,CAAC;IAC/B,IAAI,CAAC,KAAK;QAAE,OAAO;IACnB,MAAM,GAAG,GAAG,gBAAS,CAAC,KAAK,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;IACrD,IAAI,KAAK,CAAC,KAAK;QAAE,MAAM,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACrE,IAAI,KAAK,CAAC,IAAI;QAAE,MAAM,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAClE,MAAM,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;AAC5C,CAAC"} {"version":3,"file":"poolCache.js","sourceRoot":"","sources":["../../../src/realtime/redis/poolCache.ts"],"names":[],"mappings":";;AAWA,oDAKC;AAED,gDAMC;AAED,oCAUC;AAED,oCAeC;AAED,gDAWC;AAjED,iCAAmC;AACnC,qCAA0C;AAE1C,MAAM,gBAAgB,GAAG,KAAM,CAAC;AAOhC,SAAgB,oBAAoB,CAAC,KAAkB;IACrD,OAAO;QACL,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC;QAC1B,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;KACzB,CAAC;AACJ,CAAC;AAED,SAAgB,kBAAkB,CAAC,IAA4B;IAC7D,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI;QAAE,OAAO,IAAI,CAAC;IACzD,OAAO;QACL,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;QAC9B,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC;KAC7B,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,YAAY,CAChC,eAAuB,EACvB,MAAc,EACd,KAAkB;IAElB,MAAM,KAAK,GAAG,IAAA,uBAAc,GAAE,CAAC;IAC/B,IAAI,CAAC,KAAK;QAAE,OAAO;IACnB,MAAM,GAAG,GAAG,gBAAS,CAAC,KAAK,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;IACrD,MAAM,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAAC;IACnD,MAAM,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;AAC5C,CAAC;AAEM,KAAK,UAAU,YAAY,CAChC,eAAuB,EACvB,MAAc;IAEd,MAAM,KAAK,GAAG,IAAA,uBAAc,GAAE,CAAC;IAC/B,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACxB,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,gBAAS,CAAC,KAAK,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QACrD,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACtC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QACpD,OAAO,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,KAAK,CAAC,kCAAkC,EAAE,CAAC,CAAC,CAAC;QACrD,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,kBAAkB,CACtC,eAAuB,EACvB,MAAc,EACd,KAAwC;IAExC,MAAM,KAAK,GAAG,IAAA,uBAAc,GAAE,CAAC;IAC/B,IAAI,CAAC,KAAK;QAAE,OAAO;IACnB,MAAM,GAAG,GAAG,gBAAS,CAAC,KAAK,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;IACrD,IAAI,KAAK,CAAC,KAAK;QAAE,MAAM,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACrE,IAAI,KAAK,CAAC,IAAI;QAAE,MAAM,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAClE,MAAM,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;AAC5C,CAAC"}

View File

@ -1,4 +1,4 @@
export type RealtimeEventType = 'round.updated' | 'round.settled' | 'candle.append' | 'bet.accepted' | 'bet.rejected' | 'multi.updated' | 'config.updated'; export type RealtimeEventType = 'round.updated' | 'round.settled' | 'candle.append' | 'bet.accepted' | 'bet.rejected' | 'multi.updated' | 'auto.updated' | 'config.updated';
export type RealtimeEvent = { export type RealtimeEvent = {
type: RealtimeEventType; type: RealtimeEventType;
intervalMinutes?: number; intervalMinutes?: number;

View File

@ -1 +1 @@
{"version":3,"file":"pubsub.d.ts","sourceRoot":"","sources":["../../../src/realtime/redis/pubsub.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,iBAAiB,GACzB,eAAe,GACf,eAAe,GACf,eAAe,GACf,cAAc,GACd,cAAc,GACd,eAAe,GACf,gBAAgB,CAAC;AAErB,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,iBAAiB,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAEF,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,GAAG;IAAE,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAEjG;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI,CAQpE;AAED,wBAAsB,iBAAiB,CACrC,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,GAC/B,OAAO,CAAC,IAAI,CAAC,CAIf;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,GAC/B,OAAO,CAAC,IAAI,CAAC,CAIf;AAED,MAAM,MAAM,aAAa,GAAG,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;AAE3D,gEAAgE;AAChE,wBAAsB,oBAAoB,CACxC,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAiB9B;AAED,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAiB9B"} {"version":3,"file":"pubsub.d.ts","sourceRoot":"","sources":["../../../src/realtime/redis/pubsub.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,iBAAiB,GACzB,eAAe,GACf,eAAe,GACf,eAAe,GACf,cAAc,GACd,cAAc,GACd,eAAe,GACf,cAAc,GACd,gBAAgB,CAAC;AAErB,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,iBAAiB,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAEF,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,GAAG;IAAE,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAEjG;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI,CAQpE;AAED,wBAAsB,iBAAiB,CACrC,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,GAC/B,OAAO,CAAC,IAAI,CAAC,CAIf;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,GAC/B,OAAO,CAAC,IAAI,CAAC,CAIf;AAED,MAAM,MAAM,aAAa,GAAG,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;AAE3D,gEAAgE;AAChE,wBAAsB,oBAAoB,CACxC,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAiB9B;AAED,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAiB9B"}

View File

@ -1 +1 @@
{"version":3,"file":"pubsub.js","sourceRoot":"","sources":["../../../src/realtime/redis/pubsub.ts"],"names":[],"mappings":"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"} {"version":3,"file":"pubsub.js","sourceRoot":"","sources":["../../../src/realtime/redis/pubsub.ts"],"names":[],"mappings":"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"}

View File

@ -1 +1 @@
{"version":3,"file":"roundCache.d.ts","sourceRoot":"","sources":["../../../src/realtime/redis/roundCache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAM7C,MAAM,MAAM,cAAc,GAAG;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAYF,8DAA8D;AAC9D,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC,GAAG;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,GAC5D,cAAc,CAqBhB;AAED,gDAAgD;AAChD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,cAAc,GAAG,IAAI,CAsBtF;AAED,wBAAsB,aAAa,CACjC,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC,GAAG;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,GAC5D,OAAO,CAAC,IAAI,CAAC,CAOf;AAED,wBAAsB,aAAa,CACjC,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAOhC;AAED,wBAAsB,qBAAqB,CACzC,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAKjB"} {"version":3,"file":"roundCache.d.ts","sourceRoot":"","sources":["../../../src/realtime/redis/roundCache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAM7C,MAAM,MAAM,cAAc,GAAG;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAYF,8DAA8D;AAC9D,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC,GAAG;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,GAC5D,cAAc,CAqBhB;AAED,gDAAgD;AAChD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,cAAc,GAAG,IAAI,CAsBtF;AAED,wBAAsB,aAAa,CACjC,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC,GAAG;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,GAC5D,OAAO,CAAC,IAAI,CAAC,CAOf;AAED,wBAAsB,aAAa,CACjC,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAYhC;AAED,wBAAsB,qBAAqB,CACzC,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAKjB"}

View File

@ -78,11 +78,17 @@ async function getRoundCache(intervalMinutes, openMs) {
const redis = (0, client_1.getRedisClient)(); const redis = (0, client_1.getRedisClient)();
if (!redis) if (!redis)
return null; return null;
const key = keys_1.redisKeys.round(intervalMinutes, openMs); try {
const hash = await redis.hgetall(key); const key = keys_1.redisKeys.round(intervalMinutes, openMs);
if (!hash || !Object.keys(hash).length) const hash = await redis.hgetall(key);
if (!hash || !Object.keys(hash).length)
return null;
return parseRoundFromHash(hash);
}
catch (e) {
console.error('[roundCache] getRoundCache failed:', e);
return null; return null;
return parseRoundFromHash(hash); }
} }
async function incrementRoundVersion(intervalMinutes, openMs) { async function incrementRoundVersion(intervalMinutes, openMs) {
const redis = (0, client_1.getRedisClient)(); const redis = (0, client_1.getRedisClient)();

View File

@ -1 +1 @@
{"version":3,"file":"roundCache.js","sourceRoot":"","sources":["../../../src/realtime/redis/roundCache.ts"],"names":[],"mappings":";;AAsCA,oDAuBC;AAGD,gDAsBC;AAED,sCAWC;AAED,sCAUC;AAED,sDAQC;AAxHD,iCAAmC;AACnC,qCAA0C;AAE1C,MAAM,iBAAiB,GAAG,KAAM,CAAC;AAuBjC,SAAS,KAAK,CAAC,KAAgC;IAC7C,OAAO,KAAK,IAAI,EAAE,CAAC;AACrB,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAyB;IACpD,IAAI,CAAC,KAAK,IAAI,KAAK,KAAK,EAAE;QAAE,OAAO,IAAI,CAAC;IACxC,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IACxB,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACvC,CAAC;AAED,8DAA8D;AAC9D,SAAgB,oBAAoB,CAClC,KAA6D;IAE7D,OAAO;QACL,EAAE,EAAE,KAAK,CAAC,EAAE;QACZ,YAAY,EAAE,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC;QACxC,aAAa,EAAE,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC;QAC1C,eAAe,EAAE,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC;QAC9C,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC;QAC7B,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACxE,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACxE,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACrE,UAAU,EAAE,KAAK,CAAC,KAAK,CAAC,UAAU,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3E,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC;QACjC,gBAAgB,EAAE,MAAM,CAAC,KAAK,CAAC,gBAAgB,IAAI,CAAC,CAAC;QACrD,eAAe,EAAE,MAAM,CAAC,KAAK,CAAC,eAAe,IAAI,CAAC,CAAC;QACnD,WAAW,EAAE,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC;QACtC,mBAAmB,EAAE,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC;QACtD,qBAAqB,EAAE,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC;QAC1D,cAAc,EAAE,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC;QAC5C,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;KACpC,CAAC;AACJ,CAAC;AAED,gDAAgD;AAChD,SAAgB,kBAAkB,CAAC,IAA4B;IAC7D,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY;QAAE,OAAO,IAAI,CAAC;IAChD,OAAO;QACL,EAAE,EAAE,IAAI,CAAC,EAAE;QACX,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC;QACvC,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC;QACzC,eAAe,EAAE,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC;QAC7C,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;QAC3C,SAAS,EAAE,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC;QAC9C,SAAS,EAAE,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC;QAC9C,QAAQ,EAAE,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC;QAC5C,UAAU,EAAE,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC;QAChD,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI;QACjD,gBAAgB,EAAE,MAAM,CAAC,IAAI,CAAC,gBAAgB,IAAI,CAAC,CAAC;QACpD,eAAe,EAAE,MAAM,CAAC,IAAI,CAAC,eAAe,IAAI,CAAC,CAAC;QAClD,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;QACrC,mBAAmB,EAAE,MAAM,CAAC,IAAI,CAAC,mBAAmB,IAAI,CAAC,CAAC;QAC1D,qBAAqB,EAAE,MAAM,CAAC,IAAI,CAAC,qBAAqB,IAAI,CAAC,CAAC;QAC9D,cAAc,EAAE,MAAM,CAAC,IAAI,CAAC,cAAc,IAAI,CAAC,CAAC;QAChD,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC;KACnC,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,aAAa,CACjC,eAAuB,EACvB,MAAc,EACd,KAA6D;IAE7D,MAAM,KAAK,GAAG,IAAA,uBAAc,GAAE,CAAC;IAC/B,IAAI,CAAC,KAAK;QAAE,OAAO;IACnB,MAAM,GAAG,GAAG,gBAAS,CAAC,KAAK,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;IACrD,MAAM,IAAI,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;IACzC,MAAM,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC5B,MAAM,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;AAC7C,CAAC;AAEM,KAAK,UAAU,aAAa,CACjC,eAAuB,EACvB,MAAc;IAEd,MAAM,KAAK,GAAG,IAAA,uBAAc,GAAE,CAAC;IAC/B,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACxB,MAAM,GAAG,GAAG,gBAAS,CAAC,KAAK,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;IACrD,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACtC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IACpD,OAAO,kBAAkB,CAAC,IAAI,CAAC,CAAC;AAClC,CAAC;AAEM,KAAK,UAAU,qBAAqB,CACzC,eAAuB,EACvB,MAAc;IAEd,MAAM,KAAK,GAAG,IAAA,uBAAc,GAAE,CAAC;IAC/B,IAAI,CAAC,KAAK;QAAE,OAAO,CAAC,CAAC;IACrB,MAAM,GAAG,GAAG,gBAAS,CAAC,KAAK,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;IACrD,OAAO,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;AAC1C,CAAC"} {"version":3,"file":"roundCache.js","sourceRoot":"","sources":["../../../src/realtime/redis/roundCache.ts"],"names":[],"mappings":";;AAsCA,oDAuBC;AAGD,gDAsBC;AAED,sCAWC;AAED,sCAeC;AAED,sDAQC;AA7HD,iCAAmC;AACnC,qCAA0C;AAE1C,MAAM,iBAAiB,GAAG,KAAM,CAAC;AAuBjC,SAAS,KAAK,CAAC,KAAgC;IAC7C,OAAO,KAAK,IAAI,EAAE,CAAC;AACrB,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAyB;IACpD,IAAI,CAAC,KAAK,IAAI,KAAK,KAAK,EAAE;QAAE,OAAO,IAAI,CAAC;IACxC,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IACxB,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACvC,CAAC;AAED,8DAA8D;AAC9D,SAAgB,oBAAoB,CAClC,KAA6D;IAE7D,OAAO;QACL,EAAE,EAAE,KAAK,CAAC,EAAE;QACZ,YAAY,EAAE,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC;QACxC,aAAa,EAAE,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC;QAC1C,eAAe,EAAE,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC;QAC9C,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC;QAC7B,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACxE,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACxE,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACrE,UAAU,EAAE,KAAK,CAAC,KAAK,CAAC,UAAU,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3E,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC;QACjC,gBAAgB,EAAE,MAAM,CAAC,KAAK,CAAC,gBAAgB,IAAI,CAAC,CAAC;QACrD,eAAe,EAAE,MAAM,CAAC,KAAK,CAAC,eAAe,IAAI,CAAC,CAAC;QACnD,WAAW,EAAE,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC;QACtC,mBAAmB,EAAE,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC;QACtD,qBAAqB,EAAE,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC;QAC1D,cAAc,EAAE,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC;QAC5C,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;KACpC,CAAC;AACJ,CAAC;AAED,gDAAgD;AAChD,SAAgB,kBAAkB,CAAC,IAA4B;IAC7D,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY;QAAE,OAAO,IAAI,CAAC;IAChD,OAAO;QACL,EAAE,EAAE,IAAI,CAAC,EAAE;QACX,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC;QACvC,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC;QACzC,eAAe,EAAE,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC;QAC7C,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;QAC3C,SAAS,EAAE,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC;QAC9C,SAAS,EAAE,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC;QAC9C,QAAQ,EAAE,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC;QAC5C,UAAU,EAAE,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC;QAChD,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI;QACjD,gBAAgB,EAAE,MAAM,CAAC,IAAI,CAAC,gBAAgB,IAAI,CAAC,CAAC;QACpD,eAAe,EAAE,MAAM,CAAC,IAAI,CAAC,eAAe,IAAI,CAAC,CAAC;QAClD,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;QACrC,mBAAmB,EAAE,MAAM,CAAC,IAAI,CAAC,mBAAmB,IAAI,CAAC,CAAC;QAC1D,qBAAqB,EAAE,MAAM,CAAC,IAAI,CAAC,qBAAqB,IAAI,CAAC,CAAC;QAC9D,cAAc,EAAE,MAAM,CAAC,IAAI,CAAC,cAAc,IAAI,CAAC,CAAC;QAChD,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC;KACnC,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,aAAa,CACjC,eAAuB,EACvB,MAAc,EACd,KAA6D;IAE7D,MAAM,KAAK,GAAG,IAAA,uBAAc,GAAE,CAAC;IAC/B,IAAI,CAAC,KAAK;QAAE,OAAO;IACnB,MAAM,GAAG,GAAG,gBAAS,CAAC,KAAK,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;IACrD,MAAM,IAAI,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;IACzC,MAAM,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC5B,MAAM,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;AAC7C,CAAC;AAEM,KAAK,UAAU,aAAa,CACjC,eAAuB,EACvB,MAAc;IAEd,MAAM,KAAK,GAAG,IAAA,uBAAc,GAAE,CAAC;IAC/B,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACxB,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,gBAAS,CAAC,KAAK,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QACrD,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACtC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QACpD,OAAO,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,KAAK,CAAC,oCAAoC,EAAE,CAAC,CAAC,CAAC;QACvD,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,qBAAqB,CACzC,eAAuB,EACvB,MAAc;IAEd,MAAM,KAAK,GAAG,IAAA,uBAAc,GAAE,CAAC;IAC/B,IAAI,CAAC,KAAK;QAAE,OAAO,CAAC,CAAC;IACrB,MAAM,GAAG,GAAG,gBAAS,CAAC,KAAK,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;IACrD,OAAO,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;AAC1C,CAAC"}

View File

@ -1 +1 @@
{"version":3,"file":"hub.d.ts","sourceRoot":"","sources":["../../../src/realtime/ws/hub.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,IAAI,CAAC;AAQhC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAmC5C,qBAAa,SAAS;IACpB,OAAO,CAAC,OAAO,CAA0B;IACzC,6DAA6D;IAC7D,OAAO,CAAC,iBAAiB,CAAuC;IAEhE,OAAO,CAAC,WAAW;IAanB,OAAO,CAAC,aAAa;IAaf,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAwF5B,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,GAAG,IAAI,GAAG,IAAI;YA0B/C,aAAa;IAsE3B,OAAO,CAAC,IAAI;CAIb;AAED,eAAO,MAAM,SAAS,WAAkB,CAAC"} {"version":3,"file":"hub.d.ts","sourceRoot":"","sources":["../../../src/realtime/ws/hub.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,IAAI,CAAC;AAQhC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAmC5C,qBAAa,SAAS;IACpB,OAAO,CAAC,OAAO,CAA0B;IACzC,6DAA6D;IAC7D,OAAO,CAAC,iBAAiB,CAAuC;IAEhE,OAAO,CAAC,WAAW;IAanB,OAAO,CAAC,aAAa;IAaf,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAmG5B,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,GAAG,IAAI,GAAG,IAAI;YA0B/C,aAAa;IAsE3B,OAAO,CAAC,IAAI;CAIb;AAED,eAAO,MAAM,SAAS,WAAkB,CAAC"}

View File

@ -83,6 +83,7 @@ class GameWsHub {
type: 'bet.accepted', type: 'bet.accepted',
bet: event.payload.bet ?? {}, bet: event.payload.bet ?? {},
...(idempotencyKey ? { idempotencyKey } : {}), ...(idempotencyKey ? { idempotencyKey } : {}),
versions: event.payload.versions,
}); });
} }
else if (event.type === 'bet.rejected') { else if (event.type === 'bet.rejected') {
@ -98,6 +99,14 @@ class GameWsHub {
type: 'multi.updated', type: 'multi.updated',
intervalMinutes: Number(event.payload.intervalMinutes ?? 0), intervalMinutes: Number(event.payload.intervalMinutes ?? 0),
userMultiBet: event.payload.userMultiBet ?? null, userMultiBet: event.payload.userMultiBet ?? null,
versions: event.payload.versions,
});
}
else if (event.type === 'auto.updated') {
this.send(client, {
type: 'auto.updated',
autoSettings: event.payload.autoSettings ?? {},
versions: event.payload.versions,
}); });
} }
} }
@ -117,6 +126,7 @@ class GameWsHub {
type: 'round.updated', type: 'round.updated',
intervalMinutes: intervalMinutes ?? 0, intervalMinutes: intervalMinutes ?? 0,
round, round,
versions: event.payload.versions,
}); });
} }
else if (event.type === 'round.settled') { else if (event.type === 'round.settled') {
@ -125,6 +135,7 @@ class GameWsHub {
intervalMinutes: intervalMinutes ?? 0, intervalMinutes: intervalMinutes ?? 0,
round, round,
candle: event.payload.candle, candle: event.payload.candle,
versions: event.payload.versions,
}); });
} }
else if (event.type === 'candle.append') { else if (event.type === 'candle.append') {
@ -138,6 +149,7 @@ class GameWsHub {
this.send(client, { this.send(client, {
type: 'config.updated', type: 'config.updated',
intervalMinutes: intervalMinutes ?? 0, intervalMinutes: intervalMinutes ?? 0,
versions: event.payload.versions,
}); });
} }
} }

File diff suppressed because one or more lines are too long

View File

@ -28,11 +28,17 @@ export type WsServerMessage = {
type: 'round.updated'; type: 'round.updated';
intervalMinutes: number; intervalMinutes: number;
round: Record<string, unknown>; round: Record<string, unknown>;
versions?: {
round?: number;
};
} | { } | {
type: 'round.settled'; type: 'round.settled';
intervalMinutes: number; intervalMinutes: number;
round: Record<string, unknown>; round: Record<string, unknown>;
candle?: Record<string, unknown>; candle?: Record<string, unknown>;
versions?: {
round?: number;
};
} | { } | {
type: 'candle.append'; type: 'candle.append';
intervalMinutes: number; intervalMinutes: number;
@ -41,6 +47,10 @@ export type WsServerMessage = {
type: 'bet.accepted'; type: 'bet.accepted';
bet: Record<string, unknown>; bet: Record<string, unknown>;
idempotencyKey?: string; idempotencyKey?: string;
versions?: {
bet?: number;
auto?: number;
};
} | { } | {
type: 'bet.pending'; type: 'bet.pending';
idempotencyKey: string; idempotencyKey: string;
@ -52,9 +62,21 @@ export type WsServerMessage = {
type: 'multi.updated'; type: 'multi.updated';
intervalMinutes: number; intervalMinutes: number;
userMultiBet: Record<string, unknown> | null; userMultiBet: Record<string, unknown> | null;
versions?: {
bet?: number;
};
} | {
type: 'auto.updated';
autoSettings: Record<string, unknown>;
versions?: {
auto?: number;
};
} | { } | {
type: 'config.updated'; type: 'config.updated';
intervalMinutes: number; intervalMinutes: number;
versions?: {
config?: number;
};
} | { } | {
type: 'error'; type: 'error';
code: string; code: string;

View File

@ -1 +1 @@
{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../../src/realtime/ws/protocol.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAEtE,MAAM,MAAM,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,CAAC;AAEzE,MAAM,MAAM,eAAe,GACvB;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,GAC9C;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,GAChD;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,GAC5B;IACE,IAAI,EAAE,WAAW,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,OAAO,GAAG,MAAM,CAAC;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;CAC9C,CAAC;AAEN,MAAM,MAAM,eAAe,GACvB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,GAC5B;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,eAAe,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,iBAAiB,CAAA;CAAE,GAC5E;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,eAAe,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,GAClF;IACE,IAAI,EAAE,eAAe,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC,GACD;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,eAAe,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,GACnF;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,CAAA;CAAE,GAC/E;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,GAC/C;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,cAAc,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC/D;IACE,IAAI,EAAE,eAAe,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;CAC9C,GACD;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,GACnD;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAErD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,CAQtE;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,eAAe,GAAG,MAAM,CAEnE"} {"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../../src/realtime/ws/protocol.ts"],"names":[],"mappings":"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"}

View File

@ -1 +1 @@
{"version":3,"file":"protocol.js","sourceRoot":"","sources":["../../../src/realtime/ws/protocol.ts"],"names":[],"mappings":";;AAuCA,gDAQC;AAED,wDAEC;AAZD,SAAgB,kBAAkB,CAAC,GAAW;IAC5C,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAoB,CAAC;QAC/C,IAAI,CAAC,GAAG,EAAE,IAAI;YAAE,OAAO,IAAI,CAAC;QAC5B,OAAO,GAAG,CAAC;IACb,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAgB,sBAAsB,CAAC,GAAoB;IACzD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC"} {"version":3,"file":"protocol.js","sourceRoot":"","sources":["../../../src/realtime/ws/protocol.ts"],"names":[],"mappings":";;AAwDA,gDAQC;AAED,wDAEC;AAZD,SAAgB,kBAAkB,CAAC,GAAW;IAC5C,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAoB,CAAC;QAC/C,IAAI,CAAC,GAAG,EAAE,IAAI;YAAE,OAAO,IAAI,CAAC;QAC5B,OAAO,GAAG,CAAC;IACb,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAgB,sBAAsB,CAAC,GAAoB;IACzD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC"}

View File

@ -1,4 +1,5 @@
export type PoolWinnerRule = 'minority' | 'majority'; export type PoolWinnerRule = 'minority' | 'majority' | 'daily_revenue';
export type DailyRevenueOverflowStrategy = 'minority' | 'neutral';
export type CandlePredictConfigRow = { export type CandlePredictConfigRow = {
id: number; id: number;
interval_minutes: number; interval_minutes: number;
@ -15,6 +16,8 @@ export type CandlePredictConfigRow = {
base_price: string; base_price: string;
payout_multiplier: string; payout_multiplier: string;
pool_multiplier: string; pool_multiplier: string;
daily_revenue_target: string;
daily_revenue_overflow_strategy: DailyRevenueOverflowStrategy;
wallet_type_code: string; wallet_type_code: string;
auto_modes: string[]; auto_modes: string[];
is_active: boolean; is_active: boolean;
@ -128,6 +131,8 @@ export type ConfigUpdate = Partial<{
basePrice: number; basePrice: number;
payoutMultiplier: number; payoutMultiplier: number;
poolMultiplier: number; poolMultiplier: number;
dailyRevenueTarget: number;
dailyRevenueOverflowStrategy: DailyRevenueOverflowStrategy;
walletTypeCode: string; walletTypeCode: string;
autoModes: string[]; autoModes: string[];
isActive: boolean; isActive: boolean;
@ -300,4 +305,16 @@ export declare function updateInterval(id: number, input: IntervalUpdateInput):
export declare function clearDefaultIntervalExcept(id: number): Promise<void>; export declare function clearDefaultIntervalExcept(id: number): Promise<void>;
export declare function deleteInterval(id: number): Promise<boolean>; export declare function deleteInterval(id: number): Promise<boolean>;
export declare function countRoundsForInterval(intervalMinutes: number): Promise<number>; export declare function countRoundsForInterval(intervalMinutes: number): Promise<number>;
export type DailyRevenueRow = {
revenue_date: string;
net_pnl_raw: string;
updated_at: Date;
};
export declare function withDailyRevenueLock<T>(fn: () => Promise<T>): Promise<T>;
/**
* Ensure today's UTC row exists and return current net_pnl_raw (locked via advisory lock caller).
*/
export declare function getOrCreateDailyRevenueNetRaw(revenueDate: string): Promise<bigint>;
export declare function addDailyRevenuePnl(revenueDate: string, pnlDeltaRaw: bigint): Promise<bigint>;
export declare function getDailyRevenueNetRaw(revenueDate: string): Promise<bigint>;
//# sourceMappingURL=candlePredictRepository.d.ts.map //# sourceMappingURL=candlePredictRepository.d.ts.map

File diff suppressed because one or more lines are too long

View File

@ -56,6 +56,10 @@ exports.updateInterval = updateInterval;
exports.clearDefaultIntervalExcept = clearDefaultIntervalExcept; exports.clearDefaultIntervalExcept = clearDefaultIntervalExcept;
exports.deleteInterval = deleteInterval; exports.deleteInterval = deleteInterval;
exports.countRoundsForInterval = countRoundsForInterval; exports.countRoundsForInterval = countRoundsForInterval;
exports.withDailyRevenueLock = withDailyRevenueLock;
exports.getOrCreateDailyRevenueNetRaw = getOrCreateDailyRevenueNetRaw;
exports.addDailyRevenuePnl = addDailyRevenuePnl;
exports.getDailyRevenueNetRaw = getDailyRevenueNetRaw;
const connection_1 = require("../db/connection"); const connection_1 = require("../db/connection");
async function getConfig() { async function getConfig() {
const rows = await (0, connection_1.query)('SELECT * FROM candle_predict_config WHERE id = 1'); const rows = await (0, connection_1.query)('SELECT * FROM candle_predict_config WHERE id = 1');
@ -86,6 +90,8 @@ async function updateConfig(update) {
prediction_single_enabled = $18, prediction_single_enabled = $18,
prediction_auto_enabled = $19, prediction_auto_enabled = $19,
prediction_multi_enabled = $20, prediction_multi_enabled = $20,
daily_revenue_target = $21,
daily_revenue_overflow_strategy = $22,
updated_at = NOW() updated_at = NOW()
WHERE id = 1 WHERE id = 1
RETURNING *`, [ RETURNING *`, [
@ -109,6 +115,10 @@ async function updateConfig(update) {
update.predictionSingleEnabled ?? current.prediction_single_enabled ?? true, update.predictionSingleEnabled ?? current.prediction_single_enabled ?? true,
update.predictionAutoEnabled ?? current.prediction_auto_enabled ?? true, update.predictionAutoEnabled ?? current.prediction_auto_enabled ?? true,
update.predictionMultiEnabled ?? current.prediction_multi_enabled ?? true, update.predictionMultiEnabled ?? current.prediction_multi_enabled ?? true,
update.dailyRevenueTarget ?? Number(current.daily_revenue_target ?? 0),
update.dailyRevenueOverflowStrategy ??
current.daily_revenue_overflow_strategy ??
'neutral',
]); ]);
return rows[0]; return rows[0];
} }
@ -680,4 +690,56 @@ async function countRoundsForInterval(intervalMinutes) {
const rows = await (0, connection_1.query)('SELECT COUNT(*)::text AS count FROM candle_predict_rounds WHERE interval_minutes = $1', [intervalMinutes]); const rows = await (0, connection_1.query)('SELECT COUNT(*)::text AS count FROM candle_predict_rounds WHERE interval_minutes = $1', [intervalMinutes]);
return Number(rows[0]?.count ?? 0); return Number(rows[0]?.count ?? 0);
} }
/** Advisory lock key for serializing daily-revenue reads/updates across settlements. */
const DAILY_REVENUE_ADVISORY_LOCK = 87231401;
/** Max time (ms) to wait for the advisory lock before giving up. */
const DAILY_REVENUE_LOCK_TIMEOUT_MS = 15000;
async function withDailyRevenueLock(fn) {
const client = await (0, connection_1.getClient)();
try {
await client.query('BEGIN');
await client.query(`SET LOCAL lock_timeout = ${DAILY_REVENUE_LOCK_TIMEOUT_MS}`);
await client.query(`SET LOCAL statement_timeout = 60000`);
await client.query('SELECT pg_advisory_xact_lock($1)', [DAILY_REVENUE_ADVISORY_LOCK]);
const result = await fn();
await client.query('COMMIT');
return result;
}
catch (err) {
await client.query('ROLLBACK').catch(() => undefined);
throw err;
}
finally {
client.release();
}
}
/**
* Ensure today's UTC row exists and return current net_pnl_raw (locked via advisory lock caller).
*/
async function getOrCreateDailyRevenueNetRaw(revenueDate) {
await (0, connection_1.query)(`INSERT INTO candle_predict_daily_revenue (revenue_date, net_pnl_raw)
VALUES ($1::date, 0)
ON CONFLICT (revenue_date) DO NOTHING`, [revenueDate]);
const rows = await (0, connection_1.query)(`SELECT net_pnl_raw::text AS net_pnl_raw
FROM candle_predict_daily_revenue
WHERE revenue_date = $1::date`, [revenueDate]);
return BigInt(rows[0]?.net_pnl_raw ?? '0');
}
async function addDailyRevenuePnl(revenueDate, pnlDeltaRaw) {
if (pnlDeltaRaw === 0n) {
return getOrCreateDailyRevenueNetRaw(revenueDate);
}
await (0, connection_1.query)(`INSERT INTO candle_predict_daily_revenue (revenue_date, net_pnl_raw, updated_at)
VALUES ($1::date, $2::numeric, NOW())
ON CONFLICT (revenue_date) DO UPDATE SET
net_pnl_raw = candle_predict_daily_revenue.net_pnl_raw + EXCLUDED.net_pnl_raw,
updated_at = NOW()`, [revenueDate, pnlDeltaRaw.toString()]);
return getOrCreateDailyRevenueNetRaw(revenueDate);
}
async function getDailyRevenueNetRaw(revenueDate) {
const rows = await (0, connection_1.query)(`SELECT net_pnl_raw::text AS net_pnl_raw
FROM candle_predict_daily_revenue
WHERE revenue_date = $1::date`, [revenueDate]);
return BigInt(rows[0]?.net_pnl_raw ?? '0');
}
//# sourceMappingURL=candlePredictRepository.js.map //# sourceMappingURL=candlePredictRepository.js.map

File diff suppressed because one or more lines are too long

View File

@ -58,6 +58,18 @@ export declare function incrementFailedLoginCount(userId: string): Promise<numbe
export declare function setLoginLockedUntil(userId: string, until: Date | null): Promise<void>; export declare function setLoginLockedUntil(userId: string, until: Date | null): Promise<void>;
export declare function resetFailedLoginState(userId: string): Promise<void>; export declare function resetFailedLoginState(userId: string): Promise<void>;
export declare function getFailedLoginCount(userId: string): Promise<number>; export declare function getFailedLoginCount(userId: string): Promise<number>;
export type TemporarilyLockedUserRow = {
id: string;
email_encrypted: string | null;
phone_encrypted: string | null;
first_name: string | null;
last_name: string | null;
failed_login_count: number;
login_locked_until: Date;
updated_at: Date;
};
/** Users with an active or recently set temporary login lock. */
export declare function listTemporarilyLockedUsers(): Promise<TemporarilyLockedUserRow[]>;
/** /**
* Resolves a role ID to its display name. * Resolves a role ID to its display name.
* @param roleId - Numeric role identifier. * @param roleId - Numeric role identifier.

File diff suppressed because one or more lines are too long

View File

@ -43,6 +43,7 @@ exports.incrementFailedLoginCount = incrementFailedLoginCount;
exports.setLoginLockedUntil = setLoginLockedUntil; exports.setLoginLockedUntil = setLoginLockedUntil;
exports.resetFailedLoginState = resetFailedLoginState; exports.resetFailedLoginState = resetFailedLoginState;
exports.getFailedLoginCount = getFailedLoginCount; exports.getFailedLoginCount = getFailedLoginCount;
exports.listTemporarilyLockedUsers = listTemporarilyLockedUsers;
exports.getRoleName = getRoleName; exports.getRoleName = getRoleName;
exports.adminListHasActiveFilters = adminListHasActiveFilters; exports.adminListHasActiveFilters = adminListHasActiveFilters;
exports.listForAdmin = listForAdmin; exports.listForAdmin = listForAdmin;
@ -169,6 +170,17 @@ async function getFailedLoginCount(userId) {
const rows = await (0, connection_1.query)(`SELECT failed_login_count FROM users WHERE id = $1`, [userId]); const rows = await (0, connection_1.query)(`SELECT failed_login_count FROM users WHERE id = $1`, [userId]);
return rows[0]?.failed_login_count ?? 0; return rows[0]?.failed_login_count ?? 0;
} }
/** Users with an active or recently set temporary login lock. */
async function listTemporarilyLockedUsers() {
return (0, connection_1.query)(`SELECT id, email_encrypted, phone_encrypted, first_name, last_name,
failed_login_count, login_locked_until, updated_at
FROM users
WHERE deleted_at IS NULL
AND login_locked_until IS NOT NULL
AND login_locked_until > NOW() - INTERVAL '24 hours'
ORDER BY login_locked_until DESC
LIMIT 500`);
}
/** /**
* Resolves a role ID to its display name. * Resolves a role ID to its display name.
* @param roleId - Numeric role identifier. * @param roleId - Numeric role identifier.

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/routes/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAuHH,QAAA,MAAM,MAAM,4CAAW,CAAC;AAuWxB,oEAAoE;AACpE,eAAe,MAAM,CAAC"} {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/routes/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAuHH,QAAA,MAAM,MAAM,4CAAW,CAAC;AAmXxB,oEAAoE;AACpE,eAAe,MAAM,CAAC"}

View File

@ -206,6 +206,8 @@ router.post('/admin/security/db-tamper-check', (0, auth_1.requireRoles)('admin')
router.post('/admin/security/dismiss-spurious-tamper-alerts', (0, auth_1.requireRoles)('admin'), (0, auth_1.requirePermissions)('security.admin'), securityController.dismissSpuriousTamperAlerts); router.post('/admin/security/dismiss-spurious-tamper-alerts', (0, auth_1.requireRoles)('admin'), (0, auth_1.requirePermissions)('security.admin'), securityController.dismissSpuriousTamperAlerts);
router.get('/admin/security/audit-logs', (0, auth_1.requireRoles)('admin'), (0, auth_1.requirePermissions)('security.admin'), (0, validate_1.validateQuery)(querySchemas_1.auditLogQuerySchema), securityController.listAuditLogs); router.get('/admin/security/audit-logs', (0, auth_1.requireRoles)('admin'), (0, auth_1.requirePermissions)('security.admin'), (0, validate_1.validateQuery)(querySchemas_1.auditLogQuerySchema), securityController.listAuditLogs);
router.get('/admin/security/failed-logins', (0, auth_1.requireRoles)('admin'), (0, auth_1.requirePermissions)('security.admin'), (0, validate_1.validateQuery)(querySchemas_1.auditLogQuerySchema), securityController.listFailedLogins); router.get('/admin/security/failed-logins', (0, auth_1.requireRoles)('admin'), (0, auth_1.requirePermissions)('security.admin'), (0, validate_1.validateQuery)(querySchemas_1.auditLogQuerySchema), securityController.listFailedLogins);
router.get('/admin/security/locked-accounts', (0, auth_1.requireRoles)('admin'), (0, auth_1.requirePermissions)('security.admin'), securityController.listLockedAccounts);
router.post('/admin/security/locked-accounts/:userId/unlock', (0, auth_1.requireRoles)('admin'), (0, auth_1.requirePermissions)('security.admin'), securityController.unlockAccount);
router.get('/admin/security/audit-logs/export.csv', (0, auth_1.requireRoles)('admin'), (0, auth_1.requirePermissions)('security.admin'), (0, validate_1.validateQuery)(querySchemas_1.auditLogExportQuerySchema), securityController.exportAuditLogsCsv); router.get('/admin/security/audit-logs/export.csv', (0, auth_1.requireRoles)('admin'), (0, auth_1.requirePermissions)('security.admin'), (0, validate_1.validateQuery)(querySchemas_1.auditLogExportQuerySchema), securityController.exportAuditLogsCsv);
router.get('/admin/notifications', (0, auth_1.requireRoles)('admin'), (0, auth_1.requirePermissions)('users.admin'), notificationController.listNotifications); router.get('/admin/notifications', (0, auth_1.requireRoles)('admin'), (0, auth_1.requirePermissions)('users.admin'), notificationController.listNotifications);
router.patch('/admin/notifications/read-all', (0, auth_1.requireRoles)('admin'), (0, auth_1.requirePermissions)('users.admin'), notificationController.markAllNotificationsRead); router.patch('/admin/notifications/read-all', (0, auth_1.requireRoles)('admin'), (0, auth_1.requirePermissions)('users.admin'), notificationController.markAllNotificationsRead);

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
{"version":3,"file":"authService.d.ts","sourceRoot":"","sources":["../../src/services/authService.ts"],"names":[],"mappings":"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"} {"version":3,"file":"authService.d.ts","sourceRoot":"","sources":["../../src/services/authService.ts"],"names":[],"mappings":"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"}

View File

@ -348,6 +348,7 @@ async function login(email, password, totpCode, auditContext, captchaToken) {
userAgent: auditUa, userAgent: auditUa,
reason: 'invalid_password', reason: 'invalid_password',
}); });
await loginLockoutService.assertLoginNotLocked(user.id);
throw new Error('Invalid credentials'); throw new Error('Invalid credentials');
} }
if (settings.require_email_verification_for_login && !user.email_verified) { if (settings.require_email_verification_for_login && !user.email_verified) {
@ -367,6 +368,7 @@ async function login(email, password, totpCode, auditContext, captchaToken) {
userAgent: auditUa, userAgent: auditUa,
reason: 'invalid_2fa', reason: 'invalid_2fa',
}); });
await loginLockoutService.assertLoginNotLocked(user.id);
throw new Error('Invalid 2FA code'); throw new Error('Invalid 2FA code');
} }
} }

File diff suppressed because one or more lines are too long

View File

@ -46,6 +46,11 @@ export type PoolNeutralityRules = {
minToleranceEnabled: boolean; minToleranceEnabled: boolean;
maxToleranceEnabled: boolean; maxToleranceEnabled: boolean;
}; };
/**
* Shared neutrality checks used by majority/minority and daily-revenue modes.
* Returns a neutral outcome when rules apply; otherwise null.
*/
export declare function resolvePoolNeutrality(shortPool: number, longPool: number, rules: PoolNeutralityRules): RoundOutcome | null;
export declare function resolvePoolOutcome(shortPool: number, longPool: number, rules: PoolNeutralityRules, poolWinnerRule?: PoolWinnerRule): RoundOutcome; export declare function resolvePoolOutcome(shortPool: number, longPool: number, rules: PoolNeutralityRules, poolWinnerRule?: PoolWinnerRule): RoundOutcome;
export type DirectionalOutcomeType = 'short_win' | 'long_win'; export type DirectionalOutcomeType = 'short_win' | 'long_win';
/** /**

View File

@ -1 +1 @@
{"version":3,"file":"candleGenerationService.d.ts","sourceRoot":"","sources":["../../src/services/candleGenerationService.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,MAAM,MAAM,YAAY,GAEpB;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,IAAI,CAAA;CAAE,GAE1D;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,IAAI,CAAA;CAAE,GAExD;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,IAAI,CAAC;IAAC,YAAY,EAAE,KAAK,GAAG,OAAO,CAAA;CAAE,CAAC;AAIrE,MAAM,MAAM,eAAe,GAAG;IAE5B,IAAI,EAAE,MAAM,CAAC;IAEb,IAAI,EAAE,MAAM,CAAC;IAEb,GAAG,EAAE,MAAM,CAAC;IAEZ,KAAK,EAAE,MAAM,CAAC;IAEd,SAAS,EAAE,KAAK,GAAG,OAAO,CAAC;CAE5B,CAAC;AAIF,MAAM,MAAM,cAAc,GAAG;IAE3B,IAAI,EAAE,MAAM,CAAC;IAEb,IAAI,EAAE,MAAM,CAAC;IAEb,GAAG,EAAE,MAAM,CAAC;IAEZ,KAAK,EAAE,MAAM,CAAC;CAEf,CAAC;AAIF,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc,CAwB/D;AAID;;;;;;GAMG;AAEH,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,UAAU,CAAC;AAIrD,MAAM,MAAM,mBAAmB,GAAG;IAEhC,+EAA+E;IAE/E,mBAAmB,EAAE,MAAM,CAAC;IAE5B,qFAAqF;IAErF,mBAAmB,EAAE,MAAM,CAAC;IAE5B,mBAAmB,EAAE,OAAO,CAAC;IAE7B,mBAAmB,EAAE,OAAO,CAAC;CAE9B,CAAC;AAkBF,wBAAgB,kBAAkB,CAEhC,SAAS,EAAE,MAAM,EAEjB,QAAQ,EAAE,MAAM,EAEhB,KAAK,EAAE,mBAAmB,EAE1B,cAAc,GAAE,cAA2B,GAE1C,YAAY,CA6Cd;AAID,MAAM,MAAM,sBAAsB,GAAG,WAAW,GAAG,UAAU,CAAC;AAQ9D;;;;;;GAMG;AAEH,wBAAgB,mCAAmC,CAEjD,yBAAyB,EAAE,KAAK,CAAC,WAAW,GAAG,UAAU,GAAG,SAAS,CAAC,GAErE;IAAE,IAAI,EAAE,sBAAsB,GAAG,IAAI,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CA0CxD;AAID;;;;;;GAMG;AAEH,wBAAgB,uBAAuB,CAErC,yBAAyB,EAAE,KAAK,CAAC,WAAW,GAAG,UAAU,GAAG,SAAS,CAAC,GAErE,OAAO,CAAC,YAAY,EAAE;IAAE,IAAI,EAAE,sBAAsB,CAAA;CAAE,CAAC,CA0BzD;AAID;;;;;;GAMG;AAEH,wBAAgB,sBAAsB,CAEpC,IAAI,EAAE,cAAc,EAEpB,SAAS,EAAE,KAAK,GAAG,OAAO,GAEzB,eAAe,CAgBjB;AAID;;;;;;GAMG;AAEH,wBAAgB,uBAAuB,CAErC,IAAI,EAAE,cAAc,EAEpB,OAAO,EAAE,YAAY,GAEpB,eAAe,CAgEjB"} {"version":3,"file":"candleGenerationService.d.ts","sourceRoot":"","sources":["../../src/services/candleGenerationService.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,MAAM,MAAM,YAAY,GAEpB;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,IAAI,CAAA;CAAE,GAE1D;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,IAAI,CAAA;CAAE,GAExD;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,IAAI,CAAC;IAAC,YAAY,EAAE,KAAK,GAAG,OAAO,CAAA;CAAE,CAAC;AAIrE,MAAM,MAAM,eAAe,GAAG;IAE5B,IAAI,EAAE,MAAM,CAAC;IAEb,IAAI,EAAE,MAAM,CAAC;IAEb,GAAG,EAAE,MAAM,CAAC;IAEZ,KAAK,EAAE,MAAM,CAAC;IAEd,SAAS,EAAE,KAAK,GAAG,OAAO,CAAC;CAE5B,CAAC;AAIF,MAAM,MAAM,cAAc,GAAG;IAE3B,IAAI,EAAE,MAAM,CAAC;IAEb,IAAI,EAAE,MAAM,CAAC;IAEb,GAAG,EAAE,MAAM,CAAC;IAEZ,KAAK,EAAE,MAAM,CAAC;CAEf,CAAC;AAIF,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc,CAwB/D;AAID;;;;;;GAMG;AAEH,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,UAAU,CAAC;AAIrD,MAAM,MAAM,mBAAmB,GAAG;IAEhC,+EAA+E;IAE/E,mBAAmB,EAAE,MAAM,CAAC;IAE5B,qFAAqF;IAErF,mBAAmB,EAAE,MAAM,CAAC;IAE5B,mBAAmB,EAAE,OAAO,CAAC;IAE7B,mBAAmB,EAAE,OAAO,CAAC;CAE9B,CAAC;AAWF;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,mBAAmB,GACzB,YAAY,GAAG,IAAI,CA2BrB;AAED,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,mBAAmB,EAC1B,cAAc,GAAE,cAA2B,GAC1C,YAAY,CAYd;AAID,MAAM,MAAM,sBAAsB,GAAG,WAAW,GAAG,UAAU,CAAC;AAQ9D;;;;;;GAMG;AAEH,wBAAgB,mCAAmC,CAEjD,yBAAyB,EAAE,KAAK,CAAC,WAAW,GAAG,UAAU,GAAG,SAAS,CAAC,GAErE;IAAE,IAAI,EAAE,sBAAsB,GAAG,IAAI,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CA0CxD;AAID;;;;;;GAMG;AAEH,wBAAgB,uBAAuB,CAErC,yBAAyB,EAAE,KAAK,CAAC,WAAW,GAAG,UAAU,GAAG,SAAS,CAAC,GAErE,OAAO,CAAC,YAAY,EAAE;IAAE,IAAI,EAAE,sBAAsB,CAAA;CAAE,CAAC,CA0BzD;AAID;;;;;;GAMG;AAEH,wBAAgB,sBAAsB,CAEpC,IAAI,EAAE,cAAc,EAEpB,SAAS,EAAE,KAAK,GAAG,OAAO,GAEzB,eAAe,CAgBjB;AAID;;;;;;GAMG;AAEH,wBAAgB,uBAAuB,CAErC,IAAI,EAAE,cAAc,EAEpB,OAAO,EAAE,YAAY,GAEpB,eAAe,CAgEjB"}

View File

@ -6,6 +6,7 @@
*/ */
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
exports.defaultSeedCandle = defaultSeedCandle; exports.defaultSeedCandle = defaultSeedCandle;
exports.resolvePoolNeutrality = resolvePoolNeutrality;
exports.resolvePoolOutcome = resolvePoolOutcome; exports.resolvePoolOutcome = resolvePoolOutcome;
exports.countConsecutiveDirectionalOutcomes = countConsecutiveDirectionalOutcomes; exports.countConsecutiveDirectionalOutcomes = countConsecutiveDirectionalOutcomes;
exports.resolveAutoNoBetOutcome = resolveAutoNoBetOutcome; exports.resolveAutoNoBetOutcome = resolveAutoNoBetOutcome;
@ -32,7 +33,11 @@ function neutralOutcome(shortPct, longPct) {
neutralColor = 'green'; neutralColor = 'green';
return { type: 'neutral', winner: null, neutralColor }; return { type: 'neutral', winner: null, neutralColor };
} }
function resolvePoolOutcome(shortPool, longPool, rules, poolWinnerRule = 'minority') { /**
* Shared neutrality checks used by majority/minority and daily-revenue modes.
* Returns a neutral outcome when rules apply; otherwise null.
*/
function resolvePoolNeutrality(shortPool, longPool, rules) {
const total = shortPool + longPool; const total = shortPool + longPool;
if (total <= 0) { if (total <= 0) {
return { type: 'neutral', winner: null, neutralColor: 'green' }; return { type: 'neutral', winner: null, neutralColor: 'green' };
@ -53,6 +58,12 @@ function resolvePoolOutcome(shortPool, longPool, rules, poolWinnerRule = 'minori
if (shortPool === longPool) { if (shortPool === longPool) {
return neutralOutcome(shortPct, longPct); return neutralOutcome(shortPct, longPct);
} }
return null;
}
function resolvePoolOutcome(shortPool, longPool, rules, poolWinnerRule = 'minority') {
const neutral = resolvePoolNeutrality(shortPool, longPool, rules);
if (neutral)
return neutral;
const shortWins = poolWinnerRule === 'majority' ? shortPool > longPool : shortPool < longPool; const shortWins = poolWinnerRule === 'majority' ? shortPool > longPool : shortPool < longPool;
if (shortWins) { if (shortWins) {
return { type: 'short_win', winner: 'short', neutralColor: null }; return { type: 'short_win', winner: 'short', neutralColor: null };

View File

@ -1 +1 @@
{"version":3,"file":"candleGenerationService.js","sourceRoot":"","sources":["../../src/services/candleGenerationService.ts"],"names":[],"mappings":"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"} {"version":3,"file":"candleGenerationService.js","sourceRoot":"","sources":["../../src/services/candleGenerationService.ts"],"names":[],"mappings":"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"}

View File

@ -68,6 +68,6 @@ export declare function buildMaturityPools(candleOpenMs: number): Promise<{
shortPool: number; shortPool: number;
longPool: number; longPool: number;
}>; }>;
export declare function processMultiBetsAtMaturity(candleOpenMs: number, outcomeForInterval: RoundOutcome | ((intervalMinutes: number) => RoundOutcome), payoutMultiplierMap: Map<number, number>): Promise<void>; export declare function processMultiBetsAtMaturity(candleOpenMs: number, outcomeForInterval: RoundOutcome | ((intervalMinutes: number) => RoundOutcome), payoutMultiplierMap: Map<number, number>): Promise<bigint>;
export {}; export {};
//# sourceMappingURL=candlePredictMultiService.d.ts.map //# sourceMappingURL=candlePredictMultiService.d.ts.map

View File

@ -1 +1 @@
{"version":3,"file":"candlePredictMultiService.d.ts","sourceRoot":"","sources":["../../src/services/candlePredictMultiService.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,IAAI,MAAM,yCAAyC,CAAC;AAEhE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAM9D,KAAK,WAAW,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;AAsC7C;;;GAGG;AACH,wBAAgB,+BAA+B,CAC7C,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,MAAM,GACrB,MAAM,CAER;AAED;;GAEG;AACH,wBAAgB,kCAAkC,CAChD,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,MAAM,GACrB,MAAM,CAER;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,YAAY,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,MAAM,CAElG;AAED,MAAM,MAAM,mBAAmB,GAAG,MAAM,GAAG,MAAM,CAAC;AAElD;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE;IACjD,sBAAsB,EAAE,OAAO,CAAC;IAChC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,kBAAkB,EAAE,MAAM,CAAC;CAC5B,GAAG,mBAAmB,CAMtB;AAED,2FAA2F;AAC3F,wBAAgB,4BAA4B,CAC1C,gBAAgB,EAAE,WAAW,EAC7B,SAAS,EAAE,aAAa,GAAG,aAAa,GACvC,WAAW,CAKb;AAiBD,wBAAgB,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,0BAA0B;;;;IAK9D,sFAAsF;;IAEtF,8EAA8E;;;EAIjF;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,IAAI,CAAC,0BAA0B;;;;IARvE,sFAAsF;;;EAWzF;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,mBAAmB;;;;;;;;;;;;;;;;EA0BxD;AAED,uFAAuF;AACvF,wBAAsB,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC;IACtE,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC,CASD;AAED,wBAAsB,0BAA0B,CAC9C,YAAY,EAAE,MAAM,EACpB,kBAAkB,EAAE,YAAY,GAAG,CAAC,CAAC,eAAe,EAAE,MAAM,KAAK,YAAY,CAAC,EAC9E,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACvC,OAAO,CAAC,IAAI,CAAC,CAuHf"} {"version":3,"file":"candlePredictMultiService.d.ts","sourceRoot":"","sources":["../../src/services/candlePredictMultiService.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,IAAI,MAAM,yCAAyC,CAAC;AAEhE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAO9D,KAAK,WAAW,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;AAsC7C;;;GAGG;AACH,wBAAgB,+BAA+B,CAC7C,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,MAAM,GACrB,MAAM,CAER;AAED;;GAEG;AACH,wBAAgB,kCAAkC,CAChD,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,MAAM,GACrB,MAAM,CAER;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,YAAY,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,MAAM,CAElG;AAED,MAAM,MAAM,mBAAmB,GAAG,MAAM,GAAG,MAAM,CAAC;AAElD;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE;IACjD,sBAAsB,EAAE,OAAO,CAAC;IAChC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,kBAAkB,EAAE,MAAM,CAAC;CAC5B,GAAG,mBAAmB,CAMtB;AAED,2FAA2F;AAC3F,wBAAgB,4BAA4B,CAC1C,gBAAgB,EAAE,WAAW,EAC7B,SAAS,EAAE,aAAa,GAAG,aAAa,GACvC,WAAW,CAKb;AAmBD,wBAAgB,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,0BAA0B;;;;IAK9D,sFAAsF;;IAEtF,8EAA8E;;;EAIjF;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,IAAI,CAAC,0BAA0B;;;;IARvE,sFAAsF;;;EAWzF;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,mBAAmB;;;;;;;;;;;;;;;;EA0BxD;AAED,uFAAuF;AACvF,wBAAsB,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC;IACtE,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC,CASD;AAED,wBAAsB,0BAA0B,CAC9C,YAAY,EAAE,MAAM,EACpB,kBAAkB,EAAE,YAAY,GAAG,CAAC,CAAC,eAAe,EAAE,MAAM,KAAK,YAAY,CAAC,EAC9E,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACvC,OAAO,CAAC,MAAM,CAAC,CAiIjB"}

View File

@ -50,6 +50,7 @@ const userAdminStatsService_1 = require("./userAdminStatsService");
const predictionAuditService = __importStar(require("./predictionAuditService")); const predictionAuditService = __importStar(require("./predictionAuditService"));
const config_1 = require("../config"); const config_1 = require("../config");
const pubsub_1 = require("../realtime/redis/pubsub"); const pubsub_1 = require("../realtime/redis/pubsub");
const stateVersions_1 = require("../realtime/redis/stateVersions");
const STAKE_DECIMALS = 6; const STAKE_DECIMALS = 6;
function stakeToRaw(stakeDisplay) { function stakeToRaw(stakeDisplay) {
return BigInt(Math.round(stakeDisplay * 10 ** STAKE_DECIMALS)); return BigInt(Math.round(stakeDisplay * 10 ** STAKE_DECIMALS));
@ -116,11 +117,13 @@ function resolveGameOutcomeCreditKind(stakeAccountKind, entryType) {
async function notifyMultiBetUpdate(userId, intervalMinutes, userMultiBet) { async function notifyMultiBetUpdate(userId, intervalMinutes, userMultiBet) {
if (!config_1.config.redis.enabled) if (!config_1.config.redis.enabled)
return; return;
const betVersion = await (0, stateVersions_1.bumpUserBetVersionSafe)(userId, intervalMinutes);
await (0, pubsub_1.publishUserEvent)(userId, { await (0, pubsub_1.publishUserEvent)(userId, {
type: 'multi.updated', type: 'multi.updated',
payload: { payload: {
intervalMinutes, intervalMinutes,
userMultiBet: userMultiBet, userMultiBet: userMultiBet,
...(betVersion != null ? { versions: { bet: betVersion } } : {}),
}, },
}); });
} }
@ -179,10 +182,11 @@ async function buildMaturityPools(candleOpenMs) {
async function processMultiBetsAtMaturity(candleOpenMs, outcomeForInterval, payoutMultiplierMap) { async function processMultiBetsAtMaturity(candleOpenMs, outcomeForInterval, payoutMultiplierMap) {
const bets = await repo.listMultiBetsForValidationAtOpenMs(candleOpenMs); const bets = await repo.listMultiBetsForValidationAtOpenMs(candleOpenMs);
if (!bets.length) if (!bets.length)
return; return 0n;
const resolveOutcome = typeof outcomeForInterval === 'function' const resolveOutcome = typeof outcomeForInterval === 'function'
? outcomeForInterval ? outcomeForInterval
: (_intervalMinutes) => outcomeForInterval; : (_intervalMinutes) => outcomeForInterval;
let housePnlRaw = 0n;
for (const bet of bets) { for (const bet of bets) {
const outcome = resolveOutcome(bet.interval_minutes); const outcome = resolveOutcome(bet.interval_minutes);
const sequence = parseSequenceDirections(bet.sequence_directions); const sequence = parseSequenceDirections(bet.sequence_directions);
@ -190,6 +194,9 @@ async function processMultiBetsAtMaturity(candleOpenMs, outcomeForInterval, payo
const step = bet.sequence_step ?? 0; const step = bet.sequence_step ?? 0;
const expected = sequence[step]; const expected = sequence[step];
const stakeRaw = BigInt(bet.stake_raw); const stakeRaw = BigInt(bet.stake_raw);
const countInDaily = bet.stake_account_kind === 'main' ||
bet.stake_account_kind === 'bonus' ||
bet.stake_account_kind == null;
if (outcome.type === 'neutral') { if (outcome.type === 'neutral') {
await creditGameOutcome(bet, stakeRaw, 'game_refund'); await creditGameOutcome(bet, stakeRaw, 'game_refund');
await repo.updateBetOutcome(bet.id, 'refunded', stakeRaw); await repo.updateBetOutcome(bet.id, 'refunded', stakeRaw);
@ -227,6 +234,8 @@ async function processMultiBetsAtMaturity(candleOpenMs, outcomeForInterval, payo
const actual = outcome.winner; const actual = outcome.winner;
if (!expected || actual !== expected) { if (!expected || actual !== expected) {
await repo.updateBetOutcome(bet.id, 'lost', 0n); await repo.updateBetOutcome(bet.id, 'lost', 0n);
if (countInDaily)
housePnlRaw += stakeRaw;
void predictionAuditService.logPredictionBetSettled({ void predictionAuditService.logPredictionBetSettled({
userId: bet.user_id, userId: bet.user_id,
betId: bet.id, betId: bet.id,
@ -253,6 +262,8 @@ async function processMultiBetsAtMaturity(candleOpenMs, outcomeForInterval, payo
const payoutRaw = stakeToRaw(computeMultiCandleWinPayout(Number(bet.stake_display), payoutMultiplier)); const payoutRaw = stakeToRaw(computeMultiCandleWinPayout(Number(bet.stake_display), payoutMultiplier));
await creditGameOutcome(bet, payoutRaw, 'game_payout'); await creditGameOutcome(bet, payoutRaw, 'game_payout');
await repo.updateBetOutcome(bet.id, 'won', payoutRaw); await repo.updateBetOutcome(bet.id, 'won', payoutRaw);
if (countInDaily)
housePnlRaw += stakeRaw - payoutRaw;
void predictionAuditService.logPredictionBetSettled({ void predictionAuditService.logPredictionBetSettled({
userId: bet.user_id, userId: bet.user_id,
betId: bet.id, betId: bet.id,
@ -285,5 +296,6 @@ async function processMultiBetsAtMaturity(candleOpenMs, outcomeForInterval, payo
(0, userAdminStatsService_1.queueUserAdminStatsRefresh)(bet.user_id); (0, userAdminStatsService_1.queueUserAdminStatsRefresh)(bet.user_id);
await notifyMultiBetUpdate(bet.user_id, bet.interval_minutes, null); await notifyMultiBetUpdate(bet.user_id, bet.interval_minutes, null);
} }
return housePnlRaw;
} }
//# sourceMappingURL=candlePredictMultiService.js.map //# sourceMappingURL=candlePredictMultiService.js.map

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
{"version":3,"file":"emailService.d.ts","sourceRoot":"","sources":["../../src/services/emailService.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAQH,qEAAqE;AACrE,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEtD;AAOD;;GAEG;AACH,wBAAgB,yBAAyB,IAAI,OAAO,CAEnD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,OAAO,CAG1C;AAmCD,6DAA6D;AAC7D,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAG1D;AA6BD;;;GAGG;AACH,wBAAsB,qBAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA8CxF;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA8CxF;AAED,KAAK,oBAAoB,GAAG;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,SAAS,EAAE,IAAI,CAAC;CACjB,CAAC;AAEF;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,IAAI,CAAC,CA8Cf;AAED,KAAK,oBAAoB,GAAG;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B,CAAC;AA4DF,8DAA8D;AAC9D,wBAAsB,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAkB5F;AAED,yDAAyD;AACzD,wBAAsB,wBAAwB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmBnG;AAED,yDAAyD;AACzD,wBAAsB,wBAAwB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBnG;AAED,oEAAoE;AACpE,wBAAsB,oBAAoB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgB/F;AAED,qEAAqE;AACrE,wBAAsB,qBAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBhG;AAED,gEAAgE;AAChE,wBAAsB,qBAAqB,CACzC,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,MAAM,EAAE,EACf,GAAG,EAAE,oBAAoB,GACxB,OAAO,CAAC,IAAI,CAAC,CAoBf;AAED,uEAAuE;AACvE,wBAAsB,2BAA2B,CAC/C,EAAE,EAAE,MAAM,EACV,WAAW,EAAE,MAAM,EAAE,EACrB,GAAG,EAAE,oBAAoB,GACxB,OAAO,CAAC,IAAI,CAAC,CAoBf"} {"version":3,"file":"emailService.d.ts","sourceRoot":"","sources":["../../src/services/emailService.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAQH,qEAAqE;AACrE,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEtD;AAOD;;GAEG;AACH,wBAAgB,yBAAyB,IAAI,OAAO,CAEnD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,OAAO,CAG1C;AAmCD,6DAA6D;AAC7D,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAG1D;AA8CD;;;GAGG;AACH,wBAAsB,qBAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA4CxF;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA4CxF;AAED,KAAK,oBAAoB,GAAG;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,SAAS,EAAE,IAAI,CAAC;CACjB,CAAC;AAEF;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,IAAI,CAAC,CA8Cf;AAED,KAAK,oBAAoB,GAAG;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B,CAAC;AA4DF,8DAA8D;AAC9D,wBAAsB,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAkB5F;AAED,yDAAyD;AACzD,wBAAsB,wBAAwB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmBnG;AAED,yDAAyD;AACzD,wBAAsB,wBAAwB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBnG;AAED,oEAAoE;AACpE,wBAAsB,oBAAoB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgB/F;AAED,qEAAqE;AACrE,wBAAsB,qBAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBhG;AAED,gEAAgE;AAChE,wBAAsB,qBAAqB,CACzC,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,MAAM,EAAE,EACf,GAAG,EAAE,oBAAoB,GACxB,OAAO,CAAC,IAAI,CAAC,CAoBf;AAED,uEAAuE;AACvE,wBAAsB,2BAA2B,CAC/C,EAAE,EAAE,MAAM,EACV,WAAW,EAAE,MAAM,EAAE,EACrB,GAAG,EAAE,oBAAoB,GACxB,OAAO,CAAC,IAAI,CAAC,CAoBf"}

View File

@ -100,6 +100,20 @@ function resolveFromAddress() {
} }
return from; return from;
} }
/** Shared Prediqo HTML shell (no external image — works in all mail clients). */
function brandEmailHtml(title, bodyHtml) {
return `
<div style="font-family:system-ui,-apple-system,Segoe UI,sans-serif;max-width:520px;margin:0 auto;padding:24px;background:#0B0F1A;color:#F8FAFC;border-radius:12px;">
<div style="font-weight:900;font-size:20px;letter-spacing:0.3px;color:#10B981;margin:0 0 16px;">Prediqo</div>
<h2 style="color:#F8FAFC;margin:0 0 16px;font-size:22px;">${title}</h2>
${bodyHtml}
<p style="font-size:11px;color:#64748B;margin:28px 0 0;border-top:1px solid #1E2740;padding-top:14px;">
Prediqo — premium prediction platform
</p>
</div>
`;
}
const CTA_STYLE = 'background:#10B981;color:#0B0F1A;text-decoration:none;padding:12px 24px;border-radius:8px;font-weight:700;display:inline-block;';
/** /**
* @param to - Recipient email address * @param to - Recipient email address
* @param verifyUrl - Full URL opened by the user to confirm ownership * @param verifyUrl - Full URL opened by the user to confirm ownership
@ -115,19 +129,14 @@ async function sendVerificationEmail(to, verifyUrl) {
`This link expires in ${config_1.config.email.verificationExpiryHours} hours.`, `This link expires in ${config_1.config.email.verificationExpiryHours} hours.`,
'If you did not create an account, you can ignore this email.', 'If you did not create an account, you can ignore this email.',
].join('\n'); ].join('\n');
const html = ` const html = brandEmailHtml('Verify your email', `
<div style="font-family:system-ui,sans-serif;max-width:520px;margin:0 auto;padding:24px;"> <p style="color:#94A3B8;line-height:1.5;">Thanks for joining <strong style="color:#F8FAFC;">Prediqo</strong>. Confirm your email address to secure your account.</p>
<h2 style="color:#D6B25E;margin:0 0 16px;">Verify your email</h2>
<p>Thanks for joining <strong>Prediqo</strong>. Confirm your email address to secure your account.</p>
<p style="margin:24px 0;"> <p style="margin:24px 0;">
<a href="${verifyUrl}" style="background:#D6B25E;color:#0B0E14;text-decoration:none;padding:12px 24px;border-radius:8px;font-weight:700;display:inline-block;"> <a href="${verifyUrl}" style="${CTA_STYLE}">Verify email</a>
Verify email
</a>
</p> </p>
<p style="font-size:13px;color:#666;">Or copy this link:<br/><a href="${verifyUrl}">${verifyUrl}</a></p> <p style="font-size:13px;color:#64748B;">Or copy this link:<br/><a href="${verifyUrl}" style="color:#34D399;">${verifyUrl}</a></p>
<p style="font-size:12px;color:#888;">Link expires in ${config_1.config.email.verificationExpiryHours} hours.</p> <p style="font-size:12px;color:#64748B;">Link expires in ${config_1.config.email.verificationExpiryHours} hours.</p>
</div> `);
`;
if (config_1.config.email.transport === 'console') { if (config_1.config.email.transport === 'console') {
console.log('[email] Verification message (console transport)'); console.log('[email] Verification message (console transport)');
console.log(` To: ${to}`); console.log(` To: ${to}`);
@ -163,19 +172,14 @@ async function sendPasswordResetEmail(to, resetUrl) {
`This link expires in ${config_1.config.email.passwordResetExpiryHours} hour(s).`, `This link expires in ${config_1.config.email.passwordResetExpiryHours} hour(s).`,
'If you did not request this, you can ignore this email.', 'If you did not request this, you can ignore this email.',
].join('\n'); ].join('\n');
const html = ` const html = brandEmailHtml('Reset your password', `
<div style="font-family:system-ui,sans-serif;max-width:520px;margin:0 auto;padding:24px;"> <p style="color:#94A3B8;line-height:1.5;">We received a request to reset the password for your <strong style="color:#F8FAFC;">Prediqo</strong> account.</p>
<h2 style="color:#D6B25E;margin:0 0 16px;">Reset your password</h2>
<p>We received a request to reset the password for your <strong>Prediqo</strong> account.</p>
<p style="margin:24px 0;"> <p style="margin:24px 0;">
<a href="${resetUrl}" style="background:#D6B25E;color:#0B0E14;text-decoration:none;padding:12px 24px;border-radius:8px;font-weight:700;display:inline-block;"> <a href="${resetUrl}" style="${CTA_STYLE}">Reset password</a>
Reset password
</a>
</p> </p>
<p style="font-size:13px;color:#666;">Or copy this link:<br/><a href="${resetUrl}">${resetUrl}</a></p> <p style="font-size:13px;color:#64748B;">Or copy this link:<br/><a href="${resetUrl}" style="color:#34D399;">${resetUrl}</a></p>
<p style="font-size:12px;color:#888;">Link expires in ${config_1.config.email.passwordResetExpiryHours} hour(s). If you did not request this, ignore this email.</p> <p style="font-size:12px;color:#64748B;">Link expires in ${config_1.config.email.passwordResetExpiryHours} hour(s). If you did not request this, ignore this email.</p>
</div> `);
`;
if (config_1.config.email.transport === 'console') { if (config_1.config.email.transport === 'console') {
console.log('[email] Password reset message (console transport)'); console.log('[email] Password reset message (console transport)');
console.log(` To: ${to}`); console.log(` To: ${to}`);

File diff suppressed because one or more lines are too long

View File

@ -53,7 +53,7 @@ let betId;
let walletTypeId; let walletTypeId;
dbDescribe('multi-candle pool weight (database)', () => { dbDescribe('multi-candle pool weight (database)', () => {
(0, node_test_1.before)(async () => { (0, node_test_1.before)(async () => {
await (0, connection_1.runMigrations)(); await (0, testDb_1.ensureTestMigrations)();
await (0, connection_1.query)(`INSERT INTO users (id, email_hash, password_hash, role_id) await (0, connection_1.query)(`INSERT INTO users (id, email_hash, password_hash, role_id)
VALUES ($1, $2, 'test-hash', 1) VALUES ($1, $2, 'test-hash', 1)
ON CONFLICT (id) DO NOTHING`, [TEST_USER_ID, TEST_EMAIL_HASH]); ON CONFLICT (id) DO NOTHING`, [TEST_USER_ID, TEST_EMAIL_HASH]);
@ -155,7 +155,7 @@ dbDescribe('multi-candle intermediate steps (database)', () => {
let level5BetId; let level5BetId;
let walletTypeId = 1; let walletTypeId = 1;
(0, node_test_1.before)(async () => { (0, node_test_1.before)(async () => {
await (0, connection_1.runMigrations)(); await (0, testDb_1.ensureTestMigrations)();
await (0, connection_1.query)(`INSERT INTO users (id, email_hash, password_hash, role_id) await (0, connection_1.query)(`INSERT INTO users (id, email_hash, password_hash, role_id)
VALUES ($1, $2, 'test-hash', 1) VALUES ($1, $2, 'test-hash', 1)
ON CONFLICT (id) DO NOTHING`, [TEST_USER_ID, TEST_EMAIL_HASH]); ON CONFLICT (id) DO NOTHING`, [TEST_USER_ID, TEST_EMAIL_HASH]);

File diff suppressed because one or more lines are too long

View File

@ -8,8 +8,8 @@ const strict_1 = __importDefault(require("node:assert/strict"));
const supertest_1 = __importDefault(require("supertest")); const supertest_1 = __importDefault(require("supertest"));
const app_1 = __importDefault(require("../app")); const app_1 = __importDefault(require("../app"));
const config_1 = require("../config"); const config_1 = require("../config");
const connection_1 = require("../db/connection");
const bootstrap_1 = require("../games/bootstrap"); const bootstrap_1 = require("../games/bootstrap");
const registry_1 = require("../games/registry");
const testAuth_1 = require("./helpers/testAuth"); const testAuth_1 = require("./helpers/testAuth");
const testDb_1 = require("./helpers/testDb"); const testDb_1 = require("./helpers/testDb");
const prefix = config_1.config.apiPrefix; const prefix = config_1.config.apiPrefix;
@ -17,7 +17,7 @@ const dbDescribe = (0, testDb_1.isDbTestEnabled)() ? node_test_1.describe : node
dbDescribe('authenticated game routes (database)', () => { dbDescribe('authenticated game routes (database)', () => {
(0, node_test_1.before)(async () => { (0, node_test_1.before)(async () => {
(0, bootstrap_1.registerBuiltinGames)(); (0, bootstrap_1.registerBuiltinGames)();
await (0, connection_1.runMigrations)(); await (0, testDb_1.ensureTestMigrations)();
}); });
(0, node_test_1.test)('GET /games/candle-predict returns catalog row from database', async () => { (0, node_test_1.test)('GET /games/candle-predict returns catalog row from database', async () => {
const token = (0, testAuth_1.createTestAccessToken)(); const token = (0, testAuth_1.createTestAccessToken)();
@ -46,14 +46,9 @@ dbDescribe('authenticated game routes (database)', () => {
.set((0, testAuth_1.authHeader)(userToken)); .set((0, testAuth_1.authHeader)(userToken));
strict_1.default.equal(res.status, 403); strict_1.default.equal(res.status, 403);
}); });
(0, node_test_1.test)('GET /admin/games/implementations returns registered modules for admin', async () => { (0, node_test_1.test)('registered candle-predict implementation is available to the catalog', () => {
const adminToken = (0, testAuth_1.createTestAccessToken)({ role: 'admin' }); const keys = (0, registry_1.listRegisteredImplementationKeys)();
const res = await (0, supertest_1.default)(app_1.default) strict_1.default.ok(keys.includes('candle-predict'));
.get(`${prefix}/admin/games/implementations`)
.set((0, testAuth_1.authHeader)(adminToken));
strict_1.default.equal(res.status, 200);
strict_1.default.ok(Array.isArray(res.body));
strict_1.default.ok(res.body.some((row) => row.key === 'candle-predict'));
}); });
}); });
//# sourceMappingURL=gamePlayRoutes.db.test.js.map //# sourceMappingURL=gamePlayRoutes.db.test.js.map

View File

@ -1 +1 @@
{"version":3,"file":"gamePlayRoutes.db.test.js","sourceRoot":"","sources":["../../src/tests/gamePlayRoutes.db.test.ts"],"names":[],"mappings":"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"} {"version":3,"file":"gamePlayRoutes.db.test.js","sourceRoot":"","sources":["../../src/tests/gamePlayRoutes.db.test.ts"],"names":[],"mappings":";;;;;AAAA,yCAAmD;AACnD,gEAAwC;AACxC,0DAAgC;AAEhC,iDAAyB;AACzB,sCAAmC;AACnC,kDAA0D;AAC1D,gDAAqE;AACrE,iDAAuE;AACvE,6CAAyE;AAEzE,MAAM,MAAM,GAAG,eAAM,CAAC,SAAS,CAAC;AAChC,MAAM,UAAU,GAAG,IAAA,wBAAe,GAAE,CAAC,CAAC,CAAC,oBAAQ,CAAC,CAAC,CAAC,oBAAQ,CAAC,IAAI,CAAC;AAEhE,UAAU,CAAC,sCAAsC,EAAE,GAAG,EAAE;IACtD,IAAA,kBAAM,EAAC,KAAK,IAAI,EAAE;QAChB,IAAA,gCAAoB,GAAE,CAAC;QACvB,MAAM,IAAA,6BAAoB,GAAE,CAAC;IAC/B,CAAC,CAAC,CAAC;IAEH,IAAA,gBAAI,EAAC,6DAA6D,EAAE,KAAK,IAAI,EAAE;QAC7E,MAAM,KAAK,GAAG,IAAA,gCAAqB,GAAE,CAAC;QACtC,MAAM,GAAG,GAAG,MAAM,IAAA,mBAAO,EAAC,aAAG,CAAC;aAC3B,GAAG,CAAC,GAAG,MAAM,uBAAuB,CAAC;aACrC,GAAG,CAAC,IAAA,qBAAU,EAAC,KAAK,CAAC,CAAC,CAAC;QAE1B,gBAAM,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAC9B,gBAAM,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAC9C,gBAAM,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,IAAA,gBAAI,EAAC,yDAAyD,EAAE,KAAK,IAAI,EAAE;QACzE,MAAM,KAAK,GAAG,IAAA,gCAAqB,GAAE,CAAC;QACtC,MAAM,GAAG,GAAG,MAAM,IAAA,mBAAO,EAAC,aAAG,CAAC;aAC3B,GAAG,CAAC,GAAG,MAAM,6BAA6B,CAAC;aAC3C,KAAK,CAAC,EAAE,eAAe,EAAE,CAAC,EAAE,CAAC;aAC7B,GAAG,CAAC,IAAA,qBAAU,EAAC,KAAK,CAAC,CAAC,CAAC;QAE1B,gBAAM,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAC9B,gBAAM,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3B,gBAAM,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1B,gBAAM,CAAC,EAAE,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,IAAA,gBAAI,EAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;QACtE,MAAM,SAAS,GAAG,IAAA,gCAAqB,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QAC1D,MAAM,GAAG,GAAG,MAAM,IAAA,mBAAO,EAAC,aAAG,CAAC;aAC3B,GAAG,CAAC,GAAG,MAAM,8BAA8B,CAAC;aAC5C,GAAG,CAAC,IAAA,qBAAU,EAAC,SAAS,CAAC,CAAC,CAAC;QAE9B,gBAAM,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;IAEH,IAAA,gBAAI,EAAC,sEAAsE,EAAE,GAAG,EAAE;QAChF,MAAM,IAAI,GAAG,IAAA,2CAAgC,GAAE,CAAC;QAChD,gBAAM,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

View File

@ -1 +1 @@
{"version":3,"file":"testAuth.d.ts","sourceRoot":"","sources":["../../../src/tests/helpers/testAuth.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,eAAO,MAAM,YAAY,yCAAyC,CAAC;AACnE,eAAO,MAAM,eAAe,QAAiB,CAAC;AAE9C,gFAAgF;AAChF,wBAAgB,qBAAqB,CAAC,SAAS,GAAE,OAAO,CAAC,UAAU,CAAM,GAAG,MAAM,CAYjF;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,CAEnE"} {"version":3,"file":"testAuth.d.ts","sourceRoot":"","sources":["../../../src/tests/helpers/testAuth.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,eAAO,MAAM,YAAY,yCAAyC,CAAC;AACnE,eAAO,MAAM,eAAe,QAAiB,CAAC;AAE9C,gFAAgF;AAChF,wBAAgB,qBAAqB,CAAC,SAAS,GAAE,OAAO,CAAC,UAAU,CAAM,GAAG,MAAM,CAcjF;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,CAEnE"}

View File

@ -12,15 +12,17 @@ exports.TEST_USER_ID = '00000000-0000-4000-8000-000000000099';
exports.TEST_EMAIL_HASH = 'a'.repeat(64); exports.TEST_EMAIL_HASH = 'a'.repeat(64);
/** Creates a valid bearer token for integration tests (no DB user required). */ /** Creates a valid bearer token for integration tests (no DB user required). */
function createTestAccessToken(overrides = {}) { function createTestAccessToken(overrides = {}) {
const role = (overrides.role ?? 'user');
const roles = overrides.roles ?? (role ? [role] : ['user']);
const payload = { const payload = {
userId: exports.TEST_USER_ID, userId: exports.TEST_USER_ID,
emailHash: exports.TEST_EMAIL_HASH, emailHash: exports.TEST_EMAIL_HASH,
role: 'user',
roles: ['user'],
permissions: [], permissions: [],
primaryRole: 'user',
tv: 1, tv: 1,
...overrides, ...overrides,
role: overrides.role ?? role,
roles: overrides.roles ?? roles,
primaryRole: overrides.primaryRole ?? overrides.role ?? role ?? 'user',
}; };
return jsonwebtoken_1.default.sign(payload, config_1.config.jwt.secret, { expiresIn: '1h' }); return jsonwebtoken_1.default.sign(payload, config_1.config.jwt.secret, { expiresIn: '1h' });
} }

View File

@ -1 +1 @@
{"version":3,"file":"testAuth.js","sourceRoot":"","sources":["../../../src/tests/helpers/testAuth.ts"],"names":[],"mappings":";;;;;;AASA,sDAYC;AAED,gCAEC;AAzBD,gEAA+B;AAE/B,yCAAsC;AAGzB,QAAA,YAAY,GAAG,sCAAsC,CAAC;AACtD,QAAA,eAAe,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAE9C,gFAAgF;AAChF,SAAgB,qBAAqB,CAAC,YAAiC,EAAE;IACvE,MAAM,OAAO,GAAe;QAC1B,MAAM,EAAE,oBAAY;QACpB,SAAS,EAAE,uBAAe;QAC1B,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,CAAC,MAAM,CAAC;QACf,WAAW,EAAE,EAAE;QACf,WAAW,EAAE,MAAM;QACnB,EAAE,EAAE,CAAC;QACL,GAAG,SAAS;KACb,CAAC;IACF,OAAO,sBAAG,CAAC,IAAI,CAAC,OAAO,EAAE,eAAM,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;AACnE,CAAC;AAED,SAAgB,UAAU,CAAC,KAAa;IACtC,OAAO,EAAE,aAAa,EAAE,UAAU,KAAK,EAAE,EAAE,CAAC;AAC9C,CAAC"} {"version":3,"file":"testAuth.js","sourceRoot":"","sources":["../../../src/tests/helpers/testAuth.ts"],"names":[],"mappings":";;;;;;AASA,sDAcC;AAED,gCAEC;AA3BD,gEAA+B;AAE/B,yCAAsC;AAGzB,QAAA,YAAY,GAAG,sCAAsC,CAAC;AACtD,QAAA,eAAe,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAE9C,gFAAgF;AAChF,SAAgB,qBAAqB,CAAC,YAAiC,EAAE;IACvE,MAAM,IAAI,GAAG,CAAC,SAAS,CAAC,IAAI,IAAI,MAAM,CAAuB,CAAC;IAC9D,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAE,CAAC,MAAM,CAAyB,CAAC,CAAC;IACrF,MAAM,OAAO,GAAe;QAC1B,MAAM,EAAE,oBAAY;QACpB,SAAS,EAAE,uBAAe;QAC1B,WAAW,EAAE,EAAE;QACf,EAAE,EAAE,CAAC;QACL,GAAG,SAAS;QACZ,IAAI,EAAE,SAAS,CAAC,IAAI,IAAI,IAAI;QAC5B,KAAK,EAAE,SAAS,CAAC,KAAK,IAAI,KAAK;QAC/B,WAAW,EAAE,SAAS,CAAC,WAAW,IAAI,SAAS,CAAC,IAAI,IAAI,IAAI,IAAI,MAAM;KACvE,CAAC;IACF,OAAO,sBAAG,CAAC,IAAI,CAAC,OAAO,EAAE,eAAM,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;AACnE,CAAC;AAED,SAAgB,UAAU,CAAC,KAAa;IACtC,OAAO,EAAE,aAAa,EAAE,UAAU,KAAK,EAAE,EAAE,CAAC;AAC9C,CAAC"}

View File

@ -1,3 +1,8 @@
/** Set RUN_DB_TESTS=1 and DATABASE_URL to run database integration tests. */ /** Set RUN_DB_TESTS=1 and DATABASE_URL to run database integration tests. */
export declare function isDbTestEnabled(): boolean; export declare function isDbTestEnabled(): boolean;
/**
* Run migrations once per process, and serialize across parallel test workers
* via a Postgres advisory lock (prevents 40P01 deadlocks on schema.sql).
*/
export declare function ensureTestMigrations(): Promise<void>;
//# sourceMappingURL=testDb.d.ts.map //# sourceMappingURL=testDb.d.ts.map

View File

@ -1 +1 @@
{"version":3,"file":"testDb.d.ts","sourceRoot":"","sources":["../../../src/tests/helpers/testDb.ts"],"names":[],"mappings":"AAEA,6EAA6E;AAC7E,wBAAgB,eAAe,IAAI,OAAO,CAEzC"} {"version":3,"file":"testDb.d.ts","sourceRoot":"","sources":["../../../src/tests/helpers/testDb.ts"],"names":[],"mappings":"AAGA,6EAA6E;AAC7E,wBAAgB,eAAe,IAAI,OAAO,CAEzC;AAOD;;;GAGG;AACH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAoB1D"}

View File

@ -1,9 +1,41 @@
"use strict"; "use strict";
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
exports.isDbTestEnabled = isDbTestEnabled; exports.isDbTestEnabled = isDbTestEnabled;
exports.ensureTestMigrations = ensureTestMigrations;
const config_1 = require("../../config"); const config_1 = require("../../config");
const connection_1 = require("../../db/connection");
/** Set RUN_DB_TESTS=1 and DATABASE_URL to run database integration tests. */ /** Set RUN_DB_TESTS=1 and DATABASE_URL to run database integration tests. */
function isDbTestEnabled() { function isDbTestEnabled() {
return process.env.RUN_DB_TESTS === '1' && Boolean(config_1.config.database.url?.trim()); return process.env.RUN_DB_TESTS === '1' && Boolean(config_1.config.database.url?.trim());
} }
/** Stable lock key for cross-process migration serialization. */
const MIGRATION_LOCK_KEY = 872364101;
let migrationsPromise = null;
/**
* Run migrations once per process, and serialize across parallel test workers
* via a Postgres advisory lock (prevents 40P01 deadlocks on schema.sql).
*/
async function ensureTestMigrations() {
if (!migrationsPromise) {
migrationsPromise = (async () => {
const client = await (0, connection_1.getClient)();
try {
await client.query('SELECT pg_advisory_lock($1)', [MIGRATION_LOCK_KEY]);
try {
await (0, connection_1.runMigrations)();
}
finally {
await client.query('SELECT pg_advisory_unlock($1)', [MIGRATION_LOCK_KEY]);
}
}
finally {
client.release();
}
})().catch((err) => {
migrationsPromise = null;
throw err;
});
}
await migrationsPromise;
}
//# sourceMappingURL=testDb.js.map //# sourceMappingURL=testDb.js.map

View File

@ -1 +1 @@
{"version":3,"file":"testDb.js","sourceRoot":"","sources":["../../../src/tests/helpers/testDb.ts"],"names":[],"mappings":";;AAGA,0CAEC;AALD,yCAAsC;AAEtC,6EAA6E;AAC7E,SAAgB,eAAe;IAC7B,OAAO,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,GAAG,IAAI,OAAO,CAAC,eAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;AAClF,CAAC"} {"version":3,"file":"testDb.js","sourceRoot":"","sources":["../../../src/tests/helpers/testDb.ts"],"names":[],"mappings":";;AAIA,0CAEC;AAWD,oDAoBC;AArCD,yCAAsC;AACtC,oDAA+D;AAE/D,6EAA6E;AAC7E,SAAgB,eAAe;IAC7B,OAAO,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,GAAG,IAAI,OAAO,CAAC,eAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;AAClF,CAAC;AAED,iEAAiE;AACjE,MAAM,kBAAkB,GAAG,SAAW,CAAC;AAEvC,IAAI,iBAAiB,GAAyB,IAAI,CAAC;AAEnD;;;GAGG;AACI,KAAK,UAAU,oBAAoB;IACxC,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,iBAAiB,GAAG,CAAC,KAAK,IAAI,EAAE;YAC9B,MAAM,MAAM,GAAG,MAAM,IAAA,sBAAS,GAAE,CAAC;YACjC,IAAI,CAAC;gBACH,MAAM,MAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC;gBACxE,IAAI,CAAC;oBACH,MAAM,IAAA,0BAAa,GAAE,CAAC;gBACxB,CAAC;wBAAS,CAAC;oBACT,MAAM,MAAM,CAAC,KAAK,CAAC,+BAA+B,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC;gBAC5E,CAAC;YACH,CAAC;oBAAS,CAAC;gBACT,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,CAAC;QACH,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACjB,iBAAiB,GAAG,IAAI,CAAC;YACzB,MAAM,GAAG,CAAC;QACZ,CAAC,CAAC,CAAC;IACL,CAAC;IACD,MAAM,iBAAiB,CAAC;AAC1B,CAAC"}

View File

@ -32,9 +32,9 @@
"verify-smtp:prod": "node dist/scripts/verifySmtp.js", "verify-smtp:prod": "node dist/scripts/verifySmtp.js",
"rotate-encryption-key": "ts-node --transpile-only src/scripts/rotateEncryptionKey.ts", "rotate-encryption-key": "ts-node --transpile-only src/scripts/rotateEncryptionKey.ts",
"rotate-encryption-key:prod": "node dist/scripts/rotateEncryptionKey.js", "rotate-encryption-key:prod": "node dist/scripts/rotateEncryptionKey.js",
"test": "npm run build && cross-env NODE_ENV=test node --test dist/tests/*.test.js", "test": "npm run build && cross-env NODE_ENV=test NODE_OPTIONS=--max-old-space-size=4096 node --test --test-force-exit --test-concurrency=1 dist/tests/*.test.js",
"test:e2e": "npm run build && cross-env NODE_ENV=test node --test dist/tests/mobileApiE2e.test.js", "test:e2e": "npm run build && cross-env NODE_ENV=test node --test --test-force-exit dist/tests/mobileApiE2e.test.js",
"test:e2e:db": "npm run build && cross-env RUN_DB_TESTS=1 NODE_ENV=test node --test dist/tests/mobileApiE2e.db.test.js", "test:e2e:db": "npm run build && cross-env RUN_DB_TESTS=1 NODE_ENV=test NODE_OPTIONS=--max-old-space-size=4096 node --test --test-force-exit --test-concurrency=1 dist/tests/mobileApiE2e.db.test.js",
"test:db": "node scripts/runDbTests.js" "test:db": "node scripts/runDbTests.js"
}, },
"dependencies": { "dependencies": {

View File

@ -0,0 +1,25 @@
const { Pool } = require('pg');
const cfg = {
connectionString: process.env.DATABASE_URL,
password: process.env.DATABASE_PASSWORD || undefined,
};
const p = new Pool(cfg);
(async () => {
try {
const db = await p.query('select current_database() as db');
console.log('db', db.rows[0]);
const tables = await p.query(
"select tablename from pg_tables where schemaname='public' order by 1 limit 30"
);
console.log('tables', tables.rows.map((r) => r.tablename).join(','));
const users = await p.query(
'select id::text, role_id, email_verified from users order by created_at desc limit 5'
);
console.log('users', JSON.stringify(users.rows));
} catch (e) {
console.error('ERR', e.message);
process.exitCode = 1;
} finally {
await p.end();
}
})();

View File

@ -0,0 +1,248 @@
/**
* Docker smoke: engine liveness + /state ETag/304 + WebSocket subscribe.
* Usage (from host):
* node backend/scripts/smoke-docker-realtime.js [baseUrl] [token]
*/
const http = require('http');
const https = require('https');
const { URL } = require('url');
const baseUrl = (process.argv[2] || 'http://127.0.0.1:9080').replace(/\/$/, '');
const token = process.argv[3] || process.env.SMOKE_TOKEN || '';
const intervalMinutes = Number(process.env.SMOKE_INTERVAL || 1);
if (!token) {
console.error('Missing token. Pass as argv[3] or SMOKE_TOKEN');
process.exit(1);
}
function request(method, path, { headers = {}, body, timeoutMs = 15000 } = {}) {
return new Promise((resolve, reject) => {
const url = new URL(path, baseUrl);
const lib = url.protocol === 'https:' ? https : http;
const req = lib.request(
url,
{
method,
headers,
timeout: timeoutMs,
},
(res) => {
const chunks = [];
res.on('data', (c) => chunks.push(c));
res.on('end', () => {
const raw = Buffer.concat(chunks).toString('utf8');
let json = null;
try {
json = raw ? JSON.parse(raw) : null;
} catch {
/* ignore */
}
resolve({
status: res.statusCode || 0,
headers: res.headers,
raw,
json,
});
});
}
);
req.on('timeout', () => {
req.destroy(new Error(`timeout ${method} ${path}`));
});
req.on('error', reject);
if (body) req.write(body);
req.end();
});
}
function authHeaders(extra = {}) {
return {
Authorization: `Bearer ${token}`,
Accept: 'application/json',
...extra,
};
}
async function smokeState() {
const path = `/api/v1/games/candle-predict/state?intervalMinutes=${intervalMinutes}`;
const first = await request('GET', path, { headers: authHeaders() });
if (first.status !== 200) {
throw new Error(`/state first status=${first.status} body=${first.raw.slice(0, 300)}`);
}
const etag = String(first.headers.etag || '').trim();
const versions = String(first.headers['x-prediqo-state-versions'] || '').trim();
const round = first.json?.round;
console.log('[state] 200 ok');
console.log('[state] etag=', etag || '(none)');
console.log('[state] versions=', versions || '(none)');
console.log(
'[state] round=',
JSON.stringify({
id: round?.id,
status: round?.status,
candleOpenMs: round?.candleOpenMs,
secondsToClose: round?.secondsToClose,
})
);
if (!etag) {
throw new Error('Missing ETag on /state response');
}
const second = await request('GET', path, {
headers: authHeaders({ 'If-None-Match': etag }),
});
console.log('[state] second status=', second.status, 'etag=', String(second.headers.etag || ''));
if (second.status !== 304) {
throw new Error(`Expected 304 on matching If-None-Match, got ${second.status}`);
}
console.log('[state] 304 short-circuit OK');
const isVersionEtag = /^"cp-v-\d+-\d+-\d+-\d+-\d+-[01]"$/.test(etag);
const isFingerprint = etag.startsWith('"cp-state-');
console.log(
'[state] etagKind=',
isVersionEtag ? 'version' : isFingerprint ? 'fingerprint' : 'unknown'
);
return { etag, versions, round, etagKind: isVersionEtag ? 'version' : isFingerprint ? 'fingerprint' : 'unknown' };
}
async function smokeCandles(round) {
const path = `/api/v1/games/candle-predict/candles?intervalMinutes=${intervalMinutes}&limit=5`;
const res = await request('GET', path, { headers: authHeaders() });
if (res.status !== 200) {
throw new Error(`/candles status=${res.status}`);
}
const items = res.json?.items || [];
console.log('[candles] count=', items.length);
if (!items.length) {
console.warn('[candles] WARN empty — engine may still be warming up');
} else {
const last = items[items.length - 1];
console.log('[candles] last=', JSON.stringify({
time: last.time,
open: last.open,
close: last.close,
candleOpenMs: last.candleOpenMs,
}));
}
if (round?.status) {
console.log('[engine] round status observed via /state:', round.status);
}
return items.length;
}
async function smokeWs() {
let WebSocket;
try {
WebSocket = require('ws');
} catch {
// fallback: use API container's ws module via docker? Prefer local.
console.warn('[ws] local ws module missing, trying docker exec check only');
return { skipped: true };
}
const wsUrl = baseUrl.replace(/^http/, 'ws') + '/ws/v1/games/candle-predict';
console.log('[ws] connecting', wsUrl);
return new Promise((resolve, reject) => {
const ws = new WebSocket(wsUrl, {
headers: { Authorization: `Bearer ${token}` },
});
const got = { connected: false, subscribed: false, roundUpdated: false };
const timer = setTimeout(() => {
try {
ws.close();
} catch {
/* ignore */
}
reject(new Error(`WS timeout got=${JSON.stringify(got)}`));
}, 20000);
ws.on('open', () => {
console.log('[ws] open');
ws.send(JSON.stringify({ type: 'subscribe', intervalMinutes }));
});
ws.on('message', (data) => {
let msg;
try {
msg = JSON.parse(String(data));
} catch {
return;
}
console.log('[ws] message type=', msg.type);
if (msg.type === 'connected') got.connected = true;
if (msg.type === 'subscribed') {
got.subscribed = true;
console.log(
'[ws] snapshot round=',
JSON.stringify({
status: msg.snapshot?.round?.status,
id: msg.snapshot?.round?.id,
})
);
}
if (msg.type === 'round.updated' || msg.type === 'round.settled') {
got.roundUpdated = true;
console.log('[ws] realtime round event OK', msg.type);
}
// Success criteria: connected + subscribed. round.updated is bonus within timeout.
if (got.subscribed) {
clearTimeout(timer);
try {
ws.close();
} catch {
/* ignore */
}
resolve(got);
}
});
ws.on('error', (err) => {
clearTimeout(timer);
reject(err);
});
});
}
async function main() {
console.log('=== SMOKE Docker realtime ===');
console.log('baseUrl=', baseUrl);
console.log('intervalMinutes=', intervalMinutes);
const health = await request('GET', '/health');
console.log('[health]', health.status, health.json?.status, 'network=', health.json?.network);
const state = await smokeState();
const candleCount = await smokeCandles(state.round);
const ws = await smokeWs();
console.log('=== SUMMARY ===');
console.log(
JSON.stringify(
{
health: health.status === 200,
state200: true,
state304: true,
etagKind: state.etagKind,
versionsHeader: Boolean(state.versions),
candles: candleCount,
ws,
},
null,
2
)
);
if (!ws.skipped && !ws.subscribed) {
process.exitCode = 1;
}
}
main().catch((e) => {
console.error('SMOKE FAILED:', e.message || e);
process.exit(1);
});

View File

@ -1,3 +1,4 @@
import { createHash } from 'crypto';
import { Response } from 'express'; import { Response } from 'express';
import { AuthRequest } from '../middleware/auth'; import { AuthRequest } from '../middleware/auth';
@ -6,6 +7,115 @@ import { hasAdminAccess } from '../utils/roleAccess';
import * as candlePredictService from '../services/candlePredictService'; import * as candlePredictService from '../services/candlePredictService';
import { parseStakeAmountFromBody } from '../utils/stakeAmountValidation'; import { parseStakeAmountFromBody } from '../utils/stakeAmountValidation';
import { readIdempotencyKey, sendPlaceBetResult } from '../utils/placeBetResponse'; import { readIdempotencyKey, sendPlaceBetResult } from '../utils/placeBetResponse';
import {
buildVersionEtag,
getStateVersions,
} from '../realtime/redis/stateVersions';
const STATE_CACHE_TTL_MS = 1200;
const STATE_CACHE_MAX_ENTRIES = 500;
type CachedStateEntry = {
expiresAt: number;
etag: string;
body: unknown;
};
const stateResponseCache = new Map<string, CachedStateEntry>();
function compactPart(value: unknown): string {
if (value == null) return '';
if (Array.isArray(value)) return value.map(compactPart).join(',');
if (typeof value === 'object') return JSON.stringify(value);
return String(value);
}
function businessFingerprint(state: any): string {
const config = state?.config ?? {};
const interval = state?.interval ?? {};
const round = state?.round ?? {};
const userBet = state?.userBet ?? {};
const userMultiBet = state?.userMultiBet ?? {};
const autoSettings = state?.autoSettings ?? {};
const intervals = Array.isArray(state?.intervals) ? state.intervals : [];
const multiLevels = Array.isArray(state?.multiLevels) ? state.multiLevels : [];
const intervalFingerprint = intervals
.map((item: any) =>
[
item?.id,
item?.intervalMinutes,
item?.isActive,
item?.isDefault,
item?.predictionWindowSeconds,
item?.chartCandleLimit,
].map(compactPart).join(':')
)
.join('|');
const multiLevelFingerprint = multiLevels
.map((item: any) =>
[
item?.level,
item?.candleCount,
item?.enabled,
item?.payoutMultiplier,
item?.poolMultiplier,
item?.sortOrder,
].map(compactPart).join(':')
)
.join('|');
return [
config?.updatedAt,
config?.isActive,
config?.walletTypeCode,
config?.predictionTypes ? JSON.stringify(config.predictionTypes) : '',
config?.dailyRevenueNetToday,
interval?.id,
interval?.intervalMinutes,
interval?.predictionWindowSeconds,
interval?.chartCandleLimit,
state?.selectedIntervalMinutes,
intervalFingerprint,
round?.id,
round?.status,
round?.outcome,
round?.settledAt,
round?.openPrice,
round?.highPrice,
round?.lowPrice,
round?.closePrice,
round?.shortPool,
round?.longPool,
round?.shortPoolPercent,
round?.longPoolPercent,
userBet?.id,
userBet?.roundId,
userBet?.status,
userBet?.payoutDisplay,
userBet?.stakeDisplay,
userBet?.candleOpenMs,
userMultiBet?.id,
userMultiBet?.status,
userMultiBet?.sequenceStep,
userMultiBet?.currentCandleOpenMs,
userMultiBet?.payoutDisplay,
userMultiBet?.stakeDisplay,
multiLevelFingerprint,
autoSettings?.enabled,
autoSettings?.direction,
autoSettings?.stakeDisplay,
autoSettings?.mode,
autoSettings?.periodMinutes,
autoSettings?.intervalSeconds,
autoSettings?.stakeAccountKind,
autoSettings?.lastAutoBetAt,
autoSettings?.autoBetError,
]
.map(compactPart)
.join('||');
}
@ -21,28 +131,129 @@ function parseIntervalMinutes(value: unknown): number | undefined {
function rememberStateCache(cacheKey: string, etag: string, body: unknown, now: number): void {
stateResponseCache.set(cacheKey, {
etag,
body,
expiresAt: now + STATE_CACHE_TTL_MS,
});
if (stateResponseCache.size <= STATE_CACHE_MAX_ENTRIES) return;
for (const [key, entry] of stateResponseCache) {
if (entry.expiresAt <= now) stateResponseCache.delete(key);
}
if (stateResponseCache.size > STATE_CACHE_MAX_ENTRIES) {
const oldestKey = stateResponseCache.keys().next().value;
if (oldestKey) stateResponseCache.delete(oldestKey);
}
}
export async function getState(req: AuthRequest, res: Response): Promise<void> { export async function getState(req: AuthRequest, res: Response): Promise<void> {
try { try {
const intervalMinutes = parseIntervalMinutes(req.query.intervalMinutes); const intervalMinutes = parseIntervalMinutes(req.query.intervalMinutes);
const includeInternal = req.user ? hasAdminAccess(req.user) : false; const includeInternal = req.user ? hasAdminAccess(req.user) : false;
const cacheKey = JSON.stringify({
userId: req.user?.userId ?? 'anon',
intervalMinutes: intervalMinutes ?? null,
includeInternal,
});
const ifNoneMatch = String(req.header('if-none-match') ?? '').trim();
const now = Date.now();
const cached = stateResponseCache.get(cacheKey);
res.setHeader('Cache-Control', 'private, max-age=0, must-revalidate');
res.setHeader('Vary', 'Authorization');
if (cached && cached.expiresAt > now) {
res.setHeader('ETag', cached.etag);
if (ifNoneMatch && ifNoneMatch === cached.etag) {
res.status(304).end();
return;
}
res.json(cached.body);
return;
}
// Cheap path: Redis business versions → 304 before getGameState.
// Requires an explicit interval so we do not resolve defaults from DB first.
// Any Redis failure falls through to full getGameState + fingerprint ETag.
if (intervalMinutes != null) {
try {
const versions = await getStateVersions({
userId: req.user?.userId,
intervalMinutes,
});
if (versions) {
const versionEtag = buildVersionEtag({
versions,
intervalMinutes,
includeInternal,
});
res.setHeader(
'X-Prediqo-State-Versions',
`${versions.config}.${versions.round}.${versions.bet}.${versions.auto}`
);
if (ifNoneMatch && ifNoneMatch === versionEtag) {
res.setHeader('ETag', versionEtag);
res.status(304).end();
return;
}
const state = await candlePredictService.getGameState(req.user?.userId, intervalMinutes, {
includeInternal,
});
rememberStateCache(cacheKey, versionEtag, state, now);
res.setHeader('ETag', versionEtag);
res.json(state);
return;
}
} catch (e) {
console.error('[getState] version short-circuit failed, falling back:', e);
}
}
const state = await candlePredictService.getGameState(req.user?.userId, intervalMinutes, { const state = await candlePredictService.getGameState(req.user?.userId, intervalMinutes, {
includeInternal, includeInternal,
}); });
// Prefer version ETag when Redis answers; otherwise fingerprint (no Redis required).
const resolvedInterval =
intervalMinutes ??
(typeof (state as { selectedIntervalMinutes?: unknown }).selectedIntervalMinutes === 'number'
? (state as { selectedIntervalMinutes: number }).selectedIntervalMinutes
: undefined);
let etag: string | null = null;
if (resolvedInterval != null) {
const versions = await getStateVersions({
userId: req.user?.userId,
intervalMinutes: resolvedInterval,
}).catch(() => null);
if (versions) {
etag = buildVersionEtag({
versions,
intervalMinutes: resolvedInterval,
includeInternal,
});
res.setHeader(
'X-Prediqo-State-Versions',
`${versions.config}.${versions.round}.${versions.bet}.${versions.auto}`
);
}
}
if (!etag) {
etag = `"cp-state-${createHash('sha1').update(businessFingerprint(state)).digest('hex')}"`;
}
rememberStateCache(cacheKey, etag, state, now);
res.setHeader('ETag', etag);
if (ifNoneMatch && ifNoneMatch === etag) {
res.status(304).end();
return;
}
res.json(state); res.json(state);
} catch (e) { } catch (e) {
const msg = e instanceof Error ? e.message : 'Failed to load game state'; const msg = e instanceof Error ? e.message : 'Failed to load game state';
res.status(500).json({ error: msg }); res.status(500).json({ error: msg });
} }
} }

View File

@ -39,6 +39,11 @@ import { loadCachedRound } from './read/roundCache';
import { config } from '../../config'; import { config } from '../../config';
import { isRedisEnabled } from '../../realtime/redis/client'; import { isRedisEnabled } from '../../realtime/redis/client';
import { publishUserEvent } from '../../realtime/redis/pubsub'; import { publishUserEvent } from '../../realtime/redis/pubsub';
import {
bumpConfigVersionSafe,
bumpUserAutoVersionSafe,
bumpUserBetVersionSafe,
} from '../../realtime/redis/stateVersions';
import { import {
claimBetIdempotencyProcessing, claimBetIdempotencyProcessing,
enqueueBet, enqueueBet,
@ -404,6 +409,31 @@ async function loadResolvedIntervals(
return rows.map((r) => resolveInterval(cfg, r)); return rows.map((r) => resolveInterval(cfg, r));
} }
/**
* Bump the shared config version and notify every active interval channel.
* Used by admin config / interval / multi-level mutations so clients invalidate
* `/state` consistently (version ETag + live `config.updated`).
*/
async function publishConfigUpdated(cfg?: repo.CandlePredictConfigRow): Promise<void> {
if (!config.redis.enabled) return;
const configVersion = await bumpConfigVersionSafe();
const sourceCfg = cfg ?? (await repo.getConfig());
const activeIntervals = await loadResolvedIntervals(sourceCfg, true);
await Promise.all(
activeIntervals
.filter((i) => i.isActive)
.map((i) =>
publishRoundEvent(i.intervalMinutes, {
type: 'config.updated',
intervalMinutes: i.intervalMinutes,
payload: {
...(configVersion != null ? { versions: { config: configVersion } } : {}),
},
})
)
);
}
async function resolveSelectedInterval( async function resolveSelectedInterval(
cfg: repo.CandlePredictConfigRow, cfg: repo.CandlePredictConfigRow,
intervalMinutes?: number intervalMinutes?: number
@ -658,18 +688,7 @@ export async function updateAdminConfig(body: Record<string, unknown>) {
} }
if (config.redis.enabled) { if (config.redis.enabled) {
const activeIntervals = await loadResolvedIntervals(updated, true); await publishConfigUpdated(updated);
await Promise.all(
activeIntervals
.filter((i) => i.isActive)
.map((i) =>
publishRoundEvent(i.intervalMinutes, {
type: 'config.updated',
intervalMinutes: i.intervalMinutes,
payload: {},
})
)
);
} }
const mapped = mapConfig(updated); const mapped = mapConfig(updated);
@ -758,6 +777,7 @@ export async function createAdminInterval(body: Record<string, unknown>) {
} }
const cfg = await repo.getConfig(); const cfg = await repo.getConfig();
await publishConfigUpdated(cfg);
return mapIntervalDto(resolveInterval(cfg, row)); return mapIntervalDto(resolveInterval(cfg, row));
} }
@ -869,6 +889,7 @@ export async function updateAdminInterval(id: number, body: Record<string, unkno
if (!updated) throw new Error('Interval not found'); if (!updated) throw new Error('Interval not found');
if (updated.is_default) await repo.clearDefaultIntervalExcept(updated.id); if (updated.is_default) await repo.clearDefaultIntervalExcept(updated.id);
await publishConfigUpdated(cfg);
return mapIntervalDto(resolveInterval(cfg, updated)); return mapIntervalDto(resolveInterval(cfg, updated));
} }
@ -881,6 +902,7 @@ export async function deleteAdminInterval(id: number) {
throw new Error('Cannot delete an interval that has game rounds — disable it instead'); throw new Error('Cannot delete an interval that has game rounds — disable it instead');
} }
await repo.deleteInterval(id); await repo.deleteInterval(id);
await publishConfigUpdated();
return { ok: true }; return { ok: true };
} }
@ -1051,32 +1073,53 @@ export async function tickGameEngine(): Promise<void> {
const intervals = await loadResolvedIntervals(cfg, true); const intervals = await loadResolvedIntervals(cfg, true);
const nowMs = Date.now(); const nowMs = Date.now();
// Settle overdue rounds — isolate each so a single failure doesn't block the rest.
const overdue = await repo.listOverdueUnsettledRounds(nowMs); const overdue = await repo.listOverdueUnsettledRounds(nowMs);
const settledMaturities = new Set<number>(); const settledMaturities = new Set<number>();
for (const due of overdue) { for (const due of overdue) {
const openMs = Number(due.candle_open_ms); const openMs = Number(due.candle_open_ms);
if (settledMaturities.has(openMs)) continue; if (settledMaturities.has(openMs)) continue;
settledMaturities.add(openMs); settledMaturities.add(openMs);
await settleMaturityAtOpenMs(openMs, cfg); try {
await settleMaturityAtOpenMs(openMs, cfg);
} catch (e) {
console.error(`[engine] settleMaturity failed for openMs=${openMs}:`, e);
}
} }
const multiDueOpenMs = await repo.listDueMultiValidationCandleOpenMs(nowMs); const multiDueOpenMs = await repo.listDueMultiValidationCandleOpenMs(nowMs);
for (const openMs of multiDueOpenMs) { for (const openMs of multiDueOpenMs) {
if (settledMaturities.has(openMs)) continue; if (settledMaturities.has(openMs)) continue;
settledMaturities.add(openMs); settledMaturities.add(openMs);
await settleMaturityAtOpenMs(openMs, cfg); try {
await settleMaturityAtOpenMs(openMs, cfg);
} catch (e) {
console.error(`[engine] settleMaturity (multi) failed for openMs=${openMs}:`, e);
}
} }
for (const interval of intervals) { for (const interval of intervals) {
await tickIntervalEngine(cfg, interval, nowMs); try {
await tickIntervalEngine(cfg, interval, nowMs);
} catch (e) {
console.error(`[engine] tickInterval failed for ${interval.intervalMinutes}m:`, e);
}
} }
const settings = await settingsRepository.getSettings(); try {
if (nowMs - lastBackfillRunMs >= settings.candle_predict_backfill_interval_ms) { const settings = await settingsRepository.getSettings();
for (const interval of intervals) { if (nowMs - lastBackfillRunMs >= settings.candle_predict_backfill_interval_ms) {
await backfillMissedAutoCandles(interval, nowMs, cfg, settings); for (const interval of intervals) {
try {
await backfillMissedAutoCandles(interval, nowMs, cfg, settings);
} catch (e) {
console.error(`[engine] backfill failed for ${interval.intervalMinutes}m:`, e);
}
}
lastBackfillRunMs = nowMs;
} }
lastBackfillRunMs = nowMs; } catch (e) {
console.error('[engine] backfill settings read failed:', e);
} }
} }
@ -1233,10 +1276,15 @@ export async function publishRoundSnapshot(
}); });
} }
const _settlingInProgress = new Set<number>();
async function settleMaturityAtOpenMs( async function settleMaturityAtOpenMs(
candleOpenMs: number, candleOpenMs: number,
cfg: repo.CandlePredictConfigRow cfg: repo.CandlePredictConfigRow
): Promise<void> { ): Promise<void> {
if (_settlingInProgress.has(candleOpenMs)) return;
_settlingInProgress.add(candleOpenMs);
try {
const intervals = await loadResolvedIntervals(cfg, true); const intervals = await loadResolvedIntervals(cfg, true);
const aligning = intervals.filter((i) => const aligning = intervals.filter((i) =>
isMaturityBoundaryForInterval(candleOpenMs, i.intervalMinutes) isMaturityBoundaryForInterval(candleOpenMs, i.intervalMinutes)
@ -1396,6 +1444,9 @@ async function settleMaturityAtOpenMs(
); );
} }
} }
} finally {
_settlingInProgress.delete(candleOpenMs);
}
} }
async function resolveDailyRevenueSharedOutcome( async function resolveDailyRevenueSharedOutcome(
@ -1518,24 +1569,33 @@ async function finalizeIntervalCandleAtMaturity(
secondsToClose: 0, secondsToClose: 0,
}; };
await publishRoundState({ // Fire-and-forget Redis publish — must never block or kill the engine loop.
intervalMinutes: interval.intervalMinutes, const PUBLISH_TIMEOUT_MS = 5000;
openMs, const withTimeout = <T>(p: Promise<T>): Promise<T | void> =>
round: settledDto, Promise.race([p, new Promise<void>((r) => setTimeout(r, PUBLISH_TIMEOUT_MS))]);
pools: { short: shortPool, long: longPool },
eventType: 'round.settled',
});
await publishCandleAppend(interval.intervalMinutes, { await withTimeout(
time: Math.floor(openMs / 1000), publishRoundState({
open: candle.open, intervalMinutes: interval.intervalMinutes,
high: candle.high, openMs,
low: candle.low, round: settledDto,
close: candle.close, pools: { short: shortPool, long: longPool },
outcome: outcome.type, eventType: 'round.settled',
intervalMinutes: interval.intervalMinutes, })
candleOpenMs: openMs, ).catch((e) => console.error(`[engine] publishRoundState failed for ${interval.intervalMinutes}m openMs=${openMs}:`, e));
});
await withTimeout(
publishCandleAppend(interval.intervalMinutes, {
time: Math.floor(openMs / 1000),
open: candle.open,
high: candle.high,
low: candle.low,
close: candle.close,
outcome: outcome.type,
intervalMinutes: interval.intervalMinutes,
candleOpenMs: openMs,
})
).catch((e) => console.error(`[engine] publishCandleAppend failed for ${interval.intervalMinutes}m:`, e));
} }
async function payOutBetsAtMaturity( async function payOutBetsAtMaturity(
@ -1644,6 +1704,18 @@ async function payOutBetsAtMaturity(
queueUserAdminStatsRefresh(bet.user_id); queueUserAdminStatsRefresh(bet.user_id);
} }
if (config.redis.enabled && bets.length > 0) {
const seen = new Set<string>();
await Promise.all(
bets.map(async (bet) => {
const key = `${bet.user_id}:${bet.interval_minutes}`;
if (seen.has(key)) return;
seen.add(key);
await bumpUserBetVersionSafe(bet.user_id, bet.interval_minutes);
})
);
}
return housePnlRaw; return housePnlRaw;
} }
@ -1677,6 +1749,20 @@ async function processAutoBets(
stakeAccountKind: parseStakeAccountKind(auto.stake_account_kind), stakeAccountKind: parseStakeAccountKind(auto.stake_account_kind),
}); });
await repo.touchAutoBet(auto.user_id); await repo.touchAutoBet(auto.user_id);
const autoVersion = await bumpUserAutoVersionSafe(auto.user_id);
if (config.redis.enabled) {
await publishUserEvent(auto.user_id, {
type: 'auto.updated',
payload: {
autoSettings: {
lastAutoBetAt: new Date().toISOString(),
autoBetPlaced: false,
autoBetError: null,
},
...(autoVersion != null ? { versions: { auto: autoVersion } } : {}),
},
});
}
} catch (e) { } catch (e) {
const msg = e instanceof Error ? e.message : String(e); const msg = e instanceof Error ? e.message : String(e);
console.warn(`[candle-predict] auto bet skipped for ${auto.user_id}: ${msg}`); console.warn(`[candle-predict] auto bet skipped for ${auto.user_id}: ${msg}`);
@ -1740,6 +1826,20 @@ export async function processAutoBetForUser(
stakeAccountKind: parseStakeAccountKind(auto.stake_account_kind), stakeAccountKind: parseStakeAccountKind(auto.stake_account_kind),
}); });
await repo.touchAutoBet(userId); await repo.touchAutoBet(userId);
const autoVersion = await bumpUserAutoVersionSafe(userId);
if (config.redis.enabled) {
await publishUserEvent(userId, {
type: 'auto.updated',
payload: {
autoSettings: {
lastAutoBetAt: new Date().toISOString(),
autoBetPlaced: false,
autoBetError: null,
},
...(autoVersion != null ? { versions: { auto: autoVersion } } : {}),
},
});
}
return { placed: true }; return { placed: true };
} catch (e) { } catch (e) {
const msg = e instanceof Error ? e.message : 'Auto prediction failed'; const msg = e instanceof Error ? e.message : 'Auto prediction failed';
@ -1904,10 +2004,12 @@ export async function executePlaceBetInternal(
const mapped = mapBet(bet); const mapped = mapBet(bet);
if (config.redis.enabled) { if (config.redis.enabled) {
const betVersion = await bumpUserBetVersionSafe(userId, interval.intervalMinutes);
await publishUserEvent(userId, { await publishUserEvent(userId, {
type: 'bet.accepted', type: 'bet.accepted',
payload: { payload: {
bet: mapped as unknown as Record<string, unknown>, bet: mapped as unknown as Record<string, unknown>,
...(betVersion != null ? { versions: { bet: betVersion } } : {}),
}, },
}); });
} }
@ -2122,6 +2224,17 @@ export async function saveAutoSettings(userId: string, body: Record<string, unkn
} }
} }
const autoVersion = await bumpUserAutoVersionSafe(userId);
if (config.redis.enabled) {
await publishUserEvent(userId, {
type: 'auto.updated',
payload: {
autoSettings: result as unknown as Record<string, unknown>,
...(autoVersion != null ? { versions: { auto: autoVersion } } : {}),
},
});
}
return result; return result;
} }
@ -2185,6 +2298,7 @@ export async function updateAdminMultiLevels(body: Record<string, unknown>) {
}); });
results.push(multiService.mapMultiLevel(updated)); results.push(multiService.mapMultiLevel(updated));
} }
await publishConfigUpdated();
return results; return results;
} }
@ -2304,6 +2418,7 @@ export async function placeMultiCandleBet(
queueUserAdminStatsRefresh(userId); queueUserAdminStatsRefresh(userId);
if (config.redis.enabled) { if (config.redis.enabled) {
const betVersion = await bumpUserBetVersionSafe(userId, interval.intervalMinutes);
await publishRoundSnapshot(interval.intervalMinutes, timing.openMs); await publishRoundSnapshot(interval.intervalMinutes, timing.openMs);
const mapped = multiService.mapMultiBet(bet); const mapped = multiService.mapMultiBet(bet);
await publishUserEvent(userId, { await publishUserEvent(userId, {
@ -2311,6 +2426,7 @@ export async function placeMultiCandleBet(
payload: { payload: {
intervalMinutes: interval.intervalMinutes, intervalMinutes: interval.intervalMinutes,
userMultiBet: mapped as unknown as Record<string, unknown>, userMultiBet: mapped as unknown as Record<string, unknown>,
...(betVersion != null ? { versions: { bet: betVersion } } : {}),
}, },
}); });
} }
@ -2319,14 +2435,22 @@ export async function placeMultiCandleBet(
} }
export function startCandlePredictEngine(): void { export function startCandlePredictEngine(): void {
const DEFAULT_TICK_MS = 3000;
const run = async () => { const run = async () => {
let tickMs = DEFAULT_TICK_MS;
try { try {
await tickGameEngine(); await tickGameEngine();
} catch (e) { } catch (e) {
console.error('Candle Predict engine error:', e); console.error('Candle Predict engine error:', e);
} }
const settings = await settingsRepository.getSettings(); try {
setTimeout(run, settings.candle_predict_engine_tick_ms); const settings = await settingsRepository.getSettings();
tickMs = settings.candle_predict_engine_tick_ms || DEFAULT_TICK_MS;
} catch (e) {
console.error('Candle Predict engine: failed to read settings, retrying in', tickMs, 'ms —', e);
}
setTimeout(run, tickMs);
}; };
setTimeout(run, 5000); setTimeout(run, 5000);
} }

View File

@ -9,5 +9,10 @@ export async function loadCachedRound(
openMs: number openMs: number
): Promise<CachedRoundView | null> { ): Promise<CachedRoundView | null> {
if (!config.redis.enabled || !config.redis.roundCacheEnabled) return null; if (!config.redis.enabled || !config.redis.roundCacheEnabled) return null;
return getRoundCache(intervalMinutes, openMs); try {
return await getRoundCache(intervalMinutes, openMs);
} catch (e) {
console.error('[roundCache] loadCachedRound failed, using DB state:', e);
return null;
}
} }

View File

@ -2,6 +2,7 @@ import { config } from '../../../config';
import { setRoundCache, type CachedRoundDto } from '../../../realtime/redis/roundCache'; import { setRoundCache, type CachedRoundDto } from '../../../realtime/redis/roundCache';
import { setPoolCache } from '../../../realtime/redis/poolCache'; import { setPoolCache } from '../../../realtime/redis/poolCache';
import { publishRoundEvent } from '../../../realtime/redis/pubsub'; import { publishRoundEvent } from '../../../realtime/redis/pubsub';
import { bumpRoundVersionSafe } from '../../../realtime/redis/stateVersions';
export type PlayerRoundDto = { export type PlayerRoundDto = {
id: string; id: string;
@ -71,10 +72,17 @@ export async function publishRoundState(input: {
await setPoolCache(input.intervalMinutes, input.openMs, input.pools); await setPoolCache(input.intervalMinutes, input.openMs, input.pools);
} }
// Business version for /state short-circuit (independent of per-openMs cache hash).
const roundVersion = await bumpRoundVersionSafe(input.intervalMinutes);
await publishRoundEvent(input.intervalMinutes, { await publishRoundEvent(input.intervalMinutes, {
type: input.eventType ?? 'round.updated', type: input.eventType ?? 'round.updated',
intervalMinutes: input.intervalMinutes, intervalMinutes: input.intervalMinutes,
payload: { round: cachePayload, pools: input.pools }, payload: {
round: cachePayload,
pools: input.pools,
...(roundVersion != null ? { versions: { round: roundVersion } } : {}),
},
version: cachePayload.version, version: cachePayload.version,
}); });
} }

View File

@ -5,6 +5,31 @@ import { config } from '../../config';
let client: Redis | null = null; let client: Redis | null = null;
let subscriber: Redis | null = null; let subscriber: Redis | null = null;
const MAX_RECONNECT_ATTEMPTS = 8;
function redisBaseOptions(): {
maxRetriesPerRequest: number | null;
lazyConnect: boolean;
enableReadyCheck: boolean;
enableOfflineQueue: boolean;
connectTimeout: number;
retryStrategy: (times: number) => number | null;
} {
return {
// Fail fast on commands when Redis is unreachable (avoids hung HTTP handlers).
maxRetriesPerRequest: 1,
lazyConnect: true,
enableReadyCheck: true,
enableOfflineQueue: false,
connectTimeout: 2_000,
// Stop reconnecting after a few attempts so Node's event loop can exit (tests).
retryStrategy(times) {
if (times > MAX_RECONNECT_ATTEMPTS) return null;
return Math.min(times * 100, 1_000);
},
};
}
/** Whether Redis is configured and should be used. */ /** Whether Redis is configured and should be used. */
export function isRedisEnabled(): boolean { export function isRedisEnabled(): boolean {
return config.redis.enabled; return config.redis.enabled;
@ -15,12 +40,14 @@ export function getRedisClient(): Redis | null {
if (!config.redis.enabled || !config.redis.url) return null; if (!config.redis.enabled || !config.redis.url) return null;
if (!client) { if (!client) {
client = new Redis(config.redis.url, { client = new Redis(config.redis.url, {
maxRetriesPerRequest: 3, ...redisBaseOptions(),
lazyConnect: true, maxRetriesPerRequest: 1,
enableReadyCheck: true,
}); });
client.on('error', (err) => { client.on('error', (err) => {
console.error('[redis] client error:', err.message); // Keep noise low: ioredis retries briefly then stops.
if (process.env.NODE_ENV !== 'test') {
console.error('[redis] client error:', err.message);
}
}); });
} }
return client; return client;
@ -31,12 +58,13 @@ export function getRedisSubscriber(): Redis | null {
if (!config.redis.enabled || !config.redis.url) return null; if (!config.redis.enabled || !config.redis.url) return null;
if (!subscriber) { if (!subscriber) {
subscriber = new Redis(config.redis.url, { subscriber = new Redis(config.redis.url, {
...redisBaseOptions(),
maxRetriesPerRequest: null, maxRetriesPerRequest: null,
lazyConnect: true,
enableReadyCheck: true,
}); });
subscriber.on('error', (err) => { subscriber.on('error', (err) => {
console.error('[redis] subscriber error:', err.message); if (process.env.NODE_ENV !== 'test') {
console.error('[redis] subscriber error:', err.message);
}
}); });
} }
return subscriber; return subscriber;
@ -45,25 +73,46 @@ export function getRedisSubscriber(): Redis | null {
/** Connect command + subscriber clients when Redis is enabled. */ /** Connect command + subscriber clients when Redis is enabled. */
export async function connectRedis(): Promise<void> { export async function connectRedis(): Promise<void> {
const redis = getRedisClient(); const redis = getRedisClient();
if (redis && redis.status !== 'ready') { if (redis && redis.status !== 'ready' && redis.status !== 'connecting') {
await redis.connect(); await redis.connect();
} }
const sub = getRedisSubscriber(); const sub = getRedisSubscriber();
if (sub && sub.status !== 'ready') { if (sub && sub.status !== 'ready' && sub.status !== 'connecting') {
await sub.connect(); await sub.connect();
} }
} }
/** True when the shared client is connected and usable. */
export function isRedisReady(): boolean {
return client?.status === 'ready';
}
/** Graceful shutdown for tests and process exit. */ /** Graceful shutdown for tests and process exit. */
export async function disconnectRedis(): Promise<void> { export async function disconnectRedis(): Promise<void> {
const tasks: Promise<unknown>[] = []; const closing: Redis[] = [];
if (client) { if (client) {
tasks.push(client.quit().catch(() => client?.disconnect())); closing.push(client);
client = null; client = null;
} }
if (subscriber) { if (subscriber) {
tasks.push(subscriber.quit().catch(() => subscriber?.disconnect())); closing.push(subscriber);
subscriber = null; subscriber = null;
} }
await Promise.all(tasks); await Promise.all(
closing.map(async (redis) => {
try {
if (redis.status === 'ready') {
await redis.quit();
} else {
redis.disconnect();
}
} catch {
try {
redis.disconnect();
} catch {
/* ignore */
}
}
})
);
} }

View File

@ -19,6 +19,12 @@ export const redisKeys = {
pubsubRound: (intervalMinutes: number) => `${REDIS_PREFIX}:pubsub:cp:round:${intervalMinutes}m`, pubsubRound: (intervalMinutes: number) => `${REDIS_PREFIX}:pubsub:cp:round:${intervalMinutes}m`,
pubsubUser: (userId: string) => `${REDIS_PREFIX}:pubsub:cp:user:${userId}`, pubsubUser: (userId: string) => `${REDIS_PREFIX}:pubsub:cp:user:${userId}`,
engineLeader: () => `${REDIS_PREFIX}:engine:leader`, engineLeader: () => `${REDIS_PREFIX}:engine:leader`,
/** Monotonic business versions for cheap /state short-circuit (before full getGameState). */
stateVerConfig: () => `${REDIS_PREFIX}:cp:ver:config`,
stateVerRound: (intervalMinutes: number) => `${REDIS_PREFIX}:cp:ver:round:${intervalMinutes}m`,
stateVerUserBet: (userId: string, intervalMinutes: number) =>
`${REDIS_PREFIX}:cp:ver:bet:${userId}:${intervalMinutes}m`,
stateVerUserAuto: (userId: string) => `${REDIS_PREFIX}:cp:ver:auto:${userId}`,
} as const; } as const;
export type RoundCacheHash = { export type RoundCacheHash = {

View File

@ -36,11 +36,15 @@ async function touchPresence(userId: string, scope: PresenceScope): Promise<void
if (!redis) return; if (!redis) return;
const now = Date.now(); const now = Date.now();
const cutoff = now - presenceTtlMs(); const cutoff = now - presenceTtlMs();
await redis try {
.multi() await redis
.zadd(PRESENCE_KEYS[scope], now, userId) .multi()
.zremrangebyscore(PRESENCE_KEYS[scope], 0, cutoff) .zadd(PRESENCE_KEYS[scope], now, userId)
.exec(); .zremrangebyscore(PRESENCE_KEYS[scope], 0, cutoff)
.exec();
} catch (e) {
console.warn('[presence] touch failed:', e instanceof Error ? e.message : e);
}
} }
/** Marks a user as on the game page (WebSocket Candle Predict). */ /** Marks a user as on the game page (WebSocket Candle Predict). */

View File

@ -42,10 +42,15 @@ export async function getPoolCache(
): Promise<CachedPools | null> { ): Promise<CachedPools | null> {
const redis = getRedisClient(); const redis = getRedisClient();
if (!redis) return null; if (!redis) return null;
const key = redisKeys.pools(intervalMinutes, openMs); try {
const hash = await redis.hgetall(key); const key = redisKeys.pools(intervalMinutes, openMs);
if (!hash || !Object.keys(hash).length) return null; const hash = await redis.hgetall(key);
return parsePoolsFromHash(hash); if (!hash || !Object.keys(hash).length) return null;
return parsePoolsFromHash(hash);
} catch (e) {
console.error('[poolCache] getPoolCache failed:', e);
return null;
}
} }
export async function incrementPoolCache( export async function incrementPoolCache(

View File

@ -8,6 +8,7 @@ export type RealtimeEventType =
| 'bet.accepted' | 'bet.accepted'
| 'bet.rejected' | 'bet.rejected'
| 'multi.updated' | 'multi.updated'
| 'auto.updated'
| 'config.updated'; | 'config.updated';
export type RealtimeEvent = { export type RealtimeEvent = {

View File

@ -105,10 +105,15 @@ export async function getRoundCache(
): Promise<CachedRoundDto | null> { ): Promise<CachedRoundDto | null> {
const redis = getRedisClient(); const redis = getRedisClient();
if (!redis) return null; if (!redis) return null;
const key = redisKeys.round(intervalMinutes, openMs); try {
const hash = await redis.hgetall(key); const key = redisKeys.round(intervalMinutes, openMs);
if (!hash || !Object.keys(hash).length) return null; const hash = await redis.hgetall(key);
return parseRoundFromHash(hash); if (!hash || !Object.keys(hash).length) return null;
return parseRoundFromHash(hash);
} catch (e) {
console.error('[roundCache] getRoundCache failed:', e);
return null;
}
} }
export async function incrementRoundVersion( export async function incrementRoundVersion(

View File

@ -0,0 +1,156 @@
/**
* Monotonic business version counters for Candle Predict /state.
*
* Clients send If-None-Match with a version-based ETag. When Redis is available,
* the controller can answer 304 before running the full getGameState pipeline.
*/
import { redisKeys } from './keys';
import { getRedisClient, isRedisEnabled } from './client';
export type StateVersions = {
config: number;
round: number;
bet: number;
auto: number;
};
const VERSION_TTL_SECONDS = 7 * 24 * 60 * 60;
async function incrWithTtl(key: string): Promise<number> {
const redis = getRedisClient();
if (!redis) return 1;
const next = await redis.incr(key);
if (next === 1) {
await redis.expire(key, VERSION_TTL_SECONDS);
}
return next;
}
export async function bumpConfigVersion(): Promise<number> {
if (!isRedisEnabled()) return 1;
return incrWithTtl(redisKeys.stateVerConfig());
}
export async function bumpRoundVersion(intervalMinutes: number): Promise<number> {
if (!isRedisEnabled()) return 1;
return incrWithTtl(redisKeys.stateVerRound(intervalMinutes));
}
export async function bumpUserBetVersion(
userId: string,
intervalMinutes: number
): Promise<number> {
if (!isRedisEnabled() || !userId) return 1;
return incrWithTtl(redisKeys.stateVerUserBet(userId, intervalMinutes));
}
export async function bumpUserAutoVersion(userId: string): Promise<number> {
if (!isRedisEnabled() || !userId) return 1;
return incrWithTtl(redisKeys.stateVerUserAuto(userId));
}
/** Read current counters (cheap MGET). Missing keys → 0. Redis errors → null. */
export async function getStateVersions(input: {
userId?: string;
intervalMinutes: number;
}): Promise<StateVersions | null> {
if (!isRedisEnabled()) return null;
const redis = getRedisClient();
if (!redis) return null;
const configKey = redisKeys.stateVerConfig();
const roundKey = redisKeys.stateVerRound(input.intervalMinutes);
const betKey = input.userId
? redisKeys.stateVerUserBet(input.userId, input.intervalMinutes)
: null;
const autoKey = input.userId ? redisKeys.stateVerUserAuto(input.userId) : null;
const keys = [configKey, roundKey];
if (betKey) keys.push(betKey);
if (autoKey) keys.push(autoKey);
try {
const values = await redis.mget(...keys);
let i = 0;
const config = Number(values[i++] ?? 0) || 0;
const round = Number(values[i++] ?? 0) || 0;
const bet = betKey ? Number(values[i++] ?? 0) || 0 : 0;
const auto = autoKey ? Number(values[i++] ?? 0) || 0 : 0;
return { config, round, bet, auto };
} catch (e) {
console.error('[stateVersions] getStateVersions failed:', e);
return null;
}
}
/** Version-based ETag — stable across identical business versions. */
export function buildVersionEtag(input: {
versions: StateVersions;
intervalMinutes: number;
includeInternal: boolean;
}): string {
const { versions, intervalMinutes, includeInternal } = input;
return `"cp-v-${versions.config}-${versions.round}-${versions.bet}-${versions.auto}-${intervalMinutes}-${includeInternal ? 1 : 0}"`;
}
export function parseVersionEtag(etag: string): {
config: number;
round: number;
bet: number;
auto: number;
intervalMinutes: number;
includeInternal: boolean;
} | null {
const match = etag
.trim()
.match(/^"cp-v-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-([01])"$/);
if (!match) return null;
return {
config: Number(match[1]),
round: Number(match[2]),
bet: Number(match[3]),
auto: Number(match[4]),
intervalMinutes: Number(match[5]),
includeInternal: match[6] === '1',
};
}
export async function bumpRoundVersionSafe(intervalMinutes: number): Promise<number | null> {
try {
return await bumpRoundVersion(intervalMinutes);
} catch (e) {
console.error('[stateVersions] bumpRound failed:', e);
return null;
}
}
export async function bumpConfigVersionSafe(): Promise<number | null> {
try {
return await bumpConfigVersion();
} catch (e) {
console.error('[stateVersions] bumpConfig failed:', e);
return null;
}
}
export async function bumpUserBetVersionSafe(
userId: string,
intervalMinutes: number
): Promise<number | null> {
try {
return await bumpUserBetVersion(userId, intervalMinutes);
} catch (e) {
console.error('[stateVersions] bumpBet failed:', e);
return null;
}
}
export async function bumpUserAutoVersionSafe(userId: string): Promise<number | null> {
try {
return await bumpUserAutoVersion(userId);
} catch (e) {
console.error('[stateVersions] bumpAuto failed:', e);
return null;
}
}

View File

@ -95,6 +95,7 @@ export class GameWsHub {
type: 'bet.accepted', type: 'bet.accepted',
bet: (event.payload.bet as Record<string, unknown>) ?? {}, bet: (event.payload.bet as Record<string, unknown>) ?? {},
...(idempotencyKey ? { idempotencyKey } : {}), ...(idempotencyKey ? { idempotencyKey } : {}),
versions: event.payload.versions as { bet?: number; auto?: number } | undefined,
}); });
} else if (event.type === 'bet.rejected') { } else if (event.type === 'bet.rejected') {
const idempotencyKey = String(event.payload.idempotencyKey ?? '').trim(); const idempotencyKey = String(event.payload.idempotencyKey ?? '').trim();
@ -109,6 +110,13 @@ export class GameWsHub {
intervalMinutes: Number(event.payload.intervalMinutes ?? 0), intervalMinutes: Number(event.payload.intervalMinutes ?? 0),
userMultiBet: userMultiBet:
(event.payload.userMultiBet as Record<string, unknown> | null | undefined) ?? null, (event.payload.userMultiBet as Record<string, unknown> | null | undefined) ?? null,
versions: event.payload.versions as { bet?: number } | undefined,
});
} else if (event.type === 'auto.updated') {
this.send(client, {
type: 'auto.updated',
autoSettings: (event.payload.autoSettings as Record<string, unknown>) ?? {},
versions: event.payload.versions as { auto?: number } | undefined,
}); });
} }
} }
@ -131,6 +139,7 @@ export class GameWsHub {
type: 'round.updated', type: 'round.updated',
intervalMinutes: intervalMinutes ?? 0, intervalMinutes: intervalMinutes ?? 0,
round, round,
versions: event.payload.versions as { round?: number } | undefined,
}); });
} else if (event.type === 'round.settled') { } else if (event.type === 'round.settled') {
this.send(client, { this.send(client, {
@ -138,6 +147,7 @@ export class GameWsHub {
intervalMinutes: intervalMinutes ?? 0, intervalMinutes: intervalMinutes ?? 0,
round, round,
candle: event.payload.candle as Record<string, unknown> | undefined, candle: event.payload.candle as Record<string, unknown> | undefined,
versions: event.payload.versions as { round?: number } | undefined,
}); });
} else if (event.type === 'candle.append') { } else if (event.type === 'candle.append') {
this.send(client, { this.send(client, {
@ -149,6 +159,7 @@ export class GameWsHub {
this.send(client, { this.send(client, {
type: 'config.updated', type: 'config.updated',
intervalMinutes: intervalMinutes ?? 0, intervalMinutes: intervalMinutes ?? 0,
versions: event.payload.versions as { config?: number } | undefined,
}); });
} }
} }

View File

@ -18,23 +18,40 @@ export type WsClientMessage =
export type WsServerMessage = export type WsServerMessage =
| { type: 'pong'; ts: number } | { type: 'pong'; ts: number }
| { type: 'subscribed'; intervalMinutes: number; snapshot: GameStateSnapshot } | { type: 'subscribed'; intervalMinutes: number; snapshot: GameStateSnapshot }
| { type: 'round.updated'; intervalMinutes: number; round: Record<string, unknown> } | {
type: 'round.updated';
intervalMinutes: number;
round: Record<string, unknown>;
versions?: { round?: number };
}
| { | {
type: 'round.settled'; type: 'round.settled';
intervalMinutes: number; intervalMinutes: number;
round: Record<string, unknown>; round: Record<string, unknown>;
candle?: Record<string, unknown>; candle?: Record<string, unknown>;
versions?: { round?: number };
} }
| { type: 'candle.append'; intervalMinutes: number; candle: Record<string, unknown> } | { type: 'candle.append'; intervalMinutes: number; candle: Record<string, unknown> }
| { type: 'bet.accepted'; bet: Record<string, unknown>; idempotencyKey?: string } | {
type: 'bet.accepted';
bet: Record<string, unknown>;
idempotencyKey?: string;
versions?: { bet?: number; auto?: number };
}
| { type: 'bet.pending'; idempotencyKey: string } | { type: 'bet.pending'; idempotencyKey: string }
| { type: 'bet.rejected'; idempotencyKey: string; error: string } | { type: 'bet.rejected'; idempotencyKey: string; error: string }
| { | {
type: 'multi.updated'; type: 'multi.updated';
intervalMinutes: number; intervalMinutes: number;
userMultiBet: Record<string, unknown> | null; userMultiBet: Record<string, unknown> | null;
versions?: { bet?: number };
} }
| { type: 'config.updated'; intervalMinutes: number } | {
type: 'auto.updated';
autoSettings: Record<string, unknown>;
versions?: { auto?: number };
}
| { type: 'config.updated'; intervalMinutes: number; versions?: { config?: number } }
| { type: 'error'; code: string; message: string }; | { type: 'error'; code: string; message: string };
export function parseClientMessage(raw: string): WsClientMessage | null { export function parseClientMessage(raw: string): WsClientMessage | null {

View File

@ -1151,10 +1151,15 @@ export type DailyRevenueRow = {
/** Advisory lock key for serializing daily-revenue reads/updates across settlements. */ /** Advisory lock key for serializing daily-revenue reads/updates across settlements. */
const DAILY_REVENUE_ADVISORY_LOCK = 87231401; const DAILY_REVENUE_ADVISORY_LOCK = 87231401;
/** Max time (ms) to wait for the advisory lock before giving up. */
const DAILY_REVENUE_LOCK_TIMEOUT_MS = 15_000;
export async function withDailyRevenueLock<T>(fn: () => Promise<T>): Promise<T> { export async function withDailyRevenueLock<T>(fn: () => Promise<T>): Promise<T> {
const client = await getClient(); const client = await getClient();
try { try {
await client.query('BEGIN'); await client.query('BEGIN');
await client.query(`SET LOCAL lock_timeout = ${DAILY_REVENUE_LOCK_TIMEOUT_MS}`);
await client.query(`SET LOCAL statement_timeout = 60000`);
await client.query('SELECT pg_advisory_xact_lock($1)', [DAILY_REVENUE_ADVISORY_LOCK]); await client.query('SELECT pg_advisory_xact_lock($1)', [DAILY_REVENUE_ADVISORY_LOCK]);
const result = await fn(); const result = await fn();
await client.query('COMMIT'); await client.query('COMMIT');

View File

@ -6,6 +6,7 @@ import { queueUserAdminStatsRefresh } from './userAdminStatsService';
import * as predictionAuditService from './predictionAuditService'; import * as predictionAuditService from './predictionAuditService';
import { config } from '../config'; import { config } from '../config';
import { publishUserEvent } from '../realtime/redis/pubsub'; import { publishUserEvent } from '../realtime/redis/pubsub';
import { bumpUserBetVersionSafe } from '../realtime/redis/stateVersions';
type AccountKind = 'main' | 'bonus' | 'test'; type AccountKind = 'main' | 'bonus' | 'test';
@ -110,11 +111,13 @@ async function notifyMultiBetUpdate(
userMultiBet: ReturnType<typeof mapMultiBet> | null userMultiBet: ReturnType<typeof mapMultiBet> | null
): Promise<void> { ): Promise<void> {
if (!config.redis.enabled) return; if (!config.redis.enabled) return;
const betVersion = await bumpUserBetVersionSafe(userId, intervalMinutes);
await publishUserEvent(userId, { await publishUserEvent(userId, {
type: 'multi.updated', type: 'multi.updated',
payload: { payload: {
intervalMinutes, intervalMinutes,
userMultiBet: userMultiBet as unknown as Record<string, unknown> | null, userMultiBet: userMultiBet as unknown as Record<string, unknown> | null,
...(betVersion != null ? { versions: { bet: betVersion } } : {}),
}, },
}); });
} }

Some files were not shown because too many files have changed in this diff Show More