Reduce frontend polling load and clean stale UI hooks
This commit is contained in:
@@ -1,8 +1,14 @@
|
|||||||
|
using System.Collections.Concurrent;
|
||||||
|
|
||||||
namespace GameList.Endpoints;
|
namespace GameList.Endpoints;
|
||||||
|
|
||||||
internal static class SuggestionValidator
|
internal static class SuggestionValidator
|
||||||
{
|
{
|
||||||
public static async Task<string?> ValidateAsync(SuggestionInput input, IHttpClientFactory httpFactory)
|
private static readonly ConcurrentDictionary<string, (bool Reachable, DateTimeOffset ExpiresAt)> ImageReachabilityCache = new(StringComparer.OrdinalIgnoreCase);
|
||||||
|
private static readonly TimeSpan ReachableCacheTtl = TimeSpan.FromMinutes(15);
|
||||||
|
private static readonly TimeSpan UnreachableCacheTtl = TimeSpan.FromMinutes(2);
|
||||||
|
|
||||||
|
public static async Task<string?> ValidateAsync(SuggestionInput input, IHttpClientFactory httpFactory, bool shouldValidateImageReachability = true)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrWhiteSpace(input.Name) || input.Name.Length > 100)
|
if (string.IsNullOrWhiteSpace(input.Name) || input.Name.Length > 100)
|
||||||
return "Name is required and must be <= 100 characters.";
|
return "Name is required and must be <= 100 characters.";
|
||||||
@@ -10,7 +16,7 @@ internal static class SuggestionValidator
|
|||||||
if (!EndpointHelpers.IsValidImageUrl(input.ScreenshotUrl))
|
if (!EndpointHelpers.IsValidImageUrl(input.ScreenshotUrl))
|
||||||
return "Screenshot URL must be http(s) and end with an image file extension.";
|
return "Screenshot URL must be http(s) and end with an image file extension.";
|
||||||
|
|
||||||
if (!await EndpointHelpers.IsReachableImageAsync(input.ScreenshotUrl, httpFactory))
|
if (shouldValidateImageReachability && !await IsReachableImageCachedAsync(input.ScreenshotUrl, httpFactory))
|
||||||
return "Screenshot URL could not be validated as an image. Use a public image link (http/https, no redirects, max 5 MB).";
|
return "Screenshot URL could not be validated as an image. Use a public image link (http/https, no redirects, max 5 MB).";
|
||||||
|
|
||||||
if (!EndpointHelpers.IsValidHttpUrl(input.GameUrl))
|
if (!EndpointHelpers.IsValidHttpUrl(input.GameUrl))
|
||||||
@@ -22,6 +28,21 @@ internal static class SuggestionValidator
|
|||||||
return ValidatePlayers(input.MinPlayers, input.MaxPlayers);
|
return ValidatePlayers(input.MinPlayers, input.MaxPlayers);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static async Task<bool> IsReachableImageCachedAsync(string? url, IHttpClientFactory httpFactory)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(url))
|
||||||
|
return true;
|
||||||
|
|
||||||
|
var normalized = url.Trim();
|
||||||
|
if (ImageReachabilityCache.TryGetValue(normalized, out var cached) && cached.ExpiresAt > DateTimeOffset.UtcNow)
|
||||||
|
return cached.Reachable;
|
||||||
|
|
||||||
|
var reachable = await EndpointHelpers.IsReachableImageAsync(normalized, httpFactory);
|
||||||
|
var ttl = reachable ? ReachableCacheTtl : UnreachableCacheTtl;
|
||||||
|
ImageReachabilityCache[normalized] = (reachable, DateTimeOffset.UtcNow.Add(ttl));
|
||||||
|
return reachable;
|
||||||
|
}
|
||||||
|
|
||||||
private static string? ValidatePlayers(int? minPlayers, int? maxPlayers)
|
private static string? ValidatePlayers(int? minPlayers, int? maxPlayers)
|
||||||
{
|
{
|
||||||
if (minPlayers is null && maxPlayers is null)
|
if (minPlayers is null && maxPlayers is null)
|
||||||
|
|||||||
@@ -145,10 +145,6 @@ internal sealed class SuggestionWorkflowService(AppDbContext db, IHttpClientFact
|
|||||||
|
|
||||||
public async Task<ServiceResult<SuggestionUpdatedResponse>> UpdateAsync(Guid playerId, int suggestionId, SuggestionInput input)
|
public async Task<ServiceResult<SuggestionUpdatedResponse>> UpdateAsync(Guid playerId, int suggestionId, SuggestionInput input)
|
||||||
{
|
{
|
||||||
var validationError = await SuggestionValidator.ValidateAsync(input, httpFactory);
|
|
||||||
if (validationError is not null)
|
|
||||||
return ServiceResult<SuggestionUpdatedResponse>.Failure(ServiceError.BadRequest(validationError));
|
|
||||||
|
|
||||||
var actor = await db.Players
|
var actor = await db.Players
|
||||||
.AsNoTracking()
|
.AsNoTracking()
|
||||||
.Where(p => p.Id == playerId)
|
.Where(p => p.Id == playerId)
|
||||||
@@ -162,6 +158,11 @@ internal sealed class SuggestionWorkflowService(AppDbContext db, IHttpClientFact
|
|||||||
if (suggestion == null)
|
if (suggestion == null)
|
||||||
return ServiceResult<SuggestionUpdatedResponse>.Failure(ServiceError.NotFound("Suggestion not found."));
|
return ServiceResult<SuggestionUpdatedResponse>.Failure(ServiceError.NotFound("Suggestion not found."));
|
||||||
|
|
||||||
|
var shouldValidateScreenshot = ShouldValidateScreenshotReachability(input.ScreenshotUrl, suggestion.ScreenshotUrl);
|
||||||
|
var validationError = await SuggestionValidator.ValidateAsync(input, httpFactory, shouldValidateScreenshot);
|
||||||
|
if (validationError is not null)
|
||||||
|
return ServiceResult<SuggestionUpdatedResponse>.Failure(ServiceError.BadRequest(validationError));
|
||||||
|
|
||||||
var isAdmin = actor.IsAdmin;
|
var isAdmin = actor.IsAdmin;
|
||||||
if (!isAdmin)
|
if (!isAdmin)
|
||||||
{
|
{
|
||||||
@@ -269,4 +270,10 @@ internal sealed class SuggestionWorkflowService(AppDbContext db, IHttpClientFact
|
|||||||
suggestion.MinPlayers = input.MinPlayers;
|
suggestion.MinPlayers = input.MinPlayers;
|
||||||
suggestion.MaxPlayers = input.MaxPlayers;
|
suggestion.MaxPlayers = input.MaxPlayers;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static bool ShouldValidateScreenshotReachability(string? requestedScreenshotUrl, string? existingScreenshotUrl)
|
||||||
|
{
|
||||||
|
var normalizedRequested = EndpointHelpers.TrimTo(requestedScreenshotUrl, 2048);
|
||||||
|
return !string.Equals(normalizedRequested, existingScreenshotUrl, StringComparison.Ordinal);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -348,6 +348,45 @@ public class SuggestionTests
|
|||||||
Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
|
Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task Update_does_not_revalidate_unchanged_screenshot_url()
|
||||||
|
{
|
||||||
|
await using var factory = new TestWebApplicationFactory();
|
||||||
|
var client = factory.CreateClientWithCookies();
|
||||||
|
await client.RegisterAsync("reval");
|
||||||
|
|
||||||
|
var create = await client.PostAsJsonAsync("/api/suggestions", new
|
||||||
|
{
|
||||||
|
Name = "Reachable once",
|
||||||
|
Genre = (string?)null,
|
||||||
|
Description = (string?)null,
|
||||||
|
ScreenshotUrl = "http://example.com/shot.png",
|
||||||
|
YoutubeUrl = (string?)null,
|
||||||
|
GameUrl = (string?)null,
|
||||||
|
MinPlayers = (int?)null,
|
||||||
|
MaxPlayers = (int?)null
|
||||||
|
});
|
||||||
|
create.EnsureSuccessStatusCode();
|
||||||
|
var createdPayload = await create.Content.ReadFromJsonAsync<JsonElement>();
|
||||||
|
var suggestionId = createdPayload.GetProperty("id").GetInt32();
|
||||||
|
|
||||||
|
factory.HttpHandler.SetResponder(_ => new HttpResponseMessage(HttpStatusCode.BadRequest));
|
||||||
|
|
||||||
|
var update = await client.PutAsJsonAsync($"/api/suggestions/{suggestionId}", new
|
||||||
|
{
|
||||||
|
Name = "Reachable once",
|
||||||
|
Genre = "Updated",
|
||||||
|
Description = (string?)null,
|
||||||
|
ScreenshotUrl = "http://example.com/shot.png",
|
||||||
|
YoutubeUrl = (string?)null,
|
||||||
|
GameUrl = (string?)null,
|
||||||
|
MinPlayers = (int?)null,
|
||||||
|
MaxPlayers = (int?)null
|
||||||
|
});
|
||||||
|
|
||||||
|
update.EnsureSuccessStatusCode();
|
||||||
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
public async Task Get_all_requires_vote_phase()
|
public async Task Get_all_requires_vote_phase()
|
||||||
{
|
{
|
||||||
|
|||||||
2
TESTS.md
2
TESTS.md
@@ -55,7 +55,7 @@ stateDiagram-v2
|
|||||||
- DB trigger also enforces suggestion cap for non-joker inserts, protecting against concurrent over-limit writes.
|
- DB trigger also enforces suggestion cap for non-joker inserts, protecting against concurrent over-limit writes.
|
||||||
- Joker path: when phase=Vote and HasJoker=true allows creation, consumes joker, resets VotesFinal for all players.
|
- Joker path: when phase=Vote and HasJoker=true allows creation, consumes joker, resets VotesFinal for all players.
|
||||||
- Phase gating: non-admin cannot create/update/delete outside Suggest (except joker create); admin bypasses phase checks for update/delete.
|
- Phase gating: non-admin cannot create/update/delete outside Suggest (except joker create); admin bypasses phase checks for update/delete.
|
||||||
- PUT /{id}: player can edit own in Suggest; name locked outside Suggest; admin can edit any time; validation mirrors create.
|
- PUT /{id}: player can edit own in Suggest; name locked outside Suggest; admin can edit any time; screenshot reachability check is skipped when screenshot URL is unchanged.
|
||||||
- DELETE /{id}: player deletes own in Suggest; admin any time; also breaks child links and deletes related votes.
|
- DELETE /{id}: player deletes own in Suggest; admin any time; also breaks child links and deletes related votes.
|
||||||
- GET /all: accessible from Vote+, orders by CreatedAt, includes link metadata, enforces phase mismatch before Vote.
|
- GET /all: accessible from Vote+, orders by CreatedAt, includes link metadata, enforces phase mismatch before Vote.
|
||||||
|
|
||||||
|
|||||||
@@ -4,8 +4,8 @@
|
|||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"lint": "eslint \"wwwroot/**/*.js\"",
|
"lint": "eslint \"wwwroot/**/*.js\"",
|
||||||
"format": "prettier --write \"eslint.config.js\" \"wwwroot/js/i18n.js\" \"wwwroot/js/{admin-ui,app-admin-handlers,app-auth-handlers,app-vote-nav-handlers,auth-ui,modals-ui,results-ui,suggestions-ui,ui-runtime,ui-utils,ui,votes-ui}.js\"",
|
"format": "prettier --write \"eslint.config.js\" \"wwwroot/**/*.js\"",
|
||||||
"format:check": "prettier --check \"eslint.config.js\" \"wwwroot/js/i18n.js\" \"wwwroot/js/{admin-ui,app-admin-handlers,app-auth-handlers,app-vote-nav-handlers,auth-ui,modals-ui,results-ui,suggestions-ui,ui-runtime,ui-utils,ui,votes-ui}.js\""
|
"format:check": "prettier --check \"eslint.config.js\" \"wwwroot/**/*.js\""
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/js": "9.21.0",
|
"@eslint/js": "9.21.0",
|
||||||
|
|||||||
@@ -1,4 +1,11 @@
|
|||||||
import { t, setLanguage, getLanguage, initI18n, onLanguageChange, faqMarkdown } from "./js/i18n.js";
|
import {
|
||||||
|
t,
|
||||||
|
setLanguage,
|
||||||
|
getLanguage,
|
||||||
|
initI18n,
|
||||||
|
onLanguageChange,
|
||||||
|
faqMarkdown,
|
||||||
|
} from "./js/i18n.js";
|
||||||
import { state, clearUserState } from "./js/state.js";
|
import { state, clearUserState } from "./js/state.js";
|
||||||
import { toast } from "./js/dom.js";
|
import { toast } from "./js/dom.js";
|
||||||
import {
|
import {
|
||||||
@@ -15,19 +22,18 @@ import {
|
|||||||
updatePhaseNav,
|
updatePhaseNav,
|
||||||
configureUiRuntime,
|
configureUiRuntime,
|
||||||
} from "./js/ui.js";
|
} from "./js/ui.js";
|
||||||
import {
|
import { loadSuggestData, loadVoteData, refreshPhaseData } from "./js/data.js";
|
||||||
loadSuggestData,
|
|
||||||
loadVoteData,
|
|
||||||
refreshPhaseData,
|
|
||||||
} from "./js/data.js";
|
|
||||||
import { setupAuthHandlers } from "./js/app-auth-handlers.js";
|
import { setupAuthHandlers } from "./js/app-auth-handlers.js";
|
||||||
import { setupAdminHandlers } from "./js/app-admin-handlers.js";
|
import { setupAdminHandlers } from "./js/app-admin-handlers.js";
|
||||||
import { setupVoteNavigationHandlers } from "./js/app-vote-nav-handlers.js";
|
import { setupVoteNavigationHandlers } from "./js/app-vote-nav-handlers.js";
|
||||||
|
|
||||||
const REFRESH_INTERVAL_MS = 4000;
|
const REFRESH_MIN_MS = 3000;
|
||||||
|
const REFRESH_MAX_MS = 20000;
|
||||||
let refreshInFlight = null;
|
let refreshInFlight = null;
|
||||||
let refreshTimerId = null;
|
let refreshTimerId = null;
|
||||||
let refreshSchedulerStarted = false;
|
let refreshSchedulerStarted = false;
|
||||||
|
let unchangedRefreshCycles = 0;
|
||||||
|
let nextRefreshDelayMs = REFRESH_MIN_MS;
|
||||||
|
|
||||||
async function runSerializedRefresh() {
|
async function runSerializedRefresh() {
|
||||||
if (refreshInFlight) return refreshInFlight;
|
if (refreshInFlight) return refreshInFlight;
|
||||||
@@ -39,8 +45,11 @@ async function runSerializedRefresh() {
|
|||||||
|
|
||||||
async function refreshWithUiErrorHandling() {
|
async function refreshWithUiErrorHandling() {
|
||||||
try {
|
try {
|
||||||
await runSerializedRefresh();
|
const changed = await runSerializedRefresh();
|
||||||
|
updateRefreshCadence(changed === true);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
// Back off after transient failures to avoid hammering server/dependencies.
|
||||||
|
nextRefreshDelayMs = Math.min(nextRefreshDelayMs * 2, REFRESH_MAX_MS);
|
||||||
if (!handleAuthError(err, clearUserState)) toast(err.message, true);
|
if (!handleAuthError(err, clearUserState)) toast(err.message, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -51,7 +60,7 @@ function scheduleNextRefresh() {
|
|||||||
await refreshWithUiErrorHandling();
|
await refreshWithUiErrorHandling();
|
||||||
}
|
}
|
||||||
scheduleNextRefresh();
|
scheduleNextRefresh();
|
||||||
}, REFRESH_INTERVAL_MS);
|
}, nextRefreshDelayMs);
|
||||||
}
|
}
|
||||||
|
|
||||||
function startRefreshScheduler() {
|
function startRefreshScheduler() {
|
||||||
@@ -60,6 +69,8 @@ function startRefreshScheduler() {
|
|||||||
|
|
||||||
document.addEventListener("visibilitychange", () => {
|
document.addEventListener("visibilitychange", () => {
|
||||||
if (!document.hidden && !state.adminStatusSelectActive) {
|
if (!document.hidden && !state.adminStatusSelectActive) {
|
||||||
|
unchangedRefreshCycles = 0;
|
||||||
|
nextRefreshDelayMs = baseRefreshDelayForPhase();
|
||||||
refreshWithUiErrorHandling();
|
refreshWithUiErrorHandling();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -70,6 +81,32 @@ function startRefreshScheduler() {
|
|||||||
scheduleNextRefresh();
|
scheduleNextRefresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function updateRefreshCadence(changed) {
|
||||||
|
const base = baseRefreshDelayForPhase();
|
||||||
|
if (changed) {
|
||||||
|
unchangedRefreshCycles = 0;
|
||||||
|
nextRefreshDelayMs = base;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
unchangedRefreshCycles = Math.min(unchangedRefreshCycles + 1, 8);
|
||||||
|
const growth = Math.pow(1.35, unchangedRefreshCycles);
|
||||||
|
nextRefreshDelayMs = Math.min(Math.round(base * growth), REFRESH_MAX_MS);
|
||||||
|
}
|
||||||
|
|
||||||
|
function baseRefreshDelayForPhase() {
|
||||||
|
switch (state.phase) {
|
||||||
|
case "Vote":
|
||||||
|
return REFRESH_MIN_MS;
|
||||||
|
case "Suggest":
|
||||||
|
return 5000;
|
||||||
|
case "Results":
|
||||||
|
return 7000;
|
||||||
|
default:
|
||||||
|
return 5000;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
configureUiRuntime({
|
configureUiRuntime({
|
||||||
refreshPhaseData: runSerializedRefresh,
|
refreshPhaseData: runSerializedRefresh,
|
||||||
loadSuggestData,
|
loadSuggestData,
|
||||||
@@ -127,7 +164,9 @@ function updateLanguageButtons() {
|
|||||||
function setupLanguageSwitchers() {
|
function setupLanguageSwitchers() {
|
||||||
const switches = document.querySelectorAll(".lang-switch");
|
const switches = document.querySelectorAll(".lang-switch");
|
||||||
const closeAll = () =>
|
const closeAll = () =>
|
||||||
switches.forEach((wrap) => wrap.querySelector(".lang-menu")?.classList.add("hidden"));
|
switches.forEach((wrap) =>
|
||||||
|
wrap.querySelector(".lang-menu")?.classList.add("hidden"),
|
||||||
|
);
|
||||||
|
|
||||||
switches.forEach((wrap) => {
|
switches.forEach((wrap) => {
|
||||||
const btn = wrap.querySelector(".lang-button");
|
const btn = wrap.querySelector(".lang-button");
|
||||||
@@ -162,10 +201,7 @@ function markdownToHtml(md) {
|
|||||||
let inParagraph = false;
|
let inParagraph = false;
|
||||||
|
|
||||||
const escapeHtml = (text) =>
|
const escapeHtml = (text) =>
|
||||||
text
|
text.replace(/&/g, "&").replace(/</g, "<").replace(/>/g, ">");
|
||||||
.replace(/&/g, "&")
|
|
||||||
.replace(/</g, "<")
|
|
||||||
.replace(/>/g, ">");
|
|
||||||
|
|
||||||
const formatInline = (text) =>
|
const formatInline = (text) =>
|
||||||
escapeHtml(text)
|
escapeHtml(text)
|
||||||
@@ -257,7 +293,11 @@ function openFaqModal() {
|
|||||||
|
|
||||||
const close = () => overlay.remove();
|
const close = () => overlay.remove();
|
||||||
overlay.addEventListener("click", (e) => {
|
overlay.addEventListener("click", (e) => {
|
||||||
if (e.target.classList.contains("edit-modal") || e.target.classList.contains("lightbox-close")) close();
|
if (
|
||||||
|
e.target.classList.contains("edit-modal") ||
|
||||||
|
e.target.classList.contains("lightbox-close")
|
||||||
|
)
|
||||||
|
close();
|
||||||
});
|
});
|
||||||
|
|
||||||
overlay.appendChild(panel);
|
overlay.appendChild(panel);
|
||||||
|
|||||||
@@ -99,6 +99,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<main class="grid">
|
<main class="grid">
|
||||||
|
|||||||
@@ -22,8 +22,11 @@ async function request(path, { method = "GET", body } = {}) {
|
|||||||
let msg = `${res.status}`;
|
let msg = `${res.status}`;
|
||||||
try {
|
try {
|
||||||
const data = await res.json();
|
const data = await res.json();
|
||||||
msg = data.error || data.detail || data.title || JSON.stringify(data);
|
msg =
|
||||||
} catch { /* ignore */ }
|
data.error || data.detail || data.title || JSON.stringify(data);
|
||||||
|
} catch {
|
||||||
|
/* ignore */
|
||||||
|
}
|
||||||
const err = new Error(msg);
|
const err = new Error(msg);
|
||||||
err.status = res.status;
|
err.status = res.status;
|
||||||
throw err;
|
throw err;
|
||||||
@@ -35,19 +38,29 @@ export const api = {
|
|||||||
state: () => request("/api/state"),
|
state: () => request("/api/state"),
|
||||||
me: () => request("/api/me"),
|
me: () => request("/api/me"),
|
||||||
authOptions: () => request("/api/auth/options"),
|
authOptions: () => request("/api/auth/options"),
|
||||||
register: (payload) => request("/api/auth/register", { method: "POST", body: payload }),
|
register: (payload) =>
|
||||||
login: (payload) => request("/api/auth/login", { method: "POST", body: payload }),
|
request("/api/auth/register", { method: "POST", body: payload }),
|
||||||
|
login: (payload) =>
|
||||||
|
request("/api/auth/login", { method: "POST", body: payload }),
|
||||||
logout: () => request("/api/auth/logout", { method: "POST" }),
|
logout: () => request("/api/auth/logout", { method: "POST" }),
|
||||||
|
|
||||||
mySuggestions: () => request("/api/suggestions/mine"),
|
mySuggestions: () => request("/api/suggestions/mine"),
|
||||||
createSuggestion: (payload) => request("/api/suggestions", { method: "POST", body: payload }),
|
createSuggestion: (payload) =>
|
||||||
deleteSuggestion: (id) => request(`/api/suggestions/${id}`, { method: "DELETE" }),
|
request("/api/suggestions", { method: "POST", body: payload }),
|
||||||
updateSuggestion: (id, payload) => request(`/api/suggestions/${id}`, { method: "PUT", body: payload }),
|
deleteSuggestion: (id) =>
|
||||||
|
request(`/api/suggestions/${id}`, { method: "DELETE" }),
|
||||||
|
updateSuggestion: (id, payload) =>
|
||||||
|
request(`/api/suggestions/${id}`, { method: "PUT", body: payload }),
|
||||||
allSuggestions: () => request("/api/suggestions/all"),
|
allSuggestions: () => request("/api/suggestions/all"),
|
||||||
|
|
||||||
myVotes: () => request("/api/votes/mine"),
|
myVotes: () => request("/api/votes/mine"),
|
||||||
vote: (suggestionId, score) => request("/api/votes", { method: "POST", body: { suggestionId, score } }),
|
vote: (suggestionId, score) =>
|
||||||
finalizeVotes: (final) => request("/api/votes/finalize", { method: "POST", body: { final } }),
|
request("/api/votes", {
|
||||||
|
method: "POST",
|
||||||
|
body: { suggestionId, score },
|
||||||
|
}),
|
||||||
|
finalizeVotes: (final) =>
|
||||||
|
request("/api/votes/finalize", { method: "POST", body: { final } }),
|
||||||
|
|
||||||
results: () => request("/api/results"),
|
results: () => request("/api/results"),
|
||||||
nextPhase: () => request("/api/me/phase/next", { method: "POST" }),
|
nextPhase: () => request("/api/me/phase/next", { method: "POST" }),
|
||||||
@@ -55,27 +68,44 @@ export const api = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export const adminApi = {
|
export const adminApi = {
|
||||||
setResultsOpen: (resultsOpen) => request("/api/admin/results", { method: "POST", body: { resultsOpen } }),
|
setResultsOpen: (resultsOpen) =>
|
||||||
|
request("/api/admin/results", {
|
||||||
|
method: "POST",
|
||||||
|
body: { resultsOpen },
|
||||||
|
}),
|
||||||
voteStatus: () => request("/api/admin/vote-status"),
|
voteStatus: () => request("/api/admin/vote-status"),
|
||||||
reset: (password) =>
|
reset: (password) =>
|
||||||
request("/api/admin/reset", { method: "POST", body: { password } }),
|
request("/api/admin/reset", { method: "POST", body: { password } }),
|
||||||
factoryReset: (password) =>
|
factoryReset: (password) =>
|
||||||
request("/api/admin/factory-reset", { method: "POST", body: { password } }),
|
request("/api/admin/factory-reset", {
|
||||||
grantJoker: (playerId) => request("/api/admin/joker", { method: "POST", body: { playerId } }),
|
method: "POST",
|
||||||
|
body: { password },
|
||||||
|
}),
|
||||||
|
grantJoker: (playerId) =>
|
||||||
|
request("/api/admin/joker", { method: "POST", body: { playerId } }),
|
||||||
setPlayerAdmin: (playerId, isAdmin) =>
|
setPlayerAdmin: (playerId, isAdmin) =>
|
||||||
request("/api/admin/player-admin", {
|
request("/api/admin/player-admin", {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
body: { playerId, isAdmin },
|
body: { playerId, isAdmin },
|
||||||
}),
|
}),
|
||||||
setPlayerPhase: (playerId, phase) =>
|
setPlayerPhase: (playerId, phase) =>
|
||||||
request("/api/admin/player-phase", { method: "POST", body: { playerId, phase } }),
|
request("/api/admin/player-phase", {
|
||||||
|
method: "POST",
|
||||||
|
body: { playerId, phase },
|
||||||
|
}),
|
||||||
deletePlayer: (playerId, password) =>
|
deletePlayer: (playerId, password) =>
|
||||||
request(`/api/admin/players/${playerId}`, {
|
request(`/api/admin/players/${playerId}`, {
|
||||||
method: "DELETE",
|
method: "DELETE",
|
||||||
body: { password },
|
body: { password },
|
||||||
}),
|
}),
|
||||||
linkSuggestions: (sourceSuggestionId, targetSuggestionId) =>
|
linkSuggestions: (sourceSuggestionId, targetSuggestionId) =>
|
||||||
request("/api/admin/link-suggestions", { method: "POST", body: { sourceSuggestionId, targetSuggestionId } }),
|
request("/api/admin/link-suggestions", {
|
||||||
|
method: "POST",
|
||||||
|
body: { sourceSuggestionId, targetSuggestionId },
|
||||||
|
}),
|
||||||
unlinkSuggestions: (suggestionId) =>
|
unlinkSuggestions: (suggestionId) =>
|
||||||
request("/api/admin/unlink-suggestions", { method: "POST", body: { suggestionId } }),
|
request("/api/admin/unlink-suggestions", {
|
||||||
|
method: "POST",
|
||||||
|
body: { suggestionId },
|
||||||
|
}),
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -114,6 +114,7 @@ function setupLoginFormHandlers({
|
|||||||
if (err?.status === 401)
|
if (err?.status === 401)
|
||||||
return toast(t("auth.invalidCredentials"), true);
|
return toast(t("auth.invalidCredentials"), true);
|
||||||
if (handleAuthError(err, clearUserState)) return;
|
if (handleAuthError(err, clearUserState)) return;
|
||||||
|
toast(err?.message || t("toast.unexpected"), true);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,20 @@
|
|||||||
import { api, adminApi } from "./api.js";
|
import { api, adminApi } from "./api.js";
|
||||||
import { handleAuthError, renderAllSuggestions, renderCounts, renderMySuggestions, renderPhasePill, renderPhaseTitles, renderResults, renderVotes, renderWelcome, setAuthUI, syncVoteScores, updatePhaseNav, openResultsRelockModal, openSuggestionsChangedModal } from "./ui.js";
|
import {
|
||||||
|
handleAuthError,
|
||||||
|
renderAllSuggestions,
|
||||||
|
renderCounts,
|
||||||
|
renderMySuggestions,
|
||||||
|
renderPhasePill,
|
||||||
|
renderPhaseTitles,
|
||||||
|
renderResults,
|
||||||
|
renderVotes,
|
||||||
|
renderWelcome,
|
||||||
|
setAuthUI,
|
||||||
|
syncVoteScores,
|
||||||
|
updatePhaseNav,
|
||||||
|
openResultsRelockModal,
|
||||||
|
openSuggestionsChangedModal,
|
||||||
|
} from "./ui.js";
|
||||||
import { state, clearUserState } from "./state.js";
|
import { state, clearUserState } from "./state.js";
|
||||||
|
|
||||||
export async function loadState() {
|
export async function loadState() {
|
||||||
@@ -86,18 +101,26 @@ export async function loadResults() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function refreshPhaseData() {
|
export async function refreshPhaseData() {
|
||||||
|
const before = buildRefreshSnapshot();
|
||||||
try {
|
try {
|
||||||
const prevPhase = state.phase;
|
const prevPhase = state.phase;
|
||||||
const prevResultsOpen = state.resultsOpen;
|
const prevResultsOpen = state.resultsOpen;
|
||||||
await loadState();
|
await loadState();
|
||||||
await Promise.all([loadSuggestData(), loadSuggestionsData(), loadResults()]);
|
await Promise.all([
|
||||||
|
loadSuggestData(),
|
||||||
|
loadSuggestionsData(),
|
||||||
|
loadResults(),
|
||||||
|
]);
|
||||||
if (state.phase === "Vote") {
|
if (state.phase === "Vote") {
|
||||||
if (!state.votesRendered) await loadVoteData();
|
if (!state.votesRendered) await loadVoteData();
|
||||||
} else {
|
} else {
|
||||||
state.votesRendered = false;
|
state.votesRendered = false;
|
||||||
await loadVoteData();
|
await loadVoteData();
|
||||||
}
|
}
|
||||||
if (state.me?.isAdmin) {
|
const adminCard = document.getElementById("admin-card");
|
||||||
|
const adminPanelVisible =
|
||||||
|
!!adminCard && !adminCard.classList.contains("hidden");
|
||||||
|
if (state.me?.isAdmin && adminPanelVisible) {
|
||||||
state.adminVoteStatus = await adminApi.voteStatus();
|
state.adminVoteStatus = await adminApi.voteStatus();
|
||||||
}
|
}
|
||||||
if (
|
if (
|
||||||
@@ -109,12 +132,34 @@ export async function refreshPhaseData() {
|
|||||||
openResultsRelockModal();
|
openResultsRelockModal();
|
||||||
}
|
}
|
||||||
updatePhaseNav();
|
updatePhaseNav();
|
||||||
|
const after = buildRefreshSnapshot();
|
||||||
|
return before !== after;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
if (handleAuthError(err, clearUserState)) return;
|
if (handleAuthError(err, clearUserState)) return;
|
||||||
throw err;
|
throw err;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function buildRefreshSnapshot() {
|
||||||
|
return JSON.stringify({
|
||||||
|
phase: state.phase,
|
||||||
|
resultsOpen: state.resultsOpen,
|
||||||
|
votesFinal: state.votesFinal,
|
||||||
|
hasJoker: state.hasJoker,
|
||||||
|
counts: state.counts
|
||||||
|
? [
|
||||||
|
state.counts.players,
|
||||||
|
state.counts.suggestions,
|
||||||
|
state.counts.votes,
|
||||||
|
]
|
||||||
|
: null,
|
||||||
|
mineCount: state.mySuggestions?.length ?? 0,
|
||||||
|
allSig: state.allSuggestionsSig ?? "",
|
||||||
|
voteCount: state.myVotes?.length ?? 0,
|
||||||
|
resultsCount: state.results?.length ?? 0,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
export function signatureSuggestions(list) {
|
export function signatureSuggestions(list) {
|
||||||
return JSON.stringify(
|
return JSON.stringify(
|
||||||
list.map((s) => [
|
list.map((s) => [
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
export const $ = (id) => document.getElementById(id);
|
export const $ = (id) => document.getElementById(id);
|
||||||
|
|
||||||
const toastEl = typeof document !== "undefined" ? document.getElementById("toast") : null;
|
const toastEl =
|
||||||
|
typeof document !== "undefined" ? document.getElementById("toast") : null;
|
||||||
|
|
||||||
export function toast(msg, isError = false) {
|
export function toast(msg, isError = false) {
|
||||||
if (!toastEl) return;
|
if (!toastEl) return;
|
||||||
|
|||||||
@@ -49,16 +49,6 @@ export function renderMySuggestions() {
|
|||||||
|
|
||||||
export function renderAllSuggestions() {
|
export function renderAllSuggestions() {
|
||||||
renderAdminLinker();
|
renderAdminLinker();
|
||||||
const list = $("all-suggestions");
|
|
||||||
if (!list) return;
|
|
||||||
list.innerHTML = "";
|
|
||||||
const allowEdit = true;
|
|
||||||
const allowDelete = !!state.me?.isAdmin;
|
|
||||||
sortByName(state.allSuggestions).forEach((s) =>
|
|
||||||
list.appendChild(
|
|
||||||
buildCard(s, { showAuthor: true, allowEdit, allowDelete }),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
renderPhaseTitles();
|
renderPhaseTitles();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -261,15 +261,6 @@ export function updatePhaseNav() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const voteNext = $("nav-vote-next");
|
|
||||||
if (voteNext) {
|
|
||||||
const locked = !state.resultsOpen && !isAdmin;
|
|
||||||
voteNext.disabled = locked;
|
|
||||||
voteNext.textContent = locked
|
|
||||||
? t("nav.waitingForResults")
|
|
||||||
: t("nav.next");
|
|
||||||
}
|
|
||||||
|
|
||||||
const adminResultsToggle = $("results-open");
|
const adminResultsToggle = $("results-open");
|
||||||
if (adminResultsToggle) {
|
if (adminResultsToggle) {
|
||||||
adminResultsToggle.textContent = state.resultsOpen
|
adminResultsToggle.textContent = state.resultsOpen
|
||||||
|
|||||||
Reference in New Issue
Block a user