@elaraai/e3-api-server 1.0.84 → 1.0.86

package/dist/src/portable.spec.js

@@ -0,0 +1,325 @@
+/**
+ * Copyright (c) 2025 Elara AI Pty Ltd
+ * Licensed under BSL 1.1. See LICENSE for details.
+ */
+/**
+ * The portable entry (`@elaraai/e3-api-server/portable`): the route factories,
+ * the handlers and the repository gate, with nothing of Node.
+ *
+ * Every module the entry reaches imports only another of them, East, e3's
+ * types, e3-core's portable entry and Hono, and names none of Node's globals:
+ * the walk e3-core holds its own portable entry to. What the entry exports is
+ * the root entry's own, but for the local server, its byte endpoints and auth.
+ * And an app mounted from it alone, over e3-core's portable pieces and with an
+ * access of its own, answers the dataset, page, dataflow and one-shot routes.
+ */
+import { describe, it } from 'node:test';
+import assert from 'node:assert/strict';
+import { existsSync, readFileSync, readdirSync } from 'node:fs';
+import { join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import ts from 'typescript';
+import { Hono } from 'hono';
+import { ArrayType, DictType, East, IntegerType, NullType, SortedMap, StringType, compareFor, decodeBeast2For, encodeBeast2For, encodeEastIR, equalFor, none, printFor, toEastTypeValue, variant, } from '@elaraai/east';
+import { MockTaskRunner } from '@elaraai/e3-core';
+import { InMemoryStateStore, InvalidNameError, LocalOrchestrator, RepoNotFoundError, RepositoryUpgradePendingError, workspaceCreate, workspaceDeploy, } from '@elaraai/e3-core/portable';
+import { InMemoryStorage, PORTABLE_PACKAGES, encodeInSegmentsOf, portableWalker, storeSegmentsOf } from '@elaraai/e3-core/test';
+import { BEAST2_CONTENT_TYPE, PackageObjectType, TASK_OBJECT_KIND, TaskObjectType, dataflowForce, } from '@elaraai/e3-types';
+import * as portable from './portable.js';
+import * as root from './index.js';
+import { DataflowExecutionStateType, DataflowRequestType, ErrorType, ExecuteResultType, OneShotRequestType, ResponseType, } from './types.js';
+/** e3-api-server's sources: the spec runs from `dist/src`. */
+const SRC = fileURLToPath(new URL('../../src/', import.meta.url));
+/** The packages a module of the entry may import: those a module of e3-core's
+ *  portable entry may, that entry itself, and Hono, which needs no more than
+ *  the web's own Request and Response. */
+const PACKAGES = new Set([...PORTABLE_PACKAGES, '@elaraai/e3-core/portable', 'hono']);
+/** The walk the entry is held to: e3-core's, over these packages. */
+const portableGraph = portableWalker(ts, PACKAGES);
+/**
+ * Reads a source module by its path under `src`, or gives `null` for none.
+ *
+ * @param planted - Rewrites a module's text, as a change to it would, by its
+ *   path
+ */
+function sources(planted = {}) {
+    return (file) => {
+        const path = join(SRC, file);
+        if (!existsSync(path))
+            return null;
+        const text = readFileSync(path, 'utf8');
+        const plant = planted[file];
+        return plant === undefined ? text : plant(text);
+    };
+}
+/** The modules of a source directory, but its specs. */
+function modulesOf(dir) {
+    return readdirSync(join(SRC, dir))
+        .filter((file) => file.endsWith('.ts') && !file.endsWith('.spec.ts') && !file.endsWith('.d.ts'))
+        .map((file) => `${dir}/${file}`);
+}
+/** The root entry's exports the portable entry leaves out, and why: each needs
+ *  Node, or is auth. */
+const ROOT_ONLY = {
+    createServer: 'the local server: local storage, runner processes and an HTTP listener',
+    resolveBudget: 'a budget of this machine\'s cores and memory',
+    createDataEndpoints: 'the local server\'s byte endpoints, which stage uploads and downloads as files in the repository',
+    createAuthMiddleware: 'auth: it verifies tokens with node:crypto',
+    generateKeyPair: 'auth: the keys the built-in OIDC provider signs with',
+    signJwt: 'auth: a token signed with node:crypto',
+};
+describe('the portable entry', () => {
+    it('reaches nothing but its own modules, East, e3\'s types, e3-core\'s portable entry and Hono, and names none of Node\'s globals', () => {
+        const { modules, faults } = portableGraph('portable.ts', sources());
+        assert.deepEqual(faults, [], 'these reach beyond the portable modules: move what needs Node to a module of the root entry');
+        const routes = modulesOf('routes').filter((file) => file !== 'routes/data.ts' && file !== 'routes/index.ts');
+        for (const carried of [...routes, ...modulesOf('handlers'), 'middleware/repository.ts', 'identity.ts', 'errors.ts', 'beast2.ts', 'types.ts']) {
+            assert.ok(modules.includes(carried), `the walk reached ${carried}`);
+        }
+        for (const left of ['routes/data.ts', 'middleware/auth.ts', 'auth/index.ts', 'auth/keys.ts', 'auth/device.ts', 'server.ts', 'local-dataflow.ts', 'index.ts']) {
+            assert.ok(!modules.includes(left), `the walk left ${left} to the root entry`);
+        }
+    });
+    it('fails a planted Node import however far from the entry, a use of Buffer, and e3-core\'s root entry, even for a type', () => {
+        const cases = [
+            ['a Node builtin, in a handler', { 'handlers/datasets.ts': (text) => `import { randomUUID } from 'node:crypto';\n${text}` },
+                ['handlers/datasets.ts:1 imports node:crypto']],
+            ['Buffer, in a route', { 'routes/objects.ts': (text) => `export const planted = (text: string) => Buffer.from(text);\n${text}` },
+                ['routes/objects.ts:1 uses Buffer']],
+            ['e3-core\'s root entry, for a type', { 'routes/executions.ts': (text) => `import type { Budget } from '@elaraai/e3-core';\n${text}` },
+                ['routes/executions.ts:1 imports @elaraai/e3-core']],
+        ];
+        for (const [what, planted, faults] of cases) {
+            assert.deepEqual(portableGraph('portable.ts', sources(planted)).faults, faults, what);
+        }
+        // A route that names a type of the auth middleware reaches all of auth's
+        // Node: why the identity a host's auth sets is declared apart from it.
+        const auth = portableGraph('middleware/auth.ts', sources()).faults;
+        assert.ok(auth.some((fault) => /^middleware\/auth\.ts:\d+ imports node:crypto$/.test(fault)), auth.join('\n'));
+        assert.deepEqual(portableGraph('portable.ts', sources({ 'routes/records.ts': (text) => `import type { AuthConfig } from '../middleware/auth.js';\n${text}` })).faults, auth);
+    });
+    it('exports the root entry\'s own functions and objects, but for the local server, its byte endpoints and auth', () => {
+        const rooted = root;
+        const portables = portable;
+        for (const [name, value] of Object.entries(portables)) {
+            assert.ok(name in rooted, `${name} is the root entry's too`);
+            assert.equal(rooted[name], value, `${name} is the root entry's own`);
+        }
+        for (const name of Object.keys(rooted)) {
+            assert.ok(name in portables || name in ROOT_ONLY, `${name} is the root entry's alone: export it from the portable entry, or say in ROOT_ONLY why it needs Node`);
+        }
+        for (const name of Object.keys(ROOT_ONLY)) {
+            assert.ok(name in rooted && !(name in portables), `${name} is the root entry's alone`);
+        }
+    });
+    it('is the package\'s `./portable` export', () => {
+        assert.equal(import.meta.resolve('@elaraai/e3-api-server/portable'), new URL('./portable.js', import.meta.url).href);
+    });
+    it('answers an e3-core error as every route answers it, for a host\'s own routes: its ErrorType, its status, its JSON, and an owed upgrade as the gate does', async () => {
+        const invalid = new InvalidNameError('workspace', 'a/b', 'holds "/", which a file name cannot');
+        const variantOf = portable.errorToVariant(invalid);
+        const expected = variant('invalid_name', { kind: 'workspace', name: 'a/b', message: invalid.message });
+        assert.ok(equalFor(ErrorType)(variantOf, expected), printFor(ErrorType)(variantOf));
+        assert.equal(portable.errorToHttpStatus(invalid), 400);
+        const missing = portable.sendJsonError(new RepoNotFoundError('gone'));
+        assert.equal(missing.status, 404);
+        assert.deepEqual(await missing.json(), { error: { type: 'repository_not_found', message: 'Repository \'gone\' not found' } });
+        const owed = new RepositoryUpgradePendingError('owing', ['host-layout-2'], null, true);
+        const pending = portable.sendUpgradePending(owed);
+        assert.equal(pending.status, 503);
+        assert.equal(pending.headers.get('Retry-After'), '5');
+        assert.deepEqual(await pending.json(), { error: { type: 'repository_upgrade_pending', message: owed.message } });
+    });
+});
+describe('an app mounted from the portable entry alone', () => {
+    const REPO = 'shop';
+    const WS = 'main';
+    const RowsType = DictType(StringType, IntegerType);
+    const rowsPath = [variant('field', 'inputs'), variant('field', 'rows')];
+    const countPath = [variant('field', 'tasks'), variant('field', 'count'), variant('field', 'output')];
+    const rows = new SortedMap(Array.from({ length: 1000 }, (_, i) => [`k${String(i).padStart(4, '0')}`, BigInt(i)]), compareFor(StringType));
+    const freeRunner = variant('east_node', { platforms: [], decode: variant('lazy', null) });
+    /** A deployed workspace: `.inputs.rows`, 1000 rows in segments of 100,
+     *  `.inputs.limit`, and a task `count` over the rows. */
+    async function deployed(storage) {
+        await storage.repos.create(REPO);
+        const rowsHash = await storeSegmentsOf(storage, REPO, encodeInSegmentsOf(RowsType, 100)(rows));
+        const limitHash = await storage.objects.write(REPO, encodeBeast2For(IntegerType)(100n));
+        // A stand-in program: the mock runner never reads it.
+        const program = await storage.objects.write(REPO, new Uint8Array([0]));
+        const countTask = await storage.objects.write(REPO, encodeBeast2For(TaskObjectType)({
+            kind: TASK_OBJECT_KIND,
+            body: variant('east', { program }),
+            runner: freeRunner,
+            inputs: [{ path: rowsPath, partition: none }],
+            output: { path: countPath, kind: variant('value', null) },
+            role: variant('data', null),
+            environment: none,
+        }));
+        const structure = variant('struct', new Map([
+            ['inputs', variant('struct', new Map([
+                    ['limit', variant('value', { type: toEastTypeValue(IntegerType), writable: true })],
+                    ['rows', variant('value', { type: toEastTypeValue(RowsType), writable: true })],
+                ]))],
+            ['tasks', variant('struct', new Map([
+                    ['count', variant('struct', new Map([
+                            ['output', variant('value', { type: toEastTypeValue(IntegerType), writable: false })],
+                        ]))],
+                ]))],
+        ]));
+        const pkg = await storage.objects.write(REPO, encodeBeast2For(PackageObjectType)({
+            tasks: new Map([['count', countTask]]),
+            data: {
+                structure,
+                refs: new Map([
+                    ['inputs/limit', variant('value', { hash: limitHash, versions: new Map() })],
+                    ['inputs/rows', variant('value', { hash: rowsHash, versions: new Map() })],
+                ]),
+            },
+            functions: new Map(),
+            records: new Map(),
+            sources: new Map(),
+        }));
+        await storage.refs.packageWrite(REPO, 'shop', '1.0.0', pkg);
+        await workspaceCreate(storage, REPO, WS);
+        await workspaceDeploy(storage, REPO, WS, 'shop', '1.0.0');
+        return { rowsHash, countTask };
+    }
+    /** A host's transfer backend that none of these requests reaches: reaching
+     *  any of its stores fails the request. */
+    const unreached = new Proxy({}, {
+        get: (_backend, store) => {
+            throw new Error(`the request reached the transfer backend's ${String(store)}`);
+        },
+    });
+    /**
+     * The host: the repositories and their gate, datasets, the dataflow and
+     * one-shot, every factory from the portable entry, over an in-memory store,
+     * a mock runner, and e3-core's portable orchestrator and state store. Its
+     * access is its own: an `X-Caller` of `operator` runs any one-shot, a
+     * `reader` a platform-free one, and anyone else none.
+     */
+    async function host() {
+        const storage = new InMemoryStorage();
+        const { rowsHash, countTask } = await deployed(storage);
+        const runner = new MockTaskRunner();
+        const stateStore = new InMemoryStateStore();
+        const orchestrator = new LocalOrchestrator(stateStore);
+        const getRepoPath = (repo) => repo;
+        const access = (c) => {
+            const caller = c.req.header('X-Caller');
+            return caller === 'operator' ? 'any' : caller === 'reader' ? 'platform_free' : 'none';
+        };
+        const app = new Hono();
+        app.use('/api/repos/:repo/*', portable.createRepositoryGate(storage, getRepoPath));
+        app.route('/api/repos', portable.createRepositoriesRoutes(storage));
+        app.route('/api/repos/:repo/workspaces/:ws/datasets', portable.createDatasetRoutes(storage, getRepoPath));
+        app.route('/api/repos/:repo/workspaces/:ws/dataflow', portable.createExecutionRoutes(storage, getRepoPath, {
+            getRunner: () => runner,
+            getOrchestrator: () => orchestrator,
+            getStateStore: () => stateStore,
+        }));
+        app.route('/api/repos/:repo/workspaces/:ws/one-shot', portable.createOneShotRoutes(storage, getRepoPath, unreached, () => runner, { access }));
+        return { app, storage, runner, rowsHash, countTask };
+    }
+    const bytes = async (response) => new Uint8Array(await response.arrayBuffer());
+    const datasets = `/api/repos/${REPO}/workspaces/${WS}/datasets`;
+    it('lists the repositories its store keeps, and its gate refuses one it does not', async () => {
+        const { app } = await host();
+        const listed = decodeBeast2For(ResponseType(ArrayType(StringType)))(await bytes(await app.request('/api/repos')));
+        assert.deepEqual(listed, variant('success', [REPO]));
+        const elsewhere = await app.request(`/api/repos/elsewhere/workspaces/${WS}/datasets/inputs/rows`);
+        assert.equal(elsewhere.status, 404);
+        assert.deepEqual(await elsewhere.json(), { error: 'not_found', message: 'Repository \'elsewhere\' not found' });
+    });
+    it('reads a dataset whole, a page of it and a key in it, and writes one', async () => {
+        const { app, rowsHash } = await host();
+        const whole = await app.request(`${datasets}/inputs/rows`);
+        assert.equal(whole.status, 200);
+        assert.ok(equalFor(RowsType)(decodeBeast2For(RowsType)(await bytes(whole)), rows), 'the rows, whole');
+        const page = await app.request(`${datasets}/inputs/rows?page=true&offset=150&limit=100`);
+        assert.equal(page.status, 200);
+        assert.deepEqual(['X-Content-SHA256', 'X-Total-Elements', 'X-Segment-Count', 'X-Page-Offset', 'X-Page-Count'].map((header) => page.headers.get(header)), [rowsHash, '1000', '10', '150', '100']);
+        const expected = new SortedMap([...rows].slice(150, 250), compareFor(StringType));
+        assert.ok(equalFor(RowsType)(decodeBeast2For(RowsType)(await bytes(page)), expected), 'rows 150 to 249');
+        const found = await app.request(`${datasets}/inputs/rows?find=true&key=${encodeURIComponent('"k0420"')}`);
+        assert.equal(found.status, 200);
+        assert.deepEqual(await found.json(), { found: true, row: 420, count: 1 });
+        const written = await app.request(`${datasets}/inputs/limit`, { method: 'PUT', body: encodeBeast2For(IntegerType)(500n) });
+        assert.deepEqual(decodeBeast2For(ResponseType(NullType))(await bytes(written)), variant('success', null));
+        assert.equal(decodeBeast2For(IntegerType)(await bytes(await app.request(`${datasets}/inputs/limit`))), 500n);
+    });
+    it('runs the dataflow through the orchestrator and state store the host gives, and serves what the run wrote', async () => {
+        const { app, storage, runner, rowsHash, countTask } = await host();
+        const read = [];
+        runner.setResult(countTask, async (inputs) => {
+            read.push(inputs);
+            return { state: 'success', cached: false, outputHash: await storage.objects.write(REPO, encodeBeast2For(IntegerType)(1000n)) };
+        });
+        const started = await app.request(`/api/repos/${REPO}/workspaces/${WS}/dataflow`, {
+            method: 'POST',
+            headers: { 'Content-Type': BEAST2_CONTENT_TYPE },
+            body: encodeBeast2For(DataflowRequestType)({ force: dataflowForce(false), filter: none }),
+        });
+        assert.equal(started.status, 202);
+        assert.deepEqual(decodeBeast2For(ResponseType(NullType))(await bytes(started)), variant('success', null));
+        // A client polls the run's state, as the state store keeps it, until the
+        // run has ended.
+        const decodeState = decodeBeast2For(ResponseType(DataflowExecutionStateType));
+        let state;
+        for (;;) {
+            const answer = decodeState(await bytes(await app.request(`/api/repos/${REPO}/workspaces/${WS}/dataflow/execution`)));
+            if (answer.type !== 'success')
+                assert.fail(`the poll was refused: ${answer.value.type}`);
+            state = answer.value;
+            if (state.status.type !== 'running')
+                break;
+            await new Promise((resolve) => setTimeout(resolve, 5));
+        }
+        assert.equal(state.status.type, 'completed');
+        if (state.summary.type !== 'some')
+            assert.fail('a run that has ended has a summary');
+        assert.deepEqual([state.summary.value.executed, state.summary.value.failed], [1n, 0n]);
+        assert.deepEqual(read, [[rowsHash]], 'the task read the workspace\'s rows');
+        assert.equal(decodeBeast2For(IntegerType)(await bytes(await app.request(`${datasets}/tasks/count/output`))), 1000n);
+    });
+    it('runs a one-shot over the workspace\'s datasets under the grant the host\'s own access gives each caller', async () => {
+        const { app, runner, rowsHash } = await host();
+        const counted = encodeBeast2For(IntegerType)(1000n);
+        runner.setDetachedResult({ kind: 'success', value: counted, stdout: '', stderr: '', stdoutTruncated: false, stderrTruncated: false });
+        const count = East.function([RowsType], IntegerType, ($, given) => given.size());
+        const log = East.platform('e3_test_log', [StringType], NullType);
+        const logged = East.function([RowsType], IntegerType, ($, given) => {
+            $(log('counted'));
+            return given.size();
+        });
+        const ResultType = ResponseType(ExecuteResultType);
+        const decodeResult = decodeBeast2For(ResultType);
+        const oneShot = async (caller, body) => decodeResult(await bytes(await app.request(`/api/repos/${REPO}/workspaces/${WS}/one-shot`, {
+            method: 'POST',
+            headers: { 'Content-Type': BEAST2_CONTENT_TYPE, ...(caller !== null && { 'X-Caller': caller }) },
+            body: encodeBeast2For(OneShotRequestType)({
+                bodyIr: encodeEastIR(body.toIR()),
+                args: [variant('dataset', rowsPath)],
+                runner: freeRunner,
+                limits: none,
+            }),
+        })));
+        const ran = variant('success', {
+            outcome: variant('success', { value: counted }),
+            stdout: '',
+            stderr: '',
+            stdoutTruncated: false,
+            stderrTruncated: false,
+            inputs: [{ path: rowsPath, hash: rowsHash }],
+        });
+        const refused = variant('error', variant('permission_denied', { path: 'one-shot' }));
+        const answers = (answer, expected, what) => assert.ok(equalFor(ResultType)(answer, expected), `${what}, and the answer is ${printFor(ResultType)(answer)}`);
+        answers(await oneShot('operator', logged), ran, 'an operator runs a body that calls a platform function');
+        answers(await oneShot('reader', count), ran, 'a reader runs a platform-free body');
+        answers(await oneShot('reader', logged), refused, 'a reader runs no body that calls a platform function');
+        answers(await oneShot(null, count), refused, 'a caller the host does not know runs nothing');
+        assert.deepEqual(runner.getDetachedCalls().map((call) => call.args), [[{ dataset: rowsHash }], [{ dataset: rowsHash }]], 'the two calls that ran read the rows the workspace holds');
+    });
+});
+//# sourceMappingURL=portable.spec.js.map

package/dist/src/portable.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"portable.spec.js","sourceRoot":"","sources":["../../src/portable.spec.ts"],"names":[],"mappings":"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"}

