Rework as scripts-centric, upload-only, gated beta lifecycle
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:
Claude Opus 4.7
+10
-26
@@ -1,56 +1,45 @@
|
||||
import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises';
|
||||
import { mkdir, mkdtemp, rm } from 'node:fs/promises';
|
||||
import { tmpdir } from 'node:os';
|
||||
import { join } from 'node:path';
|
||||
|
||||
export interface Fixture {
|
||||
root: string;
|
||||
shared: string;
|
||||
staging: string;
|
||||
t5: string;
|
||||
betaArchive: string;
|
||||
dbPath: string;
|
||||
cleanup: () => Promise<void>;
|
||||
}
|
||||
|
||||
/**
|
||||
* Build a zombies/ tree in a temp dir and point env at it BEFORE the code
|
||||
* under test is imported. Returns paths + a cleanup fn.
|
||||
* Build a servers-root tree in a temp dir and point env at it BEFORE the code
|
||||
* under test is imported. There's no shared/scripts directory anymore — the
|
||||
* upload-only model puts script content in the DB.
|
||||
*/
|
||||
export async function newFixture(files: Record<string, string> = {}, servers: string[] = ['t5_kino_1']): Promise<Fixture> {
|
||||
export async function newFixture(servers: string[] = ['t5_kino_1']): Promise<Fixture> {
|
||||
const root = await mkdtemp(join(tmpdir(), 'cherry-'));
|
||||
const shared = join(root, 'shared/scripts');
|
||||
const staging = join(shared, 'betas');
|
||||
const t5 = join(root, 't5');
|
||||
const betaArchive = join(root, 'beta-archive');
|
||||
const dbPath = join(root, 'cherry.db');
|
||||
await mkdir(staging, { recursive: true });
|
||||
await mkdir(t5, { recursive: true });
|
||||
await mkdir(betaArchive, { recursive: true });
|
||||
|
||||
for (const [rel, body] of Object.entries(files)) {
|
||||
const p = join(shared, rel);
|
||||
await mkdir(join(p, '..'), { recursive: true });
|
||||
await writeFile(p, body);
|
||||
}
|
||||
for (const s of servers) {
|
||||
await mkdir(join(t5, s, 'runtime/plutonium/storage/t5/raw/scripts/sp'), { recursive: true });
|
||||
}
|
||||
|
||||
process.env.SHARED_SCRIPTS = shared;
|
||||
process.env.SERVERS_ROOT = t5;
|
||||
process.env.REL_DEST = 'runtime/plutonium/storage/t5/raw/scripts/sp';
|
||||
process.env.BETA_ARCHIVE_DIR = betaArchive;
|
||||
process.env.DB_PATH = dbPath;
|
||||
process.env.DEPLOY_KEEP_DAYS = '7';
|
||||
process.env.HTTP_TIMEOUT_MS = '2000';
|
||||
|
||||
return {
|
||||
root,
|
||||
shared,
|
||||
staging,
|
||||
t5,
|
||||
betaArchive,
|
||||
dbPath,
|
||||
cleanup: async () => {
|
||||
// On Windows the SQLite handle keeps a lock on cherry.db-shm/wal
|
||||
// and rmdir refuses to remove the temp tree. Close the singleton
|
||||
// (if this test imported it) before removing the dir. Fresh
|
||||
// dynamic import so we grab whatever handle the test opened.
|
||||
try {
|
||||
const mod = (await import('../../src/lib/server/db/index.js')) as {
|
||||
closeDb: () => void;
|
||||
@@ -64,11 +53,6 @@ export async function newFixture(files: Record<string, string> = {}, servers: st
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Fresh module-level state. Vitest caches modules per file — this forces a
|
||||
* re-import so the tests can rebuild the singleton DB handle against a new
|
||||
* fixture.
|
||||
*/
|
||||
export async function importFresh<T>(mod: string): Promise<T> {
|
||||
return (await import(`${mod}?t=${Date.now()}${Math.random()}`)) as T;
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
});
|
||||
});
|
||||
@@ -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');
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -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);
|
||||
});
|
||||
});
|
||||
@@ -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 });
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user