testcontainers 9.1.4-beta.1 → 9.1.4-beta.2

package/dist/{src/docker → docker}/docker-client.js

@@ -21,6 +21,8 @@ const fs_1 = require("fs");
 const run_in_container_1 = require("./functions/run-in-container");
 const log_system_diagnostics_1 = require("../log-system-diagnostics");
 require("../testcontainers-properties-file");
+const stream_utils_1 = require("../stream-utils");
+const stream_1 = require("stream");
 const getDockerClient = () => __awaiter(void 0, void 0, void 0, function* () {
     const strategies = [
         new ConfigurationStrategy(),
@@ -48,7 +50,7 @@ const getDockerClient = () => __awaiter(void 0, void 0, void 0, function* () {
 const isDockerDaemonReachable = (dockerode) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const response = yield dockerode.ping();
-        return response.toString() === "OK";
+        return (yield (0, stream_utils_1.streamToString)(stream_1.Readable.from(response))) === "OK";
     }
     catch (err) {
         logger_1.log.warn(`Docker daemon is not reachable: ${err}`);

package/dist/{src/docker → docker}/functions/container/get-container.js

@@ -31,7 +31,7 @@ const getContainerByHash = (hash) => __awaiter(void 0, void 0, void 0, function*
             limit: 1,
             filters: {
                 status: ["running"],
-                label: [`${labels_1.LABEL_TESTCONTAINERS_CONTAINER_HASH}=${hash}`],
+                label: [`${labels_1.LABEL_CONTAINER_HASH}=${hash}`],
             },
         });
         if (containers.length === 0) {

package/dist/{src/docker → docker}/functions/create-labels.js

@@ -3,14 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLabels = void 0;
 const session_id_1 = require("../session-id");
 const labels_1 = require("../../labels");
-const package_json_1 = require("../../../package.json");
 const createLabels = (reusable, dockerImageName, extraLabels = {}) => {
-    const labels = Object.assign(Object.assign({}, extraLabels), { [labels_1.LABEL_TESTCONTAINERS]: "true", [labels_1.LABEL_TESTCONTAINERS_LANG]: "node", [labels_1.LABEL_TESTCONTAINERS_VERSION]: package_json_1.version });
+    const labels = Object.assign({}, extraLabels);
     if (dockerImageName && dockerImageName.isReaper()) {
         return labels;
     }
     if (!reusable) {
-        labels[labels_1.LABEL_TESTCONTAINERS_SESSION_ID] = session_id_1.sessionId;
+        labels[labels_1.LABEL_SESSION_ID] = session_id_1.sessionId;
     }
     return labels;
 };

package/dist/{src/generic-container → generic-container}/generic-container.js

@@ -101,7 +101,7 @@ class GenericContainer {
             };
             if (this.reuse) {
                 const containerHash = (0, hash_1.hash)(JSON.stringify(createContainerOptions));
-                createContainerOptions.labels = Object.assign(Object.assign({}, createContainerOptions.labels), { [labels_1.LABEL_TESTCONTAINERS_CONTAINER_HASH]: containerHash });
+                createContainerOptions.labels = Object.assign(Object.assign({}, createContainerOptions.labels), { [labels_1.LABEL_CONTAINER_HASH]: containerHash });
                 logger_1.log.debug(`Container reuse has been enabled, hash: ${containerHash}`);
                 // We might have several async processes try to create a reusable container
                 // at once, to avoid possibly creating too many of these, use a lock

package/dist/labels.d.ts

@@ -0,0 +1,2 @@
+export declare const LABEL_SESSION_ID = "org.testcontainers.session-id";
+export declare const LABEL_CONTAINER_HASH = "org.testcontainers.container-hash";

package/dist/labels.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LABEL_CONTAINER_HASH = exports.LABEL_SESSION_ID = void 0;
+exports.LABEL_SESSION_ID = "org.testcontainers.session-id";
+exports.LABEL_CONTAINER_HASH = "org.testcontainers.container-hash";

package/dist/{src/reaper.js → reaper.js}

@@ -118,7 +118,7 @@ class ReaperInstance {
                     })
                         .connect((0, port_1.getContainerPort)(port), host, () => {
                         logger_1.log.debug(`Connected to Reaper ${containerId}`);
-                        socket.write(`label=${labels_1.LABEL_TESTCONTAINERS_SESSION_ID}=${session_id_1.sessionId}\r\n`);
+                        socket.write(`label=${labels_1.LABEL_SESSION_ID}=${session_id_1.sessionId}\r\n`);
                         const reaper = new RealReaper(startedContainer, socket);
                         resolve(reaper);
                     });

package/dist/stream-utils.d.ts

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

package/dist/stream-utils.js

@@ -0,0 +1,39 @@
+"use strict";
+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());
+    });
+};
+var __asyncValues = (this && this.__asyncValues) || function (o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.streamToString = void 0;
+const streamToString = (stream, options = { trim: false }) => { var stream_1, stream_1_1; return __awaiter(void 0, void 0, void 0, function* () {
+    var e_1, _a;
+    const chunks = [];
+    try {
+        for (stream_1 = __asyncValues(stream); stream_1_1 = yield stream_1.next(), !stream_1_1.done;) {
+            const chunk = stream_1_1.value;
+            chunks.push(Buffer.from(chunk));
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (stream_1_1 && !stream_1_1.done && (_a = stream_1.return)) yield _a.call(stream_1);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    const str = Buffer.concat(chunks).toString("utf-8");
+    return options.trim ? str.trim() : str;
+}); };
+exports.streamToString = streamToString;

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "testcontainers",
   "author": "Cristian Greco",
-  "version": "9.1.4-beta.1",
-  "main": "dist/src/index",
-  "types": "dist/src/index",
+  "version": "9.1.4-beta.2",
+  "main": "dist/index",
+  "types": "dist/index",
   "keywords": [
     "docker",
     "testcontainers"
@@ -41,7 +41,7 @@
     "byline": "^5.0.0",
     "debug": "^4.3.4",
     "docker-compose": "^0.23.19",
-    "dockerode": "^3.3.4",
+    "dockerode": "^3.3.5",
     "get-port": "^5.1.1",
     "node-fetch": "^2.6.9",
     "properties-reader": "^2.2.0",

package/dist/package.json

@@ -1,93 +0,0 @@
-{
-    "name": "testcontainers",
-    "author": "Cristian Greco",
-    "version": "9.1.4-beta.1",
-    "main": "dist/src/index",
-    "types": "dist/src/index",
-    "keywords": [
-        "docker",
-        "testcontainers"
-    ],
-    "files": [
-        "dist"
-    ],
-    "description": "Testcontainers is a NodeJS library that supports tests, providing lightweight, throwaway instances of common databases, Selenium web browsers, or anything else that can run in a Docker container.",
-    "license": "MIT",
-    "homepage": "https://github.com/testcontainers/testcontainers-node#readme",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/testcontainers/testcontainers-node"
-    },
-    "bugs": {
-        "url": "https://github.com/testcontainers/testcontainers-node/issues"
-    },
-    "scripts": {
-        "prepare": "npm run build && husky install",
-        "pre-commit": "lint-staged",
-        "build": "npm run clean && tsc -p tsconfig.prod.json",
-        "clean": "rimraf dist",
-        "test": "cross-env DEBUG=testcontainers,testcontainers:exec jest --runInBand",
-        "format": "prettier --write package.json \"src/**/*.ts\"",
-        "lint": "eslint --fix package.json \"src/**/*.ts\"",
-        "updateDeps": "npx npm-check-updates -u",
-        "validateEngine": "npx ls-engines"
-    },
-    "dependencies": {
-        "@balena/dockerignore": "^1.0.2",
-        "@types/archiver": "^5.3.1",
-        "@types/dockerode": "^3.3.14",
-        "archiver": "^5.3.1",
-        "async-lock": "^1.4.0",
-        "byline": "^5.0.0",
-        "debug": "^4.3.4",
-        "docker-compose": "^0.23.19",
-        "dockerode": "^3.3.4",
-        "get-port": "^5.1.1",
-        "node-fetch": "^2.6.9",
-        "properties-reader": "^2.2.0",
-        "ssh-remote-port-forward": "^1.0.4",
-        "tar-fs": "^2.1.1"
-    },
-    "devDependencies": {
-        "@elastic/elasticsearch": "^7.17.0",
-        "@types/async-lock": "^1.4.0",
-        "@types/byline": "^4.2.33",
-        "@types/debug": "4.1.7",
-        "@types/jest": "^29.2.6",
-        "@types/node": "^18.11.19",
-        "@types/node-fetch": "^2.6.2",
-        "@types/pg": "^8.6.6",
-        "@types/properties-reader": "^2.1.1",
-        "@types/tar-fs": "^2.0.1",
-        "@typescript-eslint/eslint-plugin": "^5.41.0",
-        "@typescript-eslint/parser": "^5.41.0",
-        "arangojs": "^8.0.0",
-        "cross-env": "^7.0.3",
-        "eslint": "^8.26.0",
-        "eslint-config-prettier": "^8.5.0",
-        "husky": "^8.0.3",
-        "jest": "^29.2.2",
-        "kafkajs": "^2.2.3",
-        "lint-staged": "^13.0.4",
-        "mongoose": "^6.7.5",
-        "mysql2": "^2.3.3",
-        "nats": "^2.8.0",
-        "neo4j-driver": "^5.2.0",
-        "pg": "^8.8.0",
-        "prettier": "^2.7.1",
-        "rimraf": "^3.0.2",
-        "ts-jest": "^29.0.5",
-        "ts-node": "^10.9.1",
-        "typescript": "^4.8.4",
-        "wait-for-expect": "^3.0.2"
-    },
-    "lint-staged": {
-        "src/**/*.ts": [
-            "prettier --write",
-            "eslint --fix"
-        ]
-    },
-    "engines": {
-        "node": ">= 10.16"
-    }
-}

package/dist/src/labels.d.ts

@@ -1,5 +0,0 @@
-export declare const LABEL_TESTCONTAINERS = "org.testcontainers";
-export declare const LABEL_TESTCONTAINERS_LANG = "org.testcontainers.lang";
-export declare const LABEL_TESTCONTAINERS_VERSION = "org.testcontainers.version";
-export declare const LABEL_TESTCONTAINERS_SESSION_ID = "org.testcontainers.session-id";
-export declare const LABEL_TESTCONTAINERS_CONTAINER_HASH = "org.testcontainers.container-hash";

package/dist/src/labels.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LABEL_TESTCONTAINERS_CONTAINER_HASH = exports.LABEL_TESTCONTAINERS_SESSION_ID = exports.LABEL_TESTCONTAINERS_VERSION = exports.LABEL_TESTCONTAINERS_LANG = exports.LABEL_TESTCONTAINERS = void 0;
-exports.LABEL_TESTCONTAINERS = "org.testcontainers";
-exports.LABEL_TESTCONTAINERS_LANG = "org.testcontainers.lang";
-exports.LABEL_TESTCONTAINERS_VERSION = "org.testcontainers.version";
-exports.LABEL_TESTCONTAINERS_SESSION_ID = "org.testcontainers.session-id";
-exports.LABEL_TESTCONTAINERS_CONTAINER_HASH = "org.testcontainers.container-hash";