@zukhruf/testing 0.3.37 → 0.3.39

package/dist/docker/{docker.d.ts → fixtures.d.ts}

@@ -1,9 +1,10 @@
-import { Container, type DockerCommand, ServiceContainer } from './container.ts';
+import { Docker, type Environment, type ExecResult, type OwnedContainer, type OwnedVolume } from '@zukhruf/docker';
 import { DockerDirectory } from './directory.ts';
-import type { TestRun } from './test-run.ts';
-import { DockerVolume } from './volume.ts';
+import { ServiceContainer } from './service-container.ts';
 /** Marks a server that `reuse()` shares across processes and runs. */
 export declare const SHARED_SERVER_LABEL = "dev.zukhruf.testing.shared";
+/** The fingerprint of a shared server's configuration. */
+export declare const CONFIG_LABEL = "dev.zukhruf.testing.config";
 /** A volume or a path on the engine's host, mounted into a container. */
 export interface Mount {
     /** A volume's name, or an absolute path on the engine's host. */
@@ -21,8 +22,10 @@ export interface ContainerOptions {
     env?: Record<string, string>;
     labels?: Record<string, string> | undefined;
     mounts?: Mount[];
+    /** `<path>[:<options>]`, as `docker run --tmpfs` takes it. */
     tmpfs?: string[];
     ipcHost?: boolean;
+    /** A size in the Docker CLI's binary units, such as `512m` or `1g`. */
     memory?: string;
     cpus?: number;
     memorySwappiness?: number;
@@ -31,16 +34,21 @@ export interface ServiceOptions extends ContainerOptions {
     /** The container's port that answers on 127.0.0.1 of this machine. */
     internalPort: number;
     /** Runs on every acquisition. Throw until ready, using timebox for polling. */
-    healthy?: (container: ServiceContainer) => unknown;
+    healthy?: (service: ServiceContainer) => unknown;
 }
-export interface DockerOptions {
-    /** The run that owns what this process creates: `TestRun.fromEnvironment(process.env)`. */
-    testRun?: TestRun | undefined;
+export interface DockerFixturesOptions {
+    /** The environment of this process, such as `process.env`: it selects the engine and the run. */
+    environment: Environment;
 }
-/** The engine the Docker CLI selects. Docker owns cross-process coordination; this instance holds no server cache. */
-export declare class Docker {
+/**
+ * Container fixtures on the engine that `environment` selects. The engine is
+ * connected on the first acquisition and kept: handles keep the engine they
+ * were made on. Docker owns cross-process coordination; this instance holds
+ * no server cache.
+ */
+export declare class DockerFixtures {
     #private;
-    constructor({ testRun }?: DockerOptions);
+    constructor({ environment }: DockerFixturesOptions);
     /**
      * Defaults for disposable test containers, including external launchers.
      * A launcher creates with these labels and no acquisition of this class:
@@ -53,26 +61,24 @@ export declare class Docker {
         };
         labels: Record<string, string>;
     };
-    info(): Promise<{
-        architecture: string;
-        endpoint: string;
-    }>;
+    /** The client of the engine that this instance's handles are on. */
+    client(): Promise<Docker>;
+    /** A fixture directory on the engine's host. */
     directory(): Promise<DockerDirectory>;
     /** Creates a named volume. Its run's cleanup removes it if this process dies first. */
-    volume(): Promise<DockerVolume>;
-    readonly command: DockerCommand;
-    isAvailable(): Promise<boolean>;
+    volume(): Promise<OwnedVolume>;
     /** Starts a container this process owns. It stays after it stops, until disposal removes it. */
-    start(options: ContainerOptions): Promise<Container>;
-    /** Starts a dedicated server. Failure or disposal stops it, and a stopped server is removed. */
+    start(options: ContainerOptions): Promise<OwnedContainer>;
+    /** Starts a dedicated server. Failure or disposal removes it. */
     serve(options: ServiceOptions): Promise<ServiceContainer>;
     /**
-     * Reuse one server per configuration on this daemon, across processes/runs.
-     * Docker reserves the name atomically. Readiness failure leaves it running.
-     * Only explicitly dispose the returned container after all its users finish.
+     * Reuse one server per configuration on this engine, across processes and
+     * runs. Docker reserves the name atomically. Readiness failure leaves it
+     * running. Disposal closes only the forward; the server keeps running for
+     * its other users.
      */
     reuse(options: ServiceOptions): Promise<ServiceContainer>;
-    /** Runs a container to completion and returns its standard output. The container is removed afterwards. */
-    run(options: ContainerOptions): Promise<string>;
+    /** Runs a container to completion and gives its output and exit code. The container is removed afterwards. */
+    run(options: ContainerOptions): Promise<ExecResult>;
 }
-//# sourceMappingURL=docker.d.ts.map
+//# sourceMappingURL=fixtures.d.ts.map

package/dist/docker/fixtures.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fixtures.d.ts","sourceRoot":"","sources":["../../src/docker/fixtures.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,MAAM,EAEN,KAAK,WAAW,EAChB,KAAK,UAAU,EAEf,KAAK,cAAc,EACnB,KAAK,WAAW,EACjB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAG1D,sEAAsE;AACtE,eAAO,MAAM,mBAAmB,+BAA+B,CAAC;AAChE,0DAA0D;AAC1D,eAAO,MAAM,YAAY,+BAA+B,CAAC;AAEzD,yEAAyE;AACzE,MAAM,WAAW,KAAK;IACpB,iEAAiE;IACjE,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,oCAAoC;IACpC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,wGAAwG;IACxG,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;IAC5C,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC;IACjB,8DAA8D;IAC9D,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,uEAAuE;IACvE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,cAAe,SAAQ,gBAAgB;IACtD,sEAAsE;IACtE,YAAY,EAAE,MAAM,CAAC;IACrB,+EAA+E;IAC/E,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC;CAClD;AAED,MAAM,WAAW,qBAAqB;IACpC,iGAAiG;IACjG,WAAW,EAAE,WAAW,CAAC;CAC1B;AAmCD;;;;;GAKG;AACH,qBAAa,cAAc;;gBAsBb,EAAE,WAAW,EAAE,EAAE,qBAAqB;IAKlD;;;;OAIG;IACH,IAAI,QAAQ,IAAI;QACd,SAAS,EAAE;YAAE,MAAM,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAA;SAAE,CAAC;QAC5C,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KAChC,CAMA;IAED,oEAAoE;IAC9D,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC;IAI/B,gDAAgD;IAC1C,SAAS,IAAI,OAAO,CAAC,eAAe,CAAC;IAI3C,uFAAuF;IACjF,MAAM,IAAI,OAAO,CAAC,WAAW,CAAC;IAQpC,gGAAgG;IAC1F,KAAK,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,cAAc,CAAC;IAS/D,iEAAiE;IAC3D,KAAK,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAkB/D;;;;;OAKG;IACG,KAAK,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA+B/D,8GAA8G;IACxG,GAAG,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,UAAU,CAAC;CAwJ1D"}

package/dist/docker/fixtures.js

@@ -0,0 +1,265 @@
+import { createHash, randomUUID } from 'node:crypto';
+import pMemoize from 'p-memoize';
+import { ConnectionFailedError, Docker, ImageNotFoundError, } from '@zukhruf/docker';
+import { DockerDirectory } from "./directory.js";
+import { DockerHost } from "./host.js";
+import { ServiceContainer } from "./service-container.js";
+import { TestRun } from "./test-run.js";
+/** Marks a server that `reuse()` shares across processes and runs. */
+export const SHARED_SERVER_LABEL = 'dev.zukhruf.testing.shared';
+/** The fingerprint of a shared server's configuration. */
+export const CONFIG_LABEL = 'dev.zukhruf.testing.config';
+const units = {
+    b: 1,
+    k: 1024,
+    m: 1024 ** 2,
+    g: 1024 ** 3,
+    t: 1024 ** 4,
+    p: 1024 ** 5,
+};
+/** Bytes of a size such as `1g`, in the binary units of the Docker CLI's `--memory`. */
+function bytes(size) {
+    const match = /^(\d+(?:\.\d+)?)\s?([bkmgtp])?i?b?$/i.exec(size);
+    if (!match?.[1])
+        throw new Error(`Invalid memory size: ${size}`);
+    return Math.trunc(Number(match[1]) * (units[match[2]?.toLowerCase() ?? 'b'] ?? 1));
+}
+const byKey = ([a], [b]) => {
+    if (a < b)
+        return -1;
+    if (a > b)
+        return 1;
+    return 0;
+};
+const generatedName = (image) => `test-${image.replace(/[^a-zA-Z0-9_.-]/g, '-')}-${randomUUID()}`;
+/**
+ * Container fixtures on the engine that `environment` selects. The engine is
+ * connected on the first acquisition and kept: handles keep the engine they
+ * were made on. Docker owns cross-process coordination; this instance holds
+ * no server cache.
+ */
+export class DockerFixtures {
+    #environment;
+    #run;
+    #engine = pMemoize(async () => {
+        this.#run?.recordThisProcess();
+        const client = await Docker.connect({
+            environment: this.#environment,
+        }).catch((error) => {
+            if (error instanceof ConnectionFailedError)
+                throw new Error('Docker is required for container-backed tests', {
+                    cause: error,
+                });
+            throw error;
+        });
+        try {
+            return { client, host: new DockerHost(client.host, this.#run) };
+        }
+        catch (error) {
+            await client[Symbol.asyncDispose]();
+            throw error;
+        }
+    });
+    constructor({ environment }) {
+        this.#environment = environment;
+        this.#run = TestRun.fromEnvironment(environment);
+    }
+    /**
+     * Defaults for disposable test containers, including external launchers.
+     * A launcher creates with these labels and no acquisition of this class:
+     * the read records this process, so the global teardown sweeps the run.
+     */
+    get defaults() {
+        this.#run?.recordThisProcess();
+        return {
+            resources: { memory: '1g', cpus: 1 },
+            labels: this.#run?.labels ?? {},
+        };
+    }
+    /** The client of the engine that this instance's handles are on. */
+    async client() {
+        return (await this.#engine()).client;
+    }
+    /** A fixture directory on the engine's host. */
+    async directory() {
+        return DockerDirectory.create((await this.#engine()).host, this.#run);
+    }
+    /** Creates a named volume. Its run's cleanup removes it if this process dies first. */
+    async volume() {
+        const { client } = await this.#engine();
+        return client.volumes.create({
+            Name: `zukhruf-testing-${randomUUID()}`,
+            Labels: this.defaults.labels,
+        });
+    }
+    /** Starts a container this process owns. It stays after it stops, until disposal removes it. */
+    async start(options) {
+        const engine = await this.#engine();
+        const container = await this.#create(engine, this.#owned(options), {
+            name: options.name ?? generatedName(options.image),
+        });
+        await this.#startOrRemove(container);
+        return container;
+    }
+    /** Starts a dedicated server. Failure or disposal removes it. */
+    async serve(options) {
+        const engine = await this.#engine();
+        const owned = this.#owned(options);
+        const container = await this.#create(engine, this.#published(owned, options.internalPort), { name: options.name ?? generatedName(options.image) });
+        const remove = () => container.remove({ force: true, v: true });
+        await this.#startOrRemove(container);
+        try {
+            return await this.#ready(engine, container, options, remove);
+        }
+        catch (error) {
+            await remove().catch(() => { });
+            throw error;
+        }
+    }
+    /**
+     * Reuse one server per configuration on this engine, across processes and
+     * runs. Docker reserves the name atomically. Readiness failure leaves it
+     * running. Disposal closes only the forward; the server keeps running for
+     * its other users.
+     */
+    async reuse(options) {
+        const engine = await this.#engine();
+        const fingerprint = this.#fingerprint(options);
+        const name = options.name ?? `zukhruf-testing-${fingerprint}`;
+        const body = this.#published(this.#body({
+            ...options,
+            labels: {
+                ...options.labels,
+                [SHARED_SERVER_LABEL]: '1',
+                [CONFIG_LABEL]: fingerprint,
+            },
+        }), options.internalPort);
+        const { container } = await this.#creating(engine, () => engine.client.containers.createOrGet(body, { name }));
+        const inspected = await container.inspect();
+        const labels = inspected.Config?.Labels;
+        if (labels?.[SHARED_SERVER_LABEL] !== '1' ||
+            labels[CONFIG_LABEL] !== fingerprint)
+            throw new Error(`Container ${name} does not match the shared test configuration`);
+        if (inspected.State?.Status !== 'running')
+            await container.start();
+        return this.#ready(engine, container, options, undefined);
+    }
+    /** Runs a container to completion and gives its output and exit code. The container is removed afterwards. */
+    async run(options) {
+        const engine = await this.#engine();
+        const body = this.#owned(options);
+        return this.#creating(engine, () => engine.client.containers.run(body, {
+            name: options.name ?? generatedName(options.image),
+        }));
+    }
+    async #create(engine, body, { name }) {
+        return this.#creating(engine, () => engine.client.containers.create(body, { name }));
+    }
+    /**
+     * Runs `create` under a creating record, and pulls a missing image before
+     * a second try, as `docker run` does.
+     */
+    async #creating(engine, create) {
+        await using _creating = await this.#run?.recordCreating();
+        try {
+            return await create();
+        }
+        catch (error) {
+            if (!(error instanceof ImageNotFoundError))
+                throw error;
+            await engine.client.images.pull(error.image);
+            return await create();
+        }
+    }
+    async #startOrRemove(container) {
+        try {
+            await container.start();
+        }
+        catch (error) {
+            await container.remove({ force: true, v: true }).catch(() => { });
+            throw error;
+        }
+    }
+    async #ready(engine, container, { internalPort, healthy }, remove) {
+        const published = await container.port(internalPort);
+        if (!published)
+            throw new Error(`Container ${container.id} publishes no port for ${internalPort}`);
+        const connection = await engine.host.forward(published.port);
+        const service = new ServiceContainer(container, connection.port, connection.close, remove);
+        try {
+            await healthy?.(service);
+            return service;
+        }
+        catch (error) {
+            await service.disconnect();
+            throw error;
+        }
+    }
+    /** The body of a container this process owns: it carries the run's labels. */
+    #owned(options) {
+        return this.#body({
+            ...options,
+            labels: { ...options.labels, ...this.defaults.labels },
+        });
+    }
+    /** Publishes `internalPort` on 127.0.0.1 of the engine's host; the engine removes the container when it stops. */
+    #published(body, internalPort) {
+        const port = `${internalPort}/tcp`;
+        return {
+            ...body,
+            ExposedPorts: { [port]: {} },
+            HostConfig: {
+                ...body.HostConfig,
+                AutoRemove: true,
+                PortBindings: { [port]: [{ HostIp: '127.0.0.1', HostPort: '' }] },
+            },
+        };
+    }
+    #body(options) {
+        const { resources } = this.defaults;
+        const hostConfig = {
+            Binds: (options.mounts ?? []).map(({ source, target, readOnly }) => `${source}:${target}${readOnly ? ':ro' : ''}`),
+            Tmpfs: Object.fromEntries((options.tmpfs ?? []).map((spec) => {
+                const separator = spec.indexOf(':');
+                return separator === -1
+                    ? [spec, '']
+                    : [spec.slice(0, separator), spec.slice(separator + 1)];
+            })),
+            Memory: bytes(options.memory ?? resources.memory),
+            NanoCpus: Math.round((options.cpus ?? resources.cpus) * 1e9),
+            ...(options.ipcHost ? { IpcMode: 'host' } : {}),
+            ...(options.memorySwappiness === undefined
+                ? {}
+                : { MemorySwappiness: options.memorySwappiness }),
+        };
+        return {
+            Image: options.image,
+            ...(options.command ? { Cmd: options.command } : {}),
+            ...(options.hostname ? { Hostname: options.hostname } : {}),
+            Labels: options.labels ?? {},
+            Env: Object.entries(options.env ?? {}).map(([key, value]) => `${key}=${value}`),
+            HostConfig: hostConfig,
+        };
+    }
+    #fingerprint(options) {
+        const { resources } = this.defaults;
+        return createHash('sha256')
+            .update(JSON.stringify({
+            transportVersion: 3,
+            memory: options.memory ?? resources.memory,
+            cpus: options.cpus ?? resources.cpus,
+            image: options.image,
+            command: options.command ?? [],
+            hostname: options.hostname,
+            internalPort: options.internalPort,
+            env: Object.entries(options.env ?? {}).sort(byKey),
+            labels: Object.entries(options.labels ?? {}).sort(byKey),
+            mounts: options.mounts ?? [],
+            tmpfs: options.tmpfs ?? [],
+            ipcHost: Boolean(options.ipcHost),
+            memorySwappiness: options.memorySwappiness,
+        }))
+            .digest('hex');
+    }
+}
+//# sourceMappingURL=fixtures.js.map

