podkeeper 0.3.0 → 0.4.0

package/lib/genericService.js

@@ -34,7 +34,7 @@ class GenericService {
     const entrypoint = ["/deadmanswitch"];
     const command = [metadata.Config.Entrypoint, options.command ?? metadata.Config.Cmd].flat();
     const deadmanswitchName = imageArch === "arm64" ? "deadmanswitch_linux_aarch64" : "deadmanswitch_linux_x86_64";
-    const usedPorts = new Set(options.ports);
+    const usedPorts = new Set(options.ports.map((port) => port.container));
     let switchPort = 54321;
     while (usedPorts.has(switchPort))
       ++switchPort;
@@ -45,7 +45,7 @@ class GenericService {
         { containerPath: "/deadmanswitch", hostPath: path.join(__dirname, "..", "deadmanswitch", "bin", deadmanswitchName) }
       ],
       ports: [
-        ...options.ports.map((port) => ({ container: port, host: 0 })),
+        ...options.ports,
         { container: switchPort, host: 0 }
       ],
       entrypoint,

package/lib/minio.js

@@ -6,10 +6,21 @@ class Minio {
     this._accessKeyId = _accessKeyId;
     this._secretAccessKey = _secretAccessKey;
   }
-  static async start({ accessKeyId = "root", secretAccessKey = "password" } = {}) {
+  static async start({
+    accessKeyId = "root",
+    secretAccessKey = "password",
+    hostApiPort = 0,
+    hostWebuiPort = 0
+  } = {}) {
     const service = await GenericService.start({
       imageName: "quay.io/minio/minio:latest",
-      ports: [9e3, 9090],
+      ports: [{
+        container: 9e3,
+        host: hostApiPort
+      }, {
+        container: 9090,
+        host: hostWebuiPort
+      }],
       healthcheck: {
         test: ["CMD", `mc`, `ready`, `local`],
         intervalMs: ms("100ms"),

package/lib/mysql.js

@@ -8,10 +8,13 @@ class MySQL {
     this._rootPassword = _rootPassword;
     this._db = _db;
   }
-  static async start({ db = "mydatabase", rootPassword = "rootpassword" } = {}) {
+  static async start({ db = "mydatabase", rootPassword = "rootpassword", hostPort = 0 } = {}) {
     const service = await GenericService.start({
       imageName: "mysql:latest",
-      ports: [MYSQL_PORT],
+      ports: [{
+        container: MYSQL_PORT,
+        host: hostPort
+      }],
       healthcheck: {
         test: ["CMD-SHELL", `mysqladmin ping --host 127.0.0.1 -u root --password=${rootPassword}`],
         intervalMs: ms("100ms"),

package/lib/postgres.js

@@ -9,12 +9,12 @@ class Postgres {
     this._password = _password;
     this._db = _db;
   }
-  static async start({ user = "user", password = "password", db = "postgres" } = {}) {
+  static async start({ user = "user", password = "password", db = "postgres", hostPort = 0 } = {}) {
     const service = await GenericService.start({
       imageName: "postgres:latest",
-      ports: [POSTGRES_PORT],
+      ports: [{ container: POSTGRES_PORT, host: hostPort }],
       healthcheck: {
-        test: ["CMD-SHELL", "pg_isready"],
+        test: ["CMD-SHELL", "pg_isready", `--username=${user}`, `--host=localhost`, `--port=${POSTGRES_PORT}`, `--dbname=${db}`],
         intervalMs: ms("1s"),
         retries: 10,
         startPeriodMs: 0,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "podkeeper",
   "type": "module",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "",
   "exports": {
     ".": {
@@ -12,7 +12,7 @@
   },
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "npx playwright test"
   },
   "repository": {
     "type": "git",
@@ -23,12 +23,14 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "@degulabs/build": "^0.0.1",
     "@playwright/test": "^1.48.2",
     "@types/ms": "^0.7.34",
     "@types/node": "^22.8.5",
+    "@types/pg": "^8.11.10",
     "@types/ws": "^8.5.12",
     "esbuild": "^0.24.0",
+    "kubik": "^0.6.0",
+    "pg": "^8.13.1",
     "typescript": "^5.6.3"
   },
   "dependencies": {

package/types/genericService.d.ts

@@ -6,7 +6,10 @@ export declare class GenericService {
     private _ws;
     static start(options: {
         imageName: string;
-        ports: number[];
+        ports: {
+            host: number;
+            container: number;
+        }[];
         healthcheck?: {
             test: string[];
             intervalMs: number;

package/types/minio.d.ts

@@ -3,9 +3,11 @@ export declare class Minio {
     private _service;
     private _accessKeyId;
     private _secretAccessKey;
-    static start({ accessKeyId, secretAccessKey }?: {
+    static start({ accessKeyId, secretAccessKey, hostApiPort, hostWebuiPort, }?: {
         accessKeyId?: string | undefined;
         secretAccessKey?: string | undefined;
+        hostApiPort?: number | undefined;
+        hostWebuiPort?: number | undefined;
     }): Promise<Minio>;
     constructor(_service: GenericService, _accessKeyId: string, _secretAccessKey: string);
     accessKeyId(): string;

package/types/mysql.d.ts

@@ -3,9 +3,10 @@ export declare class MySQL {
     private _service;
     private _rootPassword;
     private _db;
-    static start({ db, rootPassword }?: {
+    static start({ db, rootPassword, hostPort }?: {
         db?: string | undefined;
         rootPassword?: string | undefined;
+        hostPort?: number | undefined;
     }): Promise<MySQL>;
     constructor(_service: GenericService, _rootPassword: string, _db: string);
     databaseUrl(): string;

package/types/postgres.d.ts

@@ -4,10 +4,11 @@ export declare class Postgres {
     private _user;
     private _password;
     private _db;
-    static start({ user, password, db }?: {
+    static start({ user, password, db, hostPort }?: {
         user?: string | undefined;
         password?: string | undefined;
         db?: string | undefined;
+        hostPort?: number | undefined;
     }): Promise<Postgres>;
     constructor(_service: GenericService, _user: string, _password: string, _db: string);
     databaseUrl(): string;