testcontainers 12.1.0 → 12.2.1

package/build/generic-container/generic-container.js

@@ -4,13 +4,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GenericContainer = void 0;
+const node_fs_1 = require("node:fs");
 const archiver_1 = __importDefault(require("archiver"));
 const async_lock_1 = __importDefault(require("async-lock"));
-const fs_1 = require("fs");
 const common_1 = require("../common");
 const container_runtime_1 = require("../container-runtime");
 const types_1 = require("../container-runtime/clients/container/types");
+// biome-ignore lint/suspicious/noImportCycles: Ryuk and sshd run as GenericContainers; only dereferenced at runtime
 const port_forwarder_1 = require("../port-forwarder/port-forwarder");
+// biome-ignore lint/suspicious/noImportCycles: Ryuk and sshd run as GenericContainers; only dereferenced at runtime
 const reaper_1 = require("../reaper/reaper");
 const bound_ports_1 = require("../utils/bound-ports");
 const labels_1 = require("../utils/labels");
@@ -19,8 +21,10 @@ const port_1 = require("../utils/port");
 const pull_policy_1 = require("../utils/pull-policy");
 const wait_strategy_selector_1 = require("../wait-strategies/utils/wait-strategy-selector");
 const wait_for_container_1 = require("../wait-strategies/wait-for-container");
+// biome-ignore lint/suspicious/noImportCycles: fromDockerfile() and build() construct each other; only dereferenced at runtime
 const generic_container_builder_1 = require("./generic-container-builder");
 const inspect_container_util_ports_exposed_1 = require("./inspect-container-util-ports-exposed");
