testcontainers 12.0.2 → 12.0.4

package/build/container-runtime/clients/container/docker-container-client.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DockerContainerClient = void 0;
 const stream_1 = require("stream");
+const promises_1 = require("stream/promises");
 const common_1 = require("../../../common");
 class DockerContainerClient {
     dockerode;
@@ -216,11 +217,18 @@ class DockerContainerClient {
             };
             processStream(stdoutStream, stdoutChunks);
             processStream(stderrStream, stderrChunks);
-            await new Promise((res, rej) => {
-                stream.on("end", res);
-                stream.on("error", rej);
-            });
-            stream.destroy();
+            try {
+                await new Promise((res, rej) => {
+                    stream.on("end", res);
+                    stream.on("error", rej);
+                });
+                stdoutStream.end();
+                stderrStream.end();
+                await Promise.all([(0, promises_1.finished)(stdoutStream), (0, promises_1.finished)(stderrStream)]);
+            }
+            finally {
+                stream.destroy();
+            }
             const inspectResult = await exec.inspect();
             const exitCode = inspectResult.ExitCode ?? -1;
             const output = outputChunks.join("");

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

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GenericContainer = void 0;
-const archiver_1 = require("archiver");
+const archiver_1 = __importDefault(require("archiver"));
 const async_lock_1 = __importDefault(require("async-lock"));
 const fs_1 = require("fs");
 const common_1 = require("../common");
@@ -186,7 +186,7 @@ class GenericContainer {
         }
     }
     async createArchiveToCopyToContainer() {
-        const tar = new archiver_1.TarArchive();
+        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),

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

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StartedGenericContainer = void 0;
-const archiver_1 = require("archiver");
+const archiver_1 = __importDefault(require("archiver"));
 const async_lock_1 = __importDefault(require("async-lock"));
 const fs_1 = require("fs");
 const common_1 = require("../common");
@@ -151,7 +151,7 @@ class StartedGenericContainer {
     async copyFilesToContainer(filesToCopy) {
         common_1.log.debug(`Copying files to container...`, { containerId: this.container.id });
         const client = await (0, container_runtime_1.getContainerRuntimeClient)();
-        const tar = new archiver_1.TarArchive();
+        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),
@@ -164,7 +164,7 @@ class StartedGenericContainer {
     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 = new archiver_1.TarArchive();
+        const tar = (0, archiver_1.default)("tar");
         directoriesToCopy.forEach(({ source, target }) => tar.directory(source, target));
         tar.finalize();
         await client.container.putArchive(this.container, tar, "/");
@@ -173,7 +173,7 @@ class StartedGenericContainer {
     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 = new archiver_1.TarArchive();
+        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, "/");

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

@@ -9,7 +9,7 @@ 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
-    : container_runtime_1.ImageName.fromString("testcontainers/sshd:1.3.0").string;
+    : container_runtime_1.ImageName.fromString("testcontainers/sshd:1.4.0").string;
 class PortForwarder {
     sshConnection;
     containerId;

package/build/version.d.ts

@@ -1 +1 @@
-export declare const LIB_VERSION = "12.0.2";
+export declare const LIB_VERSION = "12.0.4";

package/build/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LIB_VERSION = void 0;
-exports.LIB_VERSION = "12.0.2";
+exports.LIB_VERSION = "12.0.4";

package/build/wait-strategies/http-wait-strategy.d.ts

@@ -23,10 +23,10 @@ export declare class HttpWaitStrategy extends AbstractWaitStrategy {
         [key: string]: string;
     }): this;
     withBasicCredentials(username: string, password: string): this;
-    withReadTimeout(startupTimeoutMs: number): this;
+    withReadTimeout(readTimeoutMs: number): this;
     usingTls(): this;
     allowInsecure(): this;
     waitUntilReady(container: Dockerode.Container, boundPorts: BoundPorts): Promise<void>;
     private handleContainerExit;
-    private getAgent;
+    private createInsecureAgent;
 }

package/build/wait-strategies/http-wait-strategy.js

@@ -47,8 +47,8 @@ class HttpWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
         this.headers = { ...this.headers, Authorization: `Basic ${base64Encoded}` };
         return this;
     }