package/dist/docker/fixtures.js.map

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

package/dist/docker/host.d.ts

@@ -1,25 +1,18 @@
 import { type Result } from 'nano-spawn';
 import { type TestRun } from './test-run.ts';
 export declare const quote: (value: string) => string;
-/** How long one Docker CLI call may take before this process stops it. */
-export declare const DOCKER_COMMAND_TIMEOUT = 240000;
 /** How long one command in the SSH engine's remote shell may take. */
 export declare const SHELL_TIMEOUT = 30000;
-/** The environment that points the Docker CLI at `endpoint`, whatever context is selected. */
-export declare const dockerEnvironment: (endpoint: string) => Record<string, string | undefined>;
 /**
- * An engine endpoint. Resolve it with the Docker CLI so its native
- * context/environment precedence wins. With a run, each command it starts
- * has a process record while it runs.
+ * The endpoint of an engine, for what the Engine API does not do: a shell
+ * on the host of an SSH engine and port forwards from it. With a run, each
+ * command it starts has a process record while it runs.
  */
 export declare class DockerHost {
     #private;
     readonly endpoint: string;
     constructor(endpoint: string, run: TestRun | undefined);
-    /** The engine the Docker CLI selects. A run gets this process's process record. */
-    static resolve(run: TestRun | undefined): Promise<DockerHost>;
     get remote(): boolean;
-    readonly command: (args: string[]) => Promise<Result>;
     sshArgs(options?: string[]): string[];
     shell(script: string, input?: string): Promise<Result>;
     forward(port: number): Promise<{

package/dist/docker/host.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"host.d.ts","sourceRoot":"","sources":["../../src/docker/host.ts"],"names":[],"mappings":"AAKA,OAAgB,EACd,KAAK,MAAM,EAGZ,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,KAAK,OAAO,EAAiB,MAAM,eAAe,CAAC;AAE5D,eAAO,MAAM,KAAK,GAAI,OAAO,MAAM,KAAG,MACC,CAAC;AAExC,0EAA0E;AAC1E,eAAO,MAAM,sBAAsB,SAAU,CAAC;AAC9C,sEAAsE;AACtE,eAAO,MAAM,aAAa,QAAS,CAAC;AAEpC,8FAA8F;AAC9F,eAAO,MAAM,iBAAiB,GAC5B,UAAU,MAAM,KACf,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAGlC,CAAC;AAKH;;;;GAIG;AACH,qBAAa,UAAU;;IACrB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;gBAGd,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,SAAS;IAUtD,mFAAmF;WACtE,OAAO,CAAC,GAAG,EAAE,OAAO,GAAG,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC;IAYnE,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,QAAQ,CAAC,OAAO,GAAI,MAAM,MAAM,EAAE,KAAG,OAAO,CAAC,MAAM,CAAC,CAMhD;IAeJ,OAAO,CAAC,OAAO,GAAE,MAAM,EAAO,GAAG,MAAM,EAAE;IAqBzC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAShD,OAAO,CACX,IAAI,EAAE,MAAM,GACX,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;KAAE,CAAC;CAkJzD"}
+{"version":3,"file":"host.d.ts","sourceRoot":"","sources":["../../src/docker/host.ts"],"names":[],"mappings":"AAKA,OAAgB,EACd,KAAK,MAAM,EAGZ,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,KAAK,OAAO,EAAiB,MAAM,eAAe,CAAC;AAE5D,eAAO,MAAM,KAAK,GAAI,OAAO,MAAM,KAAG,MACC,CAAC;AAExC,sEAAsE;AACtE,eAAO,MAAM,aAAa,QAAS,CAAC;AAwBpC;;;;GAIG;AACH,qBAAa,UAAU;;IACrB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;gBAGd,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,SAAS;IAUtD,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,OAAO,CAAC,OAAO,GAAE,MAAM,EAAO,GAAG,MAAM,EAAE;IAqBzC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAUhD,OAAO,CACX,IAAI,EAAE,MAAM,GACX,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;KAAE,CAAC;CAkJzD"}

package/dist/docker/host.js

@@ -6,21 +6,31 @@ import command, { SubprocessError, } from 'nano-spawn';
 import { timebox } from "../async/timebox.js";
 import { forwardPrefix } from "./test-run.js";
 export const quote = (value) => `'${value.replaceAll("'", "'\\''")}'`;
-/** How long one Docker CLI call may take before this process stops it. */
-export const DOCKER_COMMAND_TIMEOUT = 240_000;
 /** How long one command in the SSH engine's remote shell may take. */
 export const SHELL_TIMEOUT = 30_000;
-/** The environment that points the Docker CLI at `endpoint`, whatever context is selected. */
-export const dockerEnvironment = (endpoint) => ({
-    DOCKER_CONTEXT: undefined,
-    DOCKER_HOST: endpoint,
-});
 /** Local Unix sockets, Docker Desktop's named pipe on Windows, and SSH engines. A `tcp://` engine may be on another machine. */
 const supportedEndpoints = ['unix://', 'npipe://', 'ssh://'];
 /**
- * An engine endpoint. Resolve it with the Docker CLI so its native
- * context/environment precedence wins. With a run, each command it starts
- * has a process record while it runs.
+ * A command this process started. A killed process leaves its commands
+ * running; their process records keep its run until they end.
+ */
+async function recorded(run, subprocess) {
+    if (!run)
+        return subprocess;
+    // Awaited below; a command that fails while its record is written must
+    // not count as an unhandled rejection.
+    subprocess.catch(() => { });
+    const { pid } = await subprocess.nodeChildProcess;
+    // Node leaves pid undefined when the spawn failed: no process to record.
+    if (pid === undefined)
+        return subprocess;
+    await using _record = await run.recordProcess(pid);
+    return await subprocess;
+}
+/**
+ * The endpoint of an engine, for what the Engine API does not do: a shell
+ * on the host of an SSH engine and port forwards from it. With a run, each
+ * command it starts has a process record while it runs.
  */
 export class DockerHost {
     endpoint;
@@ -32,39 +42,9 @@ export class DockerHost {
         this.endpoint = endpoint;
         this.#run = run;
     }
-    /** The engine the Docker CLI selects. A run gets this process's process record. */
-    static async resolve(run) {
-        const { stdout } = await command('docker', [
-            'context',
-            'inspect',
-            '--format',
-            '{{.Endpoints.docker.Host}}',
-        ]);
-        const host = new DockerHost(stdout.trim(), run);
-        await run?.recordProcess(process.pid);
-        return host;
-    }
     get remote() {
         return this.endpoint.startsWith('ssh://');
     }
-    command = (args) => this.#recorded(command('docker', args, {
-        env: dockerEnvironment(this.endpoint),
-        timeout: DOCKER_COMMAND_TIMEOUT,
-    }));
-    /** A killed process leaves its commands running; their records keep its run until they end. */
-    async #recorded(subprocess) {
-        if (!this.#run)
-            return subprocess;
-        // Awaited below; a command that fails while its record is written must
-        // not count as an unhandled rejection.
-        subprocess.catch(() => { });
-        const { pid } = await subprocess.nodeChildProcess;
-        // Node leaves pid undefined when the spawn failed: no process to record.
-        if (pid === undefined)
-            return subprocess;
-        await using _record = await this.#run.recordProcess(pid);
-        return await subprocess;
-    }
     sshArgs(options = []) {
         const url = new URL(this.endpoint);
         // Pass the original hostname to OpenSSH: ~/.ssh/config, jump hosts, keys,
@@ -86,7 +66,7 @@ export class DockerHost {
         ];
     }
     shell(script, input) {
-        return this.#recorded(command('ssh', [...this.sshArgs(), script], {
+        return recorded(this.#run, command('ssh', [...this.sshArgs(), script], {
             stdin: input === undefined ? 'ignore' : { string: input },
             timeout: SHELL_TIMEOUT,
         }));