package/dist/src/routes/dataset-path.d.ts

@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2025 Elara AI Pty Ltd
+ * Licensed under BSL 1.1. See LICENSE for details.
+ */
+import type { Context } from 'hono';
+/**
+ * The dataset path a request to `/api/repos/:repo/workspaces/:ws/datasets/…`
+ * names, as its client encoded it, with `suffix` — `/upload`, `/upload/<id>` —
+ * and a trailing slash cut off: what `urlPathToTreePath` decodes, a segment at
+ * a time. The dataset routes and the transfer routes read it here alone, so
+ * they agree on it, and an upload's later requests are checked against the
+ * path its init stored.
+ *
+ * @remarks
+ * It is cut from the URL the client sent, every escape kept. Hono's
+ * `c.req.path` is decoded (`decodeURI`), so a workspace named `my ws`,
+ * `café` or `q[1]` — names a workspace may have — no longer matched a prefix
+ * built from its name, and every one of its datasets read as the root. The
+ * route's leading segments are compared decoded, so a client that escapes a
+ * name otherwise than `encodeURIComponent` does names the same dataset.
+ *
+ * @param c - The request's context
+ * @param suffix - What the route puts after the dataset's path, if anything
+ * @returns The dataset's path, still percent-encoded; empty when the request
+ *   names the root, or is not under the route
+ */
+export declare function datasetPathOf(c: Context, suffix?: string): string;
+//# sourceMappingURL=dataset-path.d.ts.map

