hammerkit 2.0.0-next.5 → 2.0.0-next.7

package/dist/server/runs.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.unavailableExecutor = exports.RunRegistry = exports.MAX_TASK_ERROR = exports.MAX_CAUSES = exports.SANDBOX_ID_PATTERN = exports.RUN_ID_PATTERN = exports.QuotaError = exports.RunError = exports.isFinal = void 0;
+exports.unavailableExecutor = exports.RunRegistry = exports.MAX_COMMANDS = exports.MAX_TASK_ERROR = exports.MAX_CAUSES = exports.SANDBOX_ID_PATTERN = exports.RUN_ID_PATTERN = exports.QuotaError = exports.RunError = exports.RUN_PHASES = exports.isFinal = void 0;
 const crypto_1 = require("crypto");
 const oauth_1 = require("./oauth");
 const run_logs_1 = require("./run-logs");
@@ -10,6 +10,11 @@ function isFinal(state) {
     return FINAL_STATES.includes(state);
 }
 exports.isFinal = isFinal;
+// What an executor reports while it works. `seq` and `time` are added by the registry.
+// The steps of a run before its tasks: `source` gets its files (a checkout of the commit, or
+// those of the sandbox), `namespace` prepares its place on the cluster, `plan` starts the
+// process of the run and reads its build files.
+exports.RUN_PHASES = ['source', 'namespace', 'plan'];
 // The server can not take the run now; `status` is what the caller is told
 class RunError extends Error {
     constructor() {
@@ -61,6 +66,11 @@ const TAIL_LINE_LENGTH = 1000;
 // does not can still not make a result of any size.
 exports.MAX_CAUSES = 20;
 exports.MAX_TASK_ERROR = 2 * 1024;
+// the command times a task result keeps
+exports.MAX_COMMANDS = 50;
+function isTimestamp(value) {
+    return typeof value === 'string' && value.length <= 40 && !Number.isNaN(Date.parse(value));
+}
 function bounded(event) {
     const causes = event.causes;
     return {
@@ -74,12 +84,20 @@ function bounded(event) {
             }
             : {}),
         ...(event.error !== undefined ? { error: event.error.slice(0, exports.MAX_TASK_ERROR) } : {}),
+        ...(event.commands
+            ? {
+                commands: event.commands
+                    .filter((c) => isTimestamp(c?.startedAt) && isTimestamp(c?.finishedAt))
+                    .slice(0, exports.MAX_COMMANDS)
+                    .map(({ startedAt, finishedAt }) => ({ startedAt, finishedAt })),
+            }
+            : {}),
     };
 }
 // what a task event weighs against the log limits of a run
 function taskEventSize(event) {
     const causes = (event.causes ?? []).reduce((sum, cause) => sum + Buffer.byteLength(cause) + 4, 0);
-    return 64 + causes + Buffer.byteLength(event.error ?? '');
+    return 64 + causes + Buffer.byteLength(event.error ?? '') + (event.commands?.length ?? 0) * 64;
 }
 // Where runs are kept while the server is up. Everything is scoped to the
 // caller that submitted the run: the same id asked for by someone else is
@@ -95,6 +113,8 @@ class RunRegistry {
         this.waiters = new Set();
         // the moves of service runs that execute beside their services
         this.moving = new Set();
+        // the records of evicted runs still being removed from the store, waited for by close
+        this.removing = new Set();
         this.maxConcurrent = options.maxConcurrent ?? 4;
         this.keep = options.keep ?? 200;
         this.maxEvents = options.maxEvents ?? 5000;
@@ -598,8 +618,10 @@ class RunRegistry {
             [...this.entries.values()].some((entry) => entry.run.state === 'running' || entry.run.state === 'up')) {
             await new Promise((resolve) => setTimeout(resolve, 10));
         }
-        // the runs that were stopped are written down before the server is gone
+        // the runs that were stopped are written down before the server is gone, and the records
+        // of evicted runs are gone from the store
         await Promise.all([...this.entries.values()].map((entry) => entry.saving));
+        await Promise.all([...this.removing]);
     }
     find(owner, id, canUse) {
         const entry = this.entries.get(id);
@@ -635,6 +657,7 @@ class RunRegistry {
             accounts: [...run.accounts],
             ...(run.approvals ? { approvals: JSON.parse(JSON.stringify(run.approvals)) } : {}),
             ...(run.results ? { results: JSON.parse(JSON.stringify(run.results)) } : {}),
+            ...(run.phases ? { phases: run.phases.map((phase) => ({ ...phase })) } : {}),
             ...(run.moves ? { moves: run.moves.map((move) => ({ ...move })) } : {}),
             ...(run.moving ? { moving: { ...run.moving } } : {}),
         };
@@ -1447,6 +1470,10 @@ class RunRegistry {
             }
             return;
         }
+        if (recorded.type === 'phase') {
+            this.keepPhase(entry, recorded);
+            return;
+        }
         const event = recorded.type === 'task' ? bounded(recorded) : recorded;
         if (event.type === 'log') {
             this.keepTail(entry, event.task, event.text);
@@ -1469,6 +1496,19 @@ class RunRegistry {
         }
         this.push(entry, event);
     }
+    // once each, from the executor: a phase it reports again (a service run that wakes) is the
+    // newest
+    keepPhase(entry, event) {
+        if (!exports.RUN_PHASES.includes(event.phase) ||
+            !isTimestamp(event.startedAt) ||
+            !isTimestamp(event.finishedAt) ||
+            Date.parse(event.finishedAt) < Date.parse(event.startedAt)) {
+            return;
+        }
+        const phases = (entry.run.phases ?? []).filter((phase) => phase.phase !== event.phase);
+        phases.push({ phase: event.phase, startedAt: event.startedAt, finishedAt: event.finishedAt });
+        entry.run.phases = phases.sort((a, b) => exports.RUN_PHASES.indexOf(a.phase) - exports.RUN_PHASES.indexOf(b.phase));
+    }
     keepTail(entry, task, text) {
         let tail = entry.tails.get(task);
         if (!tail) {
@@ -1510,6 +1550,7 @@ class RunRegistry {
             ...(event.durationMs !== undefined ? { durationMs: event.durationMs } : {}),
             ...(event.exitCode !== undefined ? { exitCode: event.exitCode } : {}),
             ...(event.error ? { error: event.error } : {}),
+            ...(event.commands?.length ? { commands: event.commands } : {}),
             ...(event.state === 'cached'
                 ? { cache: { hit: true } }
                 : event.state === 'succeeded' || event.state === 'failed'
@@ -1547,7 +1588,11 @@ class RunRegistry {
         const finished = [...this.entries.values()].filter((entry) => FINAL_STATES.includes(entry.run.state));
         for (const entry of finished.slice(0, Math.max(0, finished.length - this.keep))) {
             this.entries.delete(entry.run.id);
-            void entry.saving.then(() => this.options.store?.remove(entry.run.id)).catch(() => undefined);
+            const removal = entry.saving
+                .then(() => this.options.store?.remove(entry.run.id))
+                .catch(() => undefined)
+                .finally(() => this.removing.delete(removal));
+            this.removing.add(removal);
         }
     }
 }

package/dist/server/server-config.js

@@ -45,7 +45,10 @@ exports.issuerSchema = zod_1.z
     scope: zod_1.z.string().min(1).default('openid'),
 })
     .strict();
-const subjectSchema = zod_1.z.object({ iss: zod_1.z.string().min(1), sub: zod_1.z.string().min(1) }).strict();
+// `name`: how pages name a subject whose tokens name nobody, such as a service account's
+const subjectSchema = zod_1.z
+    .object({ iss: zod_1.z.string().min(1), sub: zod_1.z.string().min(1), name: zod_1.z.string().trim().min(1).max(100).optional() })
+    .strict();
 const groupSchema = zod_1.z.object({ iss: zod_1.z.string().min(1), name: zod_1.z.string().min(1) }).strict();
 const claimsSchema = zod_1.z.object({ iss: zod_1.z.string().min(1), match: zod_1.z.record(zod_1.z.string()) }).strict();
 // Who: the person or client (`subject`), everyone in a group of an issuer

package/dist/server/server.js

@@ -129,7 +129,7 @@ async function handleRuns(config, registry, definitions, sources, sandboxes, pla
             }
             const runs = filter.scope === 'mine' ? registry.list(principal) : registry.all();
             (0, http_2.send)(res, 200, {
-                runs: (0, overview_1.filterRuns)(runs, viewer, filter).map((run) => listRun(registry, viewer, run)),
+                runs: (0, overview_1.filterRuns)(runs, viewer, filter).map((run) => listRun(registry, definitions, viewer, run)),
             });
         }
         else if (method === 'POST') {
@@ -228,7 +228,7 @@ async function handleRuns(config, registry, definitions, sources, sandboxes, pla
             const may = run && (0, overview_1.runActions)(viewer, run);
             run
                 ? (0, http_2.send)(res, 200, {
-                    ...toRunResponse(run, (0, overview_1.queuePlace)(registry, viewer, run), !(0, overview_1.owns)(viewer, run)),
+                    ...toRunResponse(run, (0, overview_1.queuePlace)(registry, viewer, run), !(0, overview_1.owns)(viewer, run), viewer.nameOf),
                     ...(may ? { may } : {}),
                 })
                 : (0, http_2.send)(res, 404, { error: 'not found' });
@@ -322,18 +322,21 @@ function runsTheSame(run, next) {
 }
 exports.runsTheSame = runsTheSame;
 // A run whole, for its owner and who may read it; who is not its owner is told whose it is.
-function toRunResponse(run, queue, named = false) {
+function toRunResponse(run, queue, named = false, nameOf) {
     const { owner, ...visible } = run;
+    const name = owner.name ?? nameOf?.(owner);
     return {
         ...visible,
-        ...(named ? { owner: { iss: owner.iss, sub: owner.sub, ...(owner.name ? { name: owner.name } : {}) } } : {}),
+        ...(named ? { owner: { iss: owner.iss, sub: owner.sub, ...(name ? { name } : {}) } } : {}),
         results: run.results ?? {},
         ...(queue ? { queue } : {}),
     };
 }
-function listRun(registry, viewer, run) {
-    return (0, overview_1.toListedRun)(viewer, run, (0, overview_1.queuePlace)(registry, viewer, run));
+function listRun(registry, definitions, viewer, run) {
+    return (0, overview_1.toListedRun)(viewer, run, (0, overview_1.queuePlace)(registry, viewer, run), entryOf(definitions));
 }
+// where in its repository the build file of a version is
+const entryOf = (definitions) => (definition) => definitions.find(definition)?.entry;
 async function submitRun(config, registry, definitions, sources, sandboxes, planning, repos, endpointUrl, log, principal, req, res) {
     const parsed = run_request_1.runRequestSchema.safeParse(await (0, http_2.readJson)(req));
     if (!parsed.success) {
@@ -697,7 +700,7 @@ async function handleApi(api, principal, req, res, url) {
             (0, http_2.send)(res, 403, { error: 'you are not entitled to anything on this server' });
             return;
         }
-        (0, http_2.send)(res, 200, (0, overview_1.getOverview)(registry.snapshot(), registry.usage(principal), viewer));
+        (0, http_2.send)(res, 200, (0, overview_1.getOverview)(registry.snapshot(), registry.usage(principal), viewer, entryOf(definitions)));
         return;
     }
     if (path === '/v1/capacity' || path === '/v1/tasks') {

package/dist/utils/limit.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createLimit = void 0;
+function createLimit(concurrency) {
+    let running = 0;
+    const waiting = [];
+    return async (fn) => {
+        if (running >= concurrency) {
+            await new Promise((resolve) => waiting.push(resolve));
+        }
+        else {
+            running++;
+        }
+        try {
+            return await fn();
+        }
+        finally {
+            const next = waiting.shift();
+            if (next) {
+                // the slot goes to the next one as it is
+                next();
+            }
+            else {
+                running--;
+            }
+        }
+    };
+}
+exports.createLimit = createLimit;
+//# sourceMappingURL=limit.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hammerkit",
   "description": "Containerized build tool with incremental caching that runs the same build file locally, in Docker and on Kubernetes.",
-  "version": "2.0.0-next.5",
+  "version": "2.0.0-next.7",
   "keywords": [
     "build",
     "build-tool",