testcontainers 12.2.0 → 12.2.1

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.2.0";
+exports.LIB_VERSION = "12.2.1";

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

@@ -1,6 +1,6 @@
-import Dockerode from "dockerode";
-import { BoundPorts } from "../utils/bound-ports";
-import { AbstractWaitStrategy, WaitStrategy } from "./wait-strategy";
+import type Dockerode from "dockerode";
+import type { BoundPorts } from "../utils/bound-ports";
+import { AbstractWaitStrategy, type WaitStrategy } from "./wait-strategy";
 export declare class CompositeWaitStrategy extends AbstractWaitStrategy {
     private readonly waitStrategies;
     private deadline?;

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

@@ -37,7 +37,9 @@ class CompositeWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
     withStartupTimeout(startupTimeoutMs) {
         this.waitStrategies
             .filter((waitStrategy) => !waitStrategy.isStartupTimeoutSet())
-            .forEach((waitStrategy) => waitStrategy.withStartupTimeout(startupTimeoutMs));
+            .forEach((waitStrategy) => {
+            waitStrategy.withStartupTimeout(startupTimeoutMs);
+        });
         return this;
     }
     withDeadline(deadline) {

package/build/wait-strategies/health-check-wait-strategy.d.ts

@@ -1,4 +1,4 @@
-import Dockerode from "dockerode";
+import type Dockerode from "dockerode";
 import { AbstractWaitStrategy } from "./wait-strategy";
 export declare class HealthCheckWaitStrategy extends AbstractWaitStrategy {
     waitUntilReady(container: Dockerode.Container): Promise<void>;

package/build/wait-strategies/host-port-wait-strategy.d.ts

@@ -1,5 +1,5 @@
-import Dockerode from "dockerode";
-import { BoundPorts } from "../utils/bound-ports";
+import type Dockerode from "dockerode";
+import type { BoundPorts } from "../utils/bound-ports";
 import { AbstractWaitStrategy } from "./wait-strategy";
 export declare class HostPortWaitStrategy extends AbstractWaitStrategy {
     waitUntilReady(container: Dockerode.Container, boundPorts: BoundPorts): Promise<void>;

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

@@ -1,5 +1,5 @@
-import Dockerode from "dockerode";
-import { BoundPorts } from "../utils/bound-ports";
+import type Dockerode from "dockerode";
+import type { BoundPorts } from "../utils/bound-ports";
 import { AbstractWaitStrategy } from "./wait-strategy";
 export interface HttpWaitStrategyOptions {
     abortOnContainerExit?: boolean;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpWaitStrategy = void 0;
+const consumers_1 = require("node:stream/consumers");
 const undici_1 = require("undici");
 const common_1 = require("../common");
 const container_runtime_1 = require("../container-runtime");
@@ -126,17 +127,13 @@ class HttpWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
     }
     async handleContainerExit(container) {
         const tail = 50;
-        const lastLogs = [];
         const client = await (0, container_runtime_1.getContainerRuntimeClient)();
         let message;
         try {
-            const stream = await client.container.logs(container, { tail });
-            await new Promise((res) => {
-                stream.on("data", (d) => lastLogs.push(d.trim())).on("end", res);
-            });
-            message = `Container exited during HTTP healthCheck, last ${tail} logs: ${lastLogs.join("\n")}`;
+            const lastLogs = await (0, consumers_1.text)(await client.container.logs(container, { tail }));
+            message = `Container exited during HTTP healthCheck, last ${tail} logs: ${lastLogs.trim()}`;
         }
-        catch (err) {
+        catch (_err) {
             message = "Container exited during HTTP healthCheck, failed to get last logs";
         }
         common_1.log.error(message, { containerId: container.id });

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

@@ -1,10 +1,10 @@
-import Dockerode from "dockerode";
-import { BoundPorts } from "../utils/bound-ports";
+import type Dockerode from "dockerode";
+import type { BoundPorts } from "../utils/bound-ports";
 import { AbstractWaitStrategy } from "./wait-strategy";
 export type Log = string;
 export declare class LogWaitStrategy extends AbstractWaitStrategy {
     private readonly message;
     private readonly times;
     constructor(message: Log | RegExp, times: number);
-    waitUntilReady(container: Dockerode.Container, boundPorts: BoundPorts, startTime?: Date): Promise<void>;
+    waitUntilReady(container: Dockerode.Container, _boundPorts: BoundPorts, startTime?: Date): Promise<void>;
 }

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

@@ -16,7 +16,7 @@ class LogWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
         this.message = message;
         this.times = times;
     }
-    async waitUntilReady(container, boundPorts, startTime) {
+    async waitUntilReady(container, _boundPorts, startTime) {
         common_1.log.debug(`Waiting for log message "${this.message}"...`, { containerId: container.id });
         const client = await (0, container_runtime_1.getContainerRuntimeClient)();
         const stream = await client.container.logs(container, { since: startTime ? startTime.getTime() / 1000 : 0 });

package/build/wait-strategies/one-shot-startup-startegy.d.ts

@@ -1,5 +1,5 @@
-import Dockerode from "dockerode";
-import { StartupCheckStrategy, StartupStatus } from "./startup-check-strategy";
+import type Dockerode from "dockerode";
+import { StartupCheckStrategy, type StartupStatus } from "./startup-check-strategy";
 export declare class OneShotStartupCheckStrategy extends StartupCheckStrategy {
     DOCKER_TIMESTAMP_ZERO: string;
     private isDockerTimestampNonEmpty;

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

@@ -1,4 +1,4 @@
-import Dockerode from "dockerode";
+import type Dockerode from "dockerode";
 import { AbstractWaitStrategy } from "./wait-strategy";
 export declare class ShellWaitStrategy extends AbstractWaitStrategy {
     private readonly command;

package/build/wait-strategies/startup-check-strategy.d.ts

@@ -1,8 +1,7 @@
-import Dockerode from "dockerode";
+import type Dockerode from "dockerode";
 import { AbstractWaitStrategy } from "./wait-strategy";
 export type StartupStatus = "PENDING" | "SUCCESS" | "FAIL";
 export declare abstract class StartupCheckStrategy extends AbstractWaitStrategy {
-    constructor();
     abstract checkStartupState(dockerClient: Dockerode, containerId: string): Promise<StartupStatus>;
     waitUntilReady(container: Dockerode.Container): Promise<void>;
 }

package/build/wait-strategies/startup-check-strategy.js

@@ -5,9 +5,6 @@ const common_1 = require("../common");
 const container_runtime_1 = require("../container-runtime");
 const wait_strategy_1 = require("./wait-strategy");
 class StartupCheckStrategy extends wait_strategy_1.AbstractWaitStrategy {
-    constructor() {
-        super();
-    }
     async waitUntilReady(container) {
         const client = await (0, container_runtime_1.getContainerRuntimeClient)();
         const startupStatus = await new common_1.IntervalRetry(1000).retryUntil(async () => await this.checkStartupState(client.container.dockerode, container.id), (startupStatus) => startupStatus === "SUCCESS" || startupStatus === "FAIL", () => {

package/build/wait-strategies/utils/health-check.d.ts

@@ -1,10 +1,8 @@
-import { ContainerInspectInfo, HealthConfig, ImageInspectInfo } from "dockerode";
-import { HealthCheck, HealthCheckStatus } from "../../types";
+import type { ContainerInspectInfo, HealthConfig, ImageInspectInfo } from "dockerode";
+import type { HealthCheck, HealthCheckStatus } from "../../types";
 type HealthCheckConfig = HealthConfig | HealthCheck;
 type HealthCheckInspectInfo = ContainerInspectInfo | ImageInspectInfo;
-export declare const isHealthCheckDisabled: (healthCheck: HealthCheckConfig | undefined) => boolean;
 export declare const hasHealthCheck: (healthCheck: HealthCheckConfig | undefined) => boolean;
-export declare const getHealthCheckConfig: (inspectResult: HealthCheckInspectInfo) => HealthConfig | undefined;
 export declare const hasHealthCheckConfig: (inspectResult: HealthCheckInspectInfo) => boolean;
 export declare const hasDisabledHealthCheckConfig: (inspectResult: HealthCheckInspectInfo) => boolean;
 export declare const getHealthCheckStatusFromInspect: (inspectResult: ContainerInspectInfo) => HealthCheckStatus | undefined;

package/build/wait-strategies/utils/health-check.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasHealthCheckStatus = exports.getHealthCheckStatusFromInspect = exports.hasDisabledHealthCheckConfig = exports.hasHealthCheckConfig = exports.getHealthCheckConfig = exports.hasHealthCheck = exports.isHealthCheckDisabled = void 0;
+exports.hasHealthCheckStatus = exports.getHealthCheckStatusFromInspect = exports.hasDisabledHealthCheckConfig = exports.hasHealthCheckConfig = exports.hasHealthCheck = void 0;
 const DISABLED_HEALTH_CHECK_TEST = "NONE";
 const getHealthCheckTest = (healthCheck) => {
     if ("test" in healthCheck) {
@@ -21,7 +21,6 @@ const isHealthCheckDisabled = (healthCheck) => {
     }
     return isDisabledHealthCheck(test);
 };
-exports.isHealthCheckDisabled = isHealthCheckDisabled;
 const hasHealthCheck = (healthCheck) => {
     if (healthCheck === undefined) {
         return false;
@@ -30,7 +29,7 @@ const hasHealthCheck = (healthCheck) => {
     if (test === undefined || test.length === 0) {
         return false;
     }
-    return !(0, exports.isHealthCheckDisabled)(healthCheck);
+    return !isHealthCheckDisabled(healthCheck);
 };
 exports.hasHealthCheck = hasHealthCheck;
 const getHealthCheckConfig = (inspectResult) => {
@@ -42,13 +41,12 @@ const getHealthCheckConfig = (inspectResult) => {
         inspectWithHealthCheckConfig.Healthcheck ??
         inspectWithHealthCheckConfig.HealthCheck);
 };
-exports.getHealthCheckConfig = getHealthCheckConfig;
 const hasHealthCheckConfig = (inspectResult) => {
-    return (0, exports.hasHealthCheck)((0, exports.getHealthCheckConfig)(inspectResult));
+    return (0, exports.hasHealthCheck)(getHealthCheckConfig(inspectResult));
 };
 exports.hasHealthCheckConfig = hasHealthCheckConfig;
 const hasDisabledHealthCheckConfig = (inspectResult) => {
-    return (0, exports.isHealthCheckDisabled)((0, exports.getHealthCheckConfig)(inspectResult));
+    return isHealthCheckDisabled(getHealthCheckConfig(inspectResult));
 };
 exports.hasDisabledHealthCheckConfig = hasDisabledHealthCheckConfig;
 const getHealthCheckStatusFromInspect = (inspectResult) => {

package/build/wait-strategies/utils/port-check.d.ts

@@ -1,5 +1,5 @@
-import Dockerode from "dockerode";
-import { ContainerRuntimeClient } from "../../container-runtime";
+import type Dockerode from "dockerode";
+import type { ContainerRuntimeClient } from "../../container-runtime";
 export interface PortCheck {
     isBound(port: number | string): Promise<boolean>;
 }

package/build/wait-strategies/utils/port-check.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InternalPortCheck = exports.HostPortCheck = void 0;
-const net_1 = require("net");
+const node_net_1 = require("node:net");
 const common_1 = require("../../common");
 class HostPortCheck {
     client;
@@ -14,7 +14,7 @@ class HostPortCheck {
             return Promise.resolve(true);
         }
         return new Promise((resolve) => {
-            const socket = new net_1.Socket();
+            const socket = new node_net_1.Socket();
             const portNumber = typeof port === "string" ? parseInt(port.split("/")[0], 10) : port;
             socket
                 .setTimeout(1000)

package/build/wait-strategies/utils/undici-response-parser.d.ts

@@ -1,4 +1,4 @@
-import { Dispatcher } from "undici";
+import type { Dispatcher } from "undici";
 /**
  * Converts an undici response to a fetch response.
  * This is necessary because node's fetch does not support disabling SSL validation (https://github.com/orgs/nodejs/discussions/44038).

package/build/wait-strategies/utils/undici-response-parser.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.undiciResponseToFetchResponse = undiciResponseToFetchResponse;
-const stream_1 = require("stream");
+const node_stream_1 = require("node:stream");
 /**
  * Converts an undici response to a fetch response.
  * This is necessary because node's fetch does not support disabling SSL validation (https://github.com/orgs/nodejs/discussions/44038).
@@ -25,6 +25,6 @@ function undiciResponseToFetchResponse(undiciResponse) {
     }
     const status = undiciResponse.statusCode;
     const hasNullBody = status === 204 || status === 205 || status === 304;
-    const responseBody = hasNullBody ? null : stream_1.Readable.toWeb(undiciResponse.body);
+    const responseBody = hasNullBody ? null : node_stream_1.Readable.toWeb(undiciResponse.body);
     return new Response(responseBody, { status, headers });
 }

package/build/wait-strategies/utils/wait-strategy-selector.d.ts

@@ -1,7 +1,7 @@
-import { ContainerInspectInfo } from "dockerode";
-import { ContainerRuntimeClient } from "../../container-runtime";
-import { HealthCheck } from "../../types";
-import { WaitStrategy } from "../wait-strategy";
+import type { ContainerInspectInfo } from "dockerode";
+import { type ContainerRuntimeClient } from "../../container-runtime";
+import type { HealthCheck } from "../../types";
+import type { WaitStrategy } from "../wait-strategy";
 type WaitStrategySelectorOptions = {
     client: ContainerRuntimeClient;
     inspectResult: ContainerInspectInfo;

package/build/wait-strategies/wait-for-container.d.ts

@@ -1,5 +1,5 @@
-import { Container } from "dockerode";
-import { ContainerRuntimeClient } from "../container-runtime";
-import { BoundPorts } from "../utils/bound-ports";
-import { WaitStrategy } from "./wait-strategy";
+import type { Container } from "dockerode";
+import type { ContainerRuntimeClient } from "../container-runtime";
+import type { BoundPorts } from "../utils/bound-ports";
+import type { WaitStrategy } from "./wait-strategy";
 export declare const waitForContainer: (client: ContainerRuntimeClient, container: Container, waitStrategy: WaitStrategy, boundPorts: BoundPorts, startTime?: Date) => Promise<void>;

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

@@ -1,5 +1,5 @@
-import Dockerode from "dockerode";
-import { BoundPorts } from "../utils/bound-ports";
+import type Dockerode from "dockerode";
+import type { BoundPorts } from "../utils/bound-ports";
 export interface WaitStrategy {
     waitUntilReady(container: Dockerode.Container, boundPorts: BoundPorts, startTime?: Date): Promise<void>;
     withStartupTimeout(startupTimeoutMs: number): WaitStrategy;

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

@@ -1,8 +1,8 @@
 import { CompositeWaitStrategy } from "./composite-wait-strategy";
-import { HttpWaitStrategy, HttpWaitStrategyOptions } from "./http-wait-strategy";
-import { Log } from "./log-wait-strategy";
+import { HttpWaitStrategy, type HttpWaitStrategyOptions } from "./http-wait-strategy";
+import { type Log } from "./log-wait-strategy";
 import { ShellWaitStrategy } from "./shell-wait-strategy";
-import { WaitStrategy } from "./wait-strategy";
+import type { WaitStrategy } from "./wait-strategy";
 export declare class Wait {
     static forAll(waitStrategies: WaitStrategy[]): CompositeWaitStrategy;
     static forListeningPorts(): WaitStrategy;

package/build/wait-strategies/wait.js

@@ -8,6 +8,7 @@ const http_wait_strategy_1 = require("./http-wait-strategy");
 const log_wait_strategy_1 = require("./log-wait-strategy");
 const one_shot_startup_startegy_1 = require("./one-shot-startup-startegy");
 const shell_wait_strategy_1 = require("./shell-wait-strategy");
+// biome-ignore lint/complexity/noStaticOnlyClass: public API surface, kept as a class for backwards compatibility
 class Wait {
     static forAll(waitStrategies) {
         return new composite_wait_strategy_1.CompositeWaitStrategy(waitStrategies);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testcontainers",
-  "version": "12.2.0",
+  "version": "12.2.1",
   "author": "Cristian Greco",
   "license": "MIT",
   "keywords": [
@@ -44,7 +44,7 @@
     "ssh-remote-port-forward": "^1.0.4",
     "tar-fs": "^3.1.3",
     "tmp": "^0.2.7",
-    "undici": "^8.10.2"
+    "undici": "^8.11.2"
   },
   "devDependencies": {
     "@types/archiver": "^7.0.0",
@@ -52,7 +52,6 @@
     "@types/byline": "^4.2.36",
     "@types/debug": "^4.1.13",
     "@types/proper-lockfile": "^4.1.4",
-    "@types/properties-reader": "^2.1.3",
     "@types/tar-fs": "^2.0.4",
     "@types/tmp": "^0.2.6"
   },

package/build/common/streams.d.ts

@@ -1,6 +0,0 @@
-import { Readable } from "stream";
-type Options = {
-    trim: boolean;
-};
-export declare const streamToString: (stream: Readable, options?: Options) => Promise<string>;
-export {};

package/build/common/streams.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.streamToString = void 0;
-const streamToString = async (stream, options = { trim: false }) => {
-    const chunks = [];
-    for await (const chunk of stream) {
-        chunks.push(Buffer.from(chunk));
-    }
-    const str = Buffer.concat(chunks).toString("utf-8");
-    return options.trim ? str.trim() : str;
-};
-exports.streamToString = streamToString;