package/dist/src/routes/dataset-path.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dataset-path.d.ts","sourceRoot":"","sources":["../../../src/routes/dataset-path.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAYpC;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,SAAK,GAAG,MAAM,CAW7D"}

package/dist/src/routes/dataset-path.js

@@ -0,0 +1,52 @@
+/**
+ * Copyright (c) 2025 Elara AI Pty Ltd
+ * Licensed under BSL 1.1. See LICENSE for details.
+ */
+/** A path segment as the client sent it, decoded, compared with `expected`;
+ *  a segment that does not decode matches nothing. */
+function decodesTo(segment, expected) {
+    try {
+        return decodeURIComponent(segment) === expected;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * The dataset path a request to `/api/repos/:repo/workspaces/:ws/datasets/…`
+ * names, as its client encoded it, with `suffix` — `/upload`, `/upload/<id>` —
+ * and a trailing slash cut off: what `urlPathToTreePath` decodes, a segment at
+ * a time. The dataset routes and the transfer routes read it here alone, so
+ * they agree on it, and an upload's later requests are checked against the
+ * path its init stored.
+ *
+ * @remarks
+ * It is cut from the URL the client sent, every escape kept. Hono's
+ * `c.req.path` is decoded (`decodeURI`), so a workspace named `my ws`,
+ * `café` or `q[1]` — names a workspace may have — no longer matched a prefix
+ * built from its name, and every one of its datasets read as the root. The
+ * route's leading segments are compared decoded, so a client that escapes a
+ * name otherwise than `encodeURIComponent` does names the same dataset.
+ *
+ * @param c - The request's context
+ * @param suffix - What the route puts after the dataset's path, if anything
+ * @returns The dataset's path, still percent-encoded; empty when the request
+ *   names the root, or is not under the route
+ */
+export function datasetPathOf(c, suffix = '') {
+    const repo = c.req.param('repo');
+    const ws = c.req.param('ws');
+    if (repo === undefined || ws === undefined)
+        return '';
+    const head = ['', 'api', 'repos', repo, 'workspaces', ws, 'datasets'];
+    const segments = new URL(c.req.url).pathname.split('/');
+    if (segments.length < head.length || !head.every((part, i) => decodesTo(segments[i], part)))
+        return '';
+    let path = segments.slice(head.length).join('/');
+    if (suffix !== '' && path.endsWith(suffix))
+        path = path.slice(0, -suffix.length);
+    if (path.endsWith('/'))
+        path = path.slice(0, -1);
+    return path;
+}
+//# sourceMappingURL=dataset-path.js.map

package/dist/src/routes/dataset-path.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dataset-path.js","sourceRoot":"","sources":["../../../src/routes/dataset-path.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH;sDACsD;AACtD,SAAS,SAAS,CAAC,OAAe,EAAE,QAAgB;IAClD,IAAI,CAAC;QACH,OAAO,kBAAkB,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC;IAClD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,UAAU,aAAa,CAAC,CAAU,EAAE,MAAM,GAAG,EAAE;IACnD,MAAM,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACjC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC7B,IAAI,IAAI,KAAK,SAAS,IAAI,EAAE,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IACtD,MAAM,IAAI,GAAG,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,UAAU,CAAC,CAAC;IACtE,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACxD,IAAI,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAE,EAAE,IAAI,CAAC,CAAC;QAAE,OAAO,EAAE,CAAC;IACxG,IAAI,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjD,IAAI,MAAM,KAAK,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACjF,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACjD,OAAO,IAAI,CAAC;AACd,CAAC"}

package/dist/src/routes/datasets.d.ts

@@ -3,13 +3,19 @@
  * Licensed under BSL 1.1. See LICENSE for details.
  */
 import { Hono } from 'hono';
-import type { StorageBackend, TransferBackend } from '@elaraai/e3-core';
+import type { StorageBackend, TransferBackend } from '@elaraai/e3-core/portable';
+import { type PinnedCache } from '../handlers/datasets.js';
 /** Options for {@link createDatasetRoutes}. */
 export interface DatasetRouteOptions {
     /** Byte budget clamping each page's share of the source blob. Defaults to
      *  4 MiB; deployments with tighter response limits (e.g. Lambda proxy's
      *  6 MB, base64-inflated) pass a smaller budget. */
     pageByteBudget?: number;
+    /** Who may keep a hash-pinned page or key search, which never changes:
+     *  `private`, the caller's own cache alone (the default), or `public`, any
+     *  cache between it and the server as well, for a host whose data any
+     *  caller may read. */
+    cache?: PinnedCache;
 }
 export declare function createDatasetRoutes(storage: StorageBackend, getRepoPath: (repo: string) => string, transferBackend?: TransferBackend, options?: DatasetRouteOptions): Hono<import("hono/types").BlankEnv, import("hono/types").BlankSchema, "/">;
 //# sourceMappingURL=datasets.d.ts.map

package/dist/src/routes/datasets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"datasets.d.ts","sourceRoot":"","sources":["../../../src/routes/datasets.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAaxE,+CAA+C;AAC/C,MAAM,WAAW,mBAAmB;IAClC;;wDAEoD;IACpD,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AASD,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,cAAc,EACvB,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,EACrC,eAAe,CAAC,EAAE,eAAe,EACjC,OAAO,CAAC,EAAE,mBAAmB,8EA6G9B"}
+{"version":3,"file":"datasets.d.ts","sourceRoot":"","sources":["../../../src/routes/datasets.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AACjF,OAAO,EAUL,KAAK,WAAW,EACjB,MAAM,yBAAyB,CAAC;AAGjC,+CAA+C;AAC/C,MAAM,WAAW,mBAAmB;IAClC;;wDAEoD;IACpD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;;2BAGuB;IACvB,KAAK,CAAC,EAAE,WAAW,CAAC;CACrB;AASD,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,cAAc,EACvB,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,EACrC,eAAe,CAAC,EAAE,eAAe,EACjC,OAAO,CAAC,EAAE,mBAAmB,8EAoG9B"}

package/dist/src/routes/datasets.js

@@ -5,6 +5,7 @@
 import { Hono } from 'hono';
 import { urlPathToTreePath } from '@elaraai/e3-types';
 import { listDatasets, listDatasetsRecursive, listDatasetsRecursivePaths, listDatasetsWithStatus, findDatasetKey, getDataset, getDatasetPage, getDatasetStatus, setDataset, } from '../handlers/datasets.js';
+import { datasetPathOf } from './dataset-path.js';
 /** Parses an integer query param; `undefined` when absent, `NaN` when
  *  malformed (the handler rejects NaN with a 400). */
 function intParam(value) {
@@ -38,11 +39,7 @@ export function createDatasetRoutes(storage, getRepoPath, transferBackend, optio
         const repo = c.req.param('repo');
         const repoPath = getRepoPath(repo);
         const ws = c.req.param('ws');
-        // Extract the wildcard path (c.req.path is percent-encoded)
-        const fullPath = c.req.path;
-        const datasetsPrefix = `/api/repos/${encodeURIComponent(repo)}/workspaces/${encodeURIComponent(ws)}/datasets/`;
-        const pathStr = fullPath.startsWith(datasetsPrefix) ? fullPath.slice(datasetsPrefix.length) : '';
-        const treePath = urlPathToTreePath(pathStr);
+        const treePath = urlPathToTreePath(datasetPathOf(c));
         const list = c.req.query('list') === 'true';
         const recursive = c.req.query('recursive') === 'true';
         const status = c.req.query('status') === 'true';
@@ -79,7 +76,7 @@ export function createDatasetRoutes(storage, getRepoPath, transferBackend, optio
                 ...(to !== undefined && to.length > 0 && { to }),
                 ...(index !== undefined && index !== '' && { index }),
                 ...(hash !== undefined && hash !== '' && { hash }),
-            });
+            }, { ...(options?.cache !== undefined && { cache: options.cache }) });
         }
         if (page) {
             const hash = c.req.query('hash');
@@ -93,6 +90,7 @@ export function createDatasetRoutes(storage, getRepoPath, transferBackend, optio
             };
             return getDatasetPage(storage, repoPath, ws, treePath, window, {
                 ...(options?.pageByteBudget !== undefined && { byteBudget: options.pageByteBudget }),
+                ...(options?.cache !== undefined && { cache: options.cache }),
             });
         }
         // `segments=true`: a collection held as a segment manifest is answered
@@ -104,11 +102,7 @@ export function createDatasetRoutes(storage, getRepoPath, transferBackend, optio
         const repo = c.req.param('repo');
         const repoPath = getRepoPath(repo);
         const ws = c.req.param('ws');
-        // Extract the wildcard path (c.req.path is percent-encoded)
-        const fullPath = c.req.path;
-        const datasetsPrefix = `/api/repos/${encodeURIComponent(repo)}/workspaces/${encodeURIComponent(ws)}/datasets/`;
-        const pathStr = fullPath.startsWith(datasetsPrefix) ? fullPath.slice(datasetsPrefix.length) : '';
-        const treePath = urlPathToTreePath(pathStr);
+        const treePath = urlPathToTreePath(datasetPathOf(c));
         // Body is raw BEAST2, read as it arrives.
         return setDataset(storage, repoPath, ws, treePath, bodyChunks(c.req.raw.body));
     });

