testcontainers 9.6.0 → 9.7.0

package/dist/src/wait-strategy/host-port-wait-strategy.js

@@ -30,28 +30,28 @@ class HostPortWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
     waitForHostPorts(portCheck, container, boundPorts) {
         return __awaiter(this, void 0, void 0, function* () {
             for (const [, hostPort] of boundPorts.iterator()) {
-                logger_1.log.debug(`Waiting for host port ${hostPort} for ${container.id}`);
+                logger_1.log.debug(`Waiting for host port ${hostPort}...`, { containerId: container.id });
                 yield this.waitForPort(container, hostPort, portCheck);
-                logger_1.log.debug(`Host port ${hostPort} ready for ${container.id}`);
+                logger_1.log.debug(`Host port ${hostPort} ready`, { containerId: container.id });
             }
         });
     }
     waitForInternalPorts(portCheck, container, boundPorts) {
         return __awaiter(this, void 0, void 0, function* () {
             for (const [internalPort] of boundPorts.iterator()) {
-                logger_1.log.debug(`Waiting for internal port ${internalPort} for ${container.id}`);
+                logger_1.log.debug(`Waiting for internal port ${internalPort}...`, { containerId: container.id });
                 yield this.waitForPort(container, internalPort, portCheck);
-                logger_1.log.debug(`Internal port ${internalPort} ready for ${container.id}`);
+                logger_1.log.debug(`Internal port ${internalPort} ready`, { containerId: container.id });
             }
         });
     }
     waitForPort(container, port, portCheck) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const startupTimeout = (_a = this.startupTimeout) !== null && _a !== void 0 ? _a : wait_strategy_1.DEFAULT_STARTUP_TIMEOUT;
             yield new retry_strategy_1.IntervalRetryStrategy(100).retryUntil(() => portCheck.isBound(port), (isBound) => isBound, () => {
-                throw new Error(`Port ${port} not bound after ${startupTimeout}ms for ${container.id}`);
-            }, startupTimeout);
+                const message = `Port ${port} not bound after ${this.startupTimeout}ms`;
+                logger_1.log.error(message, { containerId: container.id });
+                throw new Error(message);
+            }, this.startupTimeout);
         });
     }
 }

package/dist/src/wait-strategy/http-wait-strategy.js

@@ -18,6 +18,7 @@ const retry_strategy_1 = require("../retry-strategy");
 const node_fetch_1 = __importDefault(require("node-fetch"));
 const https_1 = __importDefault(require("https"));
 const docker_client_1 = require("../docker/docker-client");
+const logger_1 = require("../logger");
 class HttpWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
     constructor(path, port) {
         super();
@@ -68,10 +69,9 @@ class HttpWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
         return this;
     }
     waitUntilReady(container, boundPorts) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            logger_1.log.debug(`Waiting for HTTP...`, { containerId: container.id });
             const { host } = yield (0, docker_client_1.dockerClient)();
-            const startupTimeout = (_a = this.startupTimeout) !== null && _a !== void 0 ? _a : wait_strategy_1.DEFAULT_STARTUP_TIMEOUT;
             yield new retry_strategy_1.IntervalRetryStrategy(this.readTimeout).retryUntil(() => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const url = `${this.protocol}://${host}:${boundPorts.getBinding(this.port)}${this.path}`;
@@ -82,7 +82,7 @@ class HttpWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
                         agent: this.getAgent(),
                     });
                 }
-                catch (_b) {
+                catch (_a) {
                     return undefined;
                 }
             }), (response) => __awaiter(this, void 0, void 0, function* () {
@@ -102,8 +102,10 @@ class HttpWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
                     return true;
                 }
             }), () => {
-                throw new Error(`URL ${this.path} not accessible after ${startupTimeout}ms for ${container.id}`);
-            }, startupTimeout);
+                const message = `URL ${this.path} not accessible after ${this.startupTimeout}ms`;
+                logger_1.log.error(message, { containerId: container.id });
+                throw new Error(message);
+            }, this.startupTimeout);
         });
     }
     getAgent() {

package/dist/src/wait-strategy/log-wait-strategy.js

@@ -24,17 +24,15 @@ class LogWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
         this.times = times;
     }
     waitUntilReady(container, boundPorts, startTime) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            logger_1.log.debug(`Waiting for log message "${this.message}" for ${container.id}`);
