Persist job history server-side so the output banner and per-step last-run status survive completion and are visible to any logged-in user on any device

This commit is contained in:
zyphlar
2026-10-16 16:09:34 -07:00
parent 9b8752eef5
commit 96d5b9bac8
2 changed files with 378 additions and 83 deletions
+143 -18
View File
@@ -13,7 +13,7 @@ import shlex
import shutil import shutil
import threading import threading
import json import json
from datetime import datetime from datetime import datetime, timezone
import yaml import yaml
try: try:
import psutil import psutil
@@ -120,10 +120,85 @@ def auth_status():
username = session.get('username') username = session.get('username')
return jsonify({'authenticated': bool(username), 'username': username or ''}) return jsonify({'authenticated': bool(username), 'username': username or ''})
# ── Store running processes ──────────────────────────────────────────────────── # ── Job registry ──────────────────────────────────────────────────────────────
# Every run is recorded under /data/jobs (metadata JSON + log file) so any
# logged-in user, on any device, can see what ran, when, and how it ended -
# even after the job finished or the server restarted.
JOBS_DIR = '/data/jobs'
JOBS_KEEP = 200
running_processes = {} running_processes = {}
process_logs = {} jobs = {} # job_id -> metadata dict (see _new_job)
process_logs = {} # job_id -> list of log lines
jobs_lock = threading.Lock()
def _utcnow():
return datetime.now(timezone.utc).isoformat(timespec='milliseconds').replace('+00:00', 'Z')
def _job_meta_path(job_id):
return os.path.join(JOBS_DIR, f'{job_id}.json')
def _job_log_path(job_id):
return os.path.join(JOBS_DIR, f'{job_id}.log')
def _save_job(job):
os.makedirs(JOBS_DIR, exist_ok=True)
tmp = _job_meta_path(job['id']) + '.tmp'
with open(tmp, 'w') as f:
json.dump(job, f)
os.replace(tmp, _job_meta_path(job['id']))
def _load_jobs():
"""Load job history from disk. Jobs left 'running' by a previous server
process can no longer be watched, so they are marked interrupted."""
if not os.path.isdir(JOBS_DIR):
return
for fname in os.listdir(JOBS_DIR):
if not fname.endswith('.json'):
continue
try:
with open(os.path.join(JOBS_DIR, fname)) as f:
job = json.load(f)
except (OSError, ValueError):
continue
if job.get('status') == 'running':
job['status'] = 'interrupted'
job['ended'] = job.get('ended') or _utcnow()
_save_job(job)
jobs[job['id']] = job
def _prune_jobs():
"""Keep only the newest JOBS_KEEP jobs on disk and in memory."""
finished = sorted((j for j in jobs.values() if j['status'] != 'running'),
key=lambda j: j['started'])
for job in finished[:max(0, len(jobs) - JOBS_KEEP)]:
jobs.pop(job['id'], None)
process_logs.pop(job['id'], None)
for path in (_job_meta_path(job['id']), _job_log_path(job['id'])):
try:
os.remove(path)
except OSError:
pass
def _job_logs(job_id):
if job_id in process_logs:
return process_logs[job_id]
try:
with open(_job_log_path(job_id)) as f:
return f.readlines()
except OSError:
return []
_load_jobs()
def _cleanup_legacy_structure(): def _cleanup_legacy_structure():
@@ -407,9 +482,31 @@ def run_script():
else: else:
return jsonify({'error': 'Invalid script configuration'}), 400 return jsonify({'error': 'Invalid script configuration'}), 400
job_id = f"{script_name}_{county}_{datetime.now().strftime('%Y%m%d_%H%M%S')}" job_id = f"{script_name}_{county}_{datetime.now().strftime('%Y%m%d_%H%M%S_%f')}"
job = {
'id': job_id,
'script': script_name,
'county': county,
'user': session.get('username'),
'started': _utcnow(),
'ended': None,
'status': 'running',
'exit_code': None,
}
with jobs_lock:
jobs[job_id] = job
process_logs[job_id] = []
_save_job(job)
_prune_jobs()
def run_command(): def run_command():
log_file = open(_job_log_path(job_id), 'w')
def log(line):
process_logs[job_id].append(line)
log_file.write(line)
log_file.flush()
try: try:
process = subprocess.Popen( process = subprocess.Popen(
cmd, cmd,
@@ -419,32 +516,62 @@ def run_script():
cwd=os.path.dirname(os.path.dirname(__file__)) cwd=os.path.dirname(os.path.dirname(__file__))
) )
running_processes[job_id] = process running_processes[job_id] = process
process_logs[job_id] = []
for line in process.stdout: for line in process.stdout:
process_logs[job_id].append(line) log(line)
process.wait() process.wait()
process_logs[job_id].append(f"\n[Process completed with exit code {process.returncode}]") job['exit_code'] = process.returncode
if job.get('cancelled'):
job['status'] = 'cancelled'
log(f"\n[Job cancelled by {job['cancelled']}]")
else:
job['status'] = 'success' if process.returncode == 0 else 'failed'
log(f"\n[Process completed with exit code {process.returncode}]")
except Exception as e: except Exception as e:
process_logs[job_id].append(f"\n[ERROR: {str(e)}]") job['status'] = 'failed'
log(f"\n[ERROR: {str(e)}]")
finally: finally:
if job_id in running_processes: running_processes.pop(job_id, None)
del running_processes[job_id] log_file.close()
with jobs_lock:
job['ended'] = _utcnow()
_save_job(job)
# Finished logs live on disk; don't hold them in memory forever.
process_logs.pop(job_id, None)
thread = threading.Thread(target=run_command) thread = threading.Thread(target=run_command)
thread.daemon = True thread.daemon = True
thread.start() thread.start()
return jsonify({'job_id': job_id, 'status': 'started'}) return jsonify({'job_id': job_id, 'status': 'started', 'job': job})
@app.route('/api/jobs')
@require_auth
def list_jobs():
"""Most recent job overall, plus the most recent job for each script/county
pair, so every device can show the same banner and per-step status."""
with jobs_lock:
ordered = sorted(jobs.values(), key=lambda j: j['started'])
latest_by_step = {}
for job in ordered:
latest_by_step[f"{job['script']}|{job['county']}"] = job
return jsonify({
'latest': ordered[-1] if ordered else None,
'steps': latest_by_step,
'running': [j['id'] for j in ordered if j['status'] == 'running'],
})
@app.route('/api/job-status/<job_id>') @app.route('/api/job-status/<job_id>')
@require_auth
def job_status(job_id): def job_status(job_id):
"""Get status and logs for a job""" """Get status and logs for a job"""
is_running = job_id in running_processes job = jobs.get(job_id)
logs = process_logs.get(job_id, []) if not job:
return jsonify({'job_id': job_id, 'running': is_running, 'logs': logs}) return jsonify({'error': 'Job not found'}), 404
return jsonify({'job_id': job_id, 'running': job['status'] == 'running',
'job': job, 'logs': _job_logs(job_id)})
@app.route('/api/cancel-job', methods=['POST']) @app.route('/api/cancel-job', methods=['POST'])
@require_auth @require_auth
@@ -459,10 +586,8 @@ def cancel_job():
return jsonify({'error': 'Job not found or already completed'}), 404 return jsonify({'error': 'Job not found or already completed'}), 404
try: try:
process = running_processes[job_id] jobs[job_id]['cancelled'] = session.get('username') or 'user'
process.terminate() running_processes[job_id].terminate()
process_logs[job_id].append('\n[Job cancelled by user]')
del running_processes[job_id]
return jsonify({'success': True}) return jsonify({'success': True})
except Exception as e: except Exception as e:
return jsonify({'error': str(e)}), 500 return jsonify({'error': str(e)}), 500
+235 -65
View File
@@ -166,6 +166,29 @@
color: #444; color: #444;
} }
.step-name { display: block; }
/* Last run of this step (for the selected county); click to view its output */
.step-last {
display: block;
margin-top: 2px;
padding: 0;
border: none;
background: none;
font: inherit;
font-size: 10px;
color: #888;
text-align: left;
cursor: pointer;
}
.step-last:hover { text-decoration: underline; }
.step-last[hidden] { display: none; }
.step-last.running { color: #1f78b4; }
.step-last.success { color: #2e7d32; }
.step-last.failed { color: #c62828; }
.step-last.cancelled,
.step-last.interrupted { color: #b26a00; }
.step-actions { .step-actions {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -296,6 +319,27 @@
display: none; display: none;
} }
/* Banner for the job whose output is shown; persists after it ends */
#jobBanner {
padding: 7px 14px;
font-size: 12px;
flex-shrink: 0;
display: none;
background: #1e2e3a;
color: #70b8e0;
border-bottom: 1px solid #111;
}
#jobBanner .job-title { font-weight: 700; }
#jobBanner .job-meta { display: block; margin-top: 2px; font-size: 11px; opacity: 0.85; }
#jobBanner .job-back {
margin-left: 6px; padding: 0; border: none; background: none;
color: inherit; font: inherit; text-decoration: underline; cursor: pointer;
}
#jobBanner.success { background: #1e3a24; color: #6fcf7f; }
#jobBanner.failed { background: #3a1e1e; color: #e07070; }
#jobBanner.cancelled,
#jobBanner.interrupted { background: #3a301e; color: #e0b070; }
#status.success { background: #1e3a24; color: #6fcf7f; } #status.success { background: #1e3a24; color: #6fcf7f; }
#status.error { background: #3a1e1e; color: #e07070; } #status.error { background: #3a1e1e; color: #e07070; }
#status.info { background: #1e2e3a; color: #70b8e0; } #status.info { background: #1e2e3a; color: #70b8e0; }
@@ -507,30 +551,30 @@
<!-- Roads --> <!-- Roads -->
<div class="wf-group"> <div class="wf-group">
<div class="wf-title">Roads</div> <div class="wf-title">Roads</div>
<div class="step"> <div class="step" data-script="download-county-roads">
<div class="step-num">1</div> <div class="step-num">1</div>
<div class="step-label">Download county data</div> <div class="step-label"><span class="step-name">Download county data</span><button type="button" class="step-last" hidden></button></div>
<div class="step-actions"> <div class="step-actions">
<button class="btn-run" onclick="runScript('download-county-roads')">Run</button> <button class="btn-run" onclick="runScript('download-county-roads')">Run</button>
</div> </div>
</div> </div>
<div class="step"> <div class="step" data-script="download-osm-roads">
<div class="step-num">2</div> <div class="step-num">2</div>
<div class="step-label">Download OSM roads</div> <div class="step-label"><span class="step-name">Download OSM roads</span><button type="button" class="step-last" hidden></button></div>
<div class="step-actions"> <div class="step-actions">
<button class="btn-run" onclick="runScript('download-osm-roads')">Run</button> <button class="btn-run" onclick="runScript('download-osm-roads')">Run</button>
</div> </div>
</div> </div>
<div class="step"> <div class="step" data-script="convert-roads">
<div class="step-num">3</div> <div class="step-num">3</div>
<div class="step-label">Convert to GeoJSON</div> <div class="step-label"><span class="step-name">Convert to GeoJSON</span><button type="button" class="step-last" hidden></button></div>
<div class="step-actions"> <div class="step-actions">
<button class="btn-run" onclick="runScript('convert-roads')">Run</button> <button class="btn-run" onclick="runScript('convert-roads')">Run</button>
</div> </div>
</div> </div>
<div class="step"> <div class="step" data-script="diff-roads">
<div class="step-num">4</div> <div class="step-num">4</div>
<div class="step-label">Diff vs OSM</div> <div class="step-label"><span class="step-name">Diff vs OSM</span><button type="button" class="step-last" hidden></button></div>
<div class="step-actions"> <div class="step-actions">
<button class="btn-run" onclick="runScript('diff-roads')">Run</button> <button class="btn-run" onclick="runScript('diff-roads')">Run</button>
</div> </div>
@@ -540,30 +584,30 @@
<!-- Paths (Sumter only) --> <!-- Paths (Sumter only) -->
<div class="wf-group" id="paths-group"> <div class="wf-group" id="paths-group">
<div class="wf-title">Paths</div> <div class="wf-title">Paths</div>
<div class="step" id="paths-step-1"> <div class="step" id="paths-step-1" data-script="download-county-paths">
<div class="step-num">1</div> <div class="step-num">1</div>
<div class="step-label">Upload county paths</div> <div class="step-label"><span class="step-name">Upload county paths</span><button type="button" class="step-last" hidden></button></div>
<div class="step-actions" id="paths-step-1-actions"> <div class="step-actions" id="paths-step-1-actions">
<!-- filled by selectCounty() --> <!-- filled by selectCounty() -->
</div> </div>
</div> </div>
<div class="step"> <div class="step" data-script="download-osm-paths">
<div class="step-num">2</div> <div class="step-num">2</div>
<div class="step-label">Download OSM paths</div> <div class="step-label"><span class="step-name">Download OSM paths</span><button type="button" class="step-last" hidden></button></div>
<div class="step-actions" id="paths-step-2-actions"> <div class="step-actions" id="paths-step-2-actions">
<!-- filled by selectCounty() --> <!-- filled by selectCounty() -->
</div> </div>
</div> </div>
<div class="step"> <div class="step" data-script="convert-paths">
<div class="step-num">3</div> <div class="step-num">3</div>
<div class="step-label">Convert to GeoJSON</div> <div class="step-label"><span class="step-name">Convert to GeoJSON</span><button type="button" class="step-last" hidden></button></div>
<div class="step-actions" id="paths-step-3-actions"> <div class="step-actions" id="paths-step-3-actions">
<!-- filled by selectCounty() --> <!-- filled by selectCounty() -->
</div> </div>
</div> </div>
<div class="step"> <div class="step" data-script="diff-paths">
<div class="step-num">4</div> <div class="step-num">4</div>
<div class="step-label">Diff vs OSM</div> <div class="step-label"><span class="step-name">Diff vs OSM</span><button type="button" class="step-last" hidden></button></div>
<div class="step-actions" id="paths-step-4-actions"> <div class="step-actions" id="paths-step-4-actions">
<!-- filled by selectCounty() --> <!-- filled by selectCounty() -->
</div> </div>
@@ -573,30 +617,30 @@
<!-- Addresses --> <!-- Addresses -->
<div class="wf-group"> <div class="wf-group">
<div class="wf-title">Addresses</div> <div class="wf-title">Addresses</div>
<div class="step"> <div class="step" data-script="download-county-addresses">
<div class="step-num">1</div> <div class="step-num">1</div>
<div class="step-label">Download county data</div> <div class="step-label"><span class="step-name">Download county data</span><button type="button" class="step-last" hidden></button></div>
<div class="step-actions"> <div class="step-actions">
<button class="btn-run" onclick="runScript('download-county-addresses')">Run</button> <button class="btn-run" onclick="runScript('download-county-addresses')">Run</button>
</div> </div>
</div> </div>
<div class="step"> <div class="step" data-script="download-osm-addresses">
<div class="step-num">2</div> <div class="step-num">2</div>
<div class="step-label">Download OSM addresses</div> <div class="step-label"><span class="step-name">Download OSM addresses</span><button type="button" class="step-last" hidden></button></div>
<div class="step-actions"> <div class="step-actions">
<button class="btn-run" onclick="runScript('download-osm-addresses')">Run</button> <button class="btn-run" onclick="runScript('download-osm-addresses')">Run</button>
</div> </div>
</div> </div>
<div class="step"> <div class="step" data-script="convert-addresses">
<div class="step-num">3</div> <div class="step-num">3</div>
<div class="step-label">Convert to GeoJSON</div> <div class="step-label"><span class="step-name">Convert to GeoJSON</span><button type="button" class="step-last" hidden></button></div>
<div class="step-actions"> <div class="step-actions">
<button class="btn-run" onclick="runScript('convert-addresses')">Run</button> <button class="btn-run" onclick="runScript('convert-addresses')">Run</button>
</div> </div>
</div> </div>
<div class="step"> <div class="step" data-script="diff-addresses">
<div class="step-num">4</div> <div class="step-num">4</div>
<div class="step-label">Diff vs OSM</div> <div class="step-label"><span class="step-name">Diff vs OSM</span><button type="button" class="step-last" hidden></button></div>
<div class="step-actions"> <div class="step-actions">
<button class="btn-run" onclick="runScript('diff-addresses')">Run</button> <button class="btn-run" onclick="runScript('diff-addresses')">Run</button>
<label class="force-label"> <label class="force-label">
@@ -604,9 +648,9 @@
</label> </label>
</div> </div>
</div> </div>
<div class="step"> <div class="step" data-script="generate-city-report">
<div class="step-num">5</div> <div class="step-num">5</div>
<div class="step-label">Generate City Boundaries Report</div> <div class="step-label"><span class="step-name">Generate City Boundaries Report</span><button type="button" class="step-last" hidden></button></div>
<div class="step-actions"> <div class="step-actions">
<button class="btn-run" onclick="runScript('generate-city-report')">Run</button> <button class="btn-run" onclick="runScript('generate-city-report')">Run</button>
</div> </div>
@@ -642,6 +686,7 @@
<span>Output</span> <span>Output</span>
<button id="cancelButton" class="btn-cancel" onclick="cancelJob()">Cancel</button> <button id="cancelButton" class="btn-cancel" onclick="cancelJob()">Cancel</button>
</div> </div>
<div id="jobBanner" role="status" aria-live="polite"></div>
<div id="status"></div> <div id="status"></div>
<div id="sys-stats"> <div id="sys-stats">
<div class="stat-row"> <div class="stat-row">
@@ -670,8 +715,12 @@
const COUNTY_CONFIG = {{ counties_json | safe }}; const COUNTY_CONFIG = {{ counties_json | safe }};
const IS_AUTHENTICATED = {{ 'true' if current_user else 'false' }}; const IS_AUTHENTICATED = {{ 'true' if current_user else 'false' }};
let activeCounty = COUNTY_CONFIG.length ? COUNTY_CONFIG[0].id : ''; let activeCounty = COUNTY_CONFIG.length ? COUNTY_CONFIG[0].id : '';
let currentJobId = null; let jobsData = null; // last /api/jobs response
let logCheckInterval = null; let viewedJob = null; // job whose output is shown in the console
let followLatest = true; // switch the console to new jobs as they start
let lastSeenLatestId = null;
let jobsTimer = null;
let uploading = false;
function requireLogin() { function requireLogin() {
showStatus('Not authenticated – please log in.', 'error'); showStatus('Not authenticated – please log in.', 'error');
@@ -693,6 +742,8 @@
panel.style.setProperty('--active-color', config ? config.color : '#28a745'); panel.style.setProperty('--active-color', config ? config.color : '#28a745');
renderPathsActions(county, config); renderPathsActions(county, config);
renderStepStatus();
if (jobsData && jobsData.running.length) disableButtons();
} }
function renderPathsActions(county, config) { function renderPathsActions(county, config) {
@@ -738,11 +789,8 @@
/* ── Script runner ── */ /* ── Script runner ── */
function runScript(scriptName) { function runScript(scriptName) {
if (!IS_AUTHENTICATED) return requireLogin(); if (!IS_AUTHENTICATED) return requireLogin();
const logsEl = document.getElementById('logs'); hideStatus();
logsEl.textContent = '';
showStatus(`Running: ${scriptName} (${activeCounty})`, 'info');
disableButtons(); disableButtons();
document.getElementById('cancelButton').classList.add('active');
// On narrow screens the console is below the steps; bring it into view // On narrow screens the console is below the steps; bring it into view
if (window.matchMedia('(max-width: 768px)').matches) { if (window.matchMedia('(max-width: 768px)').matches) {
document.querySelector('.right').scrollIntoView({ behavior: 'smooth', block: 'start' }); document.querySelector('.right').scrollIntoView({ behavior: 'smooth', block: 'start' });
@@ -757,68 +805,185 @@
fetch('/api/run-script', { fetch('/api/run-script', {
method: 'POST', method: 'POST',
headers: { 'Content-Type': 'application/json' }, headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ script: scriptName, county: activeCounty, forceDownload }) body: JSON.stringify({ script: scriptName, county: scriptName === 'ls' ? '' : activeCounty, forceDownload })
}) })
.then(r => r.json()) .then(r => r.json())
.then(data => { .then(data => {
if (data.error) { if (data.error) {
showStatus(`Error: ${data.error}`, 'error'); showStatus(`Error: ${data.error}`, 'error');
enableButtons(); enableButtons();
document.getElementById('cancelButton').classList.remove('active');
return; return;
} }
currentJobId = data.job_id; followLatest = true;
if (logCheckInterval) clearInterval(logCheckInterval); lastSeenLatestId = data.job_id;
logCheckInterval = setInterval(checkJobStatus, 1000); viewJob(data.job_id, true);
startStatsPolling();
}) })
.catch(err => { .catch(err => {
showStatus(`Error: ${err.message}`, 'error'); showStatus(`Error: ${err.message}`, 'error');
enableButtons(); enableButtons();
document.getElementById('cancelButton').classList.remove('active');
}); });
} }
function cancelJob() { function cancelJob() {
if (!currentJobId || !confirm('Cancel the running job?')) return; if (!viewedJob || viewedJob.status !== 'running' || !confirm('Cancel the running job?')) return;
fetch('/api/cancel-job', { fetch('/api/cancel-job', {
method: 'POST', method: 'POST',
headers: { 'Content-Type': 'application/json' }, headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ job_id: currentJobId }) body: JSON.stringify({ job_id: viewedJob.id })
}) })
.then(r => r.json()) .then(r => r.json())
.then(data => { .then(data => {
if (data.success) { if (data.success) refreshJobs();
showStatus('Cancelled.', 'info'); else showStatus(`Cancel failed: ${data.error}`, 'error');
clearInterval(logCheckInterval);
enableButtons();
document.getElementById('cancelButton').classList.remove('active');
currentJobId = null;
stopStatsPolling();
} else {
showStatus(`Cancel failed: ${data.error}`, 'error');
}
}); });
} }
function checkJobStatus() { /* ── Shared job status (same on every device) ── */
if (!currentJobId) return; function jobLabel(job) {
fetch(`/api/job-status/${currentJobId}`) if (job.script === 'ls') return 'List files';
const step = document.querySelector(`.step[data-script="${job.script}"]`);
if (!step) return job.script;
const group = step.closest('.wf-group').querySelector('.wf-title').textContent.trim();
return `${group} · ${step.querySelector('.step-name').textContent.trim()}`;
}
function countyName(id) {
const c = COUNTY_CONFIG.find(c => c.id === id);
return c ? c.name : id;
}
function fmtTime(iso) {
if (!iso) return '';
const d = new Date(iso);
const time = d.toLocaleTimeString([], { hour: 'numeric', minute: '2-digit' });
if (d.toDateString() === new Date().toDateString()) return time;
return `${d.toLocaleDateString([], { month: 'short', day: 'numeric' })} ${time}`;
}
function fmtDuration(fromIso, toIso) {
let s = Math.max(0, Math.round(((toIso ? new Date(toIso) : new Date()) - new Date(fromIso)) / 1000));
const h = Math.floor(s / 3600), m = Math.floor((s % 3600) / 60);
s %= 60;
return h ? `${h}h ${m}m` : m ? `${m}m ${s}s` : `${s}s`;
}
const STATUS_TEXT = {
running: 'Running', success: 'Succeeded', failed: 'Failed',
cancelled: 'Cancelled', interrupted: 'Interrupted (server restarted)'
};
const STATUS_ICON = { running: '⟳', success: '✓', failed: '✗', cancelled: '⊘', interrupted: '⚠' };
function statusText(job) {
let t = STATUS_TEXT[job.status] || job.status;
if (job.status === 'failed' && job.exit_code !== null && job.exit_code !== undefined) t += ` (exit ${job.exit_code})`;
return t;
}
function renderBanner() {
const el = document.getElementById('jobBanner');
const job = viewedJob;
if (!job) { el.style.display = 'none'; return; }
const county = job.county ? ` (${countyName(job.county)})` : '';
const by = job.user ? ` by ${job.user}` : '';
const meta = job.status === 'running'
? `Started ${fmtTime(job.started)}${by} · ${fmtDuration(job.started)} elapsed`
: `Started ${fmtTime(job.started)}${by} · ended ${fmtTime(job.ended)} · took ${fmtDuration(job.started, job.ended)}`;
el.className = job.status;
el.innerHTML = '';
const title = document.createElement('span');
title.className = 'job-title';
title.textContent = `${STATUS_ICON[job.status] || ''} ${statusText(job)}: ${jobLabel(job)}${county}`;
el.appendChild(title);
if (!followLatest && jobsData && jobsData.latest && jobsData.latest.id !== job.id) {
const back = document.createElement('button');
back.className = 'job-back';
back.textContent = 'show latest';
back.onclick = () => { followLatest = true; viewJob(jobsData.latest.id); };
el.appendChild(back);
}
const m = document.createElement('span');
m.className = 'job-meta';
m.textContent = meta;
el.appendChild(m);
el.style.display = 'block';
document.getElementById('cancelButton').classList.toggle('active', job.status === 'running');
}
function renderStepStatus() {
document.querySelectorAll('.step[data-script]').forEach(step => {
const el = step.querySelector('.step-last');
const job = jobsData && jobsData.steps[`${step.dataset.script}|${activeCounty}`];
if (!job) { el.hidden = true; return; }
el.hidden = false;
el.className = `step-last ${job.status}`;
el.textContent = job.status === 'running'
? `${STATUS_ICON.running} Running · started ${fmtTime(job.started)}`
: `${STATUS_ICON[job.status] || ''} ${statusText(job)} · ${fmtTime(job.ended)}`;
el.title = `Started ${new Date(job.started).toLocaleString()}` +
(job.ended ? `, ended ${new Date(job.ended).toLocaleString()}` : '') +
(job.user ? ` by ${job.user}` : '') + ' — click to view output';
el.onclick = () => { followLatest = false; viewJob(job.id, true); };
});
}
// Load a job's output into the console and make it the banner subject.
function viewJob(jobId, scroll) {
return fetch(`/api/job-status/${encodeURIComponent(jobId)}`)
.then(r => r.json()) .then(r => r.json())
.then(data => { .then(data => {
if (data.error) return;
const wasRunning = viewedJob && viewedJob.id === data.job.id && viewedJob.status === 'running';
viewedJob = data.job;
const logsEl = document.getElementById('logs'); const logsEl = document.getElementById('logs');
const atBottom = logsEl.scrollTop + logsEl.clientHeight >= logsEl.scrollHeight - 20;
logsEl.textContent = data.logs.join(''); logsEl.textContent = data.logs.join('');
logsEl.scrollTop = logsEl.scrollHeight; if (scroll || atBottom) logsEl.scrollTop = logsEl.scrollHeight;
if (!data.running) { if (data.job.status === 'running') startStatsPolling();
clearInterval(logCheckInterval); else if (wasRunning || statsInterval) stopStatsPolling();
showStatus('Done.', 'success'); renderBanner();
enableButtons(); scheduleJobsRefresh();
document.getElementById('cancelButton').classList.remove('active');
currentJobId = null;
stopStatsPolling();
}
}) })
.catch(err => console.error('Status check error:', err)); .catch(err => console.error('Job status error:', err));
}
function refreshJobs() {
return fetch('/api/jobs')
.then(r => r.json())
.then(data => {
if (data.error) return;
jobsData = data;
renderStepStatus();
if (data.running.length) disableButtons(); else if (!uploading) enableButtons();
const latest = data.latest;
// A newly started job (from any device) takes over the console
if (latest && latest.id !== lastSeenLatestId) {
lastSeenLatestId = latest.id;
followLatest = true;
}
const target = followLatest && latest ? latest.id : viewedJob && viewedJob.id;
const switching = target && (!viewedJob || viewedJob.id !== target);
if (switching || (viewedJob && viewedJob.status === 'running')) {
return viewJob(target, switching);
}
renderBanner();
})
.catch(err => console.error('Jobs refresh error:', err))
.finally(scheduleJobsRefresh);
}
// Poll quickly while something is running, slowly otherwise, so jobs
// started on another device show up here too.
function scheduleJobsRefresh() {
clearTimeout(jobsTimer);
const busy = (viewedJob && viewedJob.status === 'running') || (jobsData && jobsData.running.length);
jobsTimer = setTimeout(refreshJobs, busy ? 1000 : 5000);
}
if (IS_AUTHENTICATED) {
refreshJobs();
document.addEventListener('visibilitychange', () => { if (!document.hidden) refreshJobs(); });
} else {
document.getElementById('logs').innerHTML = '<span class="log-placeholder">Log in to see job output.</span>';
} }
function uploadFile(inputId, dest) { function uploadFile(inputId, dest) {
@@ -834,6 +999,7 @@
formData.append('dest', dest); formData.append('dest', dest);
showStatus(`Uploading ${file.name}...`, 'info'); showStatus(`Uploading ${file.name}...`, 'info');
uploading = true;
disableButtons(); disableButtons();
fetch('/api/upload-file', { method: 'POST', body: formData }) fetch('/api/upload-file', { method: 'POST', body: formData })
@@ -847,7 +1013,7 @@
} }
}) })
.catch(err => showStatus(`Error: ${err.message}`, 'error')) .catch(err => showStatus(`Error: ${err.message}`, 'error'))
.finally(() => enableButtons()); .finally(() => { uploading = false; refreshJobs(); });
} }
function clearData() { function clearData() {
@@ -873,6 +1039,10 @@
el.style.display = 'block'; el.style.display = 'block';
} }
function hideStatus() {
document.getElementById('status').style.display = 'none';
}
function disableButtons() { function disableButtons() {
document.querySelectorAll('.btn-run').forEach(b => b.disabled = true); document.querySelectorAll('.btn-run').forEach(b => b.disabled = true);
} }