package/dist/src/routes/datasets.js.map

@@ -1 +1 @@
-{"version":3,"file":"datasets.js","sourceRoot":"","sources":["../../../src/routes/datasets.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"datasets.js","sourceRoot":"","sources":["../../../src/routes/datasets.ts"],"names":[],"mappings":"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"}

package/dist/src/routes/executions.d.ts

@@ -3,8 +3,10 @@
  * Licensed under BSL 1.1. See LICENSE for details.
  */
 import { Hono } from 'hono';
-import type { Budget, DataflowOrchestrator, ExecutionStateStore, StorageBackend } from '@elaraai/e3-core';
+import type { DataflowOrchestrator, ExecutionStateStore, StorageBackend } from '@elaraai/e3-core/portable';
+import { type RunnerBudget } from '../handlers/dataflow.js';
 import type { GetRunner } from './functions.js';
+export type { RunnerBudget };
 /**
  * The seams the dataflow routes go through, which the host that mounts them
  * gives: what runs a repository's dataflows, and where their runs are kept.
@@ -26,7 +28,7 @@ export interface DataflowSeams {
     width?: number;
     /** The budget the runner holds, which the poll and the budget route serve;
      *  absent for a host whose runners hold none */
-    budget?: Budget;
+    budget?: RunnerBudget;
 }
 /**
  * The routes of a workspace's dataflow: start, poll, cancel, its graph, its

package/dist/src/routes/executions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"executions.d.ts","sourceRoot":"","sources":["../../../src/routes/executions.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,KAAK,EAAE,MAAM,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAY1G,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC5B;sEACkE;IAClE,SAAS,EAAE,SAAS,CAAC;IACrB,2EAA2E;IAC3E,eAAe,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,oBAAoB,CAAC;IAC5D;uDACmD;IACnD,aAAa,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,mBAAmB,CAAC;IACzD;8BAC0B;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;oDACgD;IAChD,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,cAAc,EACvB,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,EACrC,KAAK,EAAE,aAAa,8EA+ErB"}
+{"version":3,"file":"executions.d.ts","sourceRoot":"","sources":["../../../src/routes/executions.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,KAAK,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3G,OAAO,EAQL,KAAK,YAAY,EAClB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAGhD,YAAY,EAAE,YAAY,EAAE,CAAC;AAE7B;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC5B;sEACkE;IAClE,SAAS,EAAE,SAAS,CAAC;IACrB,2EAA2E;IAC3E,eAAe,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,oBAAoB,CAAC;IAC5D;uDACmD;IACnD,aAAa,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,mBAAmB,CAAC;IACzD;8BAC0B;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;oDACgD;IAChD,MAAM,CAAC,EAAE,YAAY,CAAC;CACvB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,cAAc,EACvB,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,EACrC,KAAK,EAAE,aAAa,8EAiGrB"}