package/dist/docker/host.js.map

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

package/dist/docker/index.d.ts

@@ -1,6 +1,5 @@
-export { Container, type DockerCommand, ServiceContainer, } from './container.ts';
 export { DockerDirectory } from './directory.ts';
-export { type ContainerOptions, Docker, type DockerOptions, type Mount, type ServiceOptions, } from './docker.ts';
+export { type ContainerOptions, DockerFixtures, type DockerFixturesOptions, type Mount, type ServiceOptions, } from './fixtures.ts';
+export { ServiceContainer } from './service-container.ts';
 export { TestRun } from './test-run.ts';
-export { DockerVolume } from './volume.ts';
 //# sourceMappingURL=index.d.ts.map

package/dist/docker/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/docker/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,KAAK,aAAa,EAClB,gBAAgB,GACjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EACL,KAAK,gBAAgB,EACrB,MAAM,EACN,KAAK,aAAa,EAClB,KAAK,KAAK,EACV,KAAK,cAAc,GACpB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/docker/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EACL,KAAK,gBAAgB,EACrB,cAAc,EACd,KAAK,qBAAqB,EAC1B,KAAK,KAAK,EACV,KAAK,cAAc,GACpB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC"}

package/dist/docker/index.js

@@ -1,6 +1,5 @@
-export { Container, ServiceContainer, } from "./container.js";
 export { DockerDirectory } from "./directory.js";
