@parcha/pi-durable-disk 0.1.0-beta.15 → 0.1.0-beta.17

package/dist/supervise.d.ts

@@ -1,7 +1,7 @@
 import type { Delegation } from "disk";
 import { type ArchilHost, type ControlApi, type PathlessResolver, type RunRef } from "./claim.js";
 import { PdaError } from "./errors.js";
-import { type RunRecord } from "./status.js";
+import { type RunRecord, type StartMark } from "./status.js";
 export type Json = null | boolean | number | string | Json[] | {
     [key: string]: Json;
 };
@@ -21,6 +21,22 @@ export type StartAttempt = {
     attempt: number;
     env?: Record<string, string>;
 };
+/**
+ * A box a driver made for an instance, as a receipt: who provided it, what kind, when it was made and when it ended
+ * (null while it lives), and its published list price per second (`usdPerSecond`), with the page that price was read
+ * from (`source`) and the ISO date it was read (`priced`). A box with no price (a kind the provider's page does not
+ * price, or of unknown size) has none of the three: never a price of 0. No field holds the provider's id of the box:
+ * the supervisor labels boxes itself and computes their seconds and cost.
+ */
+export type HostBox = {
+    provider: string;
+    kind: string;
+    from: string;
+    to: string | null;
+    usdPerSecond?: number;
+    source?: string;
+    priced?: string;
+};
 /** Compute is disposable and pluggable: a driver is these three calls. */
 export interface HostDriver {
     /**
@@ -41,6 +57,8 @@ export interface HostDriver {
     kill?(handle: HostHandle): Promise<void>;
     /** What `kill` takes: `process`, the instance's processes while its machine stays (a restart policy may bring them back), or `box`, its machine. */
     readonly kills?: "process" | "box";
+    /** Optional, for a driver whose instances get machines of their own: the box `handle`'s instance runs in, as a receipt. */
+    box?(handle: HostHandle): HostBox | null;
 }
 /** The control-plane calls the supervisor uses; an archil `Disk` satisfies it. */
 export interface SupervisorControl extends ControlApi {
@@ -227,18 +245,7 @@ export type EnsureResult =
  * supervisors are safe: the mount admits one claimant and the other instance exits 76.
  */
 export declare function ensureRunning(ref: RunRef, host: HostDriver, options: EnsureOptions): Promise<EnsureResult>;
-/**
- * The supervisor's record of its last start of a run: the generation the instance will write, when, by whom, and the
- * failed starts right before it (`failures`; `lastExit`, what the decision saw of the last one).
- */
-export declare const START_MARK = "start.json";
-export type StartMark = {
-    generation: number;
-    at: string;
-    by: string | null;
-    failures: number;
-    lastExit: string | null;
-};
+export { START_MARK, type StartMark } from "./status.js";
 /** The grace of a start that follows `failures` failed ones: the base doubled per failure, capped, never below the base. */
 export declare function startGrace(baseMs: number, failures: number, maxMs?: number): number;
 /**

package/dist/supervise.js

@@ -8,7 +8,7 @@ import { hostname } from "node:os";
 import { join } from "node:path";
 import { acquire, createRunDir, findDelegations, matchDelegations, pathlessResolver, revokeBestEffort, revokeCompanions, mintMountToken, MOUNT_TOKEN_TTL, parseTokenNickname, removeMountToken, runPath, unmountClaim, } from "./claim.js";
 import { FencedError, HeldError, PdaError } from "./errors.js";
-import { parseRunRecord, RUN_JSON } from "./status.js";
+import { parseRunRecord, parseStartMark, RUN_JSON, START_MARK } from "./status.js";
 export const CONTROL_TIMEOUT_MS = 10_000;
 /** The same control API with every call bounded: one that does not settle in `ms` fails as CONTROL_API_FAILED. */
 export function withTimeouts(control, ms) {
@@ -160,11 +160,8 @@ export async function ensureRunning(ref, host, options) {
     await revokeListed(opts.control, ref.id, held, all);
     return start("lease-expired", held, stonith);
 }
-/**
- * The supervisor's record of its last start of a run: the generation the instance will write, when, by whom, and the
- * failed starts right before it (`failures`; `lastExit`, what the decision saw of the last one).
- */
-export const START_MARK = "start.json";
+// The start mark (`start.json`): its name, shape and parser live in status.ts, which the instance also reads it with.
+export { START_MARK } from "./status.js";
 /** The grace of a start that follows `failures` failed ones: the base doubled per failure, capped, never below the base. */
 export function startGrace(baseMs, failures, maxMs = START_BACKOFF_MAX_MS) {
     if (baseMs <= 0)
@@ -193,17 +190,7 @@ export async function readStartMark(control, id) {
             return null;
         throw new SuperviseError("CONTROL_API_FAILED", `GetObject ${runPath(id)}/${START_MARK} failed`, { cause: err });
     }
-    try {
-        const v = JSON.parse(text);
-        if (!Number.isSafeInteger(v.generation) || v.generation < 1 || typeof v.at !== "string" || !Number.isFinite(Date.parse(v.at)))
-            return null;
-        const failures = Number.isSafeInteger(v.failures) && v.failures >= 0 ? v.failures : 0;
-        const lastExit = typeof v.lastExit === "string" ? v.lastExit : null;
-        return { generation: v.generation, at: v.at, by: typeof v.by === "string" ? v.by : null, failures, lastExit };
-    }
-    catch {
-        return null;
-    }
+    return parseStartMark(text);
 }
 /** Only a run with no run.json and no holder gets here, so the directory is either absent or idle. */
 async function ensureRunDir(control, id, owner) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcha/pi-durable-disk",
-  "version": "0.1.0-beta.15",
+  "version": "0.1.0-beta.17",
   "description": "A durable pi host on a network disk (Archil): one owner per run, a fence, durable commits, and a supervisor.",
   "keywords": [
     "pi",
@@ -56,7 +56,7 @@
     "test": "node --test --test-timeout=240000 'test/*.test.ts' 'test/examples/*.test.ts'",
     "test:acceptance": "node --test --test-concurrency=1 'test/acceptance/*.test.ts'",
     "test:live": "node --test --test-concurrency=1 'test/live/*.test.ts'",
-    "test:live:claim": "node --test --test-concurrency=1 test/live/claim.live.test.ts",
+    "test:live:claim": "node --test --test-concurrency=1 test/live/claim.live.test.ts test/live/record-home.live.test.ts",
     "test:live:env": "node --test --test-concurrency=1 test/live/env.live.test.ts",
     "test:live:lifecycle": "node --test --test-concurrency=1 test/live/lifecycle.live.test.ts",
     "test:live:run": "node --test --test-concurrency=1 test/live/run.live.test.ts",