-
@@ -171,6 +172,38 @@
+
+
+
timestamps
+ history
diff --git a/js/db.js b/js/db.js
index e3c69b3..ea0c527 100644
--- a/js/db.js
+++ b/js/db.js
@@ -55,3 +55,8 @@ async function updateInstance(vmid, data) {
async function deleteInstance(vmid) {
await api(`/instances/${vmid}`, { method: 'DELETE' });
}
+
+async function getInstanceHistory(vmid) {
+ const res = await fetch(`${BASE}/instances/${vmid}/history`);
+ return res.json();
+}
diff --git a/js/ui.js b/js/ui.js
index 70f70de..865ec77 100644
--- a/js/ui.js
+++ b/js/ui.js
@@ -3,6 +3,34 @@ let editingVmid = null;
let currentVmid = null;
let toastTimer = null;
+// ── Timezone ──────────────────────────────────────────────────────────────────
+
+const TIMEZONES = [
+ { label: 'UTC', tz: 'UTC' },
+ { label: 'Hawaii (HST)', tz: 'Pacific/Honolulu' },
+ { label: 'Alaska (AKT)', tz: 'America/Anchorage' },
+ { label: 'Pacific (PT)', tz: 'America/Los_Angeles' },
+ { label: 'Mountain (MT)', tz: 'America/Denver' },
+ { label: 'Central (CT)', tz: 'America/Chicago' },
+ { label: 'Eastern (ET)', tz: 'America/New_York' },
+ { label: 'Atlantic (AT)', tz: 'America/Halifax' },
+ { label: 'London (GMT/BST)', tz: 'Europe/London' },
+ { label: 'Paris / Berlin (CET)', tz: 'Europe/Paris' },
+ { label: 'Helsinki (EET)', tz: 'Europe/Helsinki' },
+ { label: 'Istanbul (TRT)', tz: 'Europe/Istanbul' },
+ { label: 'Dubai (GST)', tz: 'Asia/Dubai' },
+ { label: 'India (IST)', tz: 'Asia/Kolkata' },
+ { label: 'Singapore (SGT)', tz: 'Asia/Singapore' },
+ { label: 'China (CST)', tz: 'Asia/Shanghai' },
+ { label: 'Japan / Korea (JST/KST)', tz: 'Asia/Tokyo' },
+ { label: 'Sydney (AEST)', tz: 'Australia/Sydney' },
+ { label: 'Auckland (NZST)', tz: 'Pacific/Auckland' },
+];
+
+function getTimezone() {
+ return localStorage.getItem('catalyst_tz') || 'UTC';
+}
+
// ── Helpers ───────────────────────────────────────────────────────────────────
function esc(str) {
@@ -11,17 +39,25 @@ function esc(str) {
return d.innerHTML;
}
+// SQLite datetime('now') → 'YYYY-MM-DD HH:MM:SS' (UTC, no timezone marker).
+// Appending 'Z' tells JS to parse it as UTC rather than local time.
+function parseUtc(d) {
+ if (typeof d !== 'string') return new Date(d);
+ const hasZone = d.endsWith('Z') || /[+-]\d{2}:\d{2}$/.test(d);
+ return new Date(hasZone ? d : d.replace(' ', 'T') + 'Z');
+}
+
function fmtDate(d) {
if (!d) return '—';
try {
- return new Date(d).toLocaleDateString('en-US', { year: 'numeric', month: 'short', day: 'numeric' });
+ return parseUtc(d).toLocaleDateString('en-US', { year: 'numeric', month: 'short', day: 'numeric', timeZone: getTimezone() });
} catch (e) { return d; }
}
function fmtDateFull(d) {
if (!d) return '—';
try {
- return new Date(d).toLocaleString('en-US', { year: 'numeric', month: 'short', day: 'numeric', hour: '2-digit', minute: '2-digit' });
+ return parseUtc(d).toLocaleString('en-US', { year: 'numeric', month: 'short', day: 'numeric', hour: '2-digit', minute: '2-digit', timeZone: getTimezone(), timeZoneName: 'short' });
} catch (e) { return d; }
}
@@ -39,7 +75,6 @@ async function renderDashboard() {
-
`;
await populateStackFilter();
@@ -100,10 +135,39 @@ async function filterInstances() {
// ── Detail Page ───────────────────────────────────────────────────────────────
+const BOOL_FIELDS = ['atlas','argus','semaphore','patchmon','tailscale','andromeda','hardware_acceleration'];
+
+const FIELD_LABELS = {
+ name: 'name',
+ state: 'state',
+ stack: 'stack',
+ vmid: 'vmid',
+ tailscale_ip: 'tailscale ip',
+ atlas: 'atlas',
+ argus: 'argus',
+ semaphore: 'semaphore',
+ patchmon: 'patchmon',
+ tailscale: 'tailscale',
+ andromeda: 'andromeda',
+ hardware_acceleration: 'hw acceleration',
+};
+
+function stateClass(field, val) {
+ if (field !== 'state') return '';
+ return { deployed: 'tl-deployed', testing: 'tl-testing', degraded: 'tl-degraded' }[val] ?? '';
+}
+
+function fmtHistVal(field, val) {
+ if (val == null || val === '') return '—';
+ if (BOOL_FIELDS.includes(field)) return val === '1' ? 'on' : 'off';
+ return esc(val);
+}
+
async function renderDetailPage(vmid) {
- const inst = await getInstance(vmid);
+ const [inst, history, all] = await Promise.all([getInstance(vmid), getInstanceHistory(vmid), getInstances()]);
if (!inst) { navigate('dashboard'); return; }
currentVmid = vmid;
+ document.getElementById('nav-count').textContent = `${all.length} instance${all.length !== 1 ? 's' : ''}`;
document.getElementById('detail-vmid-crumb').textContent = vmid;
document.getElementById('detail-name').textContent = inst.name;
@@ -114,7 +178,7 @@ async function renderDetailPage(vmid) {
document.getElementById('detail-identity').innerHTML = `
`).join('');
- document.getElementById('detail-timestamps').innerHTML = `
- deployed
${states['deployed'] || 0}
testing
${states['testing'] || 0}
degraded
${states['degraded'] || 0}
stacks
${(await getDistinctStacks()).length}
name${esc(inst.name)}
state${esc(inst.state)}
- stack${esc(inst.stack) || '—'}
+ stack${esc(inst.stack) || '—'}
vmid${inst.vmid}
internal id${inst.id}
`;
@@ -134,10 +198,30 @@ async function renderDetailPage(vmid) {
created${fmtDateFull(inst.created_at)}
- updated${fmtDateFull(inst.updated_at)}
- `;
+ document.getElementById('detail-timestamps').innerHTML = history.length
+ ? history.map(e => {
+ if (e.field === 'created') return `
+
+ instance created
+ ${fmtDateFull(e.changed_at)}
+
`;
+ const label = FIELD_LABELS[e.field] ?? esc(e.field);
+ const newCls = (e.field === 'state' || e.field === 'stack')
+ ? `badge ${esc(e.new_value)}`
+ : `tl-new ${stateClass(e.field, e.new_value)}`;
+ return `
+
+
`;
+ }).join('')
+ : '
+ ${label}
+ ·
+ ${fmtHistVal(e.field, e.old_value)}
+ →
+ ${fmtHistVal(e.field, e.new_value)}
+
+ ${fmtDateFull(e.changed_at)}
+ no history yet
';
document.getElementById('detail-edit-btn').onclick = () => openEditModal(inst.vmid);
document.getElementById('detail-delete-btn').onclick = () => confirmDeleteDialog(inst);
@@ -258,12 +342,72 @@ function showToast(msg, type = 'success') {
toastTimer = setTimeout(() => t.classList.remove('show'), 3000);
}
+// ── Settings Modal ────────────────────────────────────────────────────────────
+
+function openSettingsModal() {
+ const sel = document.getElementById('tz-select');
+ if (!sel.options.length) {
+ for (const { label, tz } of TIMEZONES) {
+ const opt = document.createElement('option');
+ opt.value = tz;
+ opt.textContent = label;
+ sel.appendChild(opt);
+ }
+ }
+ sel.value = getTimezone();
+ document.getElementById('settings-modal').classList.add('open');
+}
+
+function closeSettingsModal() {
+ document.getElementById('settings-modal').classList.remove('open');
+ document.getElementById('import-file').value = '';
+}
+
+async function exportDB() {
+ const res = await fetch('/api/export');
+ const blob = await res.blob();
+ const url = URL.createObjectURL(blob);
+ const a = document.createElement('a');
+ a.href = url;
+ a.download = `catalyst-backup-${new Date().toISOString().slice(0, 10)}.json`;
+ a.click();
+ URL.revokeObjectURL(url);
+}
+
+async function importDB() {
+ const file = document.getElementById('import-file').files[0];
+ if (!file) { showToast('Select a backup file first', 'error'); return; }
+ document.getElementById('confirm-title').textContent = 'Replace all instances?';
+ document.getElementById('confirm-msg').textContent =
+ `This will delete all current instances and replace them with the contents of "${file.name}". This cannot be undone.`;
+ document.getElementById('confirm-overlay').classList.add('open');
+ document.getElementById('confirm-ok').onclick = async () => {
+ closeConfirm();
+ try {
+ const { instances } = JSON.parse(await file.text());
+ const res = await fetch('/api/import', {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ instances }),
+ });
+ const data = await res.json();
+ if (!res.ok) { showToast(data.error ?? 'Import failed', 'error'); return; }
+ showToast(`Imported ${data.imported} instance${data.imported !== 1 ? 's' : ''}`, 'success');
+ closeSettingsModal();
+ renderDashboard();
+ } catch {
+ showToast('Invalid backup file', 'error');
+ }
+ };
+}
+
// ── Keyboard / backdrop ───────────────────────────────────────────────────────
document.addEventListener('keydown', e => {
if (e.key !== 'Escape') return;
- if (document.getElementById('instance-modal').classList.contains('open')) { closeModal(); return; }
- if (document.getElementById('confirm-overlay').classList.contains('open')) { closeConfirm(); return; }
+ if (document.getElementById('instance-modal').classList.contains('open')) { closeModal(); return; }
+ if (document.getElementById('confirm-overlay').classList.contains('open')) { closeConfirm(); return; }
+ if (document.getElementById('settings-modal').classList.contains('open')) { closeSettingsModal(); return; }
});
document.getElementById('instance-modal').addEventListener('click', e => {
@@ -272,3 +416,13 @@ document.getElementById('instance-modal').addEventListener('click', e => {
document.getElementById('confirm-overlay').addEventListener('click', e => {
if (e.target === document.getElementById('confirm-overlay')) closeConfirm();
});
+document.getElementById('settings-modal').addEventListener('click', e => {
+ if (e.target === document.getElementById('settings-modal')) closeSettingsModal();
+});
+
+document.getElementById('tz-select').addEventListener('change', e => {
+ localStorage.setItem('catalyst_tz', e.target.value);
+ const m = window.location.pathname.match(/^\/instance\/(\d+)/);
+ if (m) renderDetailPage(parseInt(m[1], 10));
+ else renderDashboard();
+});
diff --git a/js/version.js b/js/version.js
new file mode 100644
index 0000000..538443c
--- /dev/null
+++ b/js/version.js
@@ -0,0 +1 @@
+const VERSION = "1.3.0";
diff --git a/package.json b/package.json
index 9ba6672..d04ccba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "catalyst",
- "version": "1.2.2",
+ "version": "1.3.0",
"type": "module",
"scripts": {
"start": "node server/server.js",
diff --git a/server/db.js b/server/db.js
index b88e974..bf0e99e 100644
--- a/server/db.js
+++ b/server/db.js
@@ -43,6 +43,16 @@ function createSchema() {
);
CREATE INDEX IF NOT EXISTS idx_instances_state ON instances(state);
CREATE INDEX IF NOT EXISTS idx_instances_stack ON instances(stack);
+
+ CREATE TABLE IF NOT EXISTS instance_history (
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ vmid INTEGER NOT NULL,
+ field TEXT NOT NULL,
+ old_value TEXT,
+ new_value TEXT,
+ changed_at TEXT NOT NULL DEFAULT (datetime('now'))
+ );
+ CREATE INDEX IF NOT EXISTS idx_history_vmid ON instance_history(vmid);
`);
}
@@ -99,8 +109,14 @@ export function getDistinctStacks() {
// ── Mutations ─────────────────────────────────────────────────────────────────
+const HISTORY_FIELDS = [
+ 'name', 'state', 'stack', 'vmid', 'tailscale_ip',
+ 'atlas', 'argus', 'semaphore', 'patchmon', 'tailscale', 'andromeda',
+ 'hardware_acceleration',
+];
+
export function createInstance(data) {
- return db.prepare(`
+ db.prepare(`
INSERT INTO instances
(name, state, stack, vmid, atlas, argus, semaphore, patchmon,
tailscale, andromeda, tailscale_ip, hardware_acceleration)
@@ -108,10 +124,14 @@ export function createInstance(data) {
(@name, @state, @stack, @vmid, @atlas, @argus, @semaphore, @patchmon,
@tailscale, @andromeda, @tailscale_ip, @hardware_acceleration)
`).run(data);
+ db.prepare(
+ `INSERT INTO instance_history (vmid, field, old_value, new_value) VALUES (?, 'created', NULL, NULL)`
+ ).run(data.vmid);
}
export function updateInstance(vmid, data) {
- return db.prepare(`
+ const old = getInstance(vmid);
+ db.prepare(`
UPDATE instances SET
name=@name, state=@state, stack=@stack, vmid=@newVmid,
atlas=@atlas, argus=@argus, semaphore=@semaphore, patchmon=@patchmon,
@@ -119,12 +139,42 @@ export function updateInstance(vmid, data) {
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) VALUES (?, ?, ?, ?)`
+ );
+ for (const field of HISTORY_FIELDS) {
+ const oldVal = String(old[field] ?? '');
+ const newVal = String(field === 'vmid' ? newVmid : (data[field] ?? ''));
+ if (oldVal !== newVal) insertEvt.run(newVmid, field, oldVal, newVal);
+ }
}
export function deleteInstance(vmid) {
return db.prepare('DELETE FROM instances WHERE vmid = ?').run(vmid);
}
+export function importInstances(rows) {
+ db.exec('BEGIN');
+ db.exec('DELETE FROM instances');
+ const insert = db.prepare(`
+ INSERT INTO instances
+ (name, state, stack, vmid, atlas, argus, semaphore, patchmon,
+ tailscale, andromeda, tailscale_ip, hardware_acceleration)
+ VALUES
+ (@name, @state, @stack, @vmid, @atlas, @argus, @semaphore, @patchmon,
+ @tailscale, @andromeda, @tailscale_ip, @hardware_acceleration)
+ `);
+ for (const row of rows) insert.run(row);
+ db.exec('COMMIT');
+}
+
+export function getInstanceHistory(vmid) {
+ return db.prepare(
+ 'SELECT * FROM instance_history WHERE vmid = ? ORDER BY changed_at DESC'
+ ).all(vmid);
+}
+
// ── Test helpers ──────────────────────────────────────────────────────────────
export function _resetForTest() {
diff --git a/server/routes.js b/server/routes.js
index 79eaad6..c48ef93 100644
--- a/server/routes.js
+++ b/server/routes.js
@@ -1,7 +1,7 @@
import { Router } from 'express';
import {
getInstances, getInstance, getDistinctStacks,
- createInstance, updateInstance, deleteInstance,
+ createInstance, updateInstance, deleteInstance, importInstances, getInstanceHistory,
} from './db.js';
export const router = Router();
@@ -28,9 +28,16 @@ function validate(body) {
return errors;
}
+function handleDbError(context, e, res) {
+ if (e.message.includes('UNIQUE')) return res.status(409).json({ error: 'vmid already exists' });
+ if (e.message.includes('CHECK')) return res.status(400).json({ error: 'invalid field value' });
+ console.error(context, e);
+ res.status(500).json({ error: 'internal server error' });
+}
+
function normalise(body) {
const row = {
- name: body.name.trim(),
+ name: (body.name ?? '').trim(),
state: body.state,
stack: body.stack,
vmid: body.vmid,
@@ -54,6 +61,14 @@ router.get('/instances', (req, res) => {
res.json(getInstances({ search, state, stack }));
});
+// GET /api/instances/:vmid/history
+router.get('/instances/:vmid/history', (req, res) => {
+ const vmid = parseInt(req.params.vmid, 10);
+ if (!vmid) return res.status(400).json({ error: 'invalid vmid' });
+ if (!getInstance(vmid)) return res.status(404).json({ error: 'instance not found' });
+ res.json(getInstanceHistory(vmid));
+});
+
// GET /api/instances/:vmid
router.get('/instances/:vmid', (req, res) => {
const vmid = parseInt(req.params.vmid, 10);
@@ -76,10 +91,7 @@ router.post('/instances', (req, res) => {
const created = getInstance(data.vmid);
res.status(201).json(created);
} catch (e) {
- if (e.message.includes('UNIQUE')) return res.status(409).json({ error: 'vmid already exists' });
- if (e.message.includes('CHECK')) return res.status(400).json({ error: 'invalid field value' });
- console.error('POST /api/instances', e);
- res.status(500).json({ error: 'internal server error' });
+ handleDbError('POST /api/instances', e, res);
}
});
@@ -97,9 +109,35 @@ router.put('/instances/:vmid', (req, res) => {
updateInstance(vmid, data);
res.json(getInstance(data.vmid));
} catch (e) {
- if (e.message.includes('UNIQUE')) return res.status(409).json({ error: 'vmid already exists' });
- if (e.message.includes('CHECK')) return res.status(400).json({ error: 'invalid field value' });
- console.error('PUT /api/instances/:vmid', e);
+ handleDbError('PUT /api/instances/:vmid', e, res);
+ }
+});
+
+// GET /api/export
+router.get('/export', (_req, res) => {
+ const instances = getInstances();
+ const date = new Date().toISOString().slice(0, 10);
+ res.setHeader('Content-Disposition', `attachment; filename="catalyst-backup-${date}.json"`);
+ res.json({ version: 1, exported_at: new Date().toISOString(), instances });
+});
+
+// POST /api/import
+router.post('/import', (req, res) => {
+ const { instances } = req.body ?? {};
+ if (!Array.isArray(instances)) {
+ return res.status(400).json({ error: 'body must contain an instances array' });
+ }
+ const errors = [];
+ for (const [i, row] of instances.entries()) {
+ const errs = validate(normalise(row));
+ if (errs.length) errors.push({ index: i, errors: errs });
+ }
+ if (errors.length) return res.status(400).json({ errors });
+ try {
+ 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' });
}
});
@@ -118,7 +156,6 @@ router.delete('/instances/:vmid', (req, res) => {
deleteInstance(vmid);
res.status(204).end();
} catch (e) {
- console.error('DELETE /api/instances/:vmid', e);
- res.status(500).json({ error: 'internal server error' });
+ handleDbError('DELETE /api/instances/:vmid', e, res);
}
});
diff --git a/tests/api.test.js b/tests/api.test.js
index c807c30..66852ce 100644
--- a/tests/api.test.js
+++ b/tests/api.test.js
@@ -239,6 +239,78 @@ describe('DELETE /api/instances/:vmid', () => {
})
})
+// ── GET /api/instances/:vmid/history ─────────────────────────────────────────
+
+describe('GET /api/instances/:vmid/history', () => {
+ it('returns history events for a known vmid', async () => {
+ await request(app).post('/api/instances').send(base)
+ const res = await request(app).get('/api/instances/100/history')
+ expect(res.status).toBe(200)
+ expect(res.body).toBeInstanceOf(Array)
+ expect(res.body[0].field).toBe('created')
+ })
+
+ it('returns 404 for unknown vmid', async () => {
+ expect((await request(app).get('/api/instances/999/history')).status).toBe(404)
+ })
+
+ it('returns 400 for non-numeric vmid', async () => {
+ expect((await request(app).get('/api/instances/abc/history')).status).toBe(400)
+ })
+})
+
+// ── GET /api/export ───────────────────────────────────────────────────────────
+
+describe('GET /api/export', () => {
+ it('returns 200 with instances array and attachment header', async () => {
+ await request(app).post('/api/instances').send(base)
+ const res = await request(app).get('/api/export')
+ expect(res.status).toBe(200)
+ expect(res.headers['content-disposition']).toMatch(/attachment/)
+ expect(res.body.instances).toHaveLength(1)
+ expect(res.body.instances[0].name).toBe('traefik')
+ })
+
+ it('returns empty instances array when no data', async () => {
+ const res = await request(app).get('/api/export')
+ expect(res.body.instances).toEqual([])
+ })
+})
+
+// ── POST /api/import ──────────────────────────────────────────────────────────
+
+describe('POST /api/import', () => {
+ it('replaces all instances and returns imported count', async () => {
+ await request(app).post('/api/instances').send(base)
+ const res = await request(app).post('/api/import')
+ .send({ instances: [{ ...base, vmid: 999, name: 'imported' }] })
+ expect(res.status).toBe(200)
+ expect(res.body.imported).toBe(1)
+ expect((await request(app).get('/api/instances')).body[0].name).toBe('imported')
+ })
+
+ it('returns 400 if instances is not an array', async () => {
+ expect((await request(app).post('/api/import').send({ instances: 'bad' })).status).toBe(400)
+ })
+
+ it('returns 400 with per-row errors for invalid rows', async () => {
+ const res = await request(app).post('/api/import')
+ .send({ instances: [{ ...base, name: '', vmid: 1 }] })
+ expect(res.status).toBe(400)
+ expect(res.body.errors[0].index).toBe(0)
+ })
+
+ it('returns 400 if body has no instances key', async () => {
+ expect((await request(app).post('/api/import').send({})).status).toBe(400)
+ })
+
+ it('returns 400 (not 500) when a row is missing name', async () => {
+ const res = await request(app).post('/api/import')
+ .send({ instances: [{ ...base, name: undefined, vmid: 1 }] })
+ expect(res.status).toBe(400)
+ })
+})
+
// ── Static assets & SPA routing ───────────────────────────────────────────────
describe('static assets and SPA routing', () => {
diff --git a/tests/db.test.js b/tests/db.test.js
index 746f2b5..de5cef4 100644
--- a/tests/db.test.js
+++ b/tests/db.test.js
@@ -2,7 +2,7 @@ import { describe, it, expect, beforeEach } from 'vitest'
import {
_resetForTest,
getInstances, getInstance, getDistinctStacks,
- createInstance, updateInstance, deleteInstance,
+ createInstance, updateInstance, deleteInstance, importInstances, getInstanceHistory,
} from '../server/db.js'
beforeEach(() => _resetForTest());
@@ -166,6 +166,62 @@ describe('deleteInstance', () => {
});
});
+// ── importInstances ───────────────────────────────────────────────────────────
+
+describe('importInstances', () => {
+ const base = { state: 'deployed', stack: 'production', atlas: 0, argus: 0, semaphore: 0, patchmon: 0, tailscale: 0, andromeda: 0, tailscale_ip: '', hardware_acceleration: 0 };
+
+ it('replaces all existing instances with the imported set', () => {
+ createInstance({ ...base, name: 'old', vmid: 1 });
+ importInstances([{ ...base, name: 'new', vmid: 2 }]);
+ expect(getInstance(1)).toBeNull();
+ expect(getInstance(2)).not.toBeNull();
+ });
+
+ it('clears all instances when passed an empty array', () => {
+ createInstance({ ...base, name: 'a', vmid: 1 });
+ importInstances([]);
+ expect(getInstances()).toEqual([]);
+ });
+});
+
+// ── instance history ─────────────────────────────────────────────────────────
+
+describe('instance history', () => {
+ const base = { state: 'deployed', stack: 'production', atlas: 0, argus: 0, semaphore: 0, patchmon: 0, tailscale: 0, andromeda: 0, tailscale_ip: '', hardware_acceleration: 0 };
+
+ it('logs a created event when an instance is created', () => {
+ createInstance({ ...base, name: 'a', vmid: 1 });
+ const h = getInstanceHistory(1);
+ expect(h).toHaveLength(1);
+ expect(h[0].field).toBe('created');
+ });
+
+ it('logs changed fields when an instance is updated', () => {
+ createInstance({ ...base, name: 'a', vmid: 1 });
+ updateInstance(1, { ...base, name: 'a', vmid: 1, state: 'degraded' });
+ const h = getInstanceHistory(1);
+ const stateEvt = h.find(e => e.field === 'state');
+ expect(stateEvt).toBeDefined();
+ expect(stateEvt.old_value).toBe('deployed');
+ expect(stateEvt.new_value).toBe('degraded');
+ });
+
+ it('logs no events when nothing changes on update', () => {
+ createInstance({ ...base, name: 'a', vmid: 1 });
+ updateInstance(1, { ...base, name: 'a', vmid: 1 });
+ const h = getInstanceHistory(1).filter(e => e.field !== 'created');
+ expect(h).toHaveLength(0);
+ });
+
+ it('records history under the new vmid when vmid changes', () => {
+ createInstance({ ...base, name: 'a', vmid: 1 });
+ updateInstance(1, { ...base, name: 'a', vmid: 2 });
+ expect(getInstanceHistory(2).some(e => e.field === 'vmid')).toBe(true);
+ expect(getInstanceHistory(1).filter(e => e.field !== 'created')).toHaveLength(0);
+ });
+});
+
// ── Test environment boot isolation ───────────────────────────────────────────
describe('test environment boot isolation', () => {
diff --git a/tests/helpers.test.js b/tests/helpers.test.js
index 26bdd4d..3b7c550 100644
--- a/tests/helpers.test.js
+++ b/tests/helpers.test.js
@@ -58,16 +58,22 @@ describe('esc', () => {
// ── fmtDate() ─────────────────────────────────────────────────────────────────
-function fmtDate(d) {
+function parseUtc(d) {
+ if (typeof d !== 'string') return new Date(d)
+ const hasZone = d.endsWith('Z') || /[+-]\d{2}:\d{2}$/.test(d)
+ return new Date(hasZone ? d : d.replace(' ', 'T') + 'Z')
+}
+
+function fmtDate(d, tz = 'UTC') {
if (!d) return '—'
try {
- return new Date(d).toLocaleDateString('en-US', { year: 'numeric', month: 'short', day: 'numeric' })
+ return parseUtc(d).toLocaleDateString('en-US', { year: 'numeric', month: 'short', day: 'numeric', timeZone: tz })
} catch (e) { return d }
}
describe('fmtDate', () => {
it('formats a valid ISO date string', () => {
- const result = fmtDate('2024-03-15T00:00:00')
+ const result = fmtDate('2024-03-15T12:00:00Z')
expect(result).toMatch(/Mar/)
expect(result).toMatch(/15/)
expect(result).toMatch(/2024/)
@@ -88,24 +94,42 @@ describe('fmtDate', () => {
// ── fmtDateFull() ─────────────────────────────────────────────────────────────
-function fmtDateFull(d) {
+function fmtDateFull(d, tz = 'UTC') {
if (!d) return '—'
try {
- return new Date(d).toLocaleString('en-US', {
+ return parseUtc(d).toLocaleString('en-US', {
year: 'numeric', month: 'short', day: 'numeric',
hour: '2-digit', minute: '2-digit',
+ timeZone: tz, timeZoneName: 'short',
})
} catch (e) { return d }
}
describe('fmtDateFull', () => {
it('includes date and time components', () => {
- const result = fmtDateFull('2024-03-15T14:30:00')
+ const result = fmtDateFull('2024-03-15T14:30:00Z')
expect(result).toMatch(/Mar/)
expect(result).toMatch(/2024/)
expect(result).toMatch(/\d{1,2}:\d{2}/)
})
+ it('includes the timezone abbreviation', () => {
+ expect(fmtDateFull('2024-03-15T14:30:00Z', 'UTC')).toMatch(/UTC/)
+ })
+
+ it('converts to the given timezone', () => {
+ // 2024-03-15 18:30 UTC = 2024-03-15 14:30 EDT (UTC-4 in March)
+ const result = fmtDateFull('2024-03-15T18:30:00Z', 'America/New_York')
+ expect(result).toMatch(/2:30/)
+ expect(result).toMatch(/EDT/)
+ })
+
+ it('treats SQLite-format timestamps (space, no Z) as UTC', () => {
+ // SQLite datetime('now') → 'YYYY-MM-DD HH:MM:SS', no timezone marker.
+ // Must parse identically to the same moment expressed as ISO UTC.
+ expect(fmtDateFull('2024-03-15 18:30:00', 'UTC')).toBe(fmtDateFull('2024-03-15T18:30:00Z', 'UTC'))
+ })
+
it('returns — for null', () => {
expect(fmtDateFull(null)).toBe('—')
})
@@ -133,6 +157,64 @@ describe('version label formatting', () => {
})
})
+// ── fmtHistVal() ─────────────────────────────────────────────────────────────
+// Mirrors the logic in ui.js — formats history field values for display.
+
+const BOOL_FIELDS = ['atlas','argus','semaphore','patchmon','tailscale','andromeda','hardware_acceleration']
+
+function fmtHistVal(field, val) {
+ if (val == null || val === '') return '—'
+ if (BOOL_FIELDS.includes(field)) return val === '1' ? 'on' : 'off'
+ return val
+}
+
+describe('fmtHistVal', () => {
+ it('returns — for null', () => {
+ expect(fmtHistVal('state', null)).toBe('—')
+ })
+
+ it('returns — for empty string', () => {
+ expect(fmtHistVal('state', '')).toBe('—')
+ })
+
+ it('returns on/off for boolean service fields', () => {
+ expect(fmtHistVal('atlas', '1')).toBe('on')
+ expect(fmtHistVal('atlas', '0')).toBe('off')
+ expect(fmtHistVal('hardware_acceleration', '1')).toBe('on')
+ })
+
+ it('returns the value as-is for non-boolean fields', () => {
+ expect(fmtHistVal('state', 'deployed')).toBe('deployed')
+ expect(fmtHistVal('name', 'plex')).toBe('plex')
+ expect(fmtHistVal('tailscale_ip', '100.64.0.1')).toBe('100.64.0.1')
+ })
+})
+
+// ── stateClass() ─────────────────────────────────────────────────────────────
+// Mirrors the logic in ui.js — maps state values to timeline CSS classes.
+
+function stateClass(field, val) {
+ if (field !== 'state') return ''
+ return { deployed: 'tl-deployed', testing: 'tl-testing', degraded: 'tl-degraded' }[val] ?? ''
+}
+
+describe('stateClass', () => {
+ it('returns empty string for non-state fields', () => {
+ expect(stateClass('name', 'plex')).toBe('')
+ expect(stateClass('stack', 'production')).toBe('')
+ })
+
+ it('returns the correct colour class for each state value', () => {
+ expect(stateClass('state', 'deployed')).toBe('tl-deployed')
+ expect(stateClass('state', 'testing')).toBe('tl-testing')
+ expect(stateClass('state', 'degraded')).toBe('tl-degraded')
+ })
+
+ it('returns empty string for unknown state values', () => {
+ expect(stateClass('state', 'unknown')).toBe('')
+ })
+})
+
// ── CSS regressions ───────────────────────────────────────────────────────────
const css = readFileSync(join(__dirname, '../css/app.css'), 'utf8')