-export { Docker, } from "./docker.js";
+export { DockerFixtures, } from "./fixtures.js";
+export { ServiceContainer } from "./service-container.js";
 export { TestRun } from "./test-run.js";
-export { DockerVolume } from "./volume.js";
 //# sourceMappingURL=index.js.map

package/dist/docker/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/docker/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAET,gBAAgB,GACjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAEL,MAAM,GAIP,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/docker/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAEL,cAAc,GAIf,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC"}

package/dist/docker/service-container.d.ts

@@ -0,0 +1,20 @@
+import type { Container } from '@zukhruf/docker';
+/**
+ * A container whose port answers on 127.0.0.1 of this machine, through an SSH
+ * forward when the engine is remote. Disposal closes the forward. A dedicated
+ * server's disposal also removes its container; a shared server's leaves it
+ * running for its other users.
+ */
+export declare class ServiceContainer implements AsyncDisposable {
+    #private;
+    readonly container: Container;
+    readonly host = "127.0.0.1";
+    readonly port: number;
+    /** Closes the forward and leaves the container running for its other users. */
+    readonly disconnect: () => Promise<void>;
+    constructor(container: Container, port: number, disconnect: () => Promise<void>, remove: (() => Promise<void>) | undefined);
+    /** Removes a dedicated server's container, then closes the forward; when both fail, a SuppressedError holds both. */
+    cleanup(): Promise<void>;
+    [Symbol.asyncDispose](): Promise<void>;
+}
+//# sourceMappingURL=service-container.d.ts.map