-            const startupTimeout = (_a = this.startupTimeout) !== null && _a !== void 0 ? _a : wait_strategy_1.DEFAULT_STARTUP_TIMEOUT;
+            logger_1.log.debug(`Waiting for log message "${this.message}"...`, { containerId: container.id });
             const stream = yield (0, container_logs_1.containerLogs)(container, { since: startTime });
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
-                    const message = `Log message "${this.message}" not received after ${startupTimeout}ms for ${container.id}`;
-                    logger_1.log.error(message);
+                    const message = `Log message "${this.message}" not received after ${this.startupTimeout}ms`;
+                    logger_1.log.error(message, { containerId: container.id });
                     reject(new Error(message));
-                }, startupTimeout);
+                }, this.startupTimeout);
                 const comparisonFn = (line) => {
                     if (this.message instanceof RegExp) {
                         return this.message.test(line);
@@ -59,7 +57,9 @@ class LogWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
                     .on("end", () => {
                     stream.destroy();
                     clearTimeout(timeout);
-                    reject(new Error(`Log stream ended and message "${this.message}" was not received for ${container.id}`));
+                    const message = `Log stream ended and message "${this.message}" was not received`;
+                    logger_1.log.error(message, { containerId: container.id });
+                    reject(new Error(message));
                 });
             });
         });

package/dist/src/wait-strategy/shell-wait-strategy.js

@@ -21,17 +21,17 @@ class ShellWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
         this.command = command;
     }
     waitUntilReady(container) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            logger_1.log.debug(`Waiting for successful shell command ${this.command} for ${container.id}`);
+            logger_1.log.debug(`Waiting for successful shell command "${this.command}"...`, { containerId: container.id });
             const { dockerode, provider } = yield (0, docker_client_1.dockerClient)();
-            const startupTimeout = (_a = this.startupTimeout) !== null && _a !== void 0 ? _a : wait_strategy_1.DEFAULT_STARTUP_TIMEOUT;
             yield new retry_strategy_1.IntervalRetryStrategy(100).retryUntil(() => __awaiter(this, void 0, void 0, function* () {
                 const { exitCode } = yield (0, exec_container_1.execContainer)(dockerode, provider, container, ["/bin/sh", "-c", this.command], false);
                 return exitCode;
             }), (exitCode) => exitCode === 0, () => {
-                throw new Error(`Shell command "${this.command}" not successful after ${startupTimeout}ms for ${container.id}`);
-            }, startupTimeout);
+                const message = `Shell command "${this.command}" not successful after ${this.startupTimeout}ms`;
+                logger_1.log.error(message, { containerId: container.id });
+                throw new Error(message);
+            }, this.startupTimeout);
         });
     }
 }

package/dist/src/wait-strategy/startup-check-strategy.js

@@ -13,13 +13,16 @@ exports.StartupCheckStrategy = void 0;
 const wait_strategy_1 = require("./wait-strategy");
 const retry_strategy_1 = require("../retry-strategy");
 const docker_client_1 = require("../docker/docker-client");
