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

Rework as scripts-centric, upload-only, gated beta lifecycle

Browse Source 
Scripts become first-class: named, versioned, uploaded via the UI, optionally
scoped to a game or map. Any change that would land on scope-matched servers
(marking-required or new version of a scoped script) must first pass a beta.
The beta runs a per-server state machine — deploy -beta.gsc → wait empty →
Komodo restart → wait healthy → optionally wait for a real match end
(games_sp.log 'ExitLevel: executed') — before it's eligible for promotion.
Rollback is always available and restores from .OLD.

The shared/scripts mirror and its betas/ staging folder are gone. Every
server now has a tracked script inventory (server_scripts table), populated
only by explicit upload flows.

New: /scripts, /scripts/[id], /betas/[id] UI; /api/scripts + /api/betas +
/api/servers/[name]/scripts endpoints; scripts.ts, inventory.ts, beta.ts
(rewritten), beta-runner.ts, match-log.ts, komodoInspectHealthy().
Removed: push.ts, /api/push, BetaPanel, legacy importer.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
josh
2026-09-12 13:25:06 -04:00
co-authored by Claude Opus 4.7
parent 47051dc79a
commit 93d5a8e2e5
52 changed files with 2605 additions and 1689 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/unit/beta.test.ts
-95
View File
@@ -1,95 +0,0 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { readFile, writeFile } from 'node:fs/promises';
import { existsSync } from 'node:fs';
import { join } from 'node:path';
import { newFixture, type Fixture } from '../helpers/fixture.js';
let fixture: Fixture;
beforeEach(async () => {
vi.resetModules();
fixture = await newFixture(
{ 'hud.gsc': 'v1', 'zom.gsc': 'v1' },
['t5_kino_1', 't5_ascension_1']
);
});
afterEach(async () => {
await fixture.cleanup();
});
describe('beta lifecycle', () => {
it('open → rollback restores original state', async () => {
const { doPush } = await import('../../src/lib/server/fleet/push.js');
const { openBeta, rollbackBeta } = await import('../../src/lib/server/fleet/beta.js');
const { seedServerRegistry } = await import('../../src/lib/server/fleet/servers.js');
await seedServerRegistry();
// Populate servers with v1 first
await doPush({ patterns: ['*'] });
// Stage a new hud
await writeFile(join(fixture.staging, 'hud.gsc'), 'v2');
// Open beta on t5_kino_1 only
const opened = await openBeta({ name: 'test1', patterns: ['t5_kino_1'] });
expect(opened.slug).toBe('test1');
expect(opened.servers).toEqual(['t5_kino_1']);
// On kino: hud-beta.gsc = v2, hud.OLD = v1, hud.gsc gone
const kinoSp = join(fixture.t5, 't5_kino_1', 'runtime/plutonium/storage/t5/raw/scripts/sp');
expect(await readFile(join(kinoSp, 'hud-beta.gsc'), 'utf8')).toBe('v2');
expect(await readFile(join(kinoSp, 'hud.OLD'), 'utf8')).toBe('v1');
expect(existsSync(join(kinoSp, 'hud.gsc'))).toBe(false);
// ascension untouched
const ascSp = join(fixture.t5, 't5_ascension_1', 'runtime/plutonium/storage/t5/raw/scripts/sp');
expect(await readFile(join(ascSp, 'hud.gsc'), 'utf8')).toBe('v1');
// Rollback
const back = await rollbackBeta('test1');
expect(back.restored).toContain('hud.gsc');
expect(await readFile(join(kinoSp, 'hud.gsc'), 'utf8')).toBe('v1');
expect(existsSync(join(kinoSp, 'hud-beta.gsc'))).toBe(false);
expect(existsSync(join(kinoSp, 'hud.OLD'))).toBe(false);
});
it('open → promote lands the beta on shared/scripts and clears beta files', async () => {
const { doPush } = await import('../../src/lib/server/fleet/push.js');
const { openBeta, promoteBeta } = await import('../../src/lib/server/fleet/beta.js');
const { seedServerRegistry } = await import('../../src/lib/server/fleet/servers.js');
await seedServerRegistry();
await doPush({ patterns: ['*'] });
await writeFile(join(fixture.staging, 'hud.gsc'), 'v2');
await openBeta({ name: 'promote-me', patterns: ['t5_kino_1'] });
const kinoSp = join(fixture.t5, 't5_kino_1', 'runtime/plutonium/storage/t5/raw/scripts/sp');
expect(existsSync(join(kinoSp, 'hud-beta.gsc'))).toBe(true);
await promoteBeta('promote-me');
// shared has v2 now
expect(await readFile(join(fixture.shared, 'hud.gsc'), 'utf8')).toBe('v2');
// kino has plain hud.gsc = v2, no OLD, no -beta
expect(await readFile(join(kinoSp, 'hud.gsc'), 'utf8')).toBe('v2');
expect(existsSync(join(kinoSp, 'hud-beta.gsc'))).toBe(false);
expect(existsSync(join(kinoSp, 'hud.OLD'))).toBe(false);
});
it('refuses to open a beta whose staged file matches an already-owned target', async () => {
const { doPush } = await import('../../src/lib/server/fleet/push.js');
const { openBeta, BetaError } = await import('../../src/lib/server/fleet/beta.js');
const { seedServerRegistry } = await import('../../src/lib/server/fleet/servers.js');
await seedServerRegistry();
await doPush({ patterns: ['*'] });
// First beta claims hud on kino
await writeFile(join(fixture.staging, 'hud.gsc'), 'v2');
await openBeta({ name: 'first', patterns: ['t5_kino_1'] });
// Second attempt on kino should conflict
await writeFile(join(fixture.staging, 'hud.gsc'), 'v3');
await expect(openBeta({ name: 'second', patterns: ['t5_kino_1'] })).rejects.toThrow(BetaError);
});
});
tests/unit/files.test.ts
+3 -2
View File
@@ -1,8 +1,9 @@
import { describe, expect, it } from 'vitest';
import { betaFile, oldFile, slugify } from '../../src/lib/server/fleet/files.js';
import { betaFile, oldFile } from '../../src/lib/server/fleet/files.js';
import { slugify } from '../../src/lib/server/fleet/scripts.js';
describe('slugify', () => {
it('matches the shell script behavior', () => {
it('matches the legacy behavior', () => {
expect(slugify('New HUD Test')).toBe('new-hud-test');
expect(slugify(' --Weird!!! ')).toBe('weird');
expect(slugify('t5_kino_1')).toBe('t5-kino-1');
tests/unit/logs.test.ts
+1 -1
View File
@@ -8,8 +8,8 @@ import { tmpdir } from 'node:os';
// stash the root globally and reset between describe blocks.
const TMP_ROOT = resolve(tmpdir(), `ec-logs-test-${Date.now()}`);
process.env.SERVERS_ROOT = TMP_ROOT;
process.env.SHARED_SCRIPTS = TMP_ROOT;
process.env.REL_DEST = 'runtime/plutonium/storage/t5/raw/scripts/sp';
process.env.BETA_ARCHIVE_DIR = resolve(TMP_ROOT, 'beta-archive');
process.env.DB_PATH = resolve(TMP_ROOT, 'test.db');
const { resolveLogPath, tailLog, isLogKey } = await import(
tests/unit/push.test.ts
-63
View File
@@ -1,63 +0,0 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { readFile } from 'node:fs/promises';
import { join } from 'node:path';
import { newFixture, type Fixture } from '../helpers/fixture.js';
let fixture: Fixture;
beforeEach(async () => {
vi.resetModules();
fixture = await newFixture(
{
'hud.gsc': 'v1',
'zom.gsc': 'v1',
'perks/perk1.gsc': 'p1'
},
['t5_kino_1', 't5_ascension_1']
);
});
afterEach(async () => {
await fixture.cleanup();
});
describe('doPush', () => {
it('adds every source file on a fresh server', async () => {
const { doPush } = await import('../../src/lib/server/fleet/push.js');
const { seedServerRegistry } = await import('../../src/lib/server/fleet/servers.js');
await seedServerRegistry();
const res = await doPush({ patterns: ['*'], dryRun: false, create: false });
expect(res.totalChangedServers).toBe(2);
expect(res.totalFiles).toBe(3 * 2);
expect(res.deploymentId).toBeTruthy();
const written = await readFile(join(fixture.t5, 't5_kino_1', 'runtime/plutonium/storage/t5/raw/scripts/sp/hud.gsc'), 'utf8');
expect(written).toBe('v1');
});
it('dry-run makes no changes and creates no deployment row', async () => {
const { doPush } = await import('../../src/lib/server/fleet/push.js');
const { seedServerRegistry } = await import('../../src/lib/server/fleet/servers.js');
await seedServerRegistry();
const res = await doPush({ patterns: ['*'], dryRun: true, create: false });
expect(res.deploymentId).toBeNull();
expect(res.totalChangedServers).toBe(2);
// no file created
await expect(readFile(join(fixture.t5, 't5_kino_1', 'runtime/plutonium/storage/t5/raw/scripts/sp/hud.gsc'))).rejects.toThrow();
});
it('skips servers that are already up to date', async () => {
const { doPush } = await import('../../src/lib/server/fleet/push.js');
const { seedServerRegistry } = await import('../../src/lib/server/fleet/servers.js');
await seedServerRegistry();
await doPush({ patterns: ['*'], dryRun: false });
// second run: everything matches → no deployment
const res = await doPush({ patterns: ['*'], dryRun: false });
expect(res.deploymentId).toBeNull();
expect(res.totalChangedServers).toBe(0);
});
});
tests/unit/sweep.test.ts
+18 -6
View File
@@ -5,7 +5,7 @@ let fixture: Fixture;
beforeEach(async () => {
vi.resetModules();
fixture = await newFixture({ 'hud.gsc': 'v1' }, ['t5_kino_1', 't5_ascension_1']);
fixture = await newFixture(['t5_kino_1', 't5_ascension_1']);
// No integrations → sweep marks rows manual, exercising that branch.
delete process.env.KOMODO_ADDRESS;
delete process.env.RCON_PASSWORD;
@@ -17,20 +17,33 @@ afterEach(async () => {
describe('sweep', () => {
it('marks all pending rows manual when integrations are unset', async () => {
const { doPush } = await import('../../src/lib/server/fleet/push.js');
const { sweep } = await import('../../src/lib/server/pipeline/sweep.js');
const { seedServerRegistry } = await import('../../src/lib/server/fleet/servers.js');
const { db } = await import('../../src/lib/server/db/index.js');
await seedServerRegistry();
const push = await doPush({ patterns: ['*'] });
expect(push.deploymentId).not.toBeNull();
// Seed a deployment row directly — the code path being tested is the
// "integrations not configured" branch, which just walks deployment_servers.
const depId = 'dep-test-001';
db().prepare("INSERT INTO deployments (id, action, started_at, triggered_by) VALUES (?, 'test', ?, 'ui')")
.run(depId, new Date().toISOString());
db()
.prepare(
"INSERT INTO deployment_servers (deployment_id, server, files_changed, restart_state, attempts) VALUES (?, ?, 1, 'pending', 0)"
)
.run(depId, 't5_kino_1');
db()
.prepare(
"INSERT INTO deployment_servers (deployment_id, server, files_changed, restart_state, attempts) VALUES (?, ?, 1, 'pending', 0)"
)
.run(depId, 't5_ascension_1');
await sweep();
const rows = db()
.prepare("SELECT restart_state FROM deployment_servers WHERE deployment_id = ?")
.all(push.deploymentId!) as Array<{ restart_state: string }>;
.all(depId) as Array<{ restart_state: string }>;
expect(rows.length).toBe(2);
for (const r of rows) expect(r.restart_state).toBe('manual');
});
@@ -39,7 +52,6 @@ describe('sweep', () => {
const { seedServerRegistry } = await import('../../src/lib/server/fleet/servers.js');
await seedServerRegistry();
// No deployments → no pending rows. Should return zero counts.
const result = await sweep();
expect(result).toEqual({ checked: 0, restarted: 0, held: 0, failed: 0 });
});