josh/electric-cherry
1
0
Fork 0
Code Issues 18 Pull Requests Actions Packages Projects Releases Wiki Activity

Add Prettier and ESLint tooling (Refs #77)

Browse Source
This commit is contained in:
josh
2026-10-09 15:56:13 -04:00
parent 8ed059b8d3
commit 16469e2d43
711 changed files with 99737 additions and 28286 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/unit/script-flow.test.ts
+180 -105
View File
@@ -25,7 +25,8 @@ async function seedFleet(): Promise<void> {
describe('scope options', () => {
it('lists distinct games and maps by game from the fleet', async () => {
await seedFleet();
const { listDistinctGames, listMapsByGame } = await import('../../src/lib/server/fleet/scripts.js');
const { listDistinctGames, listMapsByGame } =
await import('../../src/lib/server/fleet/scripts.js');
// Both fixture servers are t5, so games is a single-entry list.
expect(listDistinctGames()).toEqual(['t5']);
@@ -36,7 +37,11 @@ describe('scope options', () => {
});
describe('editing promoted script scopes', () => {
async function saveScope(scriptId: number, scopeType: 'game' | 'map' | null, scopeValue: string | null) {
async function saveScope(
scriptId: number,
scopeType: 'game' | 'map' | null,
scopeValue: string | null
) {
const { POST } = await import('../../src/routes/api/scripts/[id]/scope/+server.js');
return POST({
params: { id: String(scriptId) },
@@ -48,85 +53,127 @@ describe('editing promoted script scopes', () => {
});
}
it.each(['game', 'map'] as const)('restores a cleared %s scope and can promote again', async (scopeType) => {
await seedFleet();
const { createScript, getScript } = await import('../../src/lib/server/fleet/scripts.js');
const { openBeta, promoteBeta } = await import('../../src/lib/server/fleet/beta.js');
const { db } = await import('../../src/lib/server/db/index.js');
const scopeValue = scopeType === 'game' ? 't5' : 'zombie_theater';
const { script, version } = createScript({
name: 'restore scope', targetRelPath: 'restore.gsc',
scopeType, scopeValue, content: Buffer.from('main(){}\n')
});
async function promote() {
it.each(['game', 'map'] as const)(
'restores a cleared %s scope and can promote again',
async (scopeType) => {
await seedFleet();
const { createScript, getScript } =
await import('../../src/lib/server/fleet/scripts.js');
const { openBeta, promoteBeta } = await import('../../src/lib/server/fleet/beta.js');
const { db } = await import('../../src/lib/server/db/index.js');
const scopeValue = scopeType === 'game' ? 't5' : 'zombie_theater';
const { script, version } = createScript({
name: 'restore scope',
targetRelPath: 'restore.gsc',
scopeType,
scopeValue,
content: Buffer.from('main(){}\n')
});
async function promote() {
const { betaId } = await openBeta({
scripts: [{ scriptId: script.id, scriptVersionId: version.id }],
servers: ['t5_zombie_theater_1'],
waitForHealth: false,
waitForMatch: false
});
await activateFiles('beta', betaId);
db()
.prepare("UPDATE beta_servers SET stage = 'ready' WHERE beta_id = ?")
.run(betaId);
db().prepare("UPDATE betas SET state = 'ready-promote' WHERE id = ?").run(betaId);
const result = await promoteBeta(betaId);
await activateFiles('campaign', result.deploymentId);
return result;
}
await promote();
const cleared = await saveScope(script.id, null, null);
expect(cleared.status).toBe(200);
expect((await cleared.json()).detached).toContain('t5_zombie_theater_1');
expect(getScript(script.id)).toMatchObject({
scope_type: null,
current_version_id: version.id
});
const restored = await saveScope(script.id, scopeType, scopeValue);
expect(restored.status).toBe(200);
expect((await restored.json()).script).toMatchObject({
scope_type: scopeType,
scope_value: scopeValue,
current_version_id: version.id
});
// Saving scope must not deploy or reattach the detached inventory.
expect(
db()
.prepare('SELECT * FROM server_scripts WHERE script_version_id = ?')
.all(version.id)
).toHaveLength(0);
const result = await promote();
expect(result.landed.sort()).toEqual(
scopeType === 'game'
? ['t5_zombie_cosmodrome_1', 't5_zombie_theater_1']
: ['t5_zombie_theater_1']
);
// A promoted script can also change scope without first clearing it.
const changed = await saveScope(script.id, 'map', 'zombie_cosmodrome');
expect(changed.status).toBe(200);
expect(getScript(script.id)).toMatchObject({
scope_type: 'map',
scope_value: 'zombie_cosmodrome',
current_version_id: version.id
});
}
);
it.each(['running', 'ready-promote'])(
'rejects scope edits while a beta is %s without detaching inventory',
async (state) => {
await seedFleet();
const { createScript, getScript } =
await import('../../src/lib/server/fleet/scripts.js');
const { openBeta } = await import('../../src/lib/server/fleet/beta.js');
const { db } = await import('../../src/lib/server/db/index.js');
const { script, version } = createScript({
name: 'active scope',
targetRelPath: 'active.gsc',
scopeType: 'game',
scopeValue: 't5',
content: Buffer.from('main(){}\n')
});
const { betaId } = await openBeta({
scripts: [{ scriptId: script.id, scriptVersionId: version.id }],
servers: ['t5_zombie_theater_1'], waitForHealth: false, waitForMatch: false
servers: ['t5_zombie_theater_1'],
waitForHealth: false,
waitForMatch: false
});
await activateFiles('beta', betaId);
db().prepare("UPDATE beta_servers SET stage = 'ready' WHERE beta_id = ?").run(betaId);
db().prepare("UPDATE betas SET state = 'ready-promote' WHERE id = ?").run(betaId);
const result = await promoteBeta(betaId);
await activateFiles('campaign', result.deploymentId);
return result;
db().prepare('UPDATE betas SET state = ? WHERE id = ?').run(state, betaId);
const inventory = db().prepare('SELECT * FROM server_scripts').all();
expect(inventory.length).toBeGreaterThan(0);
for (const scopeType of [null, 'map'] as const) {
const response = await saveScope(
script.id,
scopeType,
scopeType ? 'zombie_cosmodrome' : null
);
expect(response.status).toBe(409);
expect(await response.json()).toMatchObject({ ok: false, kind: 'has-active-beta' });
expect(getScript(script.id)).toMatchObject({
scope_type: 'game',
scope_value: 't5'
});
expect(db().prepare('SELECT * FROM server_scripts').all()).toEqual(inventory);
}
}
await promote();
const cleared = await saveScope(script.id, null, null);
expect(cleared.status).toBe(200);
expect((await cleared.json()).detached).toContain('t5_zombie_theater_1');
expect(getScript(script.id)).toMatchObject({ scope_type: null, current_version_id: version.id });
const restored = await saveScope(script.id, scopeType, scopeValue);
expect(restored.status).toBe(200);
expect((await restored.json()).script).toMatchObject({
scope_type: scopeType, scope_value: scopeValue, current_version_id: version.id
});
// Saving scope must not deploy or reattach the detached inventory.
expect(db().prepare('SELECT * FROM server_scripts WHERE script_version_id = ?').all(version.id)).toHaveLength(0);
const result = await promote();
expect(result.landed.sort()).toEqual(scopeType === 'game'
? ['t5_zombie_cosmodrome_1', 't5_zombie_theater_1'] : ['t5_zombie_theater_1']);
// A promoted script can also change scope without first clearing it.
const changed = await saveScope(script.id, 'map', 'zombie_cosmodrome');
expect(changed.status).toBe(200);
expect(getScript(script.id)).toMatchObject({
scope_type: 'map', scope_value: 'zombie_cosmodrome', current_version_id: version.id
});
});
it.each(['running', 'ready-promote'])('rejects scope edits while a beta is %s without detaching inventory', async (state) => {
await seedFleet();
const { createScript, getScript } = await import('../../src/lib/server/fleet/scripts.js');
const { openBeta } = await import('../../src/lib/server/fleet/beta.js');
const { db } = await import('../../src/lib/server/db/index.js');
const { script, version } = createScript({
name: 'active scope', targetRelPath: 'active.gsc',
scopeType: 'game', scopeValue: 't5', content: Buffer.from('main(){}\n')
});
const { betaId } = await openBeta({
scripts: [{ scriptId: script.id, scriptVersionId: version.id }],
servers: ['t5_zombie_theater_1'], waitForHealth: false, waitForMatch: false
});
await activateFiles('beta', betaId);
db().prepare('UPDATE betas SET state = ? WHERE id = ?').run(state, betaId);
const inventory = db().prepare('SELECT * FROM server_scripts').all();
expect(inventory.length).toBeGreaterThan(0);
for (const scopeType of [null, 'map'] as const) {
const response = await saveScope(script.id, scopeType, scopeType ? 'zombie_cosmodrome' : null);
expect(response.status).toBe(409);
expect(await response.json()).toMatchObject({ ok: false, kind: 'has-active-beta' });
expect(getScript(script.id)).toMatchObject({ scope_type: 'game', scope_value: 't5' });
expect(db().prepare('SELECT * FROM server_scripts').all()).toEqual(inventory);
}
});
);
});
describe('promote creates a deployment', () => {
it('records deployment_files for every landed server and marks beta servers done, others pending', async () => {
await seedFleet();
const { createScript, getScript, getLatestVersion } = await import('../../src/lib/server/fleet/scripts.js');
const { createScript, getScript, getLatestVersion } =
await import('../../src/lib/server/fleet/scripts.js');
const { openBeta, promoteBeta } = await import('../../src/lib/server/fleet/beta.js');
const { db } = await import('../../src/lib/server/db/index.js');
@@ -151,31 +198,40 @@ describe('promote creates a deployment', () => {
await activateFiles('beta', betaId);
// Force all beta_servers to 'ready' and beta to 'ready-promote'.
db().prepare(`UPDATE beta_servers SET stage = 'ready', restarted_at = ? WHERE beta_id = ?`)
db()
.prepare(`UPDATE beta_servers SET stage = 'ready', restarted_at = ? WHERE beta_id = ?`)
.run(new Date().toISOString(), betaId);
db().prepare(`UPDATE betas SET state = 'ready-promote' WHERE id = ?`).run(betaId);
const result = await promoteBeta(betaId);
expect(result.deploymentId).toMatch(/^dep-.*-promote-\d+$/);
expect(new Set(result.landed)).toEqual(new Set(['t5_zombie_theater_1', 't5_zombie_cosmodrome_1']));
expect(new Set(result.landed)).toEqual(
new Set(['t5_zombie_theater_1', 't5_zombie_cosmodrome_1'])
);
expect(result.scriptIds).toEqual([script.id]);
// Deployment row is action='promote'. The multi-script schema stores
// scripts in deployment_scripts, not the legacy singular columns.
const dep = db().prepare(`SELECT * FROM deployments WHERE id = ?`).get(result.deploymentId) as any;
const dep = db()
.prepare(`SELECT * FROM deployments WHERE id = ?`)
.get(result.deploymentId) as Record<string, unknown>;
expect(dep.action).toBe('promote');
expect(dep.beta_id).toBe(betaId);
expect(dep.script_id).toBeNull(); // new promotes populate deployment_scripts
const depScripts = db().prepare(`SELECT * FROM deployment_scripts WHERE deployment_id = ?`).all(result.deploymentId) as any[];
const depScripts = db()
.prepare(`SELECT * FROM deployment_scripts WHERE deployment_id = ?`)
.all(result.deploymentId) as Record<string, unknown>[];
expect(depScripts.length).toBe(1);
expect(depScripts[0].script_id).toBe(script.id);
expect(depScripts[0].script_version_id).toBe(version.id);
expect(depScripts[0].prior_version_id).toBeNull(); // never promoted before
// deployment_files has one row per landed server.
const files = db().prepare(`SELECT * FROM deployment_files WHERE deployment_id = ?`).all(result.deploymentId) as any[];
const files = db()
.prepare(`SELECT * FROM deployment_files WHERE deployment_id = ?`)
.all(result.deploymentId) as Record<string, unknown>[];
expect(files.length).toBe(2);
for (const f of files) {
expect(f.verb).toBe('added');
@@ -187,7 +243,7 @@ describe('promote creates a deployment', () => {
// server row is 'pending' (sweep will drain-and-restart).
const servers = db()
.prepare(`SELECT * FROM deployment_servers WHERE deployment_id = ? ORDER BY server`)
.all(result.deploymentId) as any[];
.all(result.deploymentId) as { server: string; restart_state: string }[];
const byName = Object.fromEntries(servers.map((s) => [s.server, s.restart_state]));
expect(byName['t5_zombie_theater_1']).toBe('done');
expect(byName['t5_zombie_cosmodrome_1']).toBe('pending');
@@ -195,7 +251,10 @@ describe('promote creates a deployment', () => {
// Script's current_version_id and beta state land.
const after = getScript(script.id)!;
expect(after.current_version_id).toBe(version.id);
const beta = db().prepare(`SELECT state FROM betas WHERE id = ?`).get(betaId) as any;
const beta = db().prepare(`SELECT state FROM betas WHERE id = ?`).get(betaId) as Record<
string,
unknown
>;
expect(beta.state).toBe('promoted');
});
});
@@ -203,7 +262,8 @@ describe('promote creates a deployment', () => {
describe('rollback beta on ready-promote marks version test-failed', () => {
it('flips script_versions.state to test-failed when the version has no other promoting beta', async () => {
await seedFleet();
const { createScript, getLatestVersion } = await import('../../src/lib/server/fleet/scripts.js');
const { createScript, getLatestVersion } =
await import('../../src/lib/server/fleet/scripts.js');
const { openBeta, rollbackBeta } = await import('../../src/lib/server/fleet/beta.js');
const { db } = await import('../../src/lib/server/db/index.js');
@@ -232,7 +292,9 @@ describe('rollback beta on ready-promote marks version test-failed', () => {
await rollbackBeta(betaId);
const after = db().prepare(`SELECT state FROM script_versions WHERE id = ?`).get(v.id) as any;
const after = db()
.prepare(`SELECT state FROM script_versions WHERE id = ?`)
.get(v.id) as Record<string, unknown>;
expect(after.state).toBe('test-failed');
});
});
@@ -240,9 +302,11 @@ describe('rollback beta on ready-promote marks version test-failed', () => {
describe('rollback promote deployment', () => {
it('restores current_version_id + files and creates an action=rollback deployment with pending servers', async () => {
await seedFleet();
const { createScript, getScript, getLatestVersion } = await import('../../src/lib/server/fleet/scripts.js');
const { createScript, getScript, getLatestVersion } =
await import('../../src/lib/server/fleet/scripts.js');
const { openBeta, promoteBeta } = await import('../../src/lib/server/fleet/beta.js');
const { rollbackPromoteDeployment } = await import('../../src/lib/server/fleet/rollback.js');
const { rollbackPromoteDeployment } =
await import('../../src/lib/server/fleet/rollback.js');
const { db } = await import('../../src/lib/server/db/index.js');
const { script } = createScript({
@@ -261,7 +325,8 @@ describe('rollback promote deployment', () => {
waitForMatch: false
});
await activateFiles('beta', betaId);
db().prepare(`UPDATE beta_servers SET stage = 'ready', restarted_at = ? WHERE beta_id = ?`)
db()
.prepare(`UPDATE beta_servers SET stage = 'ready', restarted_at = ? WHERE beta_id = ?`)
.run(new Date().toISOString(), betaId);
db().prepare(`UPDATE betas SET state = 'ready-promote' WHERE id = ?`).run(betaId);
const promote = await promoteBeta(betaId);
@@ -272,42 +337,43 @@ describe('rollback promote deployment', () => {
const result = await rollbackPromoteDeployment(promote.deploymentId);
expect(result.deploymentId).toMatch(/^dep-.*-rollback-/);
expect(new Set(result.affectedServers)).toEqual(new Set(['t5_zombie_theater_1', 't5_zombie_cosmodrome_1']));
expect(new Set(result.affectedServers)).toEqual(
new Set(['t5_zombie_theater_1', 't5_zombie_cosmodrome_1'])
);
expect(result.scriptIds).toEqual([script.id]);
// Script's current_version_id reverted (was null before the promote).
expect(getScript(script.id)!.current_version_id).toBeNull();
// Original promote is now marked rolled_back_by.
const promoteRow = db().prepare(`SELECT rolled_back_by FROM deployments WHERE id = ?`).get(promote.deploymentId) as any;
const promoteRow = db()
.prepare(`SELECT rolled_back_by FROM deployments WHERE id = ?`)
.get(promote.deploymentId) as Record<string, unknown>;
expect(promoteRow.rolled_back_by).toBe(result.deploymentId);
// Rollback deployment_servers rows are pending.
const rbServers = db()
.prepare(`SELECT restart_state FROM deployment_servers WHERE deployment_id = ?`)
.all(result.deploymentId) as any[];
.all(result.deploymentId) as Record<string, unknown>[];
expect(rbServers.length).toBe(2);
for (const s of rbServers) expect(s.restart_state).toBe('pending');
// Second rollback attempt is rejected.
await expect(rollbackPromoteDeployment(promote.deploymentId)).rejects.toMatchObject({ kind: 'already-rolled-back' });
await expect(rollbackPromoteDeployment(promote.deploymentId)).rejects.toMatchObject({
kind: 'already-rolled-back'
});
});
});
describe('multi-script beta', () => {
it('open + promote + rollback bundle two scripts as one atomic unit', async () => {
await seedFleet();
const {
createScript,
getScript,
getLatestVersion
} = await import('../../src/lib/server/fleet/scripts.js');
const {
openBeta,
promoteBeta,
listBetaScripts
} = await import('../../src/lib/server/fleet/beta.js');
const { rollbackPromoteDeployment } = await import('../../src/lib/server/fleet/rollback.js');
const { createScript, getScript, getLatestVersion } =
await import('../../src/lib/server/fleet/scripts.js');
const { openBeta, promoteBeta, listBetaScripts } =
await import('../../src/lib/server/fleet/beta.js');
const { rollbackPromoteDeployment } =
await import('../../src/lib/server/fleet/rollback.js');
const { heldByBeta } = await import('../../src/lib/server/fleet/servers.js');
const { db } = await import('../../src/lib/server/db/index.js');
@@ -343,7 +409,9 @@ describe('multi-script beta', () => {
// Both scripts are joined to the beta.
const bundle = listBetaScripts(betaId);
expect(bundle.length).toBe(2);
expect(new Set(bundle.map((r) => r.script_id))).toEqual(new Set([a.script.id, b.script.id]));
expect(new Set(bundle.map((r) => r.script_id))).toEqual(
new Set([a.script.id, b.script.id])
);
// Both target rel paths are held on both servers.
const held1 = heldByBeta('t5_zombie_theater_1');
@@ -352,25 +420,32 @@ describe('multi-script beta', () => {
// Force ready-promote and simulate tested transition (the beta-runner
// would do this for real).
db().prepare(`UPDATE beta_servers SET stage = 'ready', restarted_at = ? WHERE beta_id = ?`)
db()
.prepare(`UPDATE beta_servers SET stage = 'ready', restarted_at = ? WHERE beta_id = ?`)
.run(new Date().toISOString(), betaId);
db().prepare(`UPDATE betas SET state = 'ready-promote' WHERE id = ?`).run(betaId);
db().prepare(`UPDATE script_versions SET state = 'tested' WHERE id IN (?, ?)`).run(va.id, vb.id);
db()
.prepare(`UPDATE script_versions SET state = 'tested' WHERE id IN (?, ?)`)
.run(va.id, vb.id);
const promote = await promoteBeta(betaId);
expect(new Set(promote.scriptIds)).toEqual(new Set([a.script.id, b.script.id]));
// ONE deployment, TWO deployment_scripts rows.
const dep = db().prepare(`SELECT * FROM deployments WHERE id = ?`).get(promote.deploymentId) as any;
const dep = db()
.prepare(`SELECT * FROM deployments WHERE id = ?`)
.get(promote.deploymentId) as Record<string, unknown>;
expect(dep.action).toBe('promote');
expect(dep.beta_id).toBe(betaId);
const depScripts = db()
.prepare(`SELECT * FROM deployment_scripts WHERE deployment_id = ? ORDER BY script_id`)
.all(promote.deploymentId) as any[];
.all(promote.deploymentId) as Record<string, unknown>[];
expect(depScripts.length).toBe(2);
// Two files per server (hud + flag) → 4 deployment_files rows.
const files = db().prepare(`SELECT * FROM deployment_files WHERE deployment_id = ?`).all(promote.deploymentId) as any[];
const files = db()
.prepare(`SELECT * FROM deployment_files WHERE deployment_id = ?`)
.all(promote.deploymentId) as Record<string, unknown>[];
expect(files.length).toBe(4);
// Both scripts' current_version_id updated.
@@ -386,7 +461,7 @@ describe('multi-script beta', () => {
// The rollback deployment mirrors both scripts.
const rbScripts = db()
.prepare(`SELECT * FROM deployment_scripts WHERE deployment_id = ?`)
.all(rb.deploymentId) as any[];
.all(rb.deploymentId) as Record<string, unknown>[];
expect(rbScripts.length).toBe(2);
});
});