package/dist/docker/service-container.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"service-container.d.ts","sourceRoot":"","sources":["../../src/docker/service-container.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD;;;;;GAKG;AACH,qBAAa,gBAAiB,YAAW,eAAe;;IACtD,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9B,QAAQ,CAAC,IAAI,eAAe;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,+EAA+E;IAC/E,QAAQ,CAAC,UAAU,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;gBAIvC,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAC/B,MAAM,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,SAAS;IAQ3C,qHAAqH;IAC/G,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAM9B,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC;CAGvC"}

package/dist/docker/service-container.js

@@ -0,0 +1,30 @@
+/**
+ * A container whose port answers on 127.0.0.1 of this machine, through an SSH
+ * forward when the engine is remote. Disposal closes the forward. A dedicated
+ * server's disposal also removes its container; a shared server's leaves it
+ * running for its other users.
+ */
+export class ServiceContainer {
+    container;
+    host = '127.0.0.1';
+    port;
+    /** Closes the forward and leaves the container running for its other users. */
+    disconnect;
+    #remove;
+    constructor(container, port, disconnect, remove) {
+        this.container = container;
+        this.port = port;
+        this.disconnect = disconnect;
+        this.#remove = remove;
+    }
+    /** Removes a dedicated server's container, then closes the forward; when both fail, a SuppressedError holds both. */
+    async cleanup() {
+        await using forward = new AsyncDisposableStack();
+        forward.defer(this.disconnect);
+        await this.#remove?.();
+    }
+    [Symbol.asyncDispose]() {
+        return this.cleanup();
+    }
+}
+//# sourceMappingURL=service-container.js.map