All checks were successful
Deploy / deploy (push) Successful in 30s
Full read-through of the project. Grouped by what actually breaks:
Browser concurrency (the invariant the design rests on)
- Every Playwright session now goes through scheduler.submit() onto the
single worker queue. "Refresh Rules", cookie import and the boot sync
were calling automation.py directly from Flask request threads, so
with gunicorn's threads=4 a refresh during a scheduled run opened a
second Chromium and both wrote /data/auth_state.json — which
Playwright writes itself, non-atomically. A torn write there reads
back as "session expired" and costs a pointless cookie re-import.
- Request handlers that need a result use run_browser_task(), which
waits REQUEST_WAIT_SECONDS (90) then raises BrowserBusy -> 503
without cancelling the work. Previously a slow in-request scrape could
exceed gunicorn's 120s timeout; killing that worker takes the
APScheduler jobstore and run queue with it, silently dropping every
pending verification poll.
Verification correctness (the feature that exists to catch silent failures)
- run_rule() no longer starts a poll loop when the watermark capture
itself failed. watermark_id was None both for "capture failed" and
"rule has no prior activity", and check_completion() skips its
comparison on None — so a failed capture matched the *previous* run's
Complete entry and reported a false "verified", the exact class of bug
the verification step was added to catch.
- A refresh now reconciles schedules.json against the live rule list.
Rule ids are stable, names are not, and the cached name is what the
Activity-page match keys on: a renamed rule kept running while
reporting "Not Confirmed" forever, training you to ignore the signal.
A deleted rule was worse — its card disappears while its cron jobs
keep firing, with no UI left to disable them. Skipped on an empty
scrape so a MassPrice redesign can't delete every saved schedule.
- The dashboard's session banner reads a session_state.json flag set by
_ensure_authenticated() instead of guessing from run_history.json.
list_rules() writes no history entry, so a failed refresh — often the
first symptom — never raised the banner, despite the docs saying it
covered "run/refresh".
Scheduler robustness
- rebuild_jobs() parses and adds each entry under its own guard. It runs
*after* clearing existing jobs, so one malformed entry escaping as an
exception left the scheduler holding no jobs at all — every schedule
silently dead until the next restart. _parse_entry() also accepts
HH:MM:SS (some browsers emit seconds, which the old two-value unpack
crashed on) and range-checks hour/minute.
- The API validates entries at save time rather than storing something
every rebuild skips, and the frontend surfaces save failures instead
of discarding them.
- An unknown TZ logs and falls back to UTC instead of crash-looping the
container with a traceback that doesn't obviously point at .env.
Auth and web hygiene
- Empty-but-set LOGIN_PASSWORD/SECRET_KEY now fall back to their
defaults. docker-compose always sets these, so a blank .env value
arrived as "" — and compare_digest("", "") is True, i.e. no login at
all. An empty submitted password is rejected outright too.
- Password compared as bytes: compare_digest raises TypeError on
non-ASCII str, turning any accented character into a 500.
- CSRF token per session, in a meta tag, echoed as X-CSRF-Token on all
four POST endpoints; explicit SameSite=Lax/HttpOnly.
- /api/* answers 401 instead of redirecting. fetch() follows a 302 to
/login, gets 200 HTML, and reads it as success — "Run Now" reported
"Queued" for runs that were never queued.
- ?next= is restricted to local paths (open redirect).
Smaller correctness fixes
- Timestamps render in TZ via a localtime filter; they were shown as raw
UTC while schedules run in America/Phoenix.
- Activity's 24h filter excludes unparseable timestamps rather than
including them, and treats naive values as UTC instead of raising.
- SameSite=None cookies are forced Secure — Chromium drops them
otherwise, silently, possibly losing the one cookie carrying the login.
- The Activity selector escapes the rule name, so a name containing a
quote no longer produces an unparseable selector.
- pytz pinned explicitly; it only ever resolved as an apscheduler 3.x
transitive dep, which 4.x drops.
Docs corrected where they disagreed with the code: auth_state.json is
written by Playwright, not through storage.py's atomic helper; the
banner's real trigger; and the deploy skill's claim that a rename causes
"rule id not found" (it can't — schedules are keyed by the stable id).
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01H6TgffxTvYhqxykAbVQg2v
174 lines
6 KiB
JavaScript
174 lines
6 KiB
JavaScript
// Every state-changing call carries the per-session CSRF token from the
|
|
// <meta> tag in _shell.html; the API rejects a POST without it.
|
|
function csrfHeaders(extra) {
|
|
const meta = document.querySelector('meta[name="csrf-token"]');
|
|
return Object.assign({}, extra || {}, { "X-CSRF-Token": meta ? meta.content : "" });
|
|
}
|
|
|
|
// Single door for the JSON API. Returns {ok} on success, or
|
|
// {ok: false, error, handled} — `handled` meaning it already told the
|
|
// user and is navigating away, so the caller should stay quiet.
|
|
// A dead login session answers 401 rather than redirecting (see
|
|
// login_required in app.py), which is what makes it distinguishable
|
|
// from a real success here.
|
|
async function apiPost(url, body) {
|
|
const headers = csrfHeaders(body ? { "Content-Type": "application/json" } : {});
|
|
let res;
|
|
try {
|
|
res = await fetch(url, {
|
|
method: "POST",
|
|
headers,
|
|
body: body ? JSON.stringify(body) : undefined,
|
|
});
|
|
} catch (err) {
|
|
return { ok: false, error: "Couldn't reach the server" };
|
|
}
|
|
if (res.status === 401) {
|
|
alert("Your login session expired — returning to the login page.");
|
|
window.location.reload();
|
|
return { ok: false, error: "signed out", handled: true };
|
|
}
|
|
if (res.ok) return { ok: true };
|
|
const data = await res.json().catch(() => ({}));
|
|
return { ok: false, error: data.error || `Request failed (${res.status})` };
|
|
}
|
|
|
|
document.addEventListener("DOMContentLoaded", () => {
|
|
const refreshBtn = document.getElementById("refresh-rules");
|
|
if (refreshBtn) {
|
|
refreshBtn.addEventListener("click", async () => {
|
|
refreshBtn.disabled = true;
|
|
const original = refreshBtn.textContent;
|
|
refreshBtn.textContent = "Refreshing…";
|
|
try {
|
|
const out = await apiPost("/api/rules/refresh");
|
|
if (!out.ok) {
|
|
if (!out.handled) alert("Refresh failed: " + out.error);
|
|
return;
|
|
}
|
|
window.location.reload();
|
|
} finally {
|
|
refreshBtn.disabled = false;
|
|
refreshBtn.textContent = original;
|
|
}
|
|
});
|
|
}
|
|
|
|
document.querySelectorAll(".rule-card").forEach(initRuleCard);
|
|
initSessionControls();
|
|
});
|
|
|
|
function initSessionControls() {
|
|
const importBtn = document.getElementById("session-import");
|
|
const textarea = document.getElementById("cookie-paste");
|
|
if (!importBtn) return; // not on the Session page
|
|
|
|
importBtn.addEventListener("click", async () => {
|
|
const original = importBtn.textContent;
|
|
importBtn.disabled = true;
|
|
importBtn.textContent = "Verifying…";
|
|
try {
|
|
const out = await apiPost("/api/session/import", { cookies: textarea.value });
|
|
if (!out.ok) {
|
|
if (!out.handled) alert(out.error);
|
|
return;
|
|
}
|
|
window.location.reload();
|
|
} finally {
|
|
importBtn.disabled = false;
|
|
importBtn.textContent = original;
|
|
}
|
|
});
|
|
}
|
|
|
|
function initRuleCard(card) {
|
|
const ruleId = card.dataset.ruleId;
|
|
|
|
card.querySelector(".rule-enabled").addEventListener("change", (e) => {
|
|
saveSchedule(card, { enabledOverride: e.target.checked });
|
|
});
|
|
|
|
card.querySelectorAll(".day-toggle[data-day]").forEach((btn) => {
|
|
btn.addEventListener("click", () => btn.classList.toggle("active"));
|
|
});
|
|
|
|
const allDaysBtn = card.querySelector(".day-toggle-all");
|
|
if (allDaysBtn) {
|
|
allDaysBtn.addEventListener("click", () => {
|
|
card.querySelectorAll(".day-toggle[data-day]").forEach((btn) => btn.classList.add("active"));
|
|
});
|
|
}
|
|
|
|
card.querySelector(".add-schedule").addEventListener("click", () => {
|
|
const time = card.querySelector(".new-time").value;
|
|
const days = [...card.querySelectorAll(".day-toggle[data-day].active")].map((b) => b.dataset.day);
|
|
if (!time || days.length === 0) {
|
|
alert("Pick a time and at least one day.");
|
|
return;
|
|
}
|
|
addChip(card, time, days);
|
|
card.querySelectorAll(".day-toggle[data-day].active").forEach((b) => b.classList.remove("active"));
|
|
saveSchedule(card);
|
|
});
|
|
|
|
card.querySelectorAll(".chip-remove").forEach((btn) => bindRemove(btn));
|
|
|
|
card.querySelector(".run-now").addEventListener("click", async (e) => {
|
|
const btn = e.currentTarget;
|
|
const original = btn.textContent;
|
|
btn.disabled = true;
|
|
btn.textContent = "Queuing…";
|
|
try {
|
|
const out = await apiPost(`/api/rules/${ruleId}/run`);
|
|
btn.textContent = out.ok ? "Queued" : "Failed";
|
|
if (!out.ok && !out.handled) alert("Could not queue that run: " + out.error);
|
|
} finally {
|
|
setTimeout(() => {
|
|
btn.textContent = original;
|
|
btn.disabled = false;
|
|
}, 2000);
|
|
}
|
|
});
|
|
}
|
|
|
|
function bindRemove(btn) {
|
|
btn.addEventListener("click", () => {
|
|
const card = btn.closest(".rule-card");
|
|
btn.closest(".schedule-chip").remove();
|
|
saveSchedule(card);
|
|
});
|
|
}
|
|
|
|
function addChip(card, time, days) {
|
|
const list = card.querySelector(".schedule-list");
|
|
const li = document.createElement("li");
|
|
li.className = "schedule-chip";
|
|
li.innerHTML =
|
|
`<span class="chip-time">${time}</span>` +
|
|
`<span class="chip-days">${days.join(" ")}</span>` +
|
|
`<button type="button" class="chip-remove" title="Remove">×</button>`;
|
|
list.appendChild(li);
|
|
bindRemove(li.querySelector(".chip-remove"));
|
|
}
|
|
|
|
async function saveSchedule(card, opts = {}) {
|
|
const ruleId = card.dataset.ruleId;
|
|
const enabled =
|
|
opts.enabledOverride !== undefined ? opts.enabledOverride : card.querySelector(".rule-enabled").checked;
|
|
const schedules = [...card.querySelectorAll(".schedule-chip")].map((chip) => ({
|
|
time: chip.querySelector(".chip-time").textContent.trim(),
|
|
days: chip
|
|
.querySelector(".chip-days")
|
|
.textContent.trim()
|
|
.split(/\s+/)
|
|
.filter(Boolean),
|
|
}));
|
|
const out = await apiPost(`/api/rules/${ruleId}/schedule`, { enabled, schedules });
|
|
if (!out.ok && !out.handled) {
|
|
alert("Schedule not saved: " + out.error);
|
|
// The card was already updated optimistically, so reload to put
|
|
// what's on screen back in sync with what's actually stored —
|
|
// otherwise a rejected schedule looks exactly like a saved one.
|
|
window.location.reload();
|
|
}
|
|
}
|