Allow revising active betas with fresh tests and history
This commit is contained in:
@@ -0,0 +1,11 @@
|
||||
import type { BetaTestView } from './beta-plan.js';
|
||||
|
||||
export interface BetaRevisionFile {
|
||||
script_id: number; name: string; kind: string; path: string;
|
||||
version_id: number; version: number; release_version: string | null; sha256: string;
|
||||
}
|
||||
export interface BetaRevision {
|
||||
revision: number; started_at: string; notes: string | null;
|
||||
files: BetaRevisionFile[];
|
||||
results: { state: string; test: BetaTestView | null; servers: Array<{ server: string; stage: string; error: string | null }> } | null;
|
||||
}
|
||||
@@ -347,6 +347,7 @@ export function db(): Database.Database {
|
||||
migrateTable(handle, 'scripts', SCRIPTS_COLUMNS);
|
||||
migrateTable(handle, 'script_versions', SCRIPT_VERSIONS_COLUMNS);
|
||||
migrateTable(handle, 'beta_scripts', BETA_SCRIPTS_COLUMNS);
|
||||
migrateTable(handle, 'beta_test_runs', [{ name: 'revision', ddl: 'ALTER TABLE beta_test_runs ADD COLUMN revision INTEGER NOT NULL DEFAULT 1' }]);
|
||||
migrateTable(handle, 'deployment_scripts', DEPLOYMENT_SCRIPTS_COLUMNS);
|
||||
migrateTable(handle, 'deployments', DEPLOYMENTS_COLUMNS);
|
||||
migrateTable(handle, 'server_launch_collections', [
|
||||
|
||||
@@ -180,6 +180,32 @@ CREATE TABLE IF NOT EXISTS betas (
|
||||
CREATE INDEX IF NOT EXISTS idx_betas_state ON betas(state);
|
||||
CREATE INDEX IF NOT EXISTS idx_betas_script ON betas(script_id);
|
||||
|
||||
-- Revisions keep the beta identity and original rollback images. Archived
|
||||
-- files are independent copies so version cleanup cannot erase this history.
|
||||
CREATE TABLE IF NOT EXISTS beta_revisions (
|
||||
beta_id INTEGER NOT NULL REFERENCES betas(id) ON DELETE CASCADE,
|
||||
revision INTEGER NOT NULL,
|
||||
started_at TEXT NOT NULL,
|
||||
notes TEXT,
|
||||
results_json TEXT,
|
||||
PRIMARY KEY (beta_id, revision)
|
||||
);
|
||||
CREATE TABLE IF NOT EXISTS beta_revision_files (
|
||||
beta_id INTEGER NOT NULL,
|
||||
revision INTEGER NOT NULL,
|
||||
script_id INTEGER NOT NULL,
|
||||
name TEXT NOT NULL,
|
||||
kind TEXT NOT NULL,
|
||||
path TEXT NOT NULL,
|
||||
version_id INTEGER NOT NULL,
|
||||
version INTEGER NOT NULL,
|
||||
release_version TEXT,
|
||||
sha256 TEXT NOT NULL,
|
||||
content BLOB NOT NULL,
|
||||
PRIMARY KEY (beta_id, revision, script_id),
|
||||
FOREIGN KEY (beta_id, revision) REFERENCES beta_revisions(beta_id, revision) ON DELETE CASCADE
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS beta_servers (
|
||||
beta_id INTEGER NOT NULL REFERENCES betas(id) ON DELETE CASCADE,
|
||||
server TEXT NOT NULL,
|
||||
@@ -208,6 +234,7 @@ CREATE TABLE IF NOT EXISTS beta_test_plans (
|
||||
CREATE TABLE IF NOT EXISTS beta_test_runs (
|
||||
id TEXT PRIMARY KEY,
|
||||
beta_id INTEGER NOT NULL REFERENCES betas(id) ON DELETE CASCADE,
|
||||
revision INTEGER NOT NULL DEFAULT 1,
|
||||
server TEXT NOT NULL,
|
||||
phase INTEGER NOT NULL DEFAULT 0,
|
||||
created_at TEXT NOT NULL,
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
import { db } from '../db/index.js';
|
||||
import type { BetaRevision } from '../../beta-revision.js';
|
||||
|
||||
export function currentBetaRevision(id: number): { revision: number; started_at: string } {
|
||||
return db().prepare(`SELECT revision, started_at FROM beta_revisions WHERE beta_id = ? ORDER BY revision DESC LIMIT 1`).get(id) as
|
||||
{ revision: number; started_at: string } | undefined
|
||||
?? { revision: 1, started_at: (db().prepare('SELECT opened_at FROM betas WHERE id = ?').get(id) as { opened_at: string }).opened_at };
|
||||
}
|
||||
|
||||
/** Called in the revision transaction, before replacing the pinned bundle. */
|
||||
export function archiveBetaRevision(id: number, revision: number, startedAt: string, notes: string | null): void {
|
||||
db().prepare('INSERT OR IGNORE INTO beta_revisions (beta_id, revision, started_at, notes) VALUES (?, ?, ?, ?)')
|
||||
.run(id, revision, startedAt, notes);
|
||||
db().prepare(`INSERT OR IGNORE INTO beta_revision_files
|
||||
(beta_id, revision, script_id, name, kind, path, version_id, version, release_version, sha256, content)
|
||||
SELECT bs.beta_id, ?, s.id, s.name, s.kind, s.target_rel_path, v.id, v.version, v.release_version, v.sha256, v.content
|
||||
FROM beta_scripts bs JOIN scripts s ON s.id = bs.script_id JOIN script_versions v ON v.id = bs.script_version_id
|
||||
WHERE bs.beta_id = ?`).run(revision, id);
|
||||
}
|
||||
|
||||
export function betaRevisionHistory(id: number): BetaRevision[] {
|
||||
const rows = db().prepare('SELECT revision, started_at, notes, results_json FROM beta_revisions WHERE beta_id = ? ORDER BY revision DESC')
|
||||
.all(id) as Array<{ revision: number; started_at: string; notes: string | null; results_json: string | null }>;
|
||||
return rows.map(({ results_json, ...row }) => ({ ...row,
|
||||
results: results_json ? JSON.parse(results_json) : null,
|
||||
files: db().prepare(`SELECT script_id, name, kind, path, version_id, version, release_version, sha256
|
||||
FROM beta_revision_files WHERE beta_id = ? AND revision = ? ORDER BY script_id`).all(id, row.revision) as BetaRevision['files']
|
||||
}));
|
||||
}
|
||||
@@ -6,6 +6,7 @@ import { parseBetaPlan, type BetaPlan, type BetaTestView } from '../../beta-plan
|
||||
import type { GameTelemetry } from '../../telemetry.js';
|
||||
import { applySample, applyGameEvent, emptyMetrics, evaluateRequirements, type TestMetrics } from './beta-evaluation.js';
|
||||
import { ONLINE_MAX_MS } from '../../server-freshness.js';
|
||||
import { currentBetaRevision } from './beta-revisions.js';
|
||||
|
||||
export interface TestRun { id: string; beta_id: number; server: string; phase: number; created_at: string; observing_at: string | null; metrics: string }
|
||||
export interface StoredPlan { beta_id: number; plan: string; outcome: string; reason: string | null }
|
||||
@@ -33,8 +34,8 @@ export async function prepareRun(betaId: number, server: string, phase = 0): Pro
|
||||
if (!activeParticipant(betaId, server)) throw new Error('Original test server was deleted; start a new beta');
|
||||
db().transaction(() => {
|
||||
db().prepare('UPDATE beta_test_runs SET retired_at = ? WHERE beta_id = ? AND server = ? AND retired_at IS NULL').run(nowIso(), betaId, server);
|
||||
db().prepare('INSERT INTO beta_test_runs (id, beta_id, server, phase, created_at, metrics) VALUES (?, ?, ?, ?, ?, ?)')
|
||||
.run(randomUUID(), betaId, server, phase, nowIso(), JSON.stringify(emptyMetrics()));
|
||||
db().prepare('INSERT INTO beta_test_runs (id, beta_id, server, phase, created_at, metrics, revision) VALUES (?, ?, ?, ?, ?, ?, ?)')
|
||||
.run(randomUUID(), betaId, server, phase, nowIso(), JSON.stringify(emptyMetrics()), currentBetaRevision(betaId).revision);
|
||||
})();
|
||||
return currentRun(betaId, server)!;
|
||||
}
|
||||
@@ -97,5 +98,5 @@ export function testView(betaId: number): BetaTestView | null {
|
||||
}),
|
||||
evidence: db().prepare(`SELECT e.id, r.server, s.server_deleted_at, e.received_at, e.kind, e.payload FROM beta_test_evidence e
|
||||
JOIN beta_test_runs r ON r.id = e.run_id JOIN beta_servers s ON s.beta_id = r.beta_id AND s.server = r.server
|
||||
WHERE r.beta_id = ? ORDER BY e.id DESC LIMIT 200`).all(betaId) as BetaTestView['evidence'] };
|
||||
WHERE r.beta_id = ? AND r.revision = ? ORDER BY e.id DESC LIMIT 200`).all(betaId, currentBetaRevision(betaId).revision) as BetaTestView['evidence'] };
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { parseBetaPlan, type BetaPlan } from '../../beta-plan.js';
|
||||
import { storedPlan } from './beta-tests.js';
|
||||
import { storedPlan, testView, activity, setOutcome } from './beta-tests.js';
|
||||
import { archiveBetaRevision, currentBetaRevision } from './beta-revisions.js';
|
||||
import type { BetaPromotionPreview } from '../../beta-promotion.js';
|
||||
|
||||
const operations = new Set<number>();
|
||||
@@ -28,17 +29,18 @@ import {
|
||||
listVersions,
|
||||
serversMatchingScope,
|
||||
setScope,
|
||||
uploadNewVersion,
|
||||
type ScopeType,
|
||||
type ScriptRow,
|
||||
type ScriptVersionRow
|
||||
} from './scripts.js';
|
||||
import { composeServerCfg } from './config-compose.js';
|
||||
import { getServerScript, removeScript } from './inventory.js';
|
||||
import { cancelStagedFiles, isFileApplied, queueFileChange } from './staged-files.js';
|
||||
import { cancelStagedFiles, isFileApplied, queueFileChange, stagedFileChanges } from './staged-files.js';
|
||||
import { emit } from '../pipeline/bus.js';
|
||||
import { cancelProvisioningJob } from '../provisioning/cancellation.js';
|
||||
import { reconcileNativeProvisioningReceipt } from '../provisioning/native.js';
|
||||
import { requestRestart } from '../provisioning/requests.js';
|
||||
import { requestRestart, releaseRestartRequest } from '../provisioning/requests.js';
|
||||
import type { BetaStage } from '../pipeline/bus.js';
|
||||
|
||||
// Whether an artifact writes a dedicated on-disk file (script/plugin) or
|
||||
@@ -497,6 +499,124 @@ export async function openBeta(input: OpenBetaInput): Promise<OpenBetaResult> {
|
||||
};
|
||||
}
|
||||
|
||||
export interface BetaRevisionUpload { scriptId: number; content: Buffer; releaseVersion?: string }
|
||||
|
||||
/** Replace existing bundle members; commit files, deadline and evidence reset together. */
|
||||
export async function reviseBeta(betaId: number, expectedRevision: number, uploads: BetaRevisionUpload[], notes = ''): Promise<{ revision: number }> {
|
||||
// Drain a runner already observing the previous revision before resetting it.
|
||||
const { betaTick } = await import('../pipeline/beta-runner.js');
|
||||
await betaTick();
|
||||
return exclusive(betaId, async () => {
|
||||
const beta = getBeta(betaId);
|
||||
if (!beta) throw new BetaError('Beta not found', 'no-such-beta');
|
||||
if (!['running', 'ready-promote'].includes(beta.state)) throw new BetaError('Beta is closed', 'invalid-state');
|
||||
const current = currentBetaRevision(betaId);
|
||||
if (current.revision !== expectedRevision) throw new BetaError('The beta changed. Reload and review the current revision.', 'preview-changed');
|
||||
if (!uploads.length || new Set(uploads.map(file => file.scriptId)).size !== uploads.length) {
|
||||
throw new BetaError('Choose at least one replacement, once per file.', 'invalid-state');
|
||||
}
|
||||
if (notes.length > 1000) throw new BetaError('Change notes must be at most 1000 characters.', 'invalid-state');
|
||||
const bundle = listBetaScripts(betaId);
|
||||
for (const file of uploads) {
|
||||
const member = bundle.find(row => row.script_id === file.scriptId);
|
||||
if (!member) throw new BetaError('Updates can only replace files already in this beta.', 'invalid-state');
|
||||
if (!file.content.length) throw new BetaError('Choose non-empty replacement files.', 'invalid-state');
|
||||
if (getVersion(member.script_version_id)!.sha256 === sha256Buffer(file.content)) {
|
||||
throw new BetaError(`${getScript(file.scriptId)!.name}: the replacement is identical to the current version.`, 'invalid-state');
|
||||
}
|
||||
}
|
||||
const servers = listBetaServers(betaId);
|
||||
if (!servers.length || servers.some(server => !isActiveBetaServer(betaId, server.server))) {
|
||||
throw new BetaError('An original beta server is missing. Roll back and open a new beta.', 'invalid-state');
|
||||
}
|
||||
ensureHostSchema(db());
|
||||
assertNativeActivationSettled(betaId);
|
||||
if (stagedFileChanges('beta', String(betaId)).some(row => row.state === 'applying')) {
|
||||
throw new BetaError('A file write was interrupted. Resolve it before updating the beta.', 'conflict');
|
||||
}
|
||||
const jobs = db().prepare(`SELECT DISTINCT d.id, d.state, d.submitted_at, n.operation_id FROM server_deployments d
|
||||
JOIN provisioning_sources s ON s.operation_id = d.id LEFT JOIN native_provisioning n ON n.deployment_id = d.id
|
||||
WHERE s.kind = 'beta' AND s.source_id = ?`).all(String(betaId)) as
|
||||
Array<{ id: string; state: string; submitted_at: string | null; operation_id: string | null }>;
|
||||
if (jobs.some(job => ['running', 'awaiting-health'].includes(job.state)
|
||||
|| (job.state === 'interrupted' && servers.some(server => server.provisioning_id === job.id))
|
||||
|| (['waiting', 'queued'].includes(job.state) && (job.submitted_at || job.operation_id)))) {
|
||||
throw new BetaError('Wait for the current activation and recovery to finish before updating this beta.', 'conflict');
|
||||
}
|
||||
const stored = storedPlan(betaId);
|
||||
const plan = stored ? parseBetaPlan(JSON.parse(stored.plan)) : null;
|
||||
const revision = current.revision + 1;
|
||||
const at = nowIso();
|
||||
db().transaction(() => {
|
||||
archiveBetaRevision(betaId, current.revision, current.started_at, null);
|
||||
db().prepare('UPDATE beta_revisions SET results_json = ? WHERE beta_id = ? AND revision = ?')
|
||||
.run(JSON.stringify({ state: beta.state, test: testView(betaId), servers }), betaId, current.revision);
|
||||
for (const upload of uploads) {
|
||||
const version = uploadNewVersion(upload.scriptId, upload.content, notes.trim() || undefined, upload.releaseVersion);
|
||||
db().prepare('UPDATE beta_scripts SET script_version_id = ? WHERE beta_id = ? AND script_id = ?')
|
||||
.run(version.id, betaId, upload.scriptId);
|
||||
db().prepare('UPDATE betas SET script_version_id = ? WHERE id = ? AND script_id = ?')
|
||||
.run(version.id, betaId, upload.scriptId);
|
||||
}
|
||||
// Preflight all targets before cancelling work. Errors roll back the
|
||||
// uploads and history as well as the beta changes.
|
||||
const changes = new Map(servers.map(server => [server.server, revisionFileChanges(betaId, server.server)]));
|
||||
// Betas created before staged activation may only have deployed_at
|
||||
// and snapshots. Record their first writes before replacing staging.
|
||||
for (const server of servers.filter(server => server.deployed_at)) {
|
||||
for (const change of changes.get(server.server)!) {
|
||||
if (isFileApplied('beta', String(betaId), server.server, change.kind, change.relPath) === null) {
|
||||
db().prepare('INSERT OR IGNORE INTO beta_file_changes (beta_id, server, rel_path) VALUES (?, ?, ?)')
|
||||
.run(betaId, server.server, change.relPath);
|
||||
}
|
||||
}
|
||||
}
|
||||
for (const job of jobs.filter(job => ['waiting', 'queued'].includes(job.state))) {
|
||||
cancelProvisioningJob(job.id, `Superseded by beta #${betaId} revision ${revision}`);
|
||||
}
|
||||
for (const server of servers) releaseRestartRequest(server.server, { kind: 'beta', id: String(betaId) });
|
||||
// New IDs prevent historical host receipts from resolving to a newer
|
||||
// revision's desired bytes. Original before images stay intact.
|
||||
db().prepare("DELETE FROM staged_file_changes WHERE source_kind = 'beta' AND source_id = ?").run(String(betaId));
|
||||
db().prepare('UPDATE beta_test_runs SET retired_at = ? WHERE beta_id = ? AND retired_at IS NULL').run(at, betaId);
|
||||
db().prepare(`UPDATE beta_servers SET stage = 'queued', error = NULL, deployed_at = NULL,
|
||||
restarted_at = NULL, healthy_at = NULL, match_seen_at = NULL, updated_at = ? WHERE beta_id = ?`).run(at, betaId);
|
||||
db().prepare("UPDATE betas SET state = 'running' WHERE id = ?").run(betaId);
|
||||
setOutcome(betaId, 'active', null);
|
||||
archiveBetaRevision(betaId, revision, at, notes.trim() || null);
|
||||
// The original first wave follows selection order; later waves are
|
||||
// ordered by the runner. Preserve that canary selection on revision.
|
||||
const firstWave = db().prepare('SELECT server FROM beta_servers WHERE beta_id = ? ORDER BY rowid LIMIT ?')
|
||||
.all(betaId, plan?.waveSize || servers.length) as { server: string }[];
|
||||
for (const server of firstWave) {
|
||||
for (const change of changes.get(server.server)!) queueFileChange(change);
|
||||
db().prepare("UPDATE beta_servers SET stage = 'awaiting-empty' WHERE beta_id = ? AND server = ?").run(betaId, server.server);
|
||||
}
|
||||
activity(betaId, `Revision ${revision} submitted; fresh tests and testing window${notes.trim() ? `: ${notes.trim()}` : ''}`);
|
||||
})();
|
||||
emit({ type: 'beta-state', betaId, state: 'running' });
|
||||
return { revision };
|
||||
});
|
||||
}
|
||||
|
||||
function revisionFileChanges(betaId: number, name: string): Parameters<typeof queueFileChange>[0][] {
|
||||
const resolved = listBetaScripts(betaId).map(row => ({ script: getScript(row.script_id)!, version: getVersion(row.script_version_id)! }));
|
||||
const server = getServer(name)!;
|
||||
const changes: Parameters<typeof queueFileChange>[0][] = resolved.filter(row => !isCollapsingKind(row.script.kind))
|
||||
.map(({ script, version }) => ({ sourceKind: 'beta', sourceId: String(betaId), server: name, kind: script.kind,
|
||||
relPath: script.target_rel_path, content: version.content, scriptVersionId: version.id, inventorySource: `beta:${betaId}` }));
|
||||
if (resolved.some(row => isCollapsingKind(row.script.kind))) {
|
||||
const composed = composeCfgForServer(name, server.game, server.map, {
|
||||
inBetaBaseline: resolved.find(row => row.script.kind === 'baseline')?.version,
|
||||
inBetaOverlays: resolved.filter(row => row.script.kind === 'config')
|
||||
});
|
||||
if (!composed) throw new BetaError(`No baseline available for ${name}.`, 'invalid-state');
|
||||
changes.push({ sourceKind: 'beta', sourceId: String(betaId), server: name, kind: 'config', relPath: configFileOf(name),
|
||||
content: Buffer.from(composed.text), inventorySource: `beta:${betaId}` });
|
||||
}
|
||||
return changes;
|
||||
}
|
||||
|
||||
/** Apply a reserved wave only when its predecessors have passed. */
|
||||
export async function deployBetaServers(betaId: number, names: string[]): Promise<void> {
|
||||
return exclusive(betaId, () => deployBetaServersInternal(betaId, names));
|
||||
@@ -620,6 +740,8 @@ async function rollbackBetaInternal(betaId: number, options: { restart?: 'manual
|
||||
const restorations: Array<{ server: string; kind: ArtifactKind; relPath: string; content: Buffer | null; versionId: number | null }> = [];
|
||||
const changed = db().prepare('SELECT 1 FROM beta_file_changes WHERE beta_id = ? AND server = ? AND rel_path = ?');
|
||||
const applied = (bs: BetaServerRow, kind: ArtifactKind, path: string) => {
|
||||
// A queued revision may supersede an applied one before its own activation.
|
||||
if (changed.get(betaId, bs.server, path)) return true;
|
||||
const staged = isFileApplied('beta', String(betaId), bs.server, kind, path);
|
||||
if (staged !== null) return staged;
|
||||
// Existing betas predating staging wrote their files before deployed_at.
|
||||
|
||||
@@ -80,6 +80,21 @@ function readExisting(path: string): Buffer | null {
|
||||
catch (err) { if ((err as NodeJS.ErrnoException).code === 'ENOENT') return null; throw err; }
|
||||
}
|
||||
|
||||
/** The first activation owns the rollback image, including an absent file. */
|
||||
export function captureBetaBeforeImage(row: StagedFileChange, before: Buffer | null): void {
|
||||
if (db().prepare('SELECT 1 FROM beta_file_changes WHERE beta_id = ? AND server = ? AND rel_path = ?')
|
||||
.get(row.source_id, row.server, row.rel_path)) return;
|
||||
const prior = getServerScript(row.server, row.rel_path);
|
||||
if (before !== null) db().prepare(`INSERT OR IGNORE INTO beta_file_snapshots
|
||||
(beta_id, server, rel_path, prior_content, prior_sha256, prior_size) VALUES (?, ?, ?, ?, ?, ?)`)
|
||||
.run(row.source_id, row.server, row.rel_path, before, sha256Buffer(before), before.length);
|
||||
db().prepare(`UPDATE beta_server_scripts SET had_original = ?, prior_version_id = ? WHERE beta_id = ? AND server = ?
|
||||
AND script_id IN (SELECT id FROM scripts WHERE target_rel_path = ? AND kind = ?)`)
|
||||
.run(before === null ? 0 : 1, prior?.script_version_id ?? null, row.source_id, row.server, row.rel_path, row.kind);
|
||||
db().prepare('INSERT INTO beta_file_changes (beta_id, server, rel_path) VALUES (?, ?, ?)')
|
||||
.run(row.source_id, row.server, row.rel_path);
|
||||
}
|
||||
|
||||
/** Only called after occupancy checks and reservation of the restart slot.
|
||||
* Synchronous file replacement keeps cancellation, new requests, and deletion
|
||||
* from interleaving between the final gates and dispatching the restart.
|
||||
@@ -111,17 +126,9 @@ export function applyStagedFilesForOperation(operationId: string, server: string
|
||||
for (const { row, path } of plans) {
|
||||
// Earlier coalesced campaigns may have just updated the same path.
|
||||
const before = readExisting(path);
|
||||
const prior = getServerScript(server, row.rel_path);
|
||||
db().transaction(() => {
|
||||
if (row.source_kind === 'beta') {
|
||||
if (before !== null) db().prepare(`INSERT OR IGNORE INTO beta_file_snapshots
|
||||
(beta_id, server, rel_path, prior_content, prior_sha256, prior_size) VALUES (?, ?, ?, ?, ?, ?)`)
|
||||
.run(row.source_id, server, row.rel_path, before, sha256Buffer(before), before.length);
|
||||
db().prepare(`UPDATE beta_server_scripts SET had_original = ?, prior_version_id = ? WHERE beta_id = ? AND server = ?
|
||||
AND script_id IN (SELECT id FROM scripts WHERE target_rel_path = ? AND kind = ?)`)
|
||||
.run(before === null ? 0 : 1, prior?.script_version_id ?? null, row.source_id, server, row.rel_path, row.kind);
|
||||
db().prepare('INSERT OR IGNORE INTO beta_file_changes (beta_id, server, rel_path) VALUES (?, ?, ?)')
|
||||
.run(row.source_id, server, row.rel_path);
|
||||
captureBetaBeforeImage(row, before);
|
||||
}
|
||||
if (row.deployment_file_id && !row.preserve_before_image) db().prepare(`UPDATE deployment_files SET
|
||||
verb = ?, content_before = ?, sha256_before = ? WHERE id = ?`)
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { db } from '../db/index.js';
|
||||
import { betaOperationInFlight, deployBetaServers, getBeta, isActiveBetaServer, listBetaServers, rollbackBeta } from '../fleet/beta.js';
|
||||
import { currentBetaRevision } from '../fleet/beta-revisions.js';
|
||||
import { betaOperationInFlight, deployBetaServers, isActiveBetaServer, listBetaServers, rollbackBeta } from '../fleet/beta.js';
|
||||
import { activity, currentRun, observeRun, prepareRun, readMetrics, saveMetrics, setOutcome, storedPlan, type StoredPlan } from '../fleet/beta-tests.js';
|
||||
import { coveragePassed, evaluateRequirements } from '../fleet/beta-evaluation.js';
|
||||
import { parseBetaPlan, type BetaPlan } from '../../beta-plan.js';
|
||||
@@ -64,7 +65,6 @@ async function tick(): Promise<void> {
|
||||
async function advancePlan(stored: StoredPlan): Promise<void> {
|
||||
const id = stored.beta_id;
|
||||
const plan = parseBetaPlan(JSON.parse(stored.plan));
|
||||
const beta = getBeta(id)!;
|
||||
const servers = listBetaServers(id);
|
||||
// Preserve the original coverage and evidence. A replacement with the same
|
||||
// name cannot complete a test that began on a different server.
|
||||
@@ -74,7 +74,7 @@ async function advancePlan(stored: StoredPlan): Promise<void> {
|
||||
setOutcome(id, 'paused', `Test server deleted: ${missing.map(server => server.server).join(', ')}. Roll back this beta and start a new test.`);
|
||||
return;
|
||||
}
|
||||
if (stored.outcome !== 'passed' && Date.now() - Date.parse(beta.opened_at) >= plan.timeoutHours * 3_600_000) {
|
||||
if (stored.outcome !== 'passed' && Date.now() - Date.parse(currentBetaRevision(id).started_at) >= plan.timeoutHours * 3_600_000) {
|
||||
betaState(id, false);
|
||||
setOutcome(id, 'inconclusive', 'Deadline reached without enough qualifying evidence');
|
||||
return;
|
||||
|
||||
@@ -22,9 +22,9 @@ import { fleetSettings } from '../settings.js';
|
||||
import { resolveRecoveredHealthOperation } from '../maintenance/recovery.js';
|
||||
import { probeServerStatus, probePlayerEvidence } from '../fleet/status-evidence.js';
|
||||
import { checkRelease, freshRelease, probeVersion } from '../integrations/plutonium.js';
|
||||
import { getServerScript, recordScript, removeScript } from '../fleet/inventory.js';
|
||||
import { recordScript, removeScript } from '../fleet/inventory.js';
|
||||
import { sha256Buffer } from '../fleet/files.js';
|
||||
import type { StagedFileChange } from '../fleet/staged-files.js';
|
||||
import { captureBetaBeforeImage, type StagedFileChange } from '../fleet/staged-files.js';
|
||||
import type { LaunchPreview } from '../../deployment-plan.js';
|
||||
import type { ProvisioningAction } from '../../provisioning.js';
|
||||
import { hostAgentUpdatesEnabled } from '../../hosts.js';
|
||||
@@ -227,13 +227,8 @@ function applyReceipt(job: Job, result: Record<string, unknown>) {
|
||||
const row = db().prepare('SELECT * FROM staged_file_changes WHERE id=?').get(plan.id) as StagedFileChange;
|
||||
if (!row || row.state === 'applied') continue;
|
||||
const bytes = snapshot.contentBase64 === null ? null : Buffer.from(snapshot.contentBase64, 'base64');
|
||||
const prior = getServerScript(job.server, row.rel_path);
|
||||
if (row.source_kind === 'beta') {
|
||||
if (bytes !== null) db().prepare(`INSERT OR IGNORE INTO beta_file_snapshots(beta_id,server,rel_path,prior_content,prior_sha256,prior_size) VALUES(?,?,?,?,?,?)`)
|
||||
.run(row.source_id, job.server, row.rel_path, bytes, sha256Buffer(bytes), bytes.length);
|
||||
db().prepare(`UPDATE beta_server_scripts SET had_original=?,prior_version_id=? WHERE beta_id=? AND server=?
|
||||
AND script_id IN (SELECT id FROM scripts WHERE target_rel_path=? AND kind=?)`).run(bytes === null ? 0 : 1, prior?.script_version_id ?? null, row.source_id, job.server, row.rel_path, row.kind);
|
||||
db().prepare('INSERT OR IGNORE INTO beta_file_changes(beta_id,server,rel_path) VALUES(?,?,?)').run(row.source_id, job.server, row.rel_path);
|
||||
captureBetaBeforeImage(row, bytes);
|
||||
db().prepare('UPDATE beta_servers SET deployed_at=?,updated_at=? WHERE beta_id=? AND server=?').run(new Date().toISOString(), new Date().toISOString(), row.source_id, job.server);
|
||||
}
|
||||
if (row.deployment_file_id && !row.preserve_before_image) db().prepare('UPDATE deployment_files SET verb=?,content_before=?,sha256_before=? WHERE id=?')
|
||||
|
||||
@@ -0,0 +1,100 @@
|
||||
<script lang="ts">
|
||||
import Dialog from './primitives/Dialog.svelte';
|
||||
import Button from './primitives/Button.svelte';
|
||||
import DiffViewer from './DiffViewer.svelte';
|
||||
import ServerIdentity from './ServerIdentity.svelte';
|
||||
import { artifactVersionLabel } from '$lib/artifact-version.js';
|
||||
|
||||
interface FileEntry { id: number; name: string; kind: string; target_rel_path: string;
|
||||
version: { version: number; release_version: string | null; sha256: string } | null }
|
||||
let { open = $bindable(false), betaId, revision, files, servers, timeoutHours, onUpdate }:
|
||||
{ open?: boolean; betaId: number; revision: number; files: FileEntry[]; servers: string[];
|
||||
timeoutHours?: number; onUpdate: () => Promise<void> } = $props();
|
||||
interface Replacement { file: File; sha: string; before: string | null; after: string | null }
|
||||
let replacements = $state<Record<number, Replacement>>({});
|
||||
let notes = $state(''), error = $state(''), reviewing = $state(false), busy = $state(false);
|
||||
const count = $derived(Object.keys(replacements).length);
|
||||
$effect(() => { if (open) { replacements = {}; notes = ''; error = ''; reviewing = false; } });
|
||||
function fileUrl(scriptId: number) { return `/api/betas/${betaId}/revisions/${revision}/files/${scriptId}`; }
|
||||
async function choose(entry: FileEntry, file?: File) {
|
||||
delete replacements[entry.id]; error = '';
|
||||
if (!file) return;
|
||||
busy = true;
|
||||
try {
|
||||
if (!file.size) throw new Error('Choose a non-empty file.');
|
||||
const bytes = await file.arrayBuffer();
|
||||
const inspection = new FormData(); inspection.set('content', file);
|
||||
const inspected = await fetch('/api/scripts/inspect', { method: 'POST', body: inspection });
|
||||
const inspectionBody = await inspected.json();
|
||||
if (!inspected.ok) throw new Error(inspectionBody.error ?? 'Could not inspect replacement file.');
|
||||
const sha = inspectionBody.sha256 as string;
|
||||
if (sha === entry.version?.sha256) throw new Error(`${entry.name}: this file is identical to the current version.`);
|
||||
let before: string | null = null, after: string | null = null;
|
||||
if (entry.kind !== 'plugin' && bytes.byteLength <= 128 * 1024) {
|
||||
const response = await fetch(fileUrl(entry.id));
|
||||
if (!response.ok) throw new Error('Could not load the current file for review. Reload the beta and try again.');
|
||||
const old = await response.arrayBuffer();
|
||||
if (old.byteLength <= 128 * 1024 && !new Uint8Array(old).includes(0) && !new Uint8Array(bytes).includes(0)) {
|
||||
before = new TextDecoder().decode(old); after = new TextDecoder().decode(bytes);
|
||||
}
|
||||
}
|
||||
replacements[entry.id] = { file, sha, before, after };
|
||||
} catch (err) { error = (err as Error).message; }
|
||||
finally { busy = false; }
|
||||
}
|
||||
async function deploy() {
|
||||
busy = true; error = '';
|
||||
try {
|
||||
const form = new FormData();
|
||||
form.set('expectedRevision', String(revision)); form.set('notes', notes);
|
||||
for (const [scriptId, replacement] of Object.entries(replacements)) form.set(`file:${scriptId}`, replacement.file);
|
||||
const response = await fetch(`/api/betas/${betaId}/revisions`, { method: 'POST', body: form });
|
||||
const body = await response.json();
|
||||
if (!response.ok) throw new Error(body.error ?? 'Could not update beta.');
|
||||
open = false; await onUpdate();
|
||||
} catch (err) { error = (err as Error).message; }
|
||||
finally { busy = false; }
|
||||
}
|
||||
</script>
|
||||
|
||||
<Dialog bind:open title={reviewing ? `Review revision ${revision + 1}` : 'Update beta'}
|
||||
description={`Replace files in beta #${betaId} and repeat its tests on the same servers.`} {busy} wide>
|
||||
{#if error}<p class="ui-error" role="alert">{error}</p>{/if}
|
||||
{#if !reviewing}
|
||||
<p>Choose replacements for the files you changed.</p>
|
||||
<div class="files">{#each files as entry}
|
||||
<label><strong>{entry.name} · {artifactVersionLabel(entry.version)}</strong><code>{entry.target_rel_path}</code>
|
||||
<input type="file" disabled={busy} onchange={event => choose(entry, event.currentTarget.files?.[0])} />
|
||||
{#if replacements[entry.id]}<span>Replacement ready for review</span>{/if}
|
||||
</label>
|
||||
{/each}</div>
|
||||
<label class="notes">Change note (optional)<textarea bind:value={notes} maxlength="1000" rows="3" disabled={busy}></textarea></label>
|
||||
{:else}
|
||||
<p><strong>{count} file{count === 1 ? '' : 's'} changed.</strong> All {servers.length} selected servers will repeat the test policy, using its existing wave order. Each server installs the bundle and restarts when empty.</p>
|
||||
<p>Previous results move to revision history. Promotion requires this revision to pass.
|
||||
{#if timeoutHours}A fresh {timeoutHours}-hour test window starts when you deploy, including time waiting for empty servers.{/if}
|
||||
Rejecting the beta still restores the files from before revision 1.</p>
|
||||
<details open><summary>Servers ({servers.length})</summary><ul>{#each servers as name}<li><ServerIdentity {name}/></li>{/each}</ul></details>
|
||||
{#each files.filter(entry => replacements[entry.id]) as entry}
|
||||
{@const replacement = replacements[entry.id]}
|
||||
<section><h3>{entry.name}</h3><p><code>{entry.target_rel_path}</code> ← {replacement.file.name} ({replacement.file.size.toLocaleString()} bytes)</p>
|
||||
<p class="hash">SHA {entry.version?.sha256.slice(0,12)} → {replacement.sha.slice(0,12)}</p>
|
||||
{#if replacement.after !== null}<DiffViewer before={replacement.before} after={replacement.after} verb="updated" relPath={entry.target_rel_path}/>
|
||||
{:else}<p>Binary or large file: review the uploaded file and checksum.</p>{/if}
|
||||
</section>
|
||||
{/each}
|
||||
{#if notes}<p>Change note: {notes}</p>{/if}
|
||||
{/if}
|
||||
{#snippet actions()}
|
||||
<Button onclick={() => open = false} disabled={busy}>Cancel</Button>
|
||||
{#if reviewing}<Button onclick={() => reviewing = false} disabled={busy}>Back</Button><Button variant="primary" onclick={deploy} disabled={busy} loading={busy}>Deploy revision {revision + 1}</Button>
|
||||
{:else}<Button variant="primary" onclick={() => reviewing = true} disabled={busy || !count}>Review update</Button>{/if}
|
||||
{/snippet}
|
||||
</Dialog>
|
||||
|
||||
<style>
|
||||
.files, label { display:grid; gap:12px; } .files { margin:20px 0; }
|
||||
.files label { padding:16px; border:1px solid var(--border-subtle); border-radius:var(--radius-md); }
|
||||
p { line-height:1.6; } code, .hash { overflow-wrap:anywhere; } .hash, label span { color:var(--text-secondary); font-size:13px; }
|
||||
li { margin:8px 0; } textarea { width:100%; } section { margin-top:24px; }
|
||||
</style>
|
||||
@@ -50,7 +50,7 @@
|
||||
{#if ['paused','failed'].includes(test.outcome) && !expired}<Button size="sm" disabled={busy || !!retryBlocked} onclick={()=>action('retry')}>Start fresh attempt</Button>{/if}
|
||||
</div>{/if}
|
||||
{#if retryBlocked && ['paused','failed'].includes(test.outcome)}<p>{retryBlocked}</p>{/if}
|
||||
{#if expired}<p class="guidance">The testing window ended. Roll back this beta first, then choose “Reuse files and test plan” to open a new beta with a longer window.</p>
|
||||
{#if expired}<p class="guidance">The testing window ended. Use “Update beta” to test changed files in a fresh revision, or roll back and reuse the plan with a longer window.</p>
|
||||
{:else if test.outcome === 'paused' && !hasDeletedServers}<p class="guidance">Resume retains completed milestones; continuous health and in-progress timing intervals start fresh. Pausing does not extend the deadline.</p>{/if}
|
||||
{/if}
|
||||
{#if error}<p role="alert" class="failed">{error}</p>{/if}
|
||||
|
||||
Reference in New Issue
Block a user