testcontainers 9.9.0 → 9.10.0

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "testcontainers",
     "author": "Cristian Greco",
-    "version": "9.9.0",
+    "version": "9.10.0",
     "main": "dist/src/index",
     "types": "dist/src/index",
     "keywords": [
@@ -38,7 +38,7 @@
     "dependencies": {
         "@balena/dockerignore": "^1.0.2",
         "@types/archiver": "^5.3.2",
-        "@types/dockerode": "^3.3.16",
+        "@types/dockerode": "^3.3.19",
         "archiver": "^5.3.1",
         "async-lock": "^1.4.0",
         "byline": "^5.0.0",
@@ -46,7 +46,7 @@
         "docker-compose": "^0.24.1",
         "dockerode": "^3.3.5",
         "get-port": "^5.1.1",
-        "node-fetch": "^2.6.9",
+        "node-fetch": "^2.6.11",
         "properties-reader": "^2.2.0",
         "ssh-remote-port-forward": "^1.0.4",
         "tar-fs": "^2.1.1",
@@ -56,34 +56,35 @@
         "@elastic/elasticsearch": "^7.17.0",
         "@types/async-lock": "^1.4.0",
         "@types/byline": "^4.2.33",
-        "@types/debug": "4.1.7",
-        "@types/jest": "^29.5.1",
-        "@types/node": "^18.16.2",
-        "@types/node-fetch": "^2.6.3",
-        "@types/pg": "^8.6.6",
+        "@types/debug": "4.1.8",
+        "@types/jest": "^29.5.2",
+        "@types/node": "^18.16.18",
+        "@types/node-fetch": "^2.6.4",
+        "@types/pg": "^8.10.2",
         "@types/properties-reader": "^2.1.1",
-        "@types/selenium-webdriver": "^4.1.14",
+        "@types/selenium-webdriver": "^4.1.15",
         "@types/tar-fs": "^2.0.1",
         "@types/tmp": "^0.2.3",
-        "@typescript-eslint/eslint-plugin": "^5.59.1",
-        "@typescript-eslint/parser": "^5.59.1",
-        "arangojs": "^8.2.1",
+        "@typescript-eslint/eslint-plugin": "^5.59.11",
+        "@typescript-eslint/parser": "^5.59.11",
+        "arangojs": "^8.3.0",
         "cross-env": "^7.0.3",
-        "eslint": "^8.39.0",
+        "eslint": "^8.42.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.2",
-        "mongoose": "^6.10.5",
+        "mongoose": "^6.11.2",
+        "mqtt": "^4.3.7",
         "mysql2": "^2.3.3",
-        "nats": "^2.13.1",
-        "neo4j-driver": "^5.7.0",
-        "pg": "^8.10.0",
+        "nats": "^2.14.0",
+        "neo4j-driver": "^5.9.1",
+        "pg": "^8.11.0",
         "prettier": "^2.8.8",
         "rimraf": "^3.0.2",
-        "selenium-webdriver": "^4.9.2",
+        "selenium-webdriver": "^4.10.0",
         "ts-jest": "^29.1.0",
         "ts-node": "^10.9.1",
         "typescript": "^4.9.5",

package/dist/src/docker/functions/container/get-container-archive.d.ts

@@ -2,6 +2,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
+/// <reference types="node" />
 import Dockerode from "dockerode";
 export type GetContainerArchiveOptions = {
     container: Dockerode.Container;

package/dist/src/docker/remote-docker-unix-socket-path.d.ts

@@ -2,5 +2,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
+/// <reference types="node" />
 import { DockerClient } from "./client/docker-client";
 export declare const getRemoteDockerUnixSocketPath: (dockerClient: DockerClient, platform?: NodeJS.Platform, env?: NodeJS.ProcessEnv) => string;

package/dist/src/docker/resolve-host.d.ts

@@ -2,6 +2,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
+/// <reference types="node" />
 import Dockerode from "dockerode";
 import { ContainerRuntime } from "./types";
 export declare const resolveHost: (dockerode: Dockerode, containerRuntime: ContainerRuntime, indexServerAddress: string, uri: string, allowUserOverrides: boolean, env?: NodeJS.ProcessEnv) => Promise<string>;

package/dist/src/dockerfile-parser.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDockerfileImages = void 0;
-const os_1 = require("os");
 const fs_1 = require("fs");
 const logger_1 = require("./logger");
 const docker_image_name_1 = require("./docker-image-name");
@@ -20,7 +19,7 @@ const getDockerfileImages = (dockerfile, buildArgs) => __awaiter(void 0, void 0,
     try {
         return (yield parseImages(dockerfile))
             .map((line) => line.replace(buildArgRegex, (_, arg) => { var _a; return (_a = buildArgs[arg]) !== null && _a !== void 0 ? _a : ""; }))
-            .map((line) => docker_image_name_1.DockerImageName.fromString(line));
+            .map((line) => docker_image_name_1.DockerImageName.fromString(line.trim()));
     }
     catch (err) {
         logger_1.log.error(`Failed to read Dockerfile "${dockerfile}": ${err}`);
@@ -31,7 +30,7 @@ exports.getDockerfileImages = getDockerfileImages;
 function parseImages(dockerfile) {
     return __awaiter(this, void 0, void 0, function* () {
         return Array.from((yield fs_1.promises.readFile(dockerfile, "utf8"))
-            .split(os_1.EOL)
+            .split(/\r?\n/)
             .filter((line) => line.toUpperCase().startsWith("FROM"))
             .map((line) => line.split(" ").filter(type_guards_1.isNotEmptyString)[1])
             .reduce((prev, next) => prev.add(next), new Set())

package/dist/src/index.d.ts

@@ -18,6 +18,7 @@ export { KafkaContainer, StartedKafkaContainer } from "./modules/kafka/kafka-con
 export { Neo4jContainer, StartedNeo4jContainer } from "./modules/neo4j/neo4j-container";
 export { ArangoDBContainer, StartedArangoContainer } from "./modules/arangodb/arangodb-container";
 export { ElasticsearchContainer, StartedElasticsearchContainer } from "./modules/elasticsearch/elasticsearch-container";
+export { HiveMQContainer, StartedHiveMQContainer } from "./modules/hivemq/hivemq-container";
 export { MySqlContainer, StartedMySqlContainer } from "./modules/mysql/mysql-container";
 export { NatsContainer, StartedNatsContainer, NatsConnectionOptions, NatsTlsOptions, } from "./modules/nats/nats-container";
 export { MongoDBContainer, StartedMongoDBContainer } from "./modules/mongodb/mongodb-container";

package/dist/src/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StoppedSeleniumRecordingContainer = exports.StoppedSeleniumContainer = exports.StartedSeleniumRecordingContainer = exports.StartedSeleniumContainer = exports.SeleniumRecordingContainer = exports.SeleniumContainer = exports.StartedMongoDBContainer = exports.MongoDBContainer = exports.StartedNatsContainer = exports.NatsContainer = exports.StartedMySqlContainer = exports.MySqlContainer = exports.StartedElasticsearchContainer = exports.ElasticsearchContainer = exports.StartedArangoContainer = exports.ArangoDBContainer = exports.StartedNeo4jContainer = exports.Neo4jContainer = exports.StartedKafkaContainer = exports.KafkaContainer = exports.StartedPostgreSqlContainer = exports.PostgreSqlContainer = exports.AbstractStoppedContainer = exports.AbstractStartedContainer = exports.AlwaysPullPolicy = exports.DefaultPullPolicy = exports.StartupCheckStrategy = exports.Wait = exports.StoppedNetwork = exports.StartedNetwork = exports.Network = exports.DownedDockerComposeEnvironment = exports.StoppedDockerComposeEnvironment = exports.StartedDockerComposeEnvironment = exports.DockerComposeEnvironment = exports.TestContainers = exports.GenericContainerBuilder = exports.GenericContainer = void 0;
+exports.StoppedSeleniumRecordingContainer = exports.StoppedSeleniumContainer = exports.StartedSeleniumRecordingContainer = exports.StartedSeleniumContainer = exports.SeleniumRecordingContainer = exports.SeleniumContainer = exports.StartedMongoDBContainer = exports.MongoDBContainer = exports.StartedNatsContainer = exports.NatsContainer = exports.StartedMySqlContainer = exports.MySqlContainer = exports.StartedHiveMQContainer = exports.HiveMQContainer = exports.StartedElasticsearchContainer = exports.ElasticsearchContainer = exports.StartedArangoContainer = exports.ArangoDBContainer = exports.StartedNeo4jContainer = exports.Neo4jContainer = exports.StartedKafkaContainer = exports.KafkaContainer = exports.StartedPostgreSqlContainer = exports.PostgreSqlContainer = exports.AbstractStoppedContainer = exports.AbstractStartedContainer = exports.AlwaysPullPolicy = exports.DefaultPullPolicy = exports.StartupCheckStrategy = exports.Wait = exports.StoppedNetwork = exports.StartedNetwork = exports.Network = exports.DownedDockerComposeEnvironment = exports.StoppedDockerComposeEnvironment = exports.StartedDockerComposeEnvironment = exports.DockerComposeEnvironment = exports.TestContainers = exports.GenericContainerBuilder = exports.GenericContainer = void 0;
 var generic_container_1 = require("./generic-container/generic-container");
 Object.defineProperty(exports, "GenericContainer", { enumerable: true, get: function () { return generic_container_1.GenericContainer; } });
 var generic_container_builder_1 = require("./generic-container/generic-container-builder");
@@ -45,6 +45,9 @@ Object.defineProperty(exports, "StartedArangoContainer", { enumerable: true, get
 var elasticsearch_container_1 = require("./modules/elasticsearch/elasticsearch-container");
 Object.defineProperty(exports, "ElasticsearchContainer", { enumerable: true, get: function () { return elasticsearch_container_1.ElasticsearchContainer; } });
 Object.defineProperty(exports, "StartedElasticsearchContainer", { enumerable: true, get: function () { return elasticsearch_container_1.StartedElasticsearchContainer; } });
+var hivemq_container_1 = require("./modules/hivemq/hivemq-container");
+Object.defineProperty(exports, "HiveMQContainer", { enumerable: true, get: function () { return hivemq_container_1.HiveMQContainer; } });
+Object.defineProperty(exports, "StartedHiveMQContainer", { enumerable: true, get: function () { return hivemq_container_1.StartedHiveMQContainer; } });
 var mysql_container_1 = require("./modules/mysql/mysql-container");
 Object.defineProperty(exports, "MySqlContainer", { enumerable: true, get: function () { return mysql_container_1.MySqlContainer; } });
 Object.defineProperty(exports, "StartedMySqlContainer", { enumerable: true, get: function () { return mysql_container_1.StartedMySqlContainer; } });

package/dist/src/modules/hivemq/hivemq-container.d.ts

@@ -0,0 +1,15 @@
+import { GenericContainer } from "../../generic-container/generic-container";
+import { StartedTestContainer } from "../../test-container";
+import { AbstractStartedContainer } from "../abstract-started-container";
+export declare class HiveMQContainer extends GenericContainer {
+    private temporaryFileSystemOptions;
+    constructor(image?: string);
+    private addFileToFileSystemOptions;
+    start(): Promise<StartedHiveMQContainer>;
+}
+export declare class StartedHiveMQContainer extends AbstractStartedContainer {
+    private readonly port;
+    constructor(startedTestContainer: StartedTestContainer);
+    getPort(): number;
+    getConnectionString(): string;
+}

package/dist/src/modules/hivemq/hivemq-container.js

@@ -0,0 +1,79 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StartedHiveMQContainer = exports.HiveMQContainer = void 0;
+const path = __importStar(require("path"));
+const generic_container_1 = require("../../generic-container/generic-container");
+const abstract_started_container_1 = require("../abstract-started-container");
+const wait_1 = require("../../wait-strategy/wait");
+const START_LOG_MESSAGE_REGEX = /(.*)Started HiveMQ in(.*)/i;
+const HIVEMQ_BASE_PATH = "/opt/hivemq";
+const MQTT_PORT = 1883;
+class HiveMQContainer extends generic_container_1.GenericContainer {
+    constructor(image = "hivemq/hivemq-ce:2023.5") {
+        super(image);
+        this.temporaryFileSystemOptions = new Map();
+        this.withExposedPorts(MQTT_PORT)
+            .withWaitStrategy(wait_1.Wait.forLogMessage(START_LOG_MESSAGE_REGEX))
+            .withStartupTimeout(120000);
+        this.addFileToFileSystemOptions("log");
+        this.addFileToFileSystemOptions("data");
+        this.withTmpFs(Object.fromEntries(this.temporaryFileSystemOptions));
+    }
+    addFileToFileSystemOptions(filename) {
+        this.temporaryFileSystemOptions.set(path.join(HIVEMQ_BASE_PATH, filename), "rw");
+    }
+    start() {
+        const _super = Object.create(null, {
+            start: { get: () => super.start }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            return new StartedHiveMQContainer(yield _super.start.call(this));
+        });
+    }
+}
+exports.HiveMQContainer = HiveMQContainer;
+class StartedHiveMQContainer extends abstract_started_container_1.AbstractStartedContainer {
+    constructor(startedTestContainer) {
+        super(startedTestContainer);
+        this.port = startedTestContainer.getMappedPort(MQTT_PORT);
+    }
+    getPort() {
+        return this.port;
+    }
+    getConnectionString() {
+        return `mqtt://${this.getHost()}:${this.getPort()}`;
+    }
+}
+exports.StartedHiveMQContainer = StartedHiveMQContainer;

package/dist/src/uuid.js

@@ -5,9 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RandomUuid = void 0;
 const crypto_1 = __importDefault(require("crypto"));
+const hash_1 = require("./hash");
 class RandomUuid {
     nextUuid() {
-        return crypto_1.default.createHash("md5").update(crypto_1.default.randomUUID()).digest("hex").substring(0, 12);
+        return (0, hash_1.hash)(crypto_1.default.randomUUID()).substring(0, 12);
     }
 }
 exports.RandomUuid = RandomUuid;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "testcontainers",
   "author": "Cristian Greco",
-  "version": "9.9.0",
+  "version": "9.10.0",
   "main": "dist/src/index",
   "types": "dist/src/index",
   "keywords": [
@@ -38,7 +38,7 @@
   "dependencies": {
     "@balena/dockerignore": "^1.0.2",
     "@types/archiver": "^5.3.2",
-    "@types/dockerode": "^3.3.16",
+    "@types/dockerode": "^3.3.19",
     "archiver": "^5.3.1",
     "async-lock": "^1.4.0",
     "byline": "^5.0.0",
@@ -46,7 +46,7 @@
     "docker-compose": "^0.24.1",
     "dockerode": "^3.3.5",
     "get-port": "^5.1.1",
-    "node-fetch": "^2.6.9",
+    "node-fetch": "^2.6.11",
     "properties-reader": "^2.2.0",
     "ssh-remote-port-forward": "^1.0.4",
     "tar-fs": "^2.1.1",
@@ -56,34 +56,35 @@
     "@elastic/elasticsearch": "^7.17.0",
     "@types/async-lock": "^1.4.0",
     "@types/byline": "^4.2.33",
-    "@types/debug": "4.1.7",
-    "@types/jest": "^29.5.1",
-    "@types/node": "^18.16.2",
-    "@types/node-fetch": "^2.6.3",
-    "@types/pg": "^8.6.6",
+    "@types/debug": "4.1.8",
+    "@types/jest": "^29.5.2",
+    "@types/node": "^18.16.18",
+    "@types/node-fetch": "^2.6.4",
+    "@types/pg": "^8.10.2",
     "@types/properties-reader": "^2.1.1",
-    "@types/selenium-webdriver": "^4.1.14",
+    "@types/selenium-webdriver": "^4.1.15",
     "@types/tar-fs": "^2.0.1",
     "@types/tmp": "^0.2.3",
-    "@typescript-eslint/eslint-plugin": "^5.59.1",
-    "@typescript-eslint/parser": "^5.59.1",
-    "arangojs": "^8.2.1",
+    "@typescript-eslint/eslint-plugin": "^5.59.11",
+    "@typescript-eslint/parser": "^5.59.11",
+    "arangojs": "^8.3.0",
     "cross-env": "^7.0.3",
-    "eslint": "^8.39.0",
+    "eslint": "^8.42.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.2",
-    "mongoose": "^6.10.5",
+    "mongoose": "^6.11.2",
+    "mqtt": "^4.3.7",
     "mysql2": "^2.3.3",
-    "nats": "^2.13.1",
-    "neo4j-driver": "^5.7.0",
-    "pg": "^8.10.0",
+    "nats": "^2.14.0",
+    "neo4j-driver": "^5.9.1",
+    "pg": "^8.11.0",
     "prettier": "^2.8.8",
     "rimraf": "^3.0.2",
-    "selenium-webdriver": "^4.9.2",
+    "selenium-webdriver": "^4.10.0",
     "ts-jest": "^29.1.0",
     "ts-node": "^10.9.1",
     "typescript": "^4.9.5",