Skip to content

Simplify scheduleDealSolve control flow #381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tameware merged 2 commits into from
Sep 15, 2026
+9 −32
Merged

Simplify scheduleDealSolve control flow #381

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa4e97d
Unroll the two-card owner loop in parseDlmBoardPayload.
tameware Sep 15, 2026
91b2996
Simplify scheduleDealSolve by dropping the impossible queued TOCTOU d…
tameware Sep 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 9 additions & 32 deletions web/dds_web.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,8 @@ function scheduleDealSolve() {
dealSolvePending = false;

await refreshDdTable();

if (epoch !== dealSolveEpoch) {
// Invalidation alone must not restart work; only a newer
// Invalidation alone must not restart; only a newer
// scheduleDealSolve (pending) should continue. A pending
// debounce will start a fresh job when it fires.
if (dealSolvePending) {
Expand All @@ -189,30 +188,13 @@ function scheduleDealSolve() {
updateHandCardDisplays(collectHands());
}

if (epoch !== dealSolveEpoch) {
if (dealSolvePending) {
continue;
}
break;
}

// Release the gate only once the epoch is stable; if a schedule
// sneaks in between the check and the clear, take the flag back
// and loop again instead of dropping the trailing request.
dealSolveQueued = false;

if (epoch !== dealSolveEpoch) {
dealSolveQueued = true;
if (dealSolvePending) {
continue;
}
break;
// Stale+pending → another iteration; else exit (success or
// invalidate). Gate release lives in finally.
if (epoch !== dealSolveEpoch && dealSolvePending) {
continue;
}

break;
}
} catch (err) {
throw err;
} finally {
const restart = dealSolvePending;
dealSolveQueued = false;
Expand Down Expand Up @@ -657,15 +639,10 @@ function parseDlmBoardPayload(letters) {
return null;
}
const [firstCard, secondCard] = pairs[i];
const owners = [
firstOwner.charAt(code),
secondOwner.charAt(code),
];
const cards = [firstCard, secondCard];
for (let j = 0; j < 2; j++) {
const direction = DIR_FROM_LETTER[owners[j]];
byDirection[direction][cards[j].charAt(0)] += cards[j].charAt(1);
}
const firstDirection = DIR_FROM_LETTER[firstOwner.charAt(code)];
byDirection[firstDirection][firstCard.charAt(0)] += firstCard.charAt(1);
const secondDirection = DIR_FROM_LETTER[secondOwner.charAt(code)];
byDirection[secondDirection][secondCard.charAt(0)] += secondCard.charAt(1);
}

return dealFromDirectionMap({
Expand Down