+// biome-ignore lint/suspicious/noImportCycles: Ryuk and sshd run as GenericContainers; only dereferenced at runtime
 const started_generic_container_1 = require("./started-generic-container");
 const reusableContainerCreationLock = new async_lock_1.default();
 class GenericContainer {
@@ -59,11 +63,19 @@ class GenericContainer {
         return this.imageName.string === (0, reaper_1.getReaperImage)();
     }
     async start() {
+        const shouldPull = this.pullPolicy.shouldPull();
         const client = await (0, container_runtime_1.getContainerRuntimeClient)();
-        await client.image.pull(this.imageName, {
-            force: this.pullPolicy.shouldPull(),
-            platform: this.createOpts.platform,
-        });
+        if (shouldPull === "never") {
+            if (!(await client.image.exists(this.imageName))) {
+                throw new Error(`Image "${this.imageName.string}" does not exist locally and pull policy is "never"`);
+            }
+        }
+        else {
+            await client.image.pull(this.imageName, {
+                force: shouldPull,
+                platform: this.createOpts.platform,
+            });
+        }
         if (this.beforeContainerCreated) {
             await this.beforeContainerCreated();
         }
@@ -137,8 +149,10 @@ class GenericContainer {
         }
         if (this.filesToCopy.length > 0 || this.directoriesToCopy.length > 0 || this.contentsToCopy.length > 0) {
             const archive = await this.createArchiveToCopyToContainer();
-            archive.finalize();
-            await client.container.putArchive(container, archive, "/", this.copyToContainerOptions);
+            await Promise.all([
+                archive.finalize(),
+                client.container.putArchive(container, archive, "/", this.copyToContainerOptions),
+            ]);
         }
         for (const archive of this.archivesToCopy) {
             await client.container.putArchive(container, archive.tar, archive.target, this.copyToContainerOptions);
@@ -189,7 +203,7 @@ class GenericContainer {
         const tar = (0, archiver_1.default)("tar");
         const filesToCopyWithStats = await Promise.all(this.filesToCopy.map(async (fileToCopy) => ({
             ...fileToCopy,
-            stats: await fs_1.promises.stat(fileToCopy.source),
+            stats: await node_fs_1.promises.stat(fileToCopy.source),
         })));
         for (const { source, target, mode, stats } of filesToCopyWithStats) {
             tar.file(source, { name: target, mode, stats });

package/build/generic-container/inspect-container-util-ports-exposed.d.ts

@@ -1,2 +1,2 @@
-import { ContainerInspectInfo } from "dockerode";
+import type { ContainerInspectInfo } from "dockerode";
 export declare function inspectContainerUntilPortsExposed(inspectFn: () => Promise<ContainerInspectInfo>, containerId: string, timeout?: number): Promise<ContainerInspectInfo>;

package/build/generic-container/inspect-container-util-ports-exposed.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.inspectContainerUntilPortsExposed = inspectContainerUntilPortsExposed;
 const common_1 = require("../common");
-async function inspectContainerUntilPortsExposed(inspectFn, containerId, timeout = 10_000) {
+async function inspectContainerUntilPortsExposed(inspectFn, containerId, timeout = 30_000) {
     const result = await new common_1.IntervalRetry(250).retryUntil(() => inspectFn(), (inspectResult) => {
         const portBindings = inspectResult?.HostConfig?.PortBindings;
         if (!portBindings)

package/build/generic-container/started-generic-container.d.ts

@@ -1,9 +1,10 @@
-import Dockerode, { ContainerInspectInfo } from "dockerode";
-import { Readable } from "stream";
-import { RestartOptions, StartedTestContainer, StopOptions, StoppedTestContainer } from "../test-container";
-import { CommitOptions, ContentToCopy, CopyToContainerOptions, DirectoryToCopy, ExecOptions, ExecResult, FileToCopy, Labels } from "../types";
+import type { Readable } from "node:stream";
+import type Dockerode from "dockerode";
+import type { ContainerInspectInfo } from "dockerode";
+import type { RestartOptions, StartedTestContainer, StopOptions, StoppedTestContainer } from "../test-container";
+import type { CommitOptions, ContentToCopy, CopyToContainerOptions, DirectoryToCopy, ExecOptions, ExecResult, FileToCopy, Labels } from "../types";
 import { BoundPorts } from "../utils/bound-ports";
-import { WaitStrategy } from "../wait-strategies/wait-strategy";
+import type { WaitStrategy } from "../wait-strategies/wait-strategy";
 export declare class StartedGenericContainer implements StartedTestContainer {
     private readonly container;
     private readonly host;

package/build/generic-container/started-generic-container.js

@@ -4,11 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StartedGenericContainer = void 0;
+const node_fs_1 = require("node:fs");
 const archiver_1 = __importDefault(require("archiver"));
 const async_lock_1 = __importDefault(require("async-lock"));
-const fs_1 = require("fs");
 const common_1 = require("../common");
 const container_runtime_1 = require("../container-runtime");
+// biome-ignore lint/suspicious/noImportCycles: Ryuk and sshd run as GenericContainers; only dereferenced at runtime
 const reaper_1 = require("../reaper/reaper");
 const bound_ports_1 = require("../utils/bound-ports");
 const labels_1 = require("../utils/labels");
@@ -139,14 +140,13 @@ class StartedGenericContainer {
         return this.getNetworkSettings()[networkName].ipAddress;
     }
     getNetworkSettings() {
-        return Object.entries(this.inspectResult.NetworkSettings.Networks)
-            .map(([networkName, network]) => ({
-            [networkName]: {
+        return Object.fromEntries(Object.entries(this.inspectResult.NetworkSettings.Networks).map(([networkName, network]) => [
+            networkName,
+            {
                 networkId: network.NetworkID,
                 ipAddress: network.IPAddress,
             },
-        }))
-            .reduce((prev, next) => ({ ...prev, ...next }), {});
+        ]));
     }
     async copyFilesToContainer(filesToCopy) {
         common_1.log.debug(`Copying files to container...`, { containerId: this.container.id });
@@ -154,29 +154,32 @@ class StartedGenericContainer {
         const tar = (0, archiver_1.default)("tar");
         const filesToCopyWithStats = await Promise.all(filesToCopy.map(async (fileToCopy) => ({
             ...fileToCopy,
-            stats: await fs_1.promises.stat(fileToCopy.source),
+            stats: await node_fs_1.promises.stat(fileToCopy.source),
         })));
-        filesToCopyWithStats.forEach(({ source, target, mode, stats }) => tar.file(source, { name: target, mode, stats }));
-        tar.finalize();
-        await client.container.putArchive(this.container, tar, "/");
+        filesToCopyWithStats.forEach(({ source, target, mode, stats }) => {
+            tar.file(source, { name: target, mode, stats });
+        });
+        await Promise.all([tar.finalize(), client.container.putArchive(this.container, tar, "/")]);
         common_1.log.debug(`Copied files to container`, { containerId: this.container.id });
     }
     async copyDirectoriesToContainer(directoriesToCopy) {
         common_1.log.debug(`Copying directories to container...`, { containerId: this.container.id });
         const client = await (0, container_runtime_1.getContainerRuntimeClient)();
         const tar = (0, archiver_1.default)("tar");
-        directoriesToCopy.forEach(({ source, target }) => tar.directory(source, target));
-        tar.finalize();
-        await client.container.putArchive(this.container, tar, "/");
+        directoriesToCopy.forEach(({ source, target }) => {
+            tar.directory(source, target);
+        });
+        await Promise.all([tar.finalize(), client.container.putArchive(this.container, tar, "/")]);
         common_1.log.debug(`Copied directories to container`, { containerId: this.container.id });
     }
     async copyContentToContainer(contentsToCopy) {
         common_1.log.debug(`Copying content to container...`, { containerId: this.container.id });
         const client = await (0, container_runtime_1.getContainerRuntimeClient)();
         const tar = (0, archiver_1.default)("tar");
-        contentsToCopy.forEach(({ content, target, mode }) => tar.append(content, { name: target, mode: mode }));
-        tar.finalize();
-        await client.container.putArchive(this.container, tar, "/");
+        contentsToCopy.forEach(({ content, target, mode }) => {
+            tar.append(content, { name: target, mode: mode });
+        });
+        await Promise.all([tar.finalize(), client.container.putArchive(this.container, tar, "/")]);
         common_1.log.debug(`Copied content to container`, { containerId: this.container.id });
     }
     async copyArchiveToContainer(tar, target = "/", options) {

package/build/generic-container/stopped-generic-container.d.ts

@@ -1,5 +1,5 @@
-import Dockerode from "dockerode";
-import { StoppedTestContainer } from "../test-container";
+import type Dockerode from "dockerode";
+import type { StoppedTestContainer } from "../test-container";
 export declare class StoppedGenericContainer implements StoppedTestContainer {
     private readonly container;
     constructor(container: Dockerode.Container);

package/build/index.d.ts

@@ -1,5 +1,5 @@
-export { IntervalRetry, RandomUuid, Retry, Uuid, log, randomUuid } from "./common";
-export { ContainerRuntimeClient, ImageName, getContainerRuntimeClient } from "./container-runtime";
+export { IntervalRetry, log, RandomUuid, Retry, randomUuid, Uuid } from "./common";
+export { ContainerRuntimeClient, getContainerRuntimeClient, ImageName } from "./container-runtime";
 export { DockerComposeEnvironment } from "./docker-compose-environment/docker-compose-environment";
 export { DownedDockerComposeEnvironment } from "./docker-compose-environment/downed-docker-compose-environment";
 export { StartedDockerComposeEnvironment } from "./docker-compose-environment/started-docker-compose-environment";
@@ -13,10 +13,10 @@ export { getReaper } from "./reaper/reaper";
 export { SocatContainer, StartedSocatContainer } from "./socat/socat-container";
 export { RestartOptions, StartedTestContainer, StopOptions, StoppedTestContainer, TestContainer, } from "./test-container";
 export { TestContainers } from "./test-containers";
-export { CommitOptions, Content, CopyToContainerOptions, ExecOptions, ExecResult, InspectResult } from "./types";
+export { BindMode, CommitOptions, Content, ContentToCopy, CopyToContainerOptions, Environment, ExecOptions, ExecResult, FileToCopy, HealthCheck, InspectResult, Labels, } from "./types";
 export { BoundPorts } from "./utils/bound-ports";
 export { LABEL_TESTCONTAINERS_SESSION_ID } from "./utils/labels";
-export { PortWithBinding, PortWithOptionalBinding, getContainerPort, hasHostBinding } from "./utils/port";
+export { getContainerPort, hasHostBinding, PortWithBinding, PortWithOptionalBinding } from "./utils/port";
 export { PortGenerator, RandomPortGenerator } from "./utils/port-generator";
 export { ImagePullPolicy, PullPolicy } from "./utils/pull-policy";
 export { HttpWaitStrategyOptions } from "./wait-strategies/http-wait-strategy";

package/build/index.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.waitForContainer = exports.Wait = exports.StartupCheckStrategy = exports.PullPolicy = exports.RandomPortGenerator = exports.hasHostBinding = exports.getContainerPort = exports.LABEL_TESTCONTAINERS_SESSION_ID = exports.BoundPorts = exports.TestContainers = exports.StartedSocatContainer = exports.SocatContainer = exports.getReaper = exports.StoppedNetwork = exports.StartedNetwork = exports.Network = exports.GenericContainerBuilder = exports.GenericContainer = exports.AbstractStoppedContainer = exports.AbstractStartedContainer = exports.StoppedDockerComposeEnvironment = exports.StartedDockerComposeEnvironment = exports.DownedDockerComposeEnvironment = exports.DockerComposeEnvironment = exports.getContainerRuntimeClient = exports.ImageName = exports.ContainerRuntimeClient = exports.randomUuid = exports.log = exports.RandomUuid = exports.IntervalRetry = void 0;
+exports.waitForContainer = exports.Wait = exports.StartupCheckStrategy = exports.PullPolicy = exports.RandomPortGenerator = exports.hasHostBinding = exports.getContainerPort = exports.LABEL_TESTCONTAINERS_SESSION_ID = exports.BoundPorts = exports.TestContainers = exports.StartedSocatContainer = exports.SocatContainer = exports.getReaper = exports.StoppedNetwork = exports.StartedNetwork = exports.Network = exports.GenericContainerBuilder = exports.GenericContainer = exports.AbstractStoppedContainer = exports.AbstractStartedContainer = exports.StoppedDockerComposeEnvironment = exports.StartedDockerComposeEnvironment = exports.DownedDockerComposeEnvironment = exports.DockerComposeEnvironment = exports.ImageName = exports.getContainerRuntimeClient = exports.ContainerRuntimeClient = exports.randomUuid = exports.RandomUuid = exports.log = exports.IntervalRetry = void 0;
 var common_1 = require("./common");
 Object.defineProperty(exports, "IntervalRetry", { enumerable: true, get: function () { return common_1.IntervalRetry; } });
-Object.defineProperty(exports, "RandomUuid", { enumerable: true, get: function () { return common_1.RandomUuid; } });
 Object.defineProperty(exports, "log", { enumerable: true, get: function () { return common_1.log; } });
+Object.defineProperty(exports, "RandomUuid", { enumerable: true, get: function () { return common_1.RandomUuid; } });
 Object.defineProperty(exports, "randomUuid", { enumerable: true, get: function () { return common_1.randomUuid; } });
 var container_runtime_1 = require("./container-runtime");
 Object.defineProperty(exports, "ContainerRuntimeClient", { enumerable: true, get: function () { return container_runtime_1.ContainerRuntimeClient; } });
-Object.defineProperty(exports, "ImageName", { enumerable: true, get: function () { return container_runtime_1.ImageName; } });
 Object.defineProperty(exports, "getContainerRuntimeClient", { enumerable: true, get: function () { return container_runtime_1.getContainerRuntimeClient; } });
+Object.defineProperty(exports, "ImageName", { enumerable: true, get: function () { return container_runtime_1.ImageName; } });
 var docker_compose_environment_1 = require("./docker-compose-environment/docker-compose-environment");
 Object.defineProperty(exports, "DockerComposeEnvironment", { enumerable: true, get: function () { return docker_compose_environment_1.DockerComposeEnvironment; } });
 var downed_docker_compose_environment_1 = require("./docker-compose-environment/downed-docker-compose-environment");

package/build/network/network.d.ts

@@ -1,6 +1,6 @@
-import Dockerode from "dockerode";
-import { Uuid } from "../common";
-import { ContainerRuntimeClient } from "../container-runtime";
+import type Dockerode from "dockerode";
+import { type Uuid } from "../common";
+import { type ContainerRuntimeClient } from "../container-runtime";
 export declare class Network {
     private readonly uuid;
     constructor(uuid?: Uuid);

package/build/port-forwarder/port-forwarder.d.ts

@@ -1,12 +1,11 @@
-import { SshConnection } from "ssh-remote-port-forward";
+import { type SshConnection } from "ssh-remote-port-forward";
 export declare const SSHD_IMAGE: string;
 declare class PortForwarder {
     private readonly sshConnection;
     private readonly containerId;
     private readonly networkId;
     private readonly ipAddress;
-    private readonly networkName;
-    constructor(sshConnection: SshConnection, containerId: string, networkId: string, ipAddress: string, networkName: string);
+    constructor(sshConnection: SshConnection, containerId: string, networkId: string, ipAddress: string);
     exposeHostPort(port: number): Promise<void>;
     getContainerId(): string;
     getNetworkId(): string;

package/build/port-forwarder/port-forwarder.js

@@ -4,24 +4,24 @@ exports.PortForwarderInstance = exports.SSHD_IMAGE = void 0;
 const ssh_remote_port_forward_1 = require("ssh-remote-port-forward");
 const common_1 = require("../common");
 const container_runtime_1 = require("../container-runtime");
+// biome-ignore lint/suspicious/noImportCycles: Ryuk and sshd run as GenericContainers; only dereferenced at runtime
 const generic_container_1 = require("../generic-container/generic-container");
+// biome-ignore lint/suspicious/noImportCycles: Ryuk and sshd run as GenericContainers; only dereferenced at runtime
 const reaper_1 = require("../reaper/reaper");
 const labels_1 = require("../utils/labels");
-exports.SSHD_IMAGE = process.env["SSHD_CONTAINER_IMAGE"]
-    ? container_runtime_1.ImageName.fromString(process.env["SSHD_CONTAINER_IMAGE"]).string
+exports.SSHD_IMAGE = process.env.SSHD_CONTAINER_IMAGE
+    ? container_runtime_1.ImageName.fromString(process.env.SSHD_CONTAINER_IMAGE).string
     : container_runtime_1.ImageName.fromString("testcontainers/sshd:1.4.0").string;
 class PortForwarder {
     sshConnection;
     containerId;
     networkId;
     ipAddress;
-    networkName;
-    constructor(sshConnection, containerId, networkId, ipAddress, networkName) {
+    constructor(sshConnection, containerId, networkId, ipAddress) {
         this.sshConnection = sshConnection;
         this.containerId = containerId;
         this.networkId = networkId;
         this.ipAddress = ipAddress;
-        this.networkName = networkName;
     }
     async exposeHostPort(port) {
         common_1.log.info(`Exposing host port ${port}...`);
@@ -38,30 +38,31 @@ class PortForwarder {
         return this.ipAddress;
     }
 }
+// biome-ignore lint/complexity/noStaticOnlyClass: singleton holder with private static state
 class PortForwarderInstance {
     static USERNAME = "root";
     static PASSWORD = "root";
     static instance;
     static isRunning() {
-        return this.instance !== undefined;
+        return PortForwarderInstance.instance !== undefined;
     }
     static async getInstance() {
-        if (!this.instance) {
+        if (!PortForwarderInstance.instance) {
             await (0, common_1.withFileLock)("testcontainers-node-sshd.lock", async () => {
                 const client = await (0, container_runtime_1.getContainerRuntimeClient)();
                 const reaper = await (0, reaper_1.getReaper)(client);
                 const sessionId = reaper.sessionId;
-                const portForwarderContainer = await this.findPortForwarderContainer(client, sessionId);
+                const portForwarderContainer = await PortForwarderInstance.findPortForwarderContainer(client, sessionId);
                 if (portForwarderContainer) {
-                    this.instance = this.reuseInstance(client, portForwarderContainer, sessionId);
+                    PortForwarderInstance.instance = PortForwarderInstance.reuseInstance(client, portForwarderContainer, sessionId);
                 }
                 else {
-                    this.instance = this.createInstance();
+                    PortForwarderInstance.instance = PortForwarderInstance.createInstance();
                 }
-                await this.instance;
+                await PortForwarderInstance.instance;
             });
         }
-        return this.instance;
+        return PortForwarderInstance.instance;
     }
     static async findPortForwarderContainer(client, sessionId) {
         const containers = await client.container.list();
@@ -72,7 +73,7 @@ class PortForwarderInstance {
     static async reuseInstance(client, container, sessionId) {
         common_1.log.debug(`Reusing existing PortForwarder for session "${sessionId}"...`);
         const host = client.info.containerRuntime.host;
-        const port = container.Ports.find((port) => port.PrivatePort == 22)?.PublicPort;
+        const port = container.Ports.find((port) => port.PrivatePort === 22)?.PublicPort;
         if (!port) {
             throw new Error("Expected PortForwarder to map exposed port 22");
         }
@@ -91,32 +92,37 @@ class PortForwarderInstance {
         const networkName = networks[0][0];
         const networkId = container.NetworkSettings.Networks[networkName].NetworkID;
         const ipAddress = container.NetworkSettings.Networks[networkName].IPAddress;
-        return new PortForwarder(connection, containerId, networkId, ipAddress, networkName);
+        return new PortForwarder(connection, containerId, networkId, ipAddress);
     }
     static async createInstance() {
         common_1.log.debug(`Creating new Port Forwarder...`);
         const client = await (0, container_runtime_1.getContainerRuntimeClient)();
         const reaper = await (0, reaper_1.getReaper)(client);
-        const containerPort = process.env["TESTCONTAINERS_SSHD_PORT"]
-            ? { container: 22, host: Number(process.env["TESTCONTAINERS_SSHD_PORT"]) }
+        const containerPort = process.env.TESTCONTAINERS_SSHD_PORT
+            ? { container: 22, host: Number(process.env.TESTCONTAINERS_SSHD_PORT) }
             : 22;
         const container = await new generic_container_1.GenericContainer(exports.SSHD_IMAGE)
             .withName(`testcontainers-port-forwarder-${reaper.sessionId}`)
             .withExposedPorts(containerPort)
-            .withEnvironment({ PASSWORD: this.PASSWORD })
+            .withEnvironment({ PASSWORD: PortForwarderInstance.PASSWORD })
             .withLabels({ [labels_1.LABEL_TESTCONTAINERS_SSHD]: "true" })
             .start();
         const host = client.info.containerRuntime.host;
         const port = container.getMappedPort(22);
         common_1.log.debug(`Connecting to Port Forwarder on "${host}:${port}"...`);
-        const connection = await (0, ssh_remote_port_forward_1.createSshConnection)({ host, port, username: this.USERNAME, password: this.PASSWORD });
+        const connection = await (0, ssh_remote_port_forward_1.createSshConnection)({
+            host,
+            port,
+            username: PortForwarderInstance.USERNAME,
+            password: PortForwarderInstance.PASSWORD,
+        });
         common_1.log.debug(`Connected to Port Forwarder on "${host}:${port}"`);
         connection.unref();
         const containerId = container.getId();
         const networkName = container.getNetworkNames()[0];
         const networkId = container.getNetworkId(networkName);
         const ipAddress = container.getIpAddress(networkName);
-        return new PortForwarder(connection, containerId, networkId, ipAddress, networkName);
+        return new PortForwarder(connection, containerId, networkId, ipAddress);
     }
 }
 exports.PortForwarderInstance = PortForwarderInstance;

package/build/reaper/reaper.d.ts

@@ -1,4 +1,4 @@
-import { ContainerRuntimeClient } from "../container-runtime";
+import { type ContainerRuntimeClient } from "../container-runtime";
 /**
  * Resolve the Ryuk reaper image name. Read lazily so that callers (and tests)
  * can set `process.env.RYUK_CONTAINER_IMAGE` _after_ this module is imported —

package/build/reaper/reaper.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getReaperImage = getReaperImage;
 exports.getReaper = getReaper;
-const net_1 = require("net");
-const os_1 = require("os");
+const node_net_1 = require("node:net");
+const node_os_1 = require("node:os");
 const common_1 = require("../common");
 const container_runtime_1 = require("../container-runtime");
+// biome-ignore lint/suspicious/noImportCycles: Ryuk and sshd run as GenericContainers; only dereferenced at runtime
 const generic_container_1 = require("../generic-container/generic-container");
 const labels_1 = require("../utils/labels");
 const wait_1 = require("../wait-strategies/wait");
@@ -17,8 +18,8 @@ const wait_1 = require("../wait-strategies/wait");
  * See https://github.com/testcontainers/testcontainers-node/issues/1310.
  */
 function getReaperImage() {
-    return process.env["RYUK_CONTAINER_IMAGE"]
-        ? container_runtime_1.ImageName.fromString(process.env["RYUK_CONTAINER_IMAGE"]).string
+    return process.env.RYUK_CONTAINER_IMAGE
+        ? container_runtime_1.ImageName.fromString(process.env.RYUK_CONTAINER_IMAGE).string
         : container_runtime_1.ImageName.fromString("testcontainers/ryuk:0.14.0").string;
 }
 let reaper;
@@ -27,7 +28,7 @@ async function getReaper(client) {
     if (reaper) {
         return reaper;
     }
-    const userId = (0, os_1.userInfo)().uid;
+    const userId = (0, node_os_1.userInfo)().uid;
     reaper = await (0, common_1.withFileLock)(`testcontainers-node-${userId}.lock`, async () => {
         const reaperContainers = await findReaperContainers(client);
         if (process.env.TESTCONTAINERS_RYUK_DISABLED === "true") {
@@ -35,9 +36,8 @@ async function getReaper(client) {
             return new DisabledReaper(sessionId, "");
         }
         for (const reaperContainer of reaperContainers) {
-            const existingSessionId = reaperContainer.Labels[labels_1.LABEL_TESTCONTAINERS_SESSION_ID] ?? new common_1.RandomUuid().nextUuid();
             try {
-                sessionId = existingSessionId;
+                sessionId = reaperContainer.Labels[labels_1.LABEL_TESTCONTAINERS_SESSION_ID];
                 return await useExistingReaper(reaperContainer, sessionId, client.info.containerRuntime.host);
             }
             catch (error) {
@@ -58,12 +58,14 @@ async function findReaperContainers(client) {
     return containers
         .filter((container) => container.State === "running" &&
         container.Labels[labels_1.LABEL_TESTCONTAINERS_RYUK] === "true" &&
-        container.Labels["TESTCONTAINERS_RYUK_TEST_LABEL"] !== "true")
+        container.Labels[labels_1.LABEL_TESTCONTAINERS_LANG] === "node" &&
+        !!container.Labels[labels_1.LABEL_TESTCONTAINERS_SESSION_ID] &&
+        container.Labels.TESTCONTAINERS_RYUK_TEST_LABEL !== "true")
         .sort((a, b) => b.Created - a.Created);
 }
 async function useExistingReaper(reaperContainer, sessionId, host) {
     common_1.log.debug(`Reusing existing Reaper for session "${sessionId}"...`);
-    const reaperPort = reaperContainer.Ports.find((port) => port.PrivatePort == 8080)?.PublicPort;
+    const reaperPort = reaperContainer.Ports.find((port) => port.PrivatePort === 8080)?.PublicPort;
     if (!reaperPort) {
         throw new Error("Expected Reaper to map exposed port 8080");
     }
@@ -74,22 +76,22 @@ async function createNewReaper(sessionId, remoteSocketPath) {
     common_1.log.debug(`Creating new Reaper for session "${sessionId}" with socket path "${remoteSocketPath}"...`);
     const container = new generic_container_1.GenericContainer(getReaperImage())
         .withName(`testcontainers-ryuk-${sessionId}`)
-        .withExposedPorts(process.env["TESTCONTAINERS_RYUK_PORT"]
-        ? { container: 8080, host: parseInt(process.env["TESTCONTAINERS_RYUK_PORT"]) }
+        .withExposedPorts(process.env.TESTCONTAINERS_RYUK_PORT
+        ? { container: 8080, host: parseInt(process.env.TESTCONTAINERS_RYUK_PORT, 10) }
         : 8080)
         .withBindMounts([{ source: remoteSocketPath, target: "/var/run/docker.sock" }])
         .withLabels({ [labels_1.LABEL_TESTCONTAINERS_SESSION_ID]: sessionId })
         .withWaitStrategy(wait_1.Wait.forLogMessage(/.*Started.*/));
-    if (process.env["TESTCONTAINERS_RYUK_VERBOSE"]) {
-        container.withEnvironment({ RYUK_VERBOSE: process.env["TESTCONTAINERS_RYUK_VERBOSE"] });
+    if (process.env.TESTCONTAINERS_RYUK_VERBOSE) {
+        container.withEnvironment({ RYUK_VERBOSE: process.env.TESTCONTAINERS_RYUK_VERBOSE });
     }
-    if (process.env["TESTCONTAINERS_RYUK_RECONNECTION_TIMEOUT"]) {
-        container.withEnvironment({ RYUK_RECONNECTION_TIMEOUT: process.env["TESTCONTAINERS_RYUK_RECONNECTION_TIMEOUT"] });
+    if (process.env.TESTCONTAINERS_RYUK_RECONNECTION_TIMEOUT) {
+        container.withEnvironment({ RYUK_RECONNECTION_TIMEOUT: process.env.TESTCONTAINERS_RYUK_RECONNECTION_TIMEOUT });
     }
-    if (process.env["TESTCONTAINERS_RYUK_PRIVILEGED"] === "true") {
+    if (process.env.TESTCONTAINERS_RYUK_PRIVILEGED === "true") {
         container.withPrivilegedMode();
     }
-    if (process.env["TESTCONTAINERS_RYUK_TEST_LABEL"] === "true") {
+    if (process.env.TESTCONTAINERS_RYUK_TEST_LABEL === "true") {
         container.withLabels({ TESTCONTAINERS_RYUK_TEST_LABEL: "true" });
     }
     const startedContainer = await container.start();
@@ -100,7 +102,7 @@ async function connectToReaperSocket(host, port, containerId) {
     const retryResult = await new common_1.IntervalRetry(1000).retryUntil((attempt) => {
         return new Promise((resolve) => {
             common_1.log.debug(`Connecting to Reaper (attempt ${attempt + 1}) on "${host}:${port}"...`, { containerId });
-            const socket = new net_1.Socket();
+            const socket = new node_net_1.Socket();
             socket
                 .unref()
                 .on("timeout", () => common_1.log.error(`Reaper ${containerId} socket timed out`))
@@ -124,7 +126,7 @@ async function connectToReaperSocket(host, port, containerId) {
         common_1.log.error(message, { containerId });
         return new Error(message);
     }, 4000);
-    if (retryResult instanceof net_1.Socket) {
+    if (retryResult instanceof node_net_1.Socket) {
         return retryResult;
     }
     else {

package/build/socat/socat-container.d.ts

@@ -1,6 +1,5 @@
 import { AbstractStartedContainer } from "../generic-container/abstract-started-container";
 import { GenericContainer } from "../generic-container/generic-container";
-import { StartedTestContainer } from "../test-container";
 export declare class SocatContainer extends GenericContainer {
     private targets;
     constructor(image?: string);
@@ -8,5 +7,4 @@ export declare class SocatContainer extends GenericContainer {
     start(): Promise<StartedSocatContainer>;
 }
 export declare class StartedSocatContainer extends AbstractStartedContainer {
-    constructor(startedTestcontainers: StartedTestContainer);
 }

package/build/socat/socat-container.js

@@ -26,8 +26,5 @@ class SocatContainer extends generic_container_1.GenericContainer {
 }
 exports.SocatContainer = SocatContainer;
 class StartedSocatContainer extends abstract_started_container_1.AbstractStartedContainer {
-    constructor(startedTestcontainers) {
-        super(startedTestcontainers);
-    }
 }
 exports.StartedSocatContainer = StartedSocatContainer;

package/build/test-container.d.ts

@@ -1,9 +1,9 @@
-import { Readable } from "stream";
-import { StartedNetwork } from "./network/network";
-import { ArchiveToCopy, BindMount, CommitOptions, ContentToCopy, CopyToContainerOptions, DirectoryToCopy, Environment, ExecOptions, ExecResult, ExtraHost, FileToCopy, Labels, ResourcesQuota, TmpFs, Ulimits } from "./types";
-import { PortWithOptionalBinding } from "./utils/port";
-import { ImagePullPolicy } from "./utils/pull-policy";
-import { WaitStrategy } from "./wait-strategies/wait-strategy";
+import type { Readable } from "node:stream";
+import type { StartedNetwork } from "./network/network";
+import type { ArchiveToCopy, BindMount, CommitOptions, ContentToCopy, CopyToContainerOptions, DirectoryToCopy, Environment, ExecOptions, ExecResult, ExtraHost, FileToCopy, Labels, ResourcesQuota, TmpFs, Ulimits } from "./types";
+import type { PortWithOptionalBinding } from "./utils/port";
+import type { ImagePullPolicy } from "./utils/pull-policy";
+import type { WaitStrategy } from "./wait-strategies/wait-strategy";
 export interface TestContainer {
     start(): Promise<StartedTestContainer>;
     withEnvironment(environment: Environment): this;

package/build/test-containers.js

@@ -4,11 +4,12 @@ exports.TestContainers = void 0;
 const common_1 = require("./common");
 const container_runtime_1 = require("./container-runtime");
 const port_forwarder_1 = require("./port-forwarder/port-forwarder");
+// biome-ignore lint/complexity/noStaticOnlyClass: public API surface, kept as a class for backwards compatibility
 class TestContainers {
     static async exposeHostPorts(...ports) {
         const portForwarder = await port_forwarder_1.PortForwarderInstance.getInstance();
         await Promise.all(ports.map((port) => portForwarder.exposeHostPort(port).catch(async (err) => {
-            if (await this.isHostPortExposed(portForwarder.getContainerId(), port)) {
+            if (await TestContainers.isHostPortExposed(portForwarder.getContainerId(), port)) {
                 common_1.log.debug(`Host port ${port} is already exposed`);
             }
             else {

package/build/types.d.ts

@@ -1,6 +1,6 @@
-import { Readable } from "stream";
-import { AuthConfig } from "./container-runtime/auth/types";
-import { ContainerCommitOptions } from "./container-runtime/clients/container/types";
+import type { Readable } from "node:stream";
+import type { AuthConfig } from "./container-runtime/auth/types";
+import type { ContainerCommitOptions } from "./container-runtime/clients/container/types";
 export type InspectResult = {
     name: string;
     hostname: string;
@@ -17,7 +17,6 @@ export type InspectResult = {
     };
     labels: Labels;
 };
-export type ContainerRuntime = "docker" | "podman";
 export type Environment = {
     [key in string]: string;
 };

package/build/utils/bound-ports.d.ts

@@ -1,6 +1,6 @@
-import { HostIp } from "../container-runtime";
-import { HostPortBindings, InspectResult } from "../types";
-import { PortWithOptionalBinding } from "./port";
+import type { HostIp } from "../container-runtime";
+import type { HostPortBindings, InspectResult } from "../types";
+import { type PortWithOptionalBinding } from "./port";
 export declare class BoundPorts {
     private readonly ports;
     getBinding(port: number | string, protocol?: string): number;

package/build/utils/bound-ports.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveHostPortBinding = exports.BoundPorts = void 0;
-const net_1 = __importDefault(require("net"));
+const node_net_1 = __importDefault(require("node:net"));
 const port_1 = require("./port");
 class BoundPorts {
     ports = new Map();
@@ -79,7 +79,7 @@ const resolveHostPortBinding = (hostIps, hostPortBindings) => {
         return hostPortBindings[0].hostPort;
     }
     for (const { family } of hostIps) {
-        const hostPortBinding = hostPortBindings.find(({ hostIp }) => net_1.default.isIP(hostIp) === family);
+        const hostPortBinding = hostPortBindings.find(({ hostIp }) => node_net_1.default.isIP(hostIp) === family);
         if (hostPortBinding !== undefined) {
             return hostPortBinding.hostPort;
         }

package/build/utils/dockerfile-parser.d.ts

@@ -1,3 +1,3 @@
 import { ImageName } from "../container-runtime";
-import { BuildArgs } from "../types";
+import type { BuildArgs } from "../types";
 export declare function getDockerfileImages(dockerfile: string, buildArgs: BuildArgs): Promise<ImageName[]>;