+const logger_1 = require("../logger");
 class StartupCheckStrategy extends wait_strategy_1.AbstractWaitStrategy {
     waitUntilReady(container) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const { dockerode } = yield (0, docker_client_1.dockerClient)();
-            const startupTimeout = (_a = this.startupTimeout) !== null && _a !== void 0 ? _a : wait_strategy_1.DEFAULT_STARTUP_TIMEOUT;
-            const startupStatus = yield new retry_strategy_1.IntervalRetryStrategy(1000).retryUntil(() => __awaiter(this, void 0, void 0, function* () { return yield this.checkStartupState(dockerode, container.id); }), (startupStatus) => startupStatus === "SUCCESS" || startupStatus === "FAIL", () => new Error(`Container not accessible after ${startupTimeout}ms for ${container.id}`), startupTimeout);
+            const startupStatus = yield new retry_strategy_1.IntervalRetryStrategy(1000).retryUntil(() => __awaiter(this, void 0, void 0, function* () { return yield this.checkStartupState(dockerode, container.id); }), (startupStatus) => startupStatus === "SUCCESS" || startupStatus === "FAIL", () => {
+                const message = `Container not accessible after ${this.startupTimeout}ms`;
+                logger_1.log.error(message, { containerId: container.id });
+                return new Error(message);
+            }, this.startupTimeout);
             if (startupStatus instanceof Error) {
                 throw startupStatus;
             }

package/dist/src/wait-strategy/wait-strategy.d.ts

@@ -1,14 +1,16 @@
 import { BoundPorts } from "../bound-ports";
 import Dockerode from "dockerode";
-export declare const DEFAULT_STARTUP_TIMEOUT = 60000;
 export interface WaitStrategy {
     waitUntilReady(container: Dockerode.Container, boundPorts: BoundPorts, startTime?: Date): Promise<void>;
     withStartupTimeout(startupTimeout: number): WaitStrategy;
-    getStartupTimeout(): number | undefined;
+    isStartupTimeoutSet(): boolean;
+    getStartupTimeout(): number;
 }
 export declare abstract class AbstractWaitStrategy implements WaitStrategy {
-    protected startupTimeout?: number;
+    protected startupTimeout: number;
+    private startupTimeoutSet;
     abstract waitUntilReady(container: Dockerode.Container, boundPorts: BoundPorts, startTime?: Date): Promise<void>;
     withStartupTimeout(startupTimeout: number): this;
-    getStartupTimeout(): number | undefined;
+    isStartupTimeoutSet(): boolean;
+    getStartupTimeout(): number;
 }

package/dist/src/wait-strategy/wait-strategy.js

@@ -1,12 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AbstractWaitStrategy = exports.DEFAULT_STARTUP_TIMEOUT = void 0;
-exports.DEFAULT_STARTUP_TIMEOUT = 60000;
+exports.AbstractWaitStrategy = void 0;
 class AbstractWaitStrategy {
+    constructor() {
+        this.startupTimeout = 60000;
+        this.startupTimeoutSet = false;
+    }
     withStartupTimeout(startupTimeout) {
         this.startupTimeout = startupTimeout;
+        this.startupTimeoutSet = true;
         return this;
     }
+    isStartupTimeoutSet() {
+        return this.startupTimeoutSet;
+    }
     getStartupTimeout() {
         return this.startupTimeout;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "testcontainers",
   "author": "Cristian Greco",
-  "version": "9.6.0",
+  "version": "9.7.0",
   "main": "dist/src/index",
   "types": "dist/src/index",
   "keywords": [
@@ -56,31 +56,31 @@
     "@types/async-lock": "^1.4.0",
     "@types/byline": "^4.2.33",
     "@types/debug": "4.1.7",
-    "@types/jest": "^29.5.0",
-    "@types/node": "^18.15.11",
+    "@types/jest": "^29.5.1",
+    "@types/node": "^18.16.2",
     "@types/node-fetch": "^2.6.3",
     "@types/pg": "^8.6.6",
     "@types/properties-reader": "^2.1.1",
     "@types/tar-fs": "^2.0.1",
-    "@typescript-eslint/eslint-plugin": "^5.57.0",
-    "@typescript-eslint/parser": "^5.57.0",
-    "arangojs": "^8.2.0",
+    "@typescript-eslint/eslint-plugin": "^5.59.1",
+    "@typescript-eslint/parser": "^5.59.1",
+    "arangojs": "^8.2.1",
     "cross-env": "^7.0.3",
-    "eslint": "^8.37.0",
+    "eslint": "^8.39.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^4.2.1",
     "husky": "^8.0.3",
     "jest": "^29.5.0",
     "kafkajs": "^2.2.4",
-    "lint-staged": "^13.2.0",
-    "mongoose": "^6.10.4",
+    "lint-staged": "^13.2.2",
+    "mongoose": "^6.10.5",
     "mysql2": "^2.3.3",
     "nats": "^2.13.1",
-    "neo4j-driver": "^5.6.0",
+    "neo4j-driver": "^5.7.0",
     "pg": "^8.10.0",
-    "prettier": "^2.8.7",
+    "prettier": "^2.8.8",
     "rimraf": "^3.0.2",
-    "ts-jest": "^29.0.5",
+    "ts-jest": "^29.1.0",
     "ts-node": "^10.9.1",
     "typescript": "^4.9.5",
     "wait-for-expect": "^3.0.2"