Compare commits
4 Commits
2e3484b1d9
...
v1.3.0
| Author | SHA1 | Date | |
|---|---|---|---|
| 120b61a423 | |||
| cd16b7ea28 | |||
| afbdefa549 | |||
| f1e192c5d4 |
@@ -79,29 +79,7 @@ jobs:
|
||||
|
||||
- name: Create Gitea release
|
||||
run: |
|
||||
cat > /tmp/make_release.py << 'PYEOF'
|
||||
import json, os
|
||||
v = os.environ['VERSION']
|
||||
img = os.environ['IMAGE']
|
||||
raw = open('/tmp/release_notes.txt').read().strip()
|
||||
feats, fixes = [], []
|
||||
for line in raw.splitlines():
|
||||
msg = line.lstrip('- ').strip()
|
||||
if msg.startswith('feat:'):
|
||||
feats.append('- ' + msg[5:].strip())
|
||||
elif msg.startswith('fix:'):
|
||||
fixes.append('- ' + msg[4:].strip())
|
||||
sections = []
|
||||
if feats:
|
||||
sections.append('### New Features\n\n' + '\n'.join(feats))
|
||||
if fixes:
|
||||
sections.append('### Bug Fixes\n\n' + '\n'.join(fixes))
|
||||
notes = '\n\n'.join(sections) or '_No changes_'
|
||||
body = notes + '\n\n### Image\n\n`' + img + ':' + v + '`'
|
||||
payload = {'tag_name': 'v'+v, 'name': 'Catalyst v'+v, 'body': body, 'draft': False, 'prerelease': False}
|
||||
open('/tmp/release_body.json', 'w').write(json.dumps(payload))
|
||||
PYEOF
|
||||
python3 /tmp/make_release.py
|
||||
python3 -c "import json,os; v=os.environ['VERSION']; img=os.environ['IMAGE']; notes=open('/tmp/release_notes.txt').read(); open('/tmp/release_body.json','w').write(json.dumps({'tag_name':'v'+v,'name':'Catalyst v'+v,'body':'### Changes\n\n'+notes+'\n\n### Image\n\n'+img+':'+v,'draft':False,'prerelease':False}))"
|
||||
curl -sf -X POST \
|
||||
-H "Authorization: token ${{ secrets.TOKEN }}" \
|
||||
-H "Content-Type: application/json" \
|
||||
|
||||
141
css/app.css
141
css/app.css
@@ -153,8 +153,6 @@ main { flex: 1; }
|
||||
}
|
||||
|
||||
.stat-cell:last-child { border-right: none; }
|
||||
.stat-clickable { cursor: pointer; user-select: none; }
|
||||
.stat-clickable:hover { background: var(--bg2); }
|
||||
|
||||
.stat-label {
|
||||
font-size: 10px;
|
||||
@@ -714,142 +712,3 @@ select:focus { border-color: var(--accent); }
|
||||
0%, 100% { opacity: 1; }
|
||||
50% { opacity: 0; }
|
||||
}
|
||||
|
||||
/* ── MOBILE ── */
|
||||
@media (max-width: 640px) {
|
||||
/* Reset desktop zoom — mobile browsers handle scaling themselves */
|
||||
html { zoom: 1; }
|
||||
|
||||
/* Nav */
|
||||
nav { padding: 0 16px; }
|
||||
|
||||
/* Dashboard header */
|
||||
.dash-header { padding: 18px 16px 14px; }
|
||||
|
||||
/* Stats bar */
|
||||
.stat-cell { padding: 10px 16px; }
|
||||
|
||||
/* Toolbar — search full-width on first row, filters + button below */
|
||||
.toolbar { flex-wrap: wrap; padding: 10px 16px; gap: 8px; }
|
||||
.search-wrap { max-width: 100%; }
|
||||
.toolbar-right { margin-left: 0; width: 100%; justify-content: flex-end; }
|
||||
|
||||
/* Instance grid — single column */
|
||||
.instance-grid {
|
||||
grid-template-columns: 1fr;
|
||||
padding: 12px 16px;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
/* Detail page */
|
||||
.detail-page { padding: 16px; }
|
||||
|
||||
/* Detail header — stack title block above actions */
|
||||
.detail-header { flex-direction: column; align-items: flex-start; gap: 14px; }
|
||||
|
||||
/* Detail sub — wrap items when they don't fit */
|
||||
.detail-sub { flex-wrap: wrap; row-gap: 4px; }
|
||||
|
||||
/* Detail grid — single column */
|
||||
.detail-grid { grid-template-columns: 1fr; }
|
||||
|
||||
/* Toggle grid — 2 columns instead of 3 */
|
||||
.toggle-grid { grid-template-columns: 1fr 1fr; }
|
||||
|
||||
/* Confirm box — no fixed width on mobile */
|
||||
.confirm-box { width: auto; max-width: calc(100vw - 32px); padding: 18px; }
|
||||
|
||||
/* History timeline — stack timestamp above event */
|
||||
.tl-item { flex-direction: column; align-items: flex-start; gap: 3px; }
|
||||
.tl-time { order: -1; }
|
||||
|
||||
/* Toast — stretch across bottom */
|
||||
.toast { right: 16px; left: 16px; bottom: 16px; }
|
||||
|
||||
/* Jobs — stack sidebar above detail */
|
||||
.jobs-layout { grid-template-columns: 1fr; }
|
||||
.jobs-sidebar { border-right: none; border-bottom: 1px solid var(--border); }
|
||||
}
|
||||
|
||||
/* ── JOBS PAGE ───────────────────────────────────────────────────────────────── */
|
||||
|
||||
.jobs-layout {
|
||||
display: grid;
|
||||
grid-template-columns: 220px 1fr;
|
||||
height: calc(100vh - 48px);
|
||||
}
|
||||
.jobs-sidebar {
|
||||
border-right: 1px solid var(--border);
|
||||
overflow-y: auto;
|
||||
}
|
||||
.jobs-sidebar-title {
|
||||
padding: 16px 16px 8px;
|
||||
font-size: 10px;
|
||||
font-weight: 600;
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 0.1em;
|
||||
color: var(--text3);
|
||||
}
|
||||
.job-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
padding: 12px 16px;
|
||||
cursor: pointer;
|
||||
border-bottom: 1px solid var(--border);
|
||||
user-select: none;
|
||||
}
|
||||
.job-item:hover, .job-item.active { background: var(--bg2); }
|
||||
.job-item-name { font-size: 13px; color: var(--text); }
|
||||
.jobs-detail {
|
||||
padding: 28px 32px;
|
||||
overflow-y: auto;
|
||||
max-width: 600px;
|
||||
}
|
||||
.jobs-detail-hd { margin-bottom: 20px; }
|
||||
.jobs-detail-title { font-size: 17px; font-weight: 600; color: var(--text); }
|
||||
.jobs-detail-desc { font-size: 12px; color: var(--text2); margin-top: 4px; line-height: 1.6; }
|
||||
.job-actions { display: flex; gap: 8px; margin: 16px 0 0; }
|
||||
.jobs-placeholder { padding: 48px 32px; color: var(--text3); font-size: 13px; }
|
||||
|
||||
/* Shared job status dot */
|
||||
.job-dot {
|
||||
width: 7px;
|
||||
height: 7px;
|
||||
border-radius: 50%;
|
||||
flex-shrink: 0;
|
||||
display: inline-block;
|
||||
}
|
||||
.job-dot--success { background: var(--accent); }
|
||||
.job-dot--error { background: var(--red); }
|
||||
.job-dot--running { background: var(--amber); animation: pulse 2s ease-in-out infinite; }
|
||||
.job-dot--none { background: var(--border2); }
|
||||
|
||||
/* Run history list */
|
||||
.run-item {
|
||||
display: grid;
|
||||
grid-template-columns: 10px 1fr 60px 1fr;
|
||||
gap: 0 12px;
|
||||
padding: 7px 0;
|
||||
border-bottom: 1px solid var(--border);
|
||||
font-size: 12px;
|
||||
align-items: baseline;
|
||||
}
|
||||
.run-item:last-child { border-bottom: none; }
|
||||
.run-time { color: var(--text3); }
|
||||
.run-status { color: var(--text2); }
|
||||
.run-result { color: var(--text); }
|
||||
.run-empty { color: var(--text3); font-size: 12px; padding: 8px 0; }
|
||||
|
||||
/* Nav dot */
|
||||
.nav-job-dot {
|
||||
display: inline-block;
|
||||
width: 6px;
|
||||
height: 6px;
|
||||
border-radius: 50%;
|
||||
margin-left: 5px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.nav-job-dot--success { background: var(--accent); }
|
||||
.nav-job-dot--error { background: var(--red); }
|
||||
.nav-job-dot--none { display: none; }
|
||||
|
||||
15
index.html
15
index.html
@@ -22,7 +22,6 @@
|
||||
<span class="nav-divider">·</span>
|
||||
<span id="nav-version"></span>
|
||||
</div>
|
||||
<button class="nav-btn" onclick="navigate('jobs')">Jobs <span id="nav-jobs-dot" class="nav-job-dot nav-job-dot--none"></span></button>
|
||||
<button class="nav-btn" onclick="openSettingsModal()" title="Settings">⚙</button>
|
||||
</nav>
|
||||
|
||||
@@ -70,6 +69,7 @@
|
||||
<div class="detail-name" id="detail-name">—</div>
|
||||
<div class="detail-sub">
|
||||
<span><span class="lbl">vmid</span> <span class="val" id="detail-vmid-sub">—</span></span>
|
||||
<span><span class="lbl">id</span> <span class="val" id="detail-id-sub">—</span></span>
|
||||
<span><span class="lbl">created</span> <span class="val" id="detail-created-sub">—</span></span>
|
||||
</div>
|
||||
</div>
|
||||
@@ -98,19 +98,6 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- JOBS PAGE -->
|
||||
<div class="page" id="page-jobs">
|
||||
<div class="jobs-layout">
|
||||
<div class="jobs-sidebar">
|
||||
<div class="jobs-sidebar-title">Jobs</div>
|
||||
<div id="jobs-list"></div>
|
||||
</div>
|
||||
<div class="jobs-detail" id="jobs-detail">
|
||||
<div class="jobs-placeholder">Select a job</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
</div>
|
||||
|
||||
|
||||
14
js/app.js
14
js/app.js
@@ -11,19 +11,12 @@ function navigate(page, vmid) {
|
||||
document.getElementById('page-detail').classList.add('active');
|
||||
history.pushState({ page: 'instance', vmid }, '', `/instance/${vmid}`);
|
||||
renderDetailPage(vmid);
|
||||
} else if (page === 'jobs') {
|
||||
document.getElementById('page-jobs').classList.add('active');
|
||||
history.pushState({ page: 'jobs' }, '', '/jobs');
|
||||
renderJobsPage();
|
||||
}
|
||||
}
|
||||
|
||||
function handleRoute() {
|
||||
const m = window.location.pathname.match(/^\/instance\/(\d+)/);
|
||||
if (window.location.pathname === '/jobs') {
|
||||
document.getElementById('page-jobs').classList.add('active');
|
||||
renderJobsPage();
|
||||
} else if (m) {
|
||||
if (m) {
|
||||
document.getElementById('page-detail').classList.add('active');
|
||||
renderDetailPage(parseInt(m[1], 10));
|
||||
} else {
|
||||
@@ -37,9 +30,6 @@ window.addEventListener('popstate', e => {
|
||||
if (e.state?.page === 'instance') {
|
||||
document.getElementById('page-detail').classList.add('active');
|
||||
renderDetailPage(e.state.vmid);
|
||||
} else if (e.state?.page === 'jobs') {
|
||||
document.getElementById('page-jobs').classList.add('active');
|
||||
renderJobsPage();
|
||||
} else {
|
||||
document.getElementById('page-dashboard').classList.add('active');
|
||||
renderDashboard();
|
||||
@@ -53,6 +43,4 @@ if (VERSION) {
|
||||
document.getElementById('nav-version').textContent = label;
|
||||
}
|
||||
|
||||
fetch('/api/jobs').then(r => r.json()).then(_updateJobsNavDot).catch(() => {});
|
||||
|
||||
handleRoute();
|
||||
|
||||
190
js/ui.js
190
js/ui.js
@@ -71,10 +71,10 @@ async function renderDashboard() {
|
||||
all.forEach(i => { states[i.state] = (states[i.state] || 0) + 1; });
|
||||
|
||||
document.getElementById('stats-bar').innerHTML = `
|
||||
<div class="stat-cell stat-clickable" onclick="setStateFilter('')"><div class="stat-label">total</div><div class="stat-value accent">${all.length}</div></div>
|
||||
<div class="stat-cell stat-clickable" onclick="setStateFilter('deployed')"><div class="stat-label">deployed</div><div class="stat-value">${states['deployed'] || 0}</div></div>
|
||||
<div class="stat-cell stat-clickable" onclick="setStateFilter('testing')"><div class="stat-label">testing</div><div class="stat-value amber">${states['testing'] || 0}</div></div>
|
||||
<div class="stat-cell stat-clickable" onclick="setStateFilter('degraded')"><div class="stat-label">degraded</div><div class="stat-value red">${states['degraded'] || 0}</div></div>
|
||||
<div class="stat-cell"><div class="stat-label">total</div><div class="stat-value accent">${all.length}</div></div>
|
||||
<div class="stat-cell"><div class="stat-label">deployed</div><div class="stat-value">${states['deployed'] || 0}</div></div>
|
||||
<div class="stat-cell"><div class="stat-label">testing</div><div class="stat-value amber">${states['testing'] || 0}</div></div>
|
||||
<div class="stat-cell"><div class="stat-label">degraded</div><div class="stat-value red">${states['degraded'] || 0}</div></div>
|
||||
`;
|
||||
|
||||
await populateStackFilter();
|
||||
@@ -95,11 +95,6 @@ async function populateStackFilter() {
|
||||
});
|
||||
}
|
||||
|
||||
function setStateFilter(state) {
|
||||
document.getElementById('filter-state').value = state;
|
||||
filterInstances();
|
||||
}
|
||||
|
||||
async function filterInstances() {
|
||||
const search = document.getElementById('search-input').value;
|
||||
const state = document.getElementById('filter-state').value;
|
||||
@@ -177,6 +172,7 @@ async function renderDetailPage(vmid) {
|
||||
document.getElementById('detail-vmid-crumb').textContent = vmid;
|
||||
document.getElementById('detail-name').textContent = inst.name;
|
||||
document.getElementById('detail-vmid-sub').textContent = inst.vmid;
|
||||
document.getElementById('detail-id-sub').textContent = inst.id;
|
||||
document.getElementById('detail-created-sub').textContent = fmtDate(inst.created_at);
|
||||
|
||||
document.getElementById('detail-identity').innerHTML = `
|
||||
@@ -184,6 +180,7 @@ async function renderDetailPage(vmid) {
|
||||
<div class="kv-row"><span class="kv-key">state</span><span class="kv-val"><span class="badge ${esc(inst.state)}">${esc(inst.state)}</span></span></div>
|
||||
<div class="kv-row"><span class="kv-key">stack</span><span class="kv-val"><span class="badge ${esc(inst.stack)}">${esc(inst.stack) || '—'}</span></span></div>
|
||||
<div class="kv-row"><span class="kv-key">vmid</span><span class="kv-val highlight">${inst.vmid}</span></div>
|
||||
<div class="kv-row"><span class="kv-key">internal id</span><span class="kv-val">${inst.id}</span></div>
|
||||
`;
|
||||
|
||||
document.getElementById('detail-network').innerHTML = `
|
||||
@@ -294,10 +291,6 @@ async function saveInstance() {
|
||||
hardware_acceleration: +document.getElementById('f-hardware-accel').checked,
|
||||
};
|
||||
|
||||
// Snapshot job state before creation — jobs fire immediately after the 201
|
||||
// so the baseline must be captured before the POST, not after.
|
||||
const jobBaseline = !editingVmid ? await _snapshotJobBaseline() : null;
|
||||
|
||||
const result = editingVmid
|
||||
? await updateInstance(editingVmid, data)
|
||||
: await createInstance(data);
|
||||
@@ -307,8 +300,6 @@ async function saveInstance() {
|
||||
showToast(`${name} ${editingVmid ? 'updated' : 'created'}`, 'success');
|
||||
closeModal();
|
||||
|
||||
if (jobBaseline) await _waitForOnCreateJobs(jobBaseline);
|
||||
|
||||
if (currentVmid && document.getElementById('page-detail').classList.contains('active')) {
|
||||
await renderDetailPage(vmid);
|
||||
} else {
|
||||
@@ -316,30 +307,6 @@ async function saveInstance() {
|
||||
}
|
||||
}
|
||||
|
||||
async function _snapshotJobBaseline() {
|
||||
const jobs = await fetch('/api/jobs').then(r => r.json());
|
||||
return new Map(jobs.map(j => [j.id, j.last_run_id ?? null]));
|
||||
}
|
||||
|
||||
async function _waitForOnCreateJobs(baseline) {
|
||||
const jobs = await fetch('/api/jobs').then(r => r.json());
|
||||
const relevant = jobs.filter(j => (j.config ?? {}).run_on_create);
|
||||
if (!relevant.length) return;
|
||||
|
||||
const deadline = Date.now() + 30_000;
|
||||
while (Date.now() < deadline) {
|
||||
await new Promise(r => setTimeout(r, 500));
|
||||
const current = await fetch('/api/jobs').then(r => r.json());
|
||||
const allDone = relevant.every(j => {
|
||||
const cur = current.find(c => c.id === j.id);
|
||||
if (!cur) return true;
|
||||
if (cur.last_run_id === baseline.get(j.id)) return false; // new run not started yet
|
||||
return cur.last_status !== 'running'; // new run complete
|
||||
});
|
||||
if (allDone) return;
|
||||
}
|
||||
}
|
||||
|
||||
// ── Confirm Dialog ────────────────────────────────────────────────────────────
|
||||
|
||||
function confirmDeleteDialog(inst) {
|
||||
@@ -417,17 +384,15 @@ async function importDB() {
|
||||
document.getElementById('confirm-ok').onclick = async () => {
|
||||
closeConfirm();
|
||||
try {
|
||||
const { instances, history = [], jobs, job_runs } = JSON.parse(await file.text());
|
||||
const { instances } = JSON.parse(await file.text());
|
||||
const res = await fetch('/api/import', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ instances, history, jobs, job_runs }),
|
||||
body: JSON.stringify({ instances }),
|
||||
});
|
||||
const data = await res.json();
|
||||
if (!res.ok) { showToast(data.error ?? 'Import failed', 'error'); return; }
|
||||
const parts = [`${data.imported} instance${data.imported !== 1 ? 's' : ''}`];
|
||||
if (data.imported_jobs != null) parts.push(`${data.imported_jobs} job${data.imported_jobs !== 1 ? 's' : ''}`);
|
||||
showToast(`Imported ${parts.join(', ')}`, 'success');
|
||||
showToast(`Imported ${data.imported} instance${data.imported !== 1 ? 's' : ''}`, 'success');
|
||||
closeSettingsModal();
|
||||
renderDashboard();
|
||||
} catch {
|
||||
@@ -461,140 +426,3 @@ document.getElementById('tz-select').addEventListener('change', e => {
|
||||
if (m) renderDetailPage(parseInt(m[1], 10));
|
||||
else renderDashboard();
|
||||
});
|
||||
|
||||
// ── Jobs Page ─────────────────────────────────────────────────────────────────
|
||||
|
||||
async function renderJobsPage() {
|
||||
const jobs = await fetch('/api/jobs').then(r => r.json());
|
||||
_updateJobsNavDot(jobs);
|
||||
document.getElementById('jobs-list').innerHTML = jobs.length
|
||||
? jobs.map(j => `
|
||||
<div class="job-item" id="job-item-${j.id}" onclick="loadJobDetail(${j.id})">
|
||||
<span class="job-dot job-dot--${j.last_status ?? 'none'}"></span>
|
||||
<span class="job-item-name">${esc(j.name)}</span>
|
||||
</div>`).join('')
|
||||
: '<div class="jobs-placeholder">No jobs</div>';
|
||||
if (jobs.length) loadJobDetail(jobs[0].id);
|
||||
}
|
||||
|
||||
async function loadJobDetail(jobId) {
|
||||
document.querySelectorAll('.job-item').forEach(el => el.classList.remove('active'));
|
||||
document.getElementById(`job-item-${jobId}`)?.classList.add('active');
|
||||
const job = await fetch(`/api/jobs/${jobId}`).then(r => r.json());
|
||||
const cfg = job.config ?? {};
|
||||
document.getElementById('jobs-detail').innerHTML = `
|
||||
<div class="jobs-detail-hd">
|
||||
<div class="jobs-detail-title">${esc(job.name)}</div>
|
||||
<div class="jobs-detail-desc">${esc(job.description)}</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="form-label" style="display:flex;align-items:center;gap:8px;cursor:pointer">
|
||||
<input type="checkbox" id="job-enabled" ${job.enabled ? 'checked' : ''}
|
||||
style="accent-color:var(--accent);width:13px;height:13px">
|
||||
Enable scheduled runs
|
||||
</label>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="job-schedule">Poll interval (minutes)</label>
|
||||
<input class="form-input" id="job-schedule" type="number" min="1" value="${job.schedule}" style="max-width:100px">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="form-label" style="display:flex;align-items:center;gap:8px;cursor:pointer">
|
||||
<input type="checkbox" id="job-run-on-create" ${cfg.run_on_create ? 'checked' : ''}
|
||||
style="accent-color:var(--accent);width:13px;height:13px">
|
||||
Run on instance creation
|
||||
</label>
|
||||
</div>
|
||||
${_renderJobConfigFields(job.key, cfg)}
|
||||
<div class="job-actions">
|
||||
<button class="btn btn-secondary" onclick="saveJobDetail(${job.id})">Save</button>
|
||||
<button class="btn btn-secondary" id="job-run-btn" onclick="runJobNow(${job.id})">Run Now</button>
|
||||
</div>
|
||||
<div class="detail-section-title" style="margin:28px 0 10px">Run History</div>
|
||||
${_renderRunList(job.runs)}
|
||||
`;
|
||||
}
|
||||
|
||||
function _renderJobConfigFields(key, cfg) {
|
||||
if (key === 'tailscale_sync') return `
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="job-cfg-tailnet">Tailnet</label>
|
||||
<input class="form-input" id="job-cfg-tailnet" type="text"
|
||||
placeholder="e.g. Tt3Btpm6D921CNTRL" value="${esc(cfg.tailnet ?? '')}">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="job-cfg-api-key">API Key</label>
|
||||
<input class="form-input" id="job-cfg-api-key" type="password"
|
||||
placeholder="tskey-api-…" value="${esc(cfg.api_key ?? '')}">
|
||||
</div>`;
|
||||
if (key === 'patchmon_sync' || key === 'semaphore_sync') {
|
||||
const label = key === 'semaphore_sync' ? 'API Token (Bearer)' : 'API Token (Basic)';
|
||||
return `
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="job-cfg-api-url">API URL</label>
|
||||
<input class="form-input" id="job-cfg-api-url" type="text"
|
||||
value="${esc(cfg.api_url ?? '')}">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="job-cfg-api-token">${label}</label>
|
||||
<input class="form-input" id="job-cfg-api-token" type="password"
|
||||
value="${esc(cfg.api_token ?? '')}">
|
||||
</div>`;
|
||||
}
|
||||
return '';
|
||||
}
|
||||
|
||||
function _renderRunList(runs) {
|
||||
if (!runs?.length) return '<div class="run-empty">No runs yet</div>';
|
||||
return `<div class="run-list">${runs.map(r => `
|
||||
<div class="run-item">
|
||||
<span class="job-dot job-dot--${r.status}"></span>
|
||||
<span class="run-time">${fmtDateFull(r.started_at)}</span>
|
||||
<span class="run-status">${esc(r.status)}</span>
|
||||
<span class="run-result">${esc(r.result)}</span>
|
||||
</div>`).join('')}</div>`;
|
||||
}
|
||||
|
||||
async function saveJobDetail(jobId) {
|
||||
const enabled = document.getElementById('job-enabled').checked;
|
||||
const schedule = document.getElementById('job-schedule').value;
|
||||
const cfg = {};
|
||||
const tailnet = document.getElementById('job-cfg-tailnet');
|
||||
const apiKey = document.getElementById('job-cfg-api-key');
|
||||
const apiUrl = document.getElementById('job-cfg-api-url');
|
||||
const apiToken = document.getElementById('job-cfg-api-token');
|
||||
if (tailnet) cfg.tailnet = tailnet.value.trim();
|
||||
if (apiKey) cfg.api_key = apiKey.value;
|
||||
if (apiUrl) cfg.api_url = apiUrl.value.trim();
|
||||
if (apiToken) cfg.api_token = apiToken.value;
|
||||
const runOnCreate = document.getElementById('job-run-on-create');
|
||||
if (runOnCreate) cfg.run_on_create = runOnCreate.checked;
|
||||
const res = await fetch(`/api/jobs/${jobId}`, {
|
||||
method: 'PUT',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ enabled, schedule: parseInt(schedule, 10), config: cfg }),
|
||||
});
|
||||
if (res.ok) { showToast('Job saved', 'success'); loadJobDetail(jobId); }
|
||||
else { showToast('Failed to save', 'error'); }
|
||||
}
|
||||
|
||||
async function runJobNow(jobId) {
|
||||
const btn = document.getElementById('job-run-btn');
|
||||
btn.disabled = true;
|
||||
btn.textContent = 'Running…';
|
||||
try {
|
||||
const res = await fetch(`/api/jobs/${jobId}/run`, { method: 'POST' });
|
||||
const data = await res.json();
|
||||
if (res.ok) { showToast(`Done — ${data.summary}`, 'success'); loadJobDetail(jobId); }
|
||||
else { showToast(data.error ?? 'Run failed', 'error'); }
|
||||
} catch { showToast('Run failed', 'error'); }
|
||||
finally { btn.disabled = false; btn.textContent = 'Run Now'; }
|
||||
}
|
||||
|
||||
function _updateJobsNavDot(jobs) {
|
||||
const dot = document.getElementById('nav-jobs-dot');
|
||||
const cls = jobs.some(j => j.last_status === 'error') ? 'error'
|
||||
: jobs.some(j => j.last_status === 'success') ? 'success'
|
||||
: 'none';
|
||||
dot.className = `nav-job-dot nav-job-dot--${cls}`;
|
||||
}
|
||||
|
||||
@@ -1 +1 @@
|
||||
const VERSION = "1.5.0";
|
||||
const VERSION = "1.3.0";
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "catalyst",
|
||||
"version": "1.5.0",
|
||||
"version": "1.3.0",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"start": "node server/server.js",
|
||||
|
||||
165
server/db.js
165
server/db.js
@@ -17,7 +17,7 @@ function init(path) {
|
||||
db.exec('PRAGMA foreign_keys = ON');
|
||||
db.exec('PRAGMA synchronous = NORMAL');
|
||||
createSchema();
|
||||
if (path !== ':memory:') { seed(); seedJobs(); }
|
||||
if (path !== ':memory:') seed();
|
||||
}
|
||||
|
||||
function createSchema() {
|
||||
@@ -53,31 +53,6 @@ function createSchema() {
|
||||
changed_at TEXT NOT NULL DEFAULT (datetime('now'))
|
||||
);
|
||||
CREATE INDEX IF NOT EXISTS idx_history_vmid ON instance_history(vmid);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS config (
|
||||
key TEXT PRIMARY KEY,
|
||||
value TEXT NOT NULL DEFAULT ''
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS jobs (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
key TEXT NOT NULL UNIQUE,
|
||||
name TEXT NOT NULL,
|
||||
description TEXT NOT NULL DEFAULT '',
|
||||
enabled INTEGER NOT NULL DEFAULT 0 CHECK(enabled IN (0,1)),
|
||||
schedule INTEGER NOT NULL DEFAULT 15,
|
||||
config TEXT NOT NULL DEFAULT '{}'
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS job_runs (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
job_id INTEGER NOT NULL,
|
||||
started_at TEXT NOT NULL DEFAULT (datetime('now')),
|
||||
ended_at TEXT,
|
||||
status TEXT NOT NULL DEFAULT 'running' CHECK(status IN ('running','success','error')),
|
||||
result TEXT NOT NULL DEFAULT ''
|
||||
);
|
||||
CREATE INDEX IF NOT EXISTS idx_job_runs_job_id ON job_runs(job_id);
|
||||
`);
|
||||
}
|
||||
|
||||
@@ -108,29 +83,6 @@ function seed() {
|
||||
db.exec('COMMIT');
|
||||
}
|
||||
|
||||
function seedJobs() {
|
||||
const upsert = db.prepare(`
|
||||
INSERT OR IGNORE INTO jobs (key, name, description, enabled, schedule, config)
|
||||
VALUES (?, ?, ?, ?, ?, ?)
|
||||
`);
|
||||
|
||||
const apiKey = getConfig('tailscale_api_key');
|
||||
const tailnet = getConfig('tailscale_tailnet');
|
||||
const tsSchedule = parseInt(getConfig('tailscale_poll_minutes', '15'), 10) || 15;
|
||||
const tsEnabled = getConfig('tailscale_enabled') === '1' ? 1 : 0;
|
||||
upsert.run('tailscale_sync', 'Tailscale Sync',
|
||||
'Syncs Tailscale device status and IPs to instances by matching hostnames.',
|
||||
tsEnabled, tsSchedule, JSON.stringify({ api_key: apiKey, tailnet }));
|
||||
|
||||
upsert.run('patchmon_sync', 'Patchmon Sync',
|
||||
'Syncs Patchmon host registration status to instances by matching hostnames.',
|
||||
0, 60, JSON.stringify({ api_url: 'http://patchmon:3000/api/v1/api/hosts', api_token: '' }));
|
||||
|
||||
upsert.run('semaphore_sync', 'Semaphore Sync',
|
||||
'Syncs Semaphore inventory membership to instances by matching hostnames.',
|
||||
0, 60, JSON.stringify({ api_url: 'http://semaphore:3000/api/project/1/inventory/1', api_token: '' }));
|
||||
}
|
||||
|
||||
// ── Queries ───────────────────────────────────────────────────────────────────
|
||||
|
||||
export function getInstances(filters = {}) {
|
||||
@@ -173,8 +125,7 @@ export function createInstance(data) {
|
||||
@tailscale, @andromeda, @tailscale_ip, @hardware_acceleration)
|
||||
`).run(data);
|
||||
db.prepare(
|
||||
`INSERT INTO instance_history (vmid, field, old_value, new_value, changed_at)
|
||||
VALUES (?, 'created', NULL, NULL, strftime('%Y-%m-%dT%H:%M:%f', 'now'))`
|
||||
`INSERT INTO instance_history (vmid, field, old_value, new_value) VALUES (?, 'created', NULL, NULL)`
|
||||
).run(data.vmid);
|
||||
}
|
||||
|
||||
@@ -185,13 +136,12 @@ export function updateInstance(vmid, data) {
|
||||
name=@name, state=@state, stack=@stack, vmid=@newVmid,
|
||||
atlas=@atlas, argus=@argus, semaphore=@semaphore, patchmon=@patchmon,
|
||||
tailscale=@tailscale, andromeda=@andromeda, tailscale_ip=@tailscale_ip,
|
||||
hardware_acceleration=@hardware_acceleration, updated_at=strftime('%Y-%m-%dT%H:%M:%f', 'now')
|
||||
hardware_acceleration=@hardware_acceleration, updated_at=datetime('now')
|
||||
WHERE vmid=@vmid
|
||||
`).run({ ...data, newVmid: data.vmid, vmid });
|
||||
const newVmid = data.vmid;
|
||||
const insertEvt = db.prepare(
|
||||
`INSERT INTO instance_history (vmid, field, old_value, new_value, changed_at)
|
||||
VALUES (?, ?, ?, ?, strftime('%Y-%m-%dT%H:%M:%f', 'now'))`
|
||||
`INSERT INTO instance_history (vmid, field, old_value, new_value) VALUES (?, ?, ?, ?)`
|
||||
);
|
||||
for (const field of HISTORY_FIELDS) {
|
||||
const oldVal = String(old[field] ?? '');
|
||||
@@ -201,13 +151,11 @@ export function updateInstance(vmid, data) {
|
||||
}
|
||||
|
||||
export function deleteInstance(vmid) {
|
||||
db.prepare('DELETE FROM instance_history WHERE vmid = ?').run(vmid);
|
||||
db.prepare('DELETE FROM instances WHERE vmid = ?').run(vmid);
|
||||
return db.prepare('DELETE FROM instances WHERE vmid = ?').run(vmid);
|
||||
}
|
||||
|
||||
export function importInstances(rows, historyRows = []) {
|
||||
export function importInstances(rows) {
|
||||
db.exec('BEGIN');
|
||||
db.exec('DELETE FROM instance_history');
|
||||
db.exec('DELETE FROM instances');
|
||||
const insert = db.prepare(`
|
||||
INSERT INTO instances
|
||||
@@ -218,114 +166,15 @@ export function importInstances(rows, historyRows = []) {
|
||||
@tailscale, @andromeda, @tailscale_ip, @hardware_acceleration)
|
||||
`);
|
||||
for (const row of rows) insert.run(row);
|
||||
if (historyRows.length) {
|
||||
const insertHist = db.prepare(
|
||||
`INSERT INTO instance_history (vmid, field, old_value, new_value, changed_at) VALUES (?, ?, ?, ?, ?)`
|
||||
);
|
||||
for (const h of historyRows) insertHist.run(h.vmid, h.field, h.old_value ?? null, h.new_value ?? null, h.changed_at);
|
||||
}
|
||||
db.exec('COMMIT');
|
||||
}
|
||||
|
||||
export function getInstanceHistory(vmid) {
|
||||
return db.prepare(
|
||||
'SELECT * FROM instance_history WHERE vmid = ? ORDER BY changed_at DESC, id DESC'
|
||||
'SELECT * FROM instance_history WHERE vmid = ? ORDER BY changed_at DESC'
|
||||
).all(vmid);
|
||||
}
|
||||
|
||||
export function getAllHistory() {
|
||||
return db.prepare('SELECT * FROM instance_history ORDER BY vmid, changed_at').all();
|
||||
}
|
||||
|
||||
export function getAllJobs() {
|
||||
return db.prepare('SELECT id, key, name, description, enabled, schedule, config FROM jobs ORDER BY id').all();
|
||||
}
|
||||
|
||||
export function getAllJobRuns() {
|
||||
return db.prepare('SELECT * FROM job_runs ORDER BY job_id, id').all();
|
||||
}
|
||||
|
||||
export function importJobs(jobRows, jobRunRows = []) {
|
||||
db.exec('BEGIN');
|
||||
db.exec('DELETE FROM job_runs');
|
||||
db.exec('DELETE FROM jobs');
|
||||
const insertJob = db.prepare(`
|
||||
INSERT INTO jobs (id, key, name, description, enabled, schedule, config)
|
||||
VALUES (@id, @key, @name, @description, @enabled, @schedule, @config)
|
||||
`);
|
||||
for (const j of jobRows) insertJob.run(j);
|
||||
if (jobRunRows.length) {
|
||||
const insertRun = db.prepare(`
|
||||
INSERT INTO job_runs (id, job_id, started_at, ended_at, status, result)
|
||||
VALUES (@id, @job_id, @started_at, @ended_at, @status, @result)
|
||||
`);
|
||||
for (const r of jobRunRows) insertRun.run(r);
|
||||
}
|
||||
db.exec('COMMIT');
|
||||
}
|
||||
|
||||
export function getConfig(key, defaultVal = '') {
|
||||
const row = db.prepare('SELECT value FROM config WHERE key = ?').get(key);
|
||||
return row ? row.value : defaultVal;
|
||||
}
|
||||
|
||||
export function setConfig(key, value) {
|
||||
db.prepare(
|
||||
`INSERT INTO config (key, value) VALUES (?, ?)
|
||||
ON CONFLICT(key) DO UPDATE SET value = excluded.value`
|
||||
).run(key, String(value));
|
||||
}
|
||||
|
||||
// ── Jobs ──────────────────────────────────────────────────────────────────────
|
||||
|
||||
const JOB_WITH_LAST_RUN = `
|
||||
SELECT j.*,
|
||||
r.id AS last_run_id,
|
||||
r.started_at AS last_run_at,
|
||||
r.status AS last_status,
|
||||
r.result AS last_result
|
||||
FROM jobs j
|
||||
LEFT JOIN job_runs r
|
||||
ON r.id = (SELECT id FROM job_runs WHERE job_id = j.id ORDER BY id DESC LIMIT 1)
|
||||
`;
|
||||
|
||||
export function getJobs() {
|
||||
return db.prepare(JOB_WITH_LAST_RUN + ' ORDER BY j.id').all();
|
||||
}
|
||||
|
||||
export function getJob(id) {
|
||||
return db.prepare(JOB_WITH_LAST_RUN + ' WHERE j.id = ?').get(id) ?? null;
|
||||
}
|
||||
|
||||
export function createJob(data) {
|
||||
db.prepare(`
|
||||
INSERT INTO jobs (key, name, description, enabled, schedule, config)
|
||||
VALUES (@key, @name, @description, @enabled, @schedule, @config)
|
||||
`).run(data);
|
||||
}
|
||||
|
||||
export function updateJob(id, { enabled, schedule, config }) {
|
||||
db.prepare(`
|
||||
UPDATE jobs SET enabled=@enabled, schedule=@schedule, config=@config WHERE id=@id
|
||||
`).run({ id, enabled, schedule, config });
|
||||
}
|
||||
|
||||
export function createJobRun(jobId) {
|
||||
return Number(db.prepare(
|
||||
`INSERT INTO job_runs (job_id, started_at) VALUES (?, strftime('%Y-%m-%dT%H:%M:%f', 'now'))`
|
||||
).run(jobId).lastInsertRowid);
|
||||
}
|
||||
|
||||
export function completeJobRun(runId, status, result) {
|
||||
db.prepare(`
|
||||
UPDATE job_runs SET ended_at=strftime('%Y-%m-%dT%H:%M:%f', 'now'), status=@status, result=@result WHERE id=@id
|
||||
`).run({ id: runId, status, result });
|
||||
}
|
||||
|
||||
export function getJobRuns(jobId) {
|
||||
return db.prepare('SELECT * FROM job_runs WHERE job_id = ? ORDER BY id DESC').all(jobId);
|
||||
}
|
||||
|
||||
// ── Test helpers ──────────────────────────────────────────────────────────────
|
||||
|
||||
export function _resetForTest() {
|
||||
|
||||
150
server/jobs.js
150
server/jobs.js
@@ -1,150 +0,0 @@
|
||||
import { getJobs, getJob, getInstances, updateInstance, createJobRun, completeJobRun } from './db.js';
|
||||
|
||||
// ── Handlers ──────────────────────────────────────────────────────────────────
|
||||
|
||||
const TAILSCALE_API = 'https://api.tailscale.com/api/v2';
|
||||
|
||||
async function tailscaleSyncHandler(cfg) {
|
||||
const { api_key, tailnet } = cfg;
|
||||
if (!api_key || !tailnet) throw new Error('Tailscale not configured — set API key and tailnet');
|
||||
|
||||
const res = await fetch(
|
||||
`${TAILSCALE_API}/tailnet/${encodeURIComponent(tailnet)}/devices`,
|
||||
{ headers: { Authorization: `Bearer ${api_key}` } }
|
||||
);
|
||||
if (!res.ok) throw new Error(`Tailscale API ${res.status}`);
|
||||
|
||||
const { devices } = await res.json();
|
||||
const tsMap = new Map(
|
||||
devices.map(d => [d.hostname, (d.addresses ?? []).find(a => a.startsWith('100.')) ?? ''])
|
||||
);
|
||||
|
||||
const instances = getInstances();
|
||||
let updated = 0;
|
||||
for (const inst of instances) {
|
||||
const tsIp = tsMap.get(inst.name);
|
||||
const matched = tsIp !== undefined;
|
||||
const newTailscale = matched ? 1 : (inst.tailscale === 1 ? 0 : inst.tailscale);
|
||||
const newIp = matched ? tsIp : (inst.tailscale === 1 ? '' : inst.tailscale_ip);
|
||||
if (newTailscale !== inst.tailscale || newIp !== inst.tailscale_ip) {
|
||||
const { id: _id, created_at: _ca, updated_at: _ua, ...instData } = inst;
|
||||
updateInstance(inst.vmid, { ...instData, tailscale: newTailscale, tailscale_ip: newIp });
|
||||
updated++;
|
||||
}
|
||||
}
|
||||
return { summary: `${updated} updated of ${instances.length}` };
|
||||
}
|
||||
|
||||
// ── Patchmon Sync ─────────────────────────────────────────────────────────────
|
||||
|
||||
async function patchmonSyncHandler(cfg) {
|
||||
const { api_url, api_token } = cfg;
|
||||
if (!api_url || !api_token) throw new Error('Patchmon not configured — set API URL and token');
|
||||
|
||||
const res = await fetch(api_url, {
|
||||
headers: { Authorization: `Basic ${api_token}` },
|
||||
});
|
||||
if (!res.ok) throw new Error(`Patchmon API ${res.status}`);
|
||||
|
||||
const data = await res.json();
|
||||
const items = Array.isArray(data) ? data : (data.hosts ?? data.data ?? []);
|
||||
const hostSet = new Set(
|
||||
items.map(h => (typeof h === 'string' ? h : (h.name ?? h.hostname ?? h.host ?? '')))
|
||||
.filter(Boolean)
|
||||
);
|
||||
|
||||
const instances = getInstances();
|
||||
let updated = 0;
|
||||
for (const inst of instances) {
|
||||
const newPatchmon = hostSet.has(inst.name) ? 1 : 0;
|
||||
if (newPatchmon !== inst.patchmon) {
|
||||
const { id: _id, created_at: _ca, updated_at: _ua, ...instData } = inst;
|
||||
updateInstance(inst.vmid, { ...instData, patchmon: newPatchmon });
|
||||
updated++;
|
||||
}
|
||||
}
|
||||
return { summary: `${updated} updated of ${instances.length}` };
|
||||
}
|
||||
|
||||
// ── Semaphore Sync ────────────────────────────────────────────────────────────
|
||||
|
||||
async function semaphoreSyncHandler(cfg) {
|
||||
const { api_url, api_token } = cfg;
|
||||
if (!api_url || !api_token) throw new Error('Semaphore not configured — set API URL and token');
|
||||
|
||||
const res = await fetch(api_url, {
|
||||
headers: { Authorization: `Bearer ${api_token}` },
|
||||
});
|
||||
if (!res.ok) throw new Error(`Semaphore API ${res.status}`);
|
||||
|
||||
const data = await res.json();
|
||||
// Inventory is an Ansible INI string; extract bare hostnames
|
||||
const hostSet = new Set(
|
||||
(data.inventory ?? '').split('\n')
|
||||
.map(l => l.trim())
|
||||
.filter(l => l && !l.startsWith('[') && !l.startsWith('#') && !l.startsWith(';'))
|
||||
.map(l => l.split(/[\s=]/)[0])
|
||||
.filter(Boolean)
|
||||
);
|
||||
|
||||
const instances = getInstances();
|
||||
let updated = 0;
|
||||
for (const inst of instances) {
|
||||
const newSemaphore = hostSet.has(inst.name) ? 1 : 0;
|
||||
if (newSemaphore !== inst.semaphore) {
|
||||
const { id: _id, created_at: _ca, updated_at: _ua, ...instData } = inst;
|
||||
updateInstance(inst.vmid, { ...instData, semaphore: newSemaphore });
|
||||
updated++;
|
||||
}
|
||||
}
|
||||
return { summary: `${updated} updated of ${instances.length}` };
|
||||
}
|
||||
|
||||
// ── Registry ──────────────────────────────────────────────────────────────────
|
||||
|
||||
const HANDLERS = {
|
||||
tailscale_sync: tailscaleSyncHandler,
|
||||
patchmon_sync: patchmonSyncHandler,
|
||||
semaphore_sync: semaphoreSyncHandler,
|
||||
};
|
||||
|
||||
// ── Public API ────────────────────────────────────────────────────────────────
|
||||
|
||||
export async function runJob(jobId) {
|
||||
const job = getJob(jobId);
|
||||
if (!job) throw new Error('Job not found');
|
||||
const handler = HANDLERS[job.key];
|
||||
if (!handler) throw new Error(`No handler for '${job.key}'`);
|
||||
const cfg = JSON.parse(job.config || '{}');
|
||||
const runId = createJobRun(jobId);
|
||||
try {
|
||||
const result = await handler(cfg);
|
||||
completeJobRun(runId, 'success', result.summary ?? '');
|
||||
return result;
|
||||
} catch (e) {
|
||||
completeJobRun(runId, 'error', e.message);
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
|
||||
const _intervals = new Map();
|
||||
|
||||
export async function runJobsOnCreate() {
|
||||
for (const job of getJobs()) {
|
||||
const cfg = JSON.parse(job.config || '{}');
|
||||
if (cfg.run_on_create) {
|
||||
try { await runJob(job.id); } catch (e) { console.error(`runJobsOnCreate job ${job.id}:`, e); }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export function restartJobs() {
|
||||
for (const iv of _intervals.values()) clearInterval(iv);
|
||||
_intervals.clear();
|
||||
for (const job of getJobs()) {
|
||||
if (!job.enabled) continue;
|
||||
const ms = Math.max(1, job.schedule || 15) * 60_000;
|
||||
const id = job.id;
|
||||
_intervals.set(id, setInterval(() => runJob(id).catch(() => {}), ms));
|
||||
}
|
||||
}
|
||||
@@ -1,11 +1,8 @@
|
||||
import { Router } from 'express';
|
||||
import {
|
||||
getInstances, getInstance, getDistinctStacks,
|
||||
createInstance, updateInstance, deleteInstance, importInstances, getInstanceHistory, getAllHistory,
|
||||
getConfig, setConfig, getJobs, getJob, updateJob, getJobRuns,
|
||||
getAllJobs, getAllJobRuns, importJobs,
|
||||
createInstance, updateInstance, deleteInstance, importInstances, getInstanceHistory,
|
||||
} from './db.js';
|
||||
import { runJob, restartJobs, runJobsOnCreate } from './jobs.js';
|
||||
|
||||
export const router = Router();
|
||||
|
||||
@@ -15,15 +12,6 @@ const VALID_STATES = ['deployed', 'testing', 'degraded'];
|
||||
const VALID_STACKS = ['production', 'development'];
|
||||
const SERVICE_KEYS = ['atlas', 'argus', 'semaphore', 'patchmon', 'tailscale', 'andromeda'];
|
||||
|
||||
const REDACTED = '**REDACTED**';
|
||||
|
||||
function maskJob(job) {
|
||||
const cfg = JSON.parse(job.config || '{}');
|
||||
if (cfg.api_key) cfg.api_key = REDACTED;
|
||||
if (cfg.api_token) cfg.api_token = REDACTED;
|
||||
return { ...job, config: cfg };
|
||||
}
|
||||
|
||||
function validate(body) {
|
||||
const errors = [];
|
||||
if (!body.name || typeof body.name !== 'string' || !body.name.trim())
|
||||
@@ -102,7 +90,6 @@ router.post('/instances', (req, res) => {
|
||||
createInstance(data);
|
||||
const created = getInstance(data.vmid);
|
||||
res.status(201).json(created);
|
||||
runJobsOnCreate().catch(() => {});
|
||||
} catch (e) {
|
||||
handleDbError('POST /api/instances', e, res);
|
||||
}
|
||||
@@ -129,17 +116,14 @@ router.put('/instances/:vmid', (req, res) => {
|
||||
// GET /api/export
|
||||
router.get('/export', (_req, res) => {
|
||||
const instances = getInstances();
|
||||
const history = getAllHistory();
|
||||
const jobs = getAllJobs();
|
||||
const job_runs = getAllJobRuns();
|
||||
const date = new Date().toISOString().slice(0, 10);
|
||||
res.setHeader('Content-Disposition', `attachment; filename="catalyst-backup-${date}.json"`);
|
||||
res.json({ version: 3, exported_at: new Date().toISOString(), instances, history, jobs, job_runs });
|
||||
res.json({ version: 1, exported_at: new Date().toISOString(), instances });
|
||||
});
|
||||
|
||||
// POST /api/import
|
||||
router.post('/import', (req, res) => {
|
||||
const { instances, history = [], jobs, job_runs } = req.body ?? {};
|
||||
const { instances } = req.body ?? {};
|
||||
if (!Array.isArray(instances)) {
|
||||
return res.status(400).json({ error: 'body must contain an instances array' });
|
||||
}
|
||||
@@ -150,15 +134,8 @@ router.post('/import', (req, res) => {
|
||||
}
|
||||
if (errors.length) return res.status(400).json({ errors });
|
||||
try {
|
||||
importInstances(instances.map(normalise), Array.isArray(history) ? history : []);
|
||||
if (Array.isArray(jobs)) {
|
||||
importJobs(jobs, Array.isArray(job_runs) ? job_runs : []);
|
||||
try { restartJobs(); } catch (e) { console.error('POST /api/import restartJobs', e); }
|
||||
}
|
||||
res.json({
|
||||
imported: instances.length,
|
||||
imported_jobs: Array.isArray(jobs) ? jobs.length : undefined,
|
||||
});
|
||||
importInstances(instances.map(normalise));
|
||||
res.json({ imported: instances.length });
|
||||
} catch (e) {
|
||||
console.error('POST /api/import', e);
|
||||
res.status(500).json({ error: 'internal server error' });
|
||||
@@ -182,49 +159,3 @@ router.delete('/instances/:vmid', (req, res) => {
|
||||
handleDbError('DELETE /api/instances/:vmid', e, res);
|
||||
}
|
||||
});
|
||||
|
||||
// GET /api/jobs
|
||||
router.get('/jobs', (_req, res) => {
|
||||
res.json(getJobs().map(maskJob));
|
||||
});
|
||||
|
||||
// GET /api/jobs/:id
|
||||
router.get('/jobs/:id', (req, res) => {
|
||||
const id = parseInt(req.params.id, 10);
|
||||
if (!id) return res.status(400).json({ error: 'invalid id' });
|
||||
const job = getJob(id);
|
||||
if (!job) return res.status(404).json({ error: 'job not found' });
|
||||
res.json({ ...maskJob(job), runs: getJobRuns(id) });
|
||||
});
|
||||
|
||||
// PUT /api/jobs/:id
|
||||
router.put('/jobs/:id', (req, res) => {
|
||||
const id = parseInt(req.params.id, 10);
|
||||
if (!id) return res.status(400).json({ error: 'invalid id' });
|
||||
const job = getJob(id);
|
||||
if (!job) return res.status(404).json({ error: 'job not found' });
|
||||
const { enabled, schedule, config: newCfg } = req.body ?? {};
|
||||
const existingCfg = JSON.parse(job.config || '{}');
|
||||
const mergedCfg = { ...existingCfg, ...(newCfg ?? {}) };
|
||||
if (newCfg?.api_key === REDACTED) mergedCfg.api_key = existingCfg.api_key;
|
||||
if (newCfg?.api_token === REDACTED) mergedCfg.api_token = existingCfg.api_token;
|
||||
updateJob(id, {
|
||||
enabled: enabled != null ? (enabled ? 1 : 0) : job.enabled,
|
||||
schedule: schedule != null ? (parseInt(schedule, 10) || 15) : job.schedule,
|
||||
config: JSON.stringify(mergedCfg),
|
||||
});
|
||||
try { restartJobs(); } catch (e) { console.error('PUT /api/jobs/:id restartJobs', e); }
|
||||
res.json(maskJob(getJob(id)));
|
||||
});
|
||||
|
||||
// POST /api/jobs/:id/run
|
||||
router.post('/jobs/:id/run', async (req, res) => {
|
||||
const id = parseInt(req.params.id, 10);
|
||||
if (!id) return res.status(400).json({ error: 'invalid id' });
|
||||
if (!getJob(id)) return res.status(404).json({ error: 'job not found' });
|
||||
try {
|
||||
res.json(await runJob(id));
|
||||
} catch (e) {
|
||||
handleDbError('POST /api/jobs/:id/run', e, res);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -3,7 +3,6 @@ import helmet from 'helmet';
|
||||
import { fileURLToPath } from 'url';
|
||||
import { dirname, join } from 'path';
|
||||
import { router } from './routes.js';
|
||||
import { restartJobs } from './jobs.js';
|
||||
|
||||
const __dirname = dirname(fileURLToPath(import.meta.url));
|
||||
const PORT = process.env.PORT ?? 3000;
|
||||
@@ -48,6 +47,5 @@ app.use((err, _req, res, _next) => {
|
||||
|
||||
// Boot — only when run directly, not when imported by tests
|
||||
if (process.argv[1] === fileURLToPath(import.meta.url)) {
|
||||
restartJobs();
|
||||
app.listen(PORT, () => console.log(`catalyst on :${PORT}`));
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest'
|
||||
import request from 'supertest'
|
||||
import { app } from '../server/server.js'
|
||||
import { _resetForTest, createJob } from '../server/db.js'
|
||||
import { _resetForTest } from '../server/db.js'
|
||||
import * as dbModule from '../server/db.js'
|
||||
|
||||
beforeEach(() => _resetForTest())
|
||||
@@ -275,33 +275,6 @@ describe('GET /api/export', () => {
|
||||
const res = await request(app).get('/api/export')
|
||||
expect(res.body.instances).toEqual([])
|
||||
})
|
||||
|
||||
it('returns version 3', async () => {
|
||||
const res = await request(app).get('/api/export')
|
||||
expect(res.body.version).toBe(3)
|
||||
})
|
||||
|
||||
it('includes a history array', async () => {
|
||||
await request(app).post('/api/instances').send(base)
|
||||
const res = await request(app).get('/api/export')
|
||||
expect(res.body.history).toBeInstanceOf(Array)
|
||||
expect(res.body.history.some(e => e.field === 'created')).toBe(true)
|
||||
})
|
||||
|
||||
it('includes jobs and job_runs arrays', async () => {
|
||||
createJob(testJob)
|
||||
const res = await request(app).get('/api/export')
|
||||
expect(res.body.jobs).toBeInstanceOf(Array)
|
||||
expect(res.body.jobs).toHaveLength(1)
|
||||
expect(res.body.jobs[0].key).toBe('tailscale_sync')
|
||||
expect(res.body.job_runs).toBeInstanceOf(Array)
|
||||
})
|
||||
|
||||
it('exports raw job config without masking', async () => {
|
||||
createJob(testJob)
|
||||
const res = await request(app).get('/api/export')
|
||||
expect(res.body.jobs[0].config).toContain('tskey-test')
|
||||
})
|
||||
})
|
||||
|
||||
// ── POST /api/import ──────────────────────────────────────────────────────────
|
||||
@@ -336,48 +309,6 @@ describe('POST /api/import', () => {
|
||||
.send({ instances: [{ ...base, name: undefined, vmid: 1 }] })
|
||||
expect(res.status).toBe(400)
|
||||
})
|
||||
|
||||
it('restores history when history array is provided', async () => {
|
||||
await request(app).post('/api/instances').send(base)
|
||||
const exp = await request(app).get('/api/export')
|
||||
await request(app).post('/api/instances').send({ ...base, vmid: 999, name: 'other' })
|
||||
const res = await request(app).post('/api/import').send({
|
||||
instances: exp.body.instances,
|
||||
history: exp.body.history,
|
||||
})
|
||||
expect(res.status).toBe(200)
|
||||
const hist = await request(app).get('/api/instances/100/history')
|
||||
expect(hist.body.some(e => e.field === 'created')).toBe(true)
|
||||
})
|
||||
|
||||
it('succeeds with a v1 backup that has no history key', async () => {
|
||||
const res = await request(app).post('/api/import')
|
||||
.send({ instances: [{ ...base, vmid: 1, name: 'legacy' }] })
|
||||
expect(res.status).toBe(200)
|
||||
expect(res.body.imported).toBe(1)
|
||||
})
|
||||
|
||||
it('imports jobs and job_runs and returns imported_jobs count', async () => {
|
||||
const exp = await request(app).get('/api/export')
|
||||
createJob(testJob)
|
||||
const fullExport = await request(app).get('/api/export')
|
||||
const res = await request(app).post('/api/import').send({
|
||||
instances: fullExport.body.instances,
|
||||
history: fullExport.body.history,
|
||||
jobs: fullExport.body.jobs,
|
||||
job_runs: fullExport.body.job_runs,
|
||||
})
|
||||
expect(res.status).toBe(200)
|
||||
expect(res.body.imported_jobs).toBe(1)
|
||||
expect((await request(app).get('/api/jobs')).body).toHaveLength(1)
|
||||
})
|
||||
|
||||
it('leaves jobs untouched when no jobs key in payload', async () => {
|
||||
createJob(testJob)
|
||||
await request(app).post('/api/import')
|
||||
.send({ instances: [{ ...base, vmid: 1, name: 'x' }] })
|
||||
expect((await request(app).get('/api/jobs')).body).toHaveLength(1)
|
||||
})
|
||||
})
|
||||
|
||||
// ── Static assets & SPA routing ───────────────────────────────────────────────
|
||||
@@ -490,172 +421,3 @@ describe('error handling — unexpected DB failures', () => {
|
||||
)
|
||||
})
|
||||
})
|
||||
|
||||
const testJob = {
|
||||
key: 'tailscale_sync', name: 'Tailscale Sync', description: 'Test job',
|
||||
enabled: 0, schedule: 15,
|
||||
config: JSON.stringify({ api_key: 'tskey-test', tailnet: 'example.com' }),
|
||||
}
|
||||
|
||||
const patchmonJob = {
|
||||
key: 'patchmon_sync', name: 'Patchmon Sync', description: 'Test patchmon job',
|
||||
enabled: 0, schedule: 60,
|
||||
config: JSON.stringify({ api_url: 'http://patchmon:3000/api/v1/api/hosts', api_token: 'secret-token' }),
|
||||
}
|
||||
|
||||
// ── GET /api/jobs ─────────────────────────────────────────────────────────────
|
||||
|
||||
describe('GET /api/jobs', () => {
|
||||
it('returns empty array when no jobs', async () => {
|
||||
const res = await request(app).get('/api/jobs')
|
||||
expect(res.status).toBe(200)
|
||||
expect(res.body).toEqual([])
|
||||
})
|
||||
|
||||
it('returns jobs with masked api key', async () => {
|
||||
createJob(testJob)
|
||||
const res = await request(app).get('/api/jobs')
|
||||
expect(res.body).toHaveLength(1)
|
||||
expect(res.body[0].config.api_key).toBe('**REDACTED**')
|
||||
})
|
||||
|
||||
it('returns jobs with masked api_token', async () => {
|
||||
createJob(patchmonJob)
|
||||
const res = await request(app).get('/api/jobs')
|
||||
expect(res.body[0].config.api_token).toBe('**REDACTED**')
|
||||
})
|
||||
})
|
||||
|
||||
// ── GET /api/jobs/:id ─────────────────────────────────────────────────────────
|
||||
|
||||
describe('GET /api/jobs/:id', () => {
|
||||
it('returns job with runs array', async () => {
|
||||
createJob(testJob)
|
||||
const id = (await request(app).get('/api/jobs')).body[0].id
|
||||
const res = await request(app).get(`/api/jobs/${id}`)
|
||||
expect(res.status).toBe(200)
|
||||
expect(res.body.runs).toBeInstanceOf(Array)
|
||||
})
|
||||
|
||||
it('returns 404 for unknown id', async () => {
|
||||
expect((await request(app).get('/api/jobs/999')).status).toBe(404)
|
||||
})
|
||||
|
||||
it('returns 400 for non-numeric id', async () => {
|
||||
expect((await request(app).get('/api/jobs/abc')).status).toBe(400)
|
||||
})
|
||||
})
|
||||
|
||||
// ── PUT /api/jobs/:id ─────────────────────────────────────────────────────────
|
||||
|
||||
describe('PUT /api/jobs/:id', () => {
|
||||
it('updates enabled and schedule', async () => {
|
||||
createJob(testJob)
|
||||
const id = (await request(app).get('/api/jobs')).body[0].id
|
||||
const res = await request(app).put(`/api/jobs/${id}`).send({ enabled: true, schedule: 30 })
|
||||
expect(res.status).toBe(200)
|
||||
expect(res.body.enabled).toBe(1)
|
||||
expect(res.body.schedule).toBe(30)
|
||||
})
|
||||
|
||||
it('does not overwrite api_key when **REDACTED** is sent', async () => {
|
||||
createJob(testJob)
|
||||
const id = (await request(app).get('/api/jobs')).body[0].id
|
||||
await request(app).put(`/api/jobs/${id}`).send({ config: { api_key: '**REDACTED**' } })
|
||||
expect(dbModule.getJob(id).config).toContain('tskey-test')
|
||||
})
|
||||
|
||||
it('returns 404 for unknown id', async () => {
|
||||
expect((await request(app).put('/api/jobs/999').send({})).status).toBe(404)
|
||||
})
|
||||
})
|
||||
|
||||
// ── POST /api/jobs/:id/run ────────────────────────────────────────────────────
|
||||
|
||||
describe('POST /api/jobs/:id/run', () => {
|
||||
afterEach(() => vi.unstubAllGlobals())
|
||||
|
||||
it('returns 404 for unknown id', async () => {
|
||||
expect((await request(app).post('/api/jobs/999/run')).status).toBe(404)
|
||||
})
|
||||
|
||||
it('runs job, returns summary, and logs the run', async () => {
|
||||
createJob(testJob)
|
||||
const id = (await request(app).get('/api/jobs')).body[0].id
|
||||
vi.stubGlobal('fetch', vi.fn().mockResolvedValueOnce({
|
||||
ok: true,
|
||||
json: async () => ({ devices: [] }),
|
||||
}))
|
||||
const res = await request(app).post(`/api/jobs/${id}/run`)
|
||||
expect(res.status).toBe(200)
|
||||
expect(res.body.summary).toBeDefined()
|
||||
const detail = await request(app).get(`/api/jobs/${id}`)
|
||||
expect(detail.body.runs).toHaveLength(1)
|
||||
expect(detail.body.runs[0].status).toBe('success')
|
||||
})
|
||||
|
||||
it('logs error run on failure', async () => {
|
||||
createJob(testJob)
|
||||
const id = (await request(app).get('/api/jobs')).body[0].id
|
||||
vi.stubGlobal('fetch', vi.fn().mockRejectedValueOnce(new Error('network error')))
|
||||
const res = await request(app).post(`/api/jobs/${id}/run`)
|
||||
expect(res.status).toBe(500)
|
||||
const detail = await request(app).get(`/api/jobs/${id}`)
|
||||
expect(detail.body.runs[0].status).toBe('error')
|
||||
})
|
||||
|
||||
it('patchmon_sync: marks instances present in host list as patchmon=1', async () => {
|
||||
createJob(patchmonJob)
|
||||
const id = (await request(app).get('/api/jobs')).body[0].id
|
||||
vi.stubGlobal('fetch', vi.fn().mockResolvedValueOnce({
|
||||
ok: true,
|
||||
json: async () => [{ name: 'plex' }, { name: 'traefik' }],
|
||||
}))
|
||||
const res = await request(app).post(`/api/jobs/${id}/run`)
|
||||
expect(res.status).toBe(200)
|
||||
expect(res.body.summary).toMatch(/updated of/)
|
||||
})
|
||||
|
||||
it('patchmon_sync: returns 500 when API token is missing', async () => {
|
||||
createJob({ ...patchmonJob, config: JSON.stringify({ api_url: 'http://patchmon:3000/api/v1/api/hosts', api_token: '' }) })
|
||||
const id = (await request(app).get('/api/jobs')).body[0].id
|
||||
const res = await request(app).post(`/api/jobs/${id}/run`)
|
||||
expect(res.status).toBe(500)
|
||||
})
|
||||
|
||||
it('run_on_create: triggers matching jobs when an instance is created', async () => {
|
||||
createJob({ ...testJob, config: JSON.stringify({ api_key: 'k', tailnet: 't', run_on_create: true }) })
|
||||
const id = (await request(app).get('/api/jobs')).body[0].id
|
||||
vi.stubGlobal('fetch', vi.fn().mockResolvedValue({ ok: true, json: async () => ({ devices: [] }) }))
|
||||
await request(app).post('/api/instances').send(base)
|
||||
await new Promise(r => setImmediate(r))
|
||||
const detail = await request(app).get(`/api/jobs/${id}`)
|
||||
expect(detail.body.runs).toHaveLength(1)
|
||||
expect(detail.body.runs[0].status).toBe('success')
|
||||
})
|
||||
|
||||
it('run_on_create: does not trigger jobs without the flag', async () => {
|
||||
createJob(testJob)
|
||||
const id = (await request(app).get('/api/jobs')).body[0].id
|
||||
await request(app).post('/api/instances').send(base)
|
||||
await new Promise(r => setImmediate(r))
|
||||
expect((await request(app).get(`/api/jobs/${id}`)).body.runs).toHaveLength(0)
|
||||
})
|
||||
|
||||
it('semaphore_sync: parses ansible inventory and updates instances', async () => {
|
||||
const semaphoreJob = {
|
||||
key: 'semaphore_sync', name: 'Semaphore Sync', description: 'test',
|
||||
enabled: 0, schedule: 60,
|
||||
config: JSON.stringify({ api_url: 'http://semaphore:3000/api/project/1/inventory/1', api_token: 'bearer-token' }),
|
||||
}
|
||||
createJob(semaphoreJob)
|
||||
const id = (await request(app).get('/api/jobs')).body[0].id
|
||||
vi.stubGlobal('fetch', vi.fn().mockResolvedValueOnce({
|
||||
ok: true,
|
||||
json: async () => ({ inventory: '[production]\nplex\nhomeassistant\n' }),
|
||||
}))
|
||||
const res = await request(app).post(`/api/jobs/${id}/run`)
|
||||
expect(res.status).toBe(200)
|
||||
expect(res.body.summary).toMatch(/updated of/)
|
||||
})
|
||||
})
|
||||
|
||||
145
tests/db.test.js
145
tests/db.test.js
@@ -3,8 +3,6 @@ import {
|
||||
_resetForTest,
|
||||
getInstances, getInstance, getDistinctStacks,
|
||||
createInstance, updateInstance, deleteInstance, importInstances, getInstanceHistory,
|
||||
getConfig, setConfig,
|
||||
getJobs, getJob, createJob, updateJob, createJobRun, completeJobRun, getJobRuns,
|
||||
} from '../server/db.js'
|
||||
|
||||
beforeEach(() => _resetForTest());
|
||||
@@ -166,19 +164,6 @@ describe('deleteInstance', () => {
|
||||
expect(getInstance(1)).toBeNull();
|
||||
expect(getInstance(2)).not.toBeNull();
|
||||
});
|
||||
|
||||
it('clears history for the deleted instance', () => {
|
||||
createInstance({ ...base, name: 'a', vmid: 1 });
|
||||
deleteInstance(1);
|
||||
expect(getInstanceHistory(1)).toHaveLength(0);
|
||||
});
|
||||
|
||||
it('does not clear history for other instances', () => {
|
||||
createInstance({ ...base, name: 'a', vmid: 1 });
|
||||
createInstance({ ...base, name: 'b', vmid: 2 });
|
||||
deleteInstance(1);
|
||||
expect(getInstanceHistory(2).length).toBeGreaterThan(0);
|
||||
});
|
||||
});
|
||||
|
||||
// ── importInstances ───────────────────────────────────────────────────────────
|
||||
@@ -198,21 +183,6 @@ describe('importInstances', () => {
|
||||
importInstances([]);
|
||||
expect(getInstances()).toEqual([]);
|
||||
});
|
||||
|
||||
it('clears history for all replaced instances', () => {
|
||||
createInstance({ ...base, name: 'old', vmid: 1 });
|
||||
importInstances([{ ...base, name: 'new', vmid: 2 }]);
|
||||
expect(getInstanceHistory(1)).toHaveLength(0);
|
||||
});
|
||||
|
||||
it('restores history rows when provided', () => {
|
||||
importInstances(
|
||||
[{ ...base, name: 'a', vmid: 1 }],
|
||||
[{ vmid: 1, field: 'created', old_value: null, new_value: null, changed_at: '2026-01-01 00:00:00' }]
|
||||
);
|
||||
const h = getInstanceHistory(1);
|
||||
expect(h.some(e => e.field === 'created')).toBe(true);
|
||||
});
|
||||
});
|
||||
|
||||
// ── instance history ─────────────────────────────────────────────────────────
|
||||
@@ -271,118 +241,3 @@ describe('test environment boot isolation', () => {
|
||||
expect(getInstances()).toEqual([]);
|
||||
});
|
||||
});
|
||||
|
||||
// ── getConfig / setConfig ─────────────────────────────────────────────────────
|
||||
|
||||
describe('getConfig / setConfig', () => {
|
||||
it('returns defaultVal when key does not exist', () => {
|
||||
expect(getConfig('missing', 'fallback')).toBe('fallback');
|
||||
});
|
||||
|
||||
it('returns empty string by default', () => {
|
||||
expect(getConfig('missing')).toBe('');
|
||||
});
|
||||
|
||||
it('stores and retrieves a value', () => {
|
||||
setConfig('tailscale_api_key', 'tskey-test');
|
||||
expect(getConfig('tailscale_api_key')).toBe('tskey-test');
|
||||
});
|
||||
|
||||
it('overwrites an existing key', () => {
|
||||
setConfig('tailscale_enabled', '0');
|
||||
setConfig('tailscale_enabled', '1');
|
||||
expect(getConfig('tailscale_enabled')).toBe('1');
|
||||
});
|
||||
|
||||
it('config is cleared by _resetForTest', () => {
|
||||
setConfig('tailscale_api_key', 'tskey-test');
|
||||
_resetForTest();
|
||||
expect(getConfig('tailscale_api_key')).toBe('');
|
||||
});
|
||||
});
|
||||
|
||||
// ── jobs ──────────────────────────────────────────────────────────────────────
|
||||
|
||||
const baseJob = {
|
||||
key: 'test_job', name: 'Test Job', description: 'desc',
|
||||
enabled: 0, schedule: 15, config: '{}',
|
||||
};
|
||||
|
||||
describe('jobs', () => {
|
||||
it('returns empty array when no jobs', () => {
|
||||
expect(getJobs()).toEqual([]);
|
||||
});
|
||||
|
||||
it('createJob + getJobs returns the job', () => {
|
||||
createJob(baseJob);
|
||||
expect(getJobs()).toHaveLength(1);
|
||||
expect(getJobs()[0].name).toBe('Test Job');
|
||||
});
|
||||
|
||||
it('getJob returns null for unknown id', () => {
|
||||
expect(getJob(999)).toBeNull();
|
||||
});
|
||||
|
||||
it('updateJob changes enabled and schedule', () => {
|
||||
createJob(baseJob);
|
||||
const id = getJobs()[0].id;
|
||||
updateJob(id, { enabled: 1, schedule: 30, config: '{}' });
|
||||
expect(getJob(id).enabled).toBe(1);
|
||||
expect(getJob(id).schedule).toBe(30);
|
||||
});
|
||||
|
||||
it('getJobs includes last_status null when no runs', () => {
|
||||
createJob(baseJob);
|
||||
expect(getJobs()[0].last_status).toBeNull();
|
||||
});
|
||||
|
||||
it('getJobs reflects last_status after a run', () => {
|
||||
createJob(baseJob);
|
||||
const id = getJobs()[0].id;
|
||||
const runId = createJobRun(id);
|
||||
completeJobRun(runId, 'success', 'ok');
|
||||
expect(getJobs()[0].last_status).toBe('success');
|
||||
});
|
||||
});
|
||||
|
||||
// ── job_runs ──────────────────────────────────────────────────────────────────
|
||||
|
||||
describe('job_runs', () => {
|
||||
it('createJobRun returns a positive id', () => {
|
||||
createJob(baseJob);
|
||||
const id = getJobs()[0].id;
|
||||
expect(createJobRun(id)).toBeGreaterThan(0);
|
||||
});
|
||||
|
||||
it('new run has status running and no ended_at', () => {
|
||||
createJob(baseJob);
|
||||
const id = getJobs()[0].id;
|
||||
const runId = createJobRun(id);
|
||||
const runs = getJobRuns(id);
|
||||
expect(runs[0].status).toBe('running');
|
||||
expect(runs[0].ended_at).toBeNull();
|
||||
});
|
||||
|
||||
it('completeJobRun sets status, result, and ended_at', () => {
|
||||
createJob(baseJob);
|
||||
const id = getJobs()[0].id;
|
||||
const runId = createJobRun(id);
|
||||
completeJobRun(runId, 'success', '2 updated of 8');
|
||||
const run = getJobRuns(id)[0];
|
||||
expect(run.status).toBe('success');
|
||||
expect(run.result).toBe('2 updated of 8');
|
||||
expect(run.ended_at).not.toBeNull();
|
||||
});
|
||||
|
||||
it('getJobRuns returns newest first', () => {
|
||||
createJob(baseJob);
|
||||
const id = getJobs()[0].id;
|
||||
const r1 = createJobRun(id);
|
||||
const r2 = createJobRun(id);
|
||||
completeJobRun(r1, 'success', 'first');
|
||||
completeJobRun(r2, 'error', 'second');
|
||||
const runs = getJobRuns(id);
|
||||
expect(runs[0].id).toBe(r2);
|
||||
expect(runs[1].id).toBe(r1);
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user