-    withReadTimeout(startupTimeoutMs) {
-        this.readTimeoutMs = startupTimeoutMs;
+    withReadTimeout(readTimeoutMs) {
+        this.readTimeoutMs = readTimeoutMs;
         return this;
     }
     usingTls() {
@@ -65,50 +65,60 @@ class HttpWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
         let containerExited = false;
         const client = await (0, container_runtime_1.getContainerRuntimeClient)();
         const { abortOnContainerExit } = this.options;
-        await new common_1.IntervalRetry(this.readTimeoutMs).retryUntil(async () => {
-            try {
-                const url = `${this.protocol}://${client.info.containerRuntime.host}:${boundPorts.getBinding(this.port)}${this.path}`;
-                if (abortOnContainerExit) {
-                    const containerStatus = (await client.container.inspect(container)).State.Status;
-                    if (containerStatus === exitStatus) {
-                        containerExited = true;
-                        return;
+        // Scoped per invocation: one strategy instance can drive concurrent waits, so a shared
+        // agent would let one finished wait destroy a dispatcher another is still using.
+        const agent = this.createInsecureAgent();
+        try {
+            await new common_1.IntervalRetry(this.readTimeoutMs).retryUntil(async () => {
+                try {
+                    const url = `${this.protocol}://${client.info.containerRuntime.host}:${boundPorts.getBinding(this.port)}${this.path}`;
+                    if (abortOnContainerExit) {
+                        const containerStatus = (await client.container.inspect(container)).State.Status;
+                        if (containerStatus === exitStatus) {
+                            containerExited = true;
+                            return;
+                        }
                     }
+                    return (0, undici_response_parser_1.undiciResponseToFetchResponse)(await (0, undici_1.request)(url, {
+                        method: this.method,
+                        signal: AbortSignal.timeout(this.readTimeoutMs),
+                        headers: this.headers,
+                        dispatcher: agent,
+                    }));
+                }
+                catch {
+                    return undefined;
+                }
+            }, async (response) => {
+                if (abortOnContainerExit && containerExited) {
+                    return true;
+                }
+                if (response === undefined) {
+                    return false;
                 }
-                return (0, undici_response_parser_1.undiciResponseToFetchResponse)(await (0, undici_1.request)(url, {
-                    method: this.method,
-                    signal: AbortSignal.timeout(this.readTimeoutMs),
-                    headers: this.headers,
-                    dispatcher: this.getAgent(),
-                }));
-            }
-            catch {
-                return undefined;
-            }
-        }, async (response) => {
-            if (abortOnContainerExit && containerExited) {
-                return true;
-            }
-            if (response === undefined) {
-                return false;
-            }
-            else if (!this.predicates.length) {
-                return response.ok;
-            }
-            else {
-                for (const predicate of this.predicates) {
-                    const result = await predicate(response);
-                    if (!result) {
-                        return false;
+                else if (!this.predicates.length) {
+                    return response.ok;
+                }
+                else {
+                    for (const predicate of this.predicates) {
+                        const result = await predicate(response);
+                        if (!result) {
+                            return false;
+                        }
                     }
+                    return true;
                 }
-                return true;
-            }
-        }, () => {
-            const message = `URL ${this.path} not accessible after ${this.startupTimeoutMs}ms`;
-            common_1.log.error(message, { containerId: container.id });
-            throw new Error(message);
-        }, this.startupTimeoutMs);
+            }, () => {
+                const message = `URL ${this.path} not accessible after ${this.startupTimeoutMs}ms`;
+                common_1.log.error(message, { containerId: container.id });
+                throw new Error(message);
+            }, this.startupTimeoutMs);
+        }
+        finally {
+            // Force-close: status-only predicates never read the body, so a graceful close() could
+            // hang waiting on unreleased connections. Nothing left to drain once the wait is done.
+            await agent?.destroy();
+        }
         if (abortOnContainerExit && containerExited) {
             return this.handleContainerExit(container);
         }
@@ -132,14 +142,15 @@ class HttpWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
         common_1.log.error(message, { containerId: container.id });
         throw new Error(message);
     }
-    getAgent() {
-        if (this._allowInsecure) {
-            return new undici_1.Agent({
-                connect: {
-                    rejectUnauthorized: false,
-                },
-            });
+    createInsecureAgent() {
+        if (!this._allowInsecure) {
+            return undefined;
         }
+        return new undici_1.Agent({
+            connect: {
+                rejectUnauthorized: false,
+            },
+        });
     }
 }
 exports.HttpWaitStrategy = HttpWaitStrategy;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testcontainers",
-  "version": "12.0.2",
+  "version": "12.0.4",
   "author": "Cristian Greco",
   "license": "MIT",
   "keywords": [
@@ -32,22 +32,22 @@
   "dependencies": {
     "@balena/dockerignore": "^1.0.2",
     "@types/dockerode": "^4.0.1",
-    "archiver": "^8.0.0",
+    "archiver": "^7.0.1",
     "async-lock": "^1.4.1",
     "byline": "^5.0.0",
     "debug": "^4.4.3",
     "docker-compose": "^1.4.2",
     "dockerode": "^5.0.0",
-    "get-port": "^7.2.0",
+    "get-port": "^5.1.1",
     "proper-lockfile": "^4.1.2",
     "properties-reader": "^3.0.1",
     "ssh-remote-port-forward": "^1.0.4",
     "tar-fs": "^3.1.2",
     "tmp": "^0.2.7",
-    "undici": "^8.3.0"
+    "undici": "^8.5.0"
   },
   "devDependencies": {
-    "@types/archiver": "^8.0.0",
+    "@types/archiver": "^7.0.0",
     "@types/async-lock": "^1.4.2",
     "@types/byline": "^4.2.36",
     "@types/debug": "^4.1.13",