@vimhead.dev/norn-cli 0.1.0-tip.35614826665.1 → 0.1.0-tip.35724621678.1

package/assets/packages/cli/src/internal/run-lease.ts

@@ -31,7 +31,10 @@ export class NornRunLease {
 		private readonly processOwner: NornRunProcessOwner,
 	) {}
 
-	static async acquire(runRoot: string, processOwner: NornRunProcessOwner = currentRunProcessOwner()): Promise<NornRunLease> {
+	static async acquire(
+		runRoot: string,
+		processOwner: NornRunProcessOwner = currentRunProcessOwner(),
+	): Promise<NornRunLease> {
 		const lockRoot = join(runRoot, LOCK_DIR_NAME);
 		for (let attempt = 1; attempt <= ACQUIRE_ATTEMPTS; attempt++) {
 			try {
@@ -48,7 +51,9 @@ export class NornRunLease {
 			} catch (error) {
 				if (!isNodeError(error) || error.code !== "EEXIST") throw error;
 				const owner = await readRunLeaseOwner(join(lockRoot, OWNER_FILE_NAME));
-				const isStale = owner ? isRunLeaseStale(owner) : await isRunLeaseDirectoryStale(lockRoot);
+				const isStale = owner
+					? isRunLeaseStale(owner)
+					: await isRunLeaseDirectoryStale(lockRoot);
 				if (!isStale) throw new Error(`Run is already active: ${runRoot}`);
 				await rm(lockRoot, { recursive: true, force: true });
 			}
@@ -59,7 +64,8 @@ export class NornRunLease {
 	async assertOwned(): Promise<void> {
 		if (this.isReleased) throw new Error("Run lease has been released");
 		const owner = await readRunLeaseOwner(this.ownerPath);
-		if (!owner || owner.token !== this.token) throw new Error("Run lease was lost");
+		if (!owner || owner.token !== this.token)
+			throw new Error("Run lease was lost");
 	}
 
 	async release(): Promise<void> {
@@ -68,7 +74,8 @@ export class NornRunLease {
 		if (this.heartbeat) clearInterval(this.heartbeat);
 		await this.heartbeatChain.catch(() => undefined);
 		const owner = await readRunLeaseOwner(this.ownerPath);
-		if (owner?.token === this.token) await rm(this.lockRoot, { recursive: true, force: true });
+		if (owner?.token === this.token)
+			await rm(this.lockRoot, { recursive: true, force: true });
 	}
 
 	private get ownerPath(): string {
@@ -77,10 +84,12 @@ export class NornRunLease {
 
 	private startHeartbeat(): void {
 		this.heartbeat = setInterval(() => {
-			this.heartbeatChain = this.heartbeatChain.then(() => this.refreshHeartbeat()).catch(() => {
-				this.isReleased = true;
-				if (this.heartbeat) clearInterval(this.heartbeat);
-			});
+			this.heartbeatChain = this.heartbeatChain
+				.then(() => this.refreshHeartbeat())
+				.catch(() => {
+					this.isReleased = true;
+					if (this.heartbeat) clearInterval(this.heartbeat);
+				});
 		}, HEARTBEAT_INTERVAL_MS);
 		this.heartbeat.unref?.();
 	}
@@ -88,13 +97,21 @@ export class NornRunLease {
 	private async refreshHeartbeat(): Promise<void> {
 		if (this.isReleased) return;
 		const owner = await readRunLeaseOwner(this.ownerPath);
-		if (!owner || owner.token !== this.token) throw new Error("Run lease was lost");
+		if (!owner || owner.token !== this.token)
+			throw new Error("Run lease was lost");
 		await this.writeOwner({ acquiredAt: owner.acquiredAt });
 	}
 
-	private async writeOwner(input: { readonly acquiredAt: string }): Promise<void> {
+	private async writeOwner(input: {
+		readonly acquiredAt: string;
+	}): Promise<void> {
 		const now = new Date().toISOString();
-		await writeJsonAtomically(this.ownerPath, { token: this.token, acquiredAt: input.acquiredAt, heartbeatAt: now, ...this.processOwner });
+		await writeJsonAtomically(this.ownerPath, {
+			token: this.token,
+			acquiredAt: input.acquiredAt,
+			heartbeatAt: now,
+			...this.processOwner,
+		});
 	}
 }
 
@@ -104,14 +121,18 @@ export type NornRunProcessOwner = {
 	readonly command: readonly string[];
 };
 
-export async function getRunLeaseHealth(runRoot: string): Promise<NornRunHealth> {
+export async function getRunLeaseHealth(
+	runRoot: string,
+): Promise<NornRunHealth> {
 	const lockRoot = join(runRoot, LOCK_DIR_NAME);
 	const owner = await readRunLeaseOwner(join(lockRoot, OWNER_FILE_NAME));
 	if (owner) return isRunLeaseStale(owner) ? "unhealthy" : "healthy";
-	return await isRunLeaseDirectoryStale(lockRoot) ? "unhealthy" : "healthy";
+	return (await isRunLeaseDirectoryStale(lockRoot)) ? "unhealthy" : "healthy";
 }
 
-export async function getRunLeaseOwner(runRoot: string): Promise<NornRunLeaseOwner | undefined> {
+export async function getRunLeaseOwner(
+	runRoot: string,
+): Promise<NornRunLeaseOwner | undefined> {
 	return readRunLeaseOwner(join(runRoot, LOCK_DIR_NAME, OWNER_FILE_NAME));
 }
 
@@ -123,7 +144,9 @@ function currentRunProcessOwner(): NornRunProcessOwner {
 	};
 }
 
-async function readRunLeaseOwner(path: string): Promise<NornRunLeaseOwner | undefined> {
+async function readRunLeaseOwner(
+	path: string,
+): Promise<NornRunLeaseOwner | undefined> {
 	try {
 		return parseRunLeaseOwner(JSON.parse(await readFile(path, "utf8")));
 	} catch (error) {
@@ -135,13 +158,40 @@ async function readRunLeaseOwner(path: string): Promise<NornRunLeaseOwner | unde
 function parseRunLeaseOwner(value: unknown): NornRunLeaseOwner | undefined {
 	if (!value || typeof value !== "object") return undefined;
 	const owner = value as Partial<NornRunLeaseOwner>;
-	if (typeof owner.token !== "string" || owner.token.length === 0) return undefined;
-	if (typeof owner.acquiredAt !== "string" || Number.isNaN(Date.parse(owner.acquiredAt))) return undefined;
-	if (typeof owner.heartbeatAt !== "string" || Number.isNaN(Date.parse(owner.heartbeatAt))) return undefined;
-	const pid = typeof owner.pid === "number" && Number.isInteger(owner.pid) ? owner.pid : 0;
-	const processGroupId = typeof owner.processGroupId === "number" && Number.isInteger(owner.processGroupId) ? owner.processGroupId : pid;
-	const command = Array.isArray(owner.command) ? owner.command.filter((value): value is string => typeof value === "string") : [];
-	return { token: owner.token, acquiredAt: owner.acquiredAt, heartbeatAt: owner.heartbeatAt, pid, processGroupId, command };
+	if (typeof owner.token !== "string" || owner.token.length === 0)
+		return undefined;
+	if (
+		typeof owner.acquiredAt !== "string" ||
+		Number.isNaN(Date.parse(owner.acquiredAt))
+	)
+		return undefined;
+	if (
+		typeof owner.heartbeatAt !== "string" ||
+		Number.isNaN(Date.parse(owner.heartbeatAt))
+	)
+		return undefined;
+	const pid =
+		typeof owner.pid === "number" && Number.isInteger(owner.pid)
+			? owner.pid
+			: 0;
+	const processGroupId =
+		typeof owner.processGroupId === "number" &&
+		Number.isInteger(owner.processGroupId)
+			? owner.processGroupId
+			: pid;
+	const command = Array.isArray(owner.command)
+		? owner.command.filter(
+				(value): value is string => typeof value === "string",
+			)
+		: [];
+	return {
+		token: owner.token,
+		acquiredAt: owner.acquiredAt,
+		heartbeatAt: owner.heartbeatAt,
+		pid,
+		processGroupId,
+		command,
+	};
 }
 
 function isRunLeaseStale(owner: NornRunLeaseOwner): boolean {

package/assets/packages/cli/src/internal/run-log.ts

@@ -23,37 +23,66 @@ export type NornRunManifest = {
 export class NornRunLogger {
 	private isInitialized = false;
 
-	constructor(private readonly input: {
-		readonly manifestPath: string;
-		readonly manifest: Omit<NornRunManifest, "events">;
-		readonly files: NornFileCoordinator;
-	}) {}
+	constructor(
+		private readonly input: {
+			readonly manifestPath: string;
+			readonly manifest: Omit<NornRunManifest, "events">;
+			readonly files: NornFileCoordinator;
+		},
+	) {}
 
-	static async load(manifestPath: string, files: NornFileCoordinator): Promise<NornRunLogger> {
+	static async load(
+		manifestPath: string,
+		files: NornFileCoordinator,
+	): Promise<NornRunLogger> {
 		const manifest = parseManifest(await files.readText(manifestPath));
 		const logger = new NornRunLogger({ manifestPath, manifest, files });
 		logger.isInitialized = true;
 		return logger;
 	}
 
-	async record(event: { readonly type: string; readonly [key: string]: unknown }): Promise<void> {
-		await this.input.files.withExclusiveLock(this.input.manifestPath, async (path) => {
-			let manifest: NornRunManifest;
-			try {
-				manifest = parseManifest(await readFile(path, "utf8"));
-			} catch (error) {
-				if (this.isInitialized || !isNodeError(error) || error.code !== "ENOENT") throw error;
-				manifest = { ...this.input.manifest, events: [] };
-			}
-			if (manifest.id !== this.input.manifest.id) throw new Error("Run manifest identity changed");
-			await writeJsonAtomically(path, { ...manifest, events: [...manifest.events, { ...event, at: new Date().toISOString() }] });
-			this.isInitialized = true;
-		});
+	async record(event: {
+		readonly type: string;
+		readonly [key: string]: unknown;
+	}): Promise<void> {
+		await this.input.files.withExclusiveLock(
+			this.input.manifestPath,
+			async (path) => {
+				let manifest: NornRunManifest;
+				try {
+					manifest = parseManifest(await readFile(path, "utf8"));
+				} catch (error) {
+					if (
+						this.isInitialized ||
+						!isNodeError(error) ||
+						error.code !== "ENOENT"
+					)
+						throw error;
+					manifest = { ...this.input.manifest, events: [] };
+				}
+				if (manifest.id !== this.input.manifest.id)
+					throw new Error("Run manifest identity changed");
+				await writeJsonAtomically(path, {
+					...manifest,
+					events: [
+						...manifest.events,
+						{ ...event, at: new Date().toISOString() },
+					],
+				});
+				this.isInitialized = true;
+			},
+		);
 	}
 }
 
 function parseManifest(content: string): NornRunManifest {
 	const manifest = JSON.parse(content) as NornRunManifest;
-	if (!manifest || typeof manifest !== "object" || typeof manifest.id !== "string" || !Array.isArray(manifest.events)) throw new Error("Invalid run manifest");
+	if (
+		!manifest ||
+		typeof manifest !== "object" ||
+		typeof manifest.id !== "string" ||
+		!Array.isArray(manifest.events)
+	)
+		throw new Error("Invalid run manifest");
 	return manifest;
 }

package/assets/packages/cli/src/internal/run-names.ts

@@ -1,22 +1,130 @@
 const ADJECTIVES = [
-	"able", "amber", "brave", "bright", "calm", "clever", "crisp", "daring", "eager", "fair",
-	"fast", "fresh", "gentle", "golden", "grand", "happy", "honest", "jolly", "kind", "lively",
-	"lucky", "merry", "nimble", "noble", "patient", "peaceful", "proud", "quiet", "rapid", "ready",
-	"royal", "sharp", "silent", "silver", "simple", "steady", "sunny", "swift", "tidy", "vivid",
+	"able",
+	"amber",
+	"brave",
+	"bright",
+	"calm",
+	"clever",
+	"crisp",
+	"daring",
+	"eager",
+	"fair",
+	"fast",
+	"fresh",
+	"gentle",
+	"golden",
+	"grand",
+	"happy",
+	"honest",
+	"jolly",
+	"kind",
+	"lively",
+	"lucky",
+	"merry",
+	"nimble",
+	"noble",
+	"patient",
+	"peaceful",
+	"proud",
+	"quiet",
+	"rapid",
+	"ready",
+	"royal",
+	"sharp",
+	"silent",
+	"silver",
+	"simple",
+	"steady",
+	"sunny",
+	"swift",
+	"tidy",
+	"vivid",
 ];
 
 const MODIFIERS = [
-	"anchor", "autumn", "brook", "cedar", "cloud", "copper", "dawn", "ember", "field", "forest",
-	"harbor", "hazel", "hill", "island", "ivory", "jade", "lake", "maple", "meadow", "moon",
-	"north", "ocean", "olive", "pearl", "pine", "rain", "river", "rose", "shadow", "snow",
-	"solar", "spring", "stone", "summer", "thunder", "timber", "valley", "violet", "willow", "winter",
+	"anchor",
+	"autumn",
+	"brook",
+	"cedar",
+	"cloud",
+	"copper",
+	"dawn",
+	"ember",
+	"field",
+	"forest",
+	"harbor",
+	"hazel",
+	"hill",
+	"island",
+	"ivory",
+	"jade",
+	"lake",
+	"maple",
+	"meadow",
+	"moon",
+	"north",
+	"ocean",
+	"olive",
+	"pearl",
+	"pine",
+	"rain",
+	"river",
+	"rose",
+	"shadow",
+	"snow",
+	"solar",
+	"spring",
+	"stone",
+	"summer",
+	"thunder",
+	"timber",
+	"valley",
+	"violet",
+	"willow",
+	"winter",
 ];
 
 const NOUNS = [
-	"badger", "beacon", "bison", "canvas", "comet", "falcon", "fjord", "fox", "garden", "glade",
-	"grove", "heron", "lantern", "lynx", "marker", "otter", "panda", "planet", "prairie", "raven",
-	"rocket", "sail", "signal", "sparrow", "summit", "tiger", "trail", "voyage", "whale", "wolf",
-	"zephyr", "orchid", "bridge", "castle", "harvest", "mirror", "needle", "quartz", "ripple", "signal",
+	"badger",
+	"beacon",
+	"bison",
+	"canvas",
+	"comet",
+	"falcon",
+	"fjord",
+	"fox",
+	"garden",
+	"glade",
+	"grove",
+	"heron",
+	"lantern",
+	"lynx",
+	"marker",
+	"otter",
+	"panda",
+	"planet",
+	"prairie",
+	"raven",
+	"rocket",
+	"sail",
+	"signal",
+	"sparrow",
+	"summit",
+	"tiger",
+	"trail",
+	"voyage",
+	"whale",
+	"wolf",
+	"zephyr",
+	"orchid",
+	"bridge",
+	"castle",
+	"harvest",
+	"mirror",
+	"needle",
+	"quartz",
+	"ripple",
+	"signal",
 ];
 
 export function generateRunName(existingNames: ReadonlySet<string>): string {