@omnitron-dev/testing 0.2.0 → 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/async/events.js.map +1 -1
- package/dist/async/retry.js.map +1 -1
- package/dist/async/wait.js.map +1 -1
- package/dist/docker/database-manager.js.map +1 -1
- package/dist/docker/docker-test-manager.d.ts +8 -0
- package/dist/docker/docker-test-manager.js +194 -45
- package/dist/docker/docker-test-manager.js.map +1 -1
- package/dist/docker/redis-manager.js +24 -50
- package/dist/docker/redis-manager.js.map +1 -1
- package/dist/errors.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/runtime/bun-adapter.d.ts +23 -1
- package/dist/runtime/bun-adapter.js +3 -0
- package/dist/runtime/bun-adapter.js.map +1 -1
- package/dist/runtime/deno-adapter.d.ts +72 -16
- package/dist/runtime/deno-adapter.js +79 -77
- package/dist/runtime/deno-adapter.js.map +1 -1
- package/dist/runtime/node-adapter.d.ts +14 -2
- package/dist/titan/database/database-testing.module.d.ts +1 -1
- package/dist/titan/database/database-testing.module.js.map +1 -1
- package/dist/titan/database/test-utilities.d.ts +1 -1
- package/dist/titan/database/test-utilities.js +1 -1
- package/dist/titan/database/test-utilities.js.map +1 -1
- package/dist/titan/index.d.ts +2 -2
- package/dist/titan/index.js +1 -1
- package/dist/titan/index.js.map +1 -1
- package/dist/titan/nexus/mock-provider.js.map +1 -1
- package/dist/titan/nexus/test-container.js.map +1 -1
- package/dist/titan/nexus/test-utilities.js.map +1 -1
- package/dist/titan/pm/mock-process-spawner.js.map +1 -1
- package/dist/titan/pm/mock-spawner.js.map +1 -1
- package/dist/titan/pm/test-process-manager.js.map +1 -1
- package/dist/titan/redis-test-utils.d.ts +6 -0
- package/dist/titan/redis-test-utils.js +29 -0
- package/dist/titan/redis-test-utils.js.map +1 -1
- package/dist/titan/test-application.js.map +1 -1
- package/dist/titan/test-fixtures.js.map +1 -1
- package/dist/titan/test-mocks.js.map +1 -1
- package/dist/titan/test-module.js.map +1 -1
- package/package.json +36 -29
- package/src/docker/a-port-the-network-could-reach.spec.ts +66 -0
- package/src/docker/docker-orphan-reaper.spec.ts +175 -0
- package/src/docker/docker-port-collision.spec.ts +97 -0
- package/src/docker/docker-test-manager.spec.ts +122 -0
- package/src/docker/docker-test-manager.ts +329 -20
- package/src/docker/docker-volume-cleanup.spec.ts +66 -0
- package/src/docker/redis-manager.ts +41 -58
- package/src/docker/types.ts +1 -0
- package/src/runtime/adapter-surface.spec.ts +83 -0
- package/src/runtime/bun-adapter.ts +21 -0
- package/src/runtime/deno-adapter.ts +149 -104
- package/src/titan/database/database-testing.module.ts +1 -1
- package/src/titan/database/test-utilities.ts +1 -1
- package/src/titan/index.ts +6 -1
- package/src/titan/nexus/test-utilities.ts +1 -0
- package/src/titan/pm/test-process-manager.ts +12 -2
- package/src/titan/redis-test-utils.ts +67 -0
- package/runtime/bun.d.ts +0 -2
- package/runtime/bun.js +0 -5
- package/runtime/bun.ts +0 -7
- package/runtime/deno.d.ts +0 -2
- package/runtime/deno.js +0 -4
- package/runtime/vitest.d.ts +0 -2
- package/runtime/vitest.js +0 -16
- package/runtime/vitest.ts +0 -7
package/dist/async/events.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../src/async/events.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAgBtC,MAAM,OAAO,oBAAoB;IAAjC;QACU,cAAS,GAKZ,EAAE,CAAC;IAkEV,CAAC;IAxDC,KAAK,CAAC,MAAW,EAAE,KAAa,EAAE,OAAgC,EAAE,
|
|
1
|
+
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../src/async/events.ts"],"names":[],"mappings":"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"}
|
package/dist/async/retry.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry.js","sourceRoot":"","sources":["../../src/async/retry.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AA8C5C,MAAM,CAAC,KAAK,UAAU,KAAK,CAAI,EAAoB,EAAE,
|
|
1
|
+
{"version":3,"file":"retry.js","sourceRoot":"","sources":["../../src/async/retry.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AA8C5C,MAAM,CAAC,KAAK,UAAU,KAAK,CAAI,EAAoB,EAAE,OAAO,GAAiB,EAAE;IAC7E,MAAM,EAAE,OAAO,GAAG,CAAC,EAAE,KAAK,GAAG,GAAG,EAAE,OAAO,GAAG,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAEnE,IAAI,SAAgB,CAAC;IAErB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC;QACjC,IAAI,CAAC;YACH,OAAO,MAAM,EAAE,EAAE,CAAC;QACpB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,SAAS,GAAG,KAAc,CAAC;YAE3B,IAAI,CAAC,GAAG,OAAO,GAAG,CAAC,EAAE,CAAC;gBACpB,IAAI,OAAO,EAAE,CAAC;oBACZ,OAAO,CAAC,SAAS,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC5B,CAAC;gBAED,MAAM,QAAQ,GAAG,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;gBAC9C,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;YAChE,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,SAAU,CAAC;AACnB,CAAC;AAuBD,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,OAAmB,EACnB,OAAO,GAAG,IAAI,EACd,YAAY,GAAG,qBAAqB;IAEpC,IAAI,SAAyB,CAAC;IAE9B,MAAM,cAAc,GAAG,IAAI,OAAO,CAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;QACtD,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE;YAC1B,MAAM,CAAC,IAAI,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC;QAClD,CAAC,EAAE,OAAO,CAAC,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,OAAO,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC;IACvD,CAAC;YAAS,CAAC;QACT,YAAY,CAAC,SAAU,CAAC,CAAC;IAC3B,CAAC;AACH,CAAC"}
|
package/dist/async/wait.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wait.js","sourceRoot":"","sources":["../../src/async/wait.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAwC5C,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,SAA2C,EAAE,
|
|
1
|
+
{"version":3,"file":"wait.js","sourceRoot":"","sources":["../../src/async/wait.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAwC5C,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,SAA2C,EAAE,OAAO,GAAgB,EAAE;IAClG,MAAM,EAAE,OAAO,GAAG,IAAI,EAAE,QAAQ,GAAG,EAAE,EAAE,OAAO,GAAG,mBAAmB,EAAE,GAAG,OAAO,CAAC;IACjF,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAEzB,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,OAAO,EAAE,CAAC;QACpC,MAAM,MAAM,GAAG,MAAM,SAAS,EAAE,CAAC;QACjC,IAAI,MAAM,EAAE,CAAC;YACX,OAAO;QACT,CAAC;QACD,MAAM,KAAK,CAAC,QAAQ,CAAC,CAAC;IACxB,CAAC;IAED,MAAM,IAAI,YAAY,CAAC,WAAW,GAAG,OAAO,EAAE,OAAO,CAAC,CAAC;AACzD,CAAC;AAsBD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,SAA2C,EAC3C,OAAO,GAAG,IAAI,EACd,QAAQ,GAAG,EAAE;IAEb,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAEzB,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,OAAO,EAAE,CAAC;QACpC,MAAM,MAAM,GAAG,MAAM,SAAS,EAAE,CAAC;QACjC,IAAI,MAAM,EAAE,CAAC;YACX,OAAO;QACT,CAAC;QACD,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,MAAM,IAAI,YAAY,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;AACtD,CAAC;AAcD,MAAM,UAAU,KAAK,CAAC,EAAU;IAC9B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAC3D,CAAC;AAeD,MAAM,UAAU,QAAQ;IACtB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;AACzD,CAAC;AAgBD,MAAM,CAAC,KAAK,UAAU,aAAa;IACjC,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;IACtD,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;AAC5D,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database-manager.js","sourceRoot":"","sources":["../../src/docker/database-manager.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"database-manager.js","sourceRoot":"","sources":["../../src/docker/database-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ export declare class DockerTestManager extends EventEmitter {
|
|
|
7
7
|
private networks;
|
|
8
8
|
private cleanupInProgress;
|
|
9
9
|
private dockerPath;
|
|
10
|
+
private static readonly PORT_COLLISION_RETRIES;
|
|
10
11
|
private basePort;
|
|
11
12
|
private maxRetries;
|
|
12
13
|
private startupTimeout;
|
|
@@ -15,12 +16,19 @@ export declare class DockerTestManager extends EventEmitter {
|
|
|
15
16
|
private cleanup;
|
|
16
17
|
private verbose;
|
|
17
18
|
private defaultNetwork?;
|
|
19
|
+
private readonly managerId;
|
|
20
|
+
private static readonly hostId;
|
|
21
|
+
private static orphanReapDone;
|
|
22
|
+
private static readonly orphanGraceMs;
|
|
18
23
|
private constructor();
|
|
19
24
|
static getInstance(options?: DockerTestManagerOptions): DockerTestManager;
|
|
20
25
|
private findDockerPath;
|
|
21
26
|
private getDockerFallbackPaths;
|
|
22
27
|
private testDockerPath;
|
|
23
28
|
private verifyDocker;
|
|
29
|
+
private reapOrphanedResources;
|
|
30
|
+
private reapOrphanedNetworks;
|
|
31
|
+
private isOrphaned;
|
|
24
32
|
private findAvailablePort;
|
|
25
33
|
private isPortAvailable;
|
|
26
34
|
private log;
|
|
@@ -1,14 +1,49 @@
|
|
|
1
1
|
import { execSync, execFileSync } from 'child_process';
|
|
2
2
|
import { randomBytes } from 'crypto';
|
|
3
|
+
import { hostname } from 'os';
|
|
3
4
|
import * as net from 'net';
|
|
4
5
|
import { EventEmitter } from 'events';
|
|
6
|
+
function parseDockerLabels(labels) {
|
|
7
|
+
const out = {};
|
|
8
|
+
for (const pair of labels.split(',')) {
|
|
9
|
+
const eq = pair.indexOf('=');
|
|
10
|
+
if (eq > 0)
|
|
11
|
+
out[pair.slice(0, eq)] = pair.slice(eq + 1);
|
|
12
|
+
}
|
|
13
|
+
return out;
|
|
14
|
+
}
|
|
15
|
+
function pidFromManagerId(managerId) {
|
|
16
|
+
const pid = Number.parseInt(managerId.split('-')[0] ?? '', 10);
|
|
17
|
+
return Number.isInteger(pid) && pid > 0 ? pid : null;
|
|
18
|
+
}
|
|
19
|
+
function isPidAlive(pid) {
|
|
20
|
+
try {
|
|
21
|
+
process.kill(pid, 0);
|
|
22
|
+
return true;
|
|
23
|
+
}
|
|
24
|
+
catch (error) {
|
|
25
|
+
return error.code === 'EPERM';
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
function parseDockerTimestamp(createdAt) {
|
|
29
|
+
const m = /^(\d{4}-\d{2}-\d{2}) (\d{2}:\d{2}:\d{2})(?:\.\d+)? ([+-]\d{2})(\d{2})/.exec(createdAt.trim());
|
|
30
|
+
if (!m)
|
|
31
|
+
return null;
|
|
32
|
+
const parsed = Date.parse(`${m[1]}T${m[2]}${m[3]}:${m[4]}`);
|
|
33
|
+
return Number.isNaN(parsed) ? null : parsed;
|
|
34
|
+
}
|
|
5
35
|
export class DockerTestManager extends EventEmitter {
|
|
36
|
+
static { this.PORT_COLLISION_RETRIES = 3; }
|
|
37
|
+
static { this.hostId = hostname(); }
|
|
38
|
+
static { this.orphanReapDone = false; }
|
|
39
|
+
static { this.orphanGraceMs = 10 * 60 * 1000; }
|
|
6
40
|
constructor(options = {}) {
|
|
7
41
|
super();
|
|
8
42
|
this.containers = new Map();
|
|
9
43
|
this.usedPorts = new Set();
|
|
10
44
|
this.networks = new Set();
|
|
11
45
|
this.cleanupInProgress = false;
|
|
46
|
+
this.managerId = `${process.pid}-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
|
|
12
47
|
this.dockerPath = options.dockerPath || this.findDockerPath();
|
|
13
48
|
const workerId = parseInt(process.env['VITEST_POOL_ID'] || process.env['VITEST_WORKER_ID'] || '1', 10);
|
|
14
49
|
const maxBasePort = 55000;
|
|
@@ -27,6 +62,7 @@ export class DockerTestManager extends EventEmitter {
|
|
|
27
62
|
this.verifyDocker();
|
|
28
63
|
if (this.cleanup) {
|
|
29
64
|
process.setMaxListeners(Math.max(20, process.getMaxListeners()));
|
|
65
|
+
this.reapOrphanedResources();
|
|
30
66
|
process.on('exit', () => this.cleanupSync());
|
|
31
67
|
process.on('SIGINT', () => {
|
|
32
68
|
this.log('SIGINT received - initiating graceful shutdown');
|
|
@@ -150,6 +186,82 @@ export class DockerTestManager extends EventEmitter {
|
|
|
150
186
|
`Visit: https://docs.docker.com/get-docker/`);
|
|
151
187
|
}
|
|
152
188
|
}
|
|
189
|
+
reapOrphanedResources() {
|
|
190
|
+
if (DockerTestManager.orphanReapDone)
|
|
191
|
+
return;
|
|
192
|
+
DockerTestManager.orphanReapDone = true;
|
|
193
|
+
try {
|
|
194
|
+
const listed = execFileSync(this.dockerPath, ['ps', '-a', '--filter', 'label=test.cleanup=true', '--format', '{{.ID}}\t{{.CreatedAt}}\t{{.Labels}}'], { encoding: 'utf8', stdio: ['pipe', 'pipe', 'ignore'] }).trim();
|
|
195
|
+
const orphans = [];
|
|
196
|
+
for (const line of listed ? listed.split('\n') : []) {
|
|
197
|
+
const [id, createdAt, labels] = line.split('\t');
|
|
198
|
+
if (!id || !createdAt || !labels)
|
|
199
|
+
continue;
|
|
200
|
+
if (!this.isOrphaned(labels, createdAt))
|
|
201
|
+
continue;
|
|
202
|
+
orphans.push(id);
|
|
203
|
+
}
|
|
204
|
+
if (orphans.length > 0) {
|
|
205
|
+
this.log(`Reaping ${orphans.length} container(s) left by processes that no longer exist`);
|
|
206
|
+
try {
|
|
207
|
+
execFileSync(this.dockerPath, ['rm', '-f', '-v', ...orphans], { stdio: 'ignore' });
|
|
208
|
+
}
|
|
209
|
+
catch (error) {
|
|
210
|
+
this.logError('Some orphaned containers could not be removed', error);
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
this.reapOrphanedNetworks();
|
|
214
|
+
}
|
|
215
|
+
catch (error) {
|
|
216
|
+
this.logError('Could not scan for orphaned test containers', error);
|
|
217
|
+
}
|
|
218
|
+
}
|
|
219
|
+
reapOrphanedNetworks() {
|
|
220
|
+
try {
|
|
221
|
+
const listed = execFileSync(this.dockerPath, ['network', 'ls', '--filter', 'label=test.cleanup=true', '--format', '{{.ID}}\t{{.Labels}}'], { encoding: 'utf8', stdio: ['pipe', 'pipe', 'ignore'] }).trim();
|
|
222
|
+
const orphans = [];
|
|
223
|
+
for (const line of listed ? listed.split('\n') : []) {
|
|
224
|
+
const [id, labels] = line.split('\t');
|
|
225
|
+
if (!id || !labels)
|
|
226
|
+
continue;
|
|
227
|
+
if (!this.isOrphaned(labels, null))
|
|
228
|
+
continue;
|
|
229
|
+
orphans.push(id);
|
|
230
|
+
}
|
|
231
|
+
if (orphans.length > 0) {
|
|
232
|
+
this.log(`Reaping ${orphans.length} network(s) left by processes that no longer exist`);
|
|
233
|
+
try {
|
|
234
|
+
execFileSync(this.dockerPath, ['network', 'rm', ...orphans], { stdio: 'ignore' });
|
|
235
|
+
}
|
|
236
|
+
catch (error) {
|
|
237
|
+
this.logError('Some orphaned test networks could not be removed', error);
|
|
238
|
+
}
|
|
239
|
+
}
|
|
240
|
+
}
|
|
241
|
+
catch (error) {
|
|
242
|
+
this.logError('Could not scan for orphaned test networks', error);
|
|
243
|
+
}
|
|
244
|
+
}
|
|
245
|
+
isOrphaned(labels, createdAt) {
|
|
246
|
+
const parsed = parseDockerLabels(labels);
|
|
247
|
+
const owner = parsed['test.manager'];
|
|
248
|
+
if (!owner || owner === this.managerId)
|
|
249
|
+
return false;
|
|
250
|
+
const host = parsed['test.host'];
|
|
251
|
+
if (host && host !== DockerTestManager.hostId)
|
|
252
|
+
return false;
|
|
253
|
+
const pid = pidFromManagerId(owner);
|
|
254
|
+
if (pid === null || isPidAlive(pid))
|
|
255
|
+
return false;
|
|
256
|
+
if (createdAt !== null) {
|
|
257
|
+
const created = parseDockerTimestamp(createdAt);
|
|
258
|
+
if (created === null)
|
|
259
|
+
return false;
|
|
260
|
+
if (Date.now() - created < DockerTestManager.orphanGraceMs)
|
|
261
|
+
return false;
|
|
262
|
+
}
|
|
263
|
+
return true;
|
|
264
|
+
}
|
|
153
265
|
async findAvailablePort() {
|
|
154
266
|
const portRangeSize = Math.min(10000, 65535 - this.basePort);
|
|
155
267
|
for (let i = 0; i < this.maxRetries; i++) {
|
|
@@ -194,7 +306,7 @@ export class DockerTestManager extends EventEmitter {
|
|
|
194
306
|
const inspectOutput = execFileSync(this.dockerPath, [
|
|
195
307
|
'inspect',
|
|
196
308
|
'--format',
|
|
197
|
-
'{{.State.Running}}\t{{.State.Status}}\t{{.State.Health.Status}}\t{{.State.ExitCode}}',
|
|
309
|
+
'{{.State.Running}}\t{{.State.Status}}\t{{if .State.Health}}{{.State.Health.Status}}{{end}}\t{{.State.ExitCode}}',
|
|
198
310
|
name,
|
|
199
311
|
], {
|
|
200
312
|
encoding: 'utf8',
|
|
@@ -233,23 +345,36 @@ export class DockerTestManager extends EventEmitter {
|
|
|
233
345
|
const name = options.name || `container-${id}`;
|
|
234
346
|
const host = '127.0.0.1';
|
|
235
347
|
try {
|
|
236
|
-
execFileSync(this.dockerPath, ['rm', '-f', name], { stdio: 'ignore' });
|
|
348
|
+
execFileSync(this.dockerPath, ['rm', '-f', '-v', name], { stdio: 'ignore' });
|
|
237
349
|
this.log(`Removed existing container: ${name}`);
|
|
238
350
|
}
|
|
239
351
|
catch {
|
|
240
352
|
}
|
|
353
|
+
const autoPorts = new Set();
|
|
241
354
|
const portMappings = new Map();
|
|
242
355
|
if (options.ports) {
|
|
243
356
|
for (const [containerPort, hostPort] of Object.entries(options.ports)) {
|
|
244
357
|
const cPort = parseInt(containerPort);
|
|
358
|
+
if (hostPort === 'auto')
|
|
359
|
+
autoPorts.add(cPort);
|
|
245
360
|
const hPort = hostPort === 'auto' ? await this.findAvailablePort() : hostPort;
|
|
246
361
|
portMappings.set(cPort, hPort);
|
|
247
362
|
}
|
|
248
363
|
}
|
|
249
364
|
const dockerArgs = ['run', '-d', '--name', name];
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
365
|
+
const portArgsStart = dockerArgs.length;
|
|
366
|
+
const writePortArgs = () => {
|
|
367
|
+
const args = [];
|
|
368
|
+
portMappings.forEach((hostPort, containerPort) => {
|
|
369
|
+
args.push('-p', `127.0.0.1:${hostPort}:${containerPort}`);
|
|
370
|
+
});
|
|
371
|
+
return args;
|
|
372
|
+
};
|
|
373
|
+
dockerArgs.push(...writePortArgs());
|
|
374
|
+
const portArgsLength = dockerArgs.length - portArgsStart;
|
|
375
|
+
const rebuildPortArgs = () => {
|
|
376
|
+
dockerArgs.splice(portArgsStart, portArgsLength, ...writePortArgs());
|
|
377
|
+
};
|
|
253
378
|
const environment = options.environment || {};
|
|
254
379
|
for (const [key, value] of Object.entries(environment)) {
|
|
255
380
|
dockerArgs.push('-e', `${key}=${value}`);
|
|
@@ -257,6 +382,8 @@ export class DockerTestManager extends EventEmitter {
|
|
|
257
382
|
const labels = {
|
|
258
383
|
'test.id': id,
|
|
259
384
|
'test.cleanup': 'true',
|
|
385
|
+
'test.manager': this.managerId,
|
|
386
|
+
'test.host': DockerTestManager.hostId,
|
|
260
387
|
...options.labels,
|
|
261
388
|
};
|
|
262
389
|
for (const [key, value] of Object.entries(labels)) {
|
|
@@ -309,35 +436,57 @@ export class DockerTestManager extends EventEmitter {
|
|
|
309
436
|
if (this.verbose) {
|
|
310
437
|
console.log(`Starting container ${name}: docker ${dockerArgs.join(' ')}`);
|
|
311
438
|
}
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
439
|
+
for (let portAttempt = 0;; portAttempt++) {
|
|
440
|
+
try {
|
|
441
|
+
this.log(`Starting container: ${name}`, { image: options.image });
|
|
442
|
+
const result = execFileSync(this.dockerPath, dockerArgs, {
|
|
443
|
+
encoding: 'utf8',
|
|
444
|
+
stdio: ['pipe', 'pipe', 'pipe'],
|
|
445
|
+
});
|
|
446
|
+
if (this.verbose && result) {
|
|
447
|
+
console.log(result);
|
|
448
|
+
}
|
|
449
|
+
break;
|
|
450
|
+
}
|
|
451
|
+
catch (error) {
|
|
452
|
+
portMappings.forEach((port) => {
|
|
453
|
+
this.usedPorts.delete(port);
|
|
454
|
+
});
|
|
455
|
+
const execError = error;
|
|
456
|
+
const stderr = execError.stderr ? String(execError.stderr).trim() : '';
|
|
457
|
+
const stdout = execError.stdout ? String(execError.stdout).trim() : '';
|
|
458
|
+
const message = execError.message || String(error);
|
|
459
|
+
if (stderr.includes('already in use') || stderr.includes('name is already') || stderr.includes('Conflict')) {
|
|
460
|
+
throw new Error(`Container name conflict: ${name} already exists.\n` +
|
|
461
|
+
`Please ensure previous test containers are cleaned up.\n` +
|
|
462
|
+
`Stderr: ${stderr}`, { cause: error });
|
|
463
|
+
}
|
|
464
|
+
const portTaken = stderr.includes('port is already allocated') ||
|
|
465
|
+
stderr.includes('address already in use') ||
|
|
466
|
+
stderr.includes('Bind for ');
|
|
467
|
+
if (portTaken && autoPorts.size > 0 && portAttempt < DockerTestManager.PORT_COLLISION_RETRIES) {
|
|
468
|
+
try {
|
|
469
|
+
execFileSync(this.dockerPath, ['rm', '-f', '-v', name], { stdio: 'ignore' });
|
|
470
|
+
}
|
|
471
|
+
catch {
|
|
472
|
+
}
|
|
473
|
+
for (const cPort of autoPorts) {
|
|
474
|
+
const hPort = await this.findAvailablePort();
|
|
475
|
+
portMappings.set(cPort, hPort);
|
|
476
|
+
}
|
|
477
|
+
rebuildPortArgs();
|
|
478
|
+
this.log(`Host port collision for ${name}, retrying with fresh ports`, {
|
|
479
|
+
attempt: portAttempt + 1,
|
|
480
|
+
});
|
|
481
|
+
continue;
|
|
482
|
+
}
|
|
483
|
+
throw new Error(`Failed to start container ${name}:\n` +
|
|
484
|
+
`Command: docker ${dockerArgs.join(' ')}\n` +
|
|
485
|
+
`Exit code: ${execError.status || 'unknown'}\n` +
|
|
486
|
+
(stderr ? `Stderr: ${stderr}\n` : '') +
|
|
487
|
+
(stdout ? `Stdout: ${stdout}\n` : '') +
|
|
488
|
+
(message && !stderr && !stdout ? `Error: ${message}` : ''), { cause: error });
|
|
320
489
|
}
|
|
321
|
-
}
|
|
322
|
-
catch (error) {
|
|
323
|
-
portMappings.forEach((port) => {
|
|
324
|
-
this.usedPorts.delete(port);
|
|
325
|
-
});
|
|
326
|
-
const execError = error;
|
|
327
|
-
const stderr = execError.stderr ? String(execError.stderr).trim() : '';
|
|
328
|
-
const stdout = execError.stdout ? String(execError.stdout).trim() : '';
|
|
329
|
-
const message = execError.message || String(error);
|
|
330
|
-
if (stderr.includes('already in use') || stderr.includes('name is already') || stderr.includes('Conflict')) {
|
|
331
|
-
throw new Error(`Container name conflict: ${name} already exists.\n` +
|
|
332
|
-
`Please ensure previous test containers are cleaned up.\n` +
|
|
333
|
-
`Stderr: ${stderr}`, { cause: error });
|
|
334
|
-
}
|
|
335
|
-
throw new Error(`Failed to start container ${name}:\n` +
|
|
336
|
-
`Command: docker ${dockerArgs.join(' ')}\n` +
|
|
337
|
-
`Exit code: ${execError.status || 'unknown'}\n` +
|
|
338
|
-
(stderr ? `Stderr: ${stderr}\n` : '') +
|
|
339
|
-
(stdout ? `Stdout: ${stdout}\n` : '') +
|
|
340
|
-
(message && !stderr && !stdout ? `Error: ${message}` : ''), { cause: error });
|
|
341
490
|
}
|
|
342
491
|
if (options.waitFor) {
|
|
343
492
|
try {
|
|
@@ -348,7 +497,7 @@ export class DockerTestManager extends EventEmitter {
|
|
|
348
497
|
this.logError(`Container ${name} failed to become ready, cleaning up`, error);
|
|
349
498
|
try {
|
|
350
499
|
execFileSync(this.dockerPath, ['stop', '-t', '5', name], { stdio: 'ignore' });
|
|
351
|
-
execFileSync(this.dockerPath, ['rm', '-f', name], { stdio: 'ignore' });
|
|
500
|
+
execFileSync(this.dockerPath, ['rm', '-f', '-v', name], { stdio: 'ignore' });
|
|
352
501
|
}
|
|
353
502
|
catch {
|
|
354
503
|
}
|
|
@@ -424,7 +573,7 @@ export class DockerTestManager extends EventEmitter {
|
|
|
424
573
|
}
|
|
425
574
|
try {
|
|
426
575
|
this.log(`Removing container ${name}`, { attempt });
|
|
427
|
-
execFileSync(this.dockerPath, ['rm', '-f', name], { stdio: 'ignore' });
|
|
576
|
+
execFileSync(this.dockerPath, ['rm', '-f', '-v', name], { stdio: 'ignore' });
|
|
428
577
|
this.log(`Container removed: ${name}`, { attempt });
|
|
429
578
|
lastError = null;
|
|
430
579
|
break;
|
|
@@ -463,7 +612,7 @@ export class DockerTestManager extends EventEmitter {
|
|
|
463
612
|
async ensureNetwork(network) {
|
|
464
613
|
if (!this.networks.has(network)) {
|
|
465
614
|
try {
|
|
466
|
-
execFileSync(this.dockerPath, ['network', 'create', network, '--label', 'test.cleanup=true'], {
|
|
615
|
+
execFileSync(this.dockerPath, ['network', 'create', network, '--label', 'test.cleanup=true', '--label', `test.manager=${this.managerId}`, '--label', `test.host=${DockerTestManager.hostId}`], {
|
|
467
616
|
stdio: 'pipe',
|
|
468
617
|
encoding: 'utf8',
|
|
469
618
|
});
|
|
@@ -480,11 +629,11 @@ export class DockerTestManager extends EventEmitter {
|
|
|
480
629
|
else if (stderr.includes('all predefined address pools have been fully subnetted')) {
|
|
481
630
|
this.log('Docker network pool exhausted, attempting cleanup...');
|
|
482
631
|
try {
|
|
483
|
-
execFileSync(this.dockerPath, ['network', 'prune', '-f'], {
|
|
632
|
+
execFileSync(this.dockerPath, ['network', 'prune', '-f', '--filter', `label=test.manager=${this.managerId}`], {
|
|
484
633
|
stdio: 'ignore',
|
|
485
634
|
});
|
|
486
635
|
this.log('Cleaned up unused networks, retrying network creation...');
|
|
487
|
-
execFileSync(this.dockerPath, ['network', 'create', network, '--label', 'test.cleanup=true'], {
|
|
636
|
+
execFileSync(this.dockerPath, ['network', 'create', network, '--label', 'test.cleanup=true', '--label', `test.manager=${this.managerId}`, '--label', `test.host=${DockerTestManager.hostId}`], {
|
|
488
637
|
stdio: 'pipe',
|
|
489
638
|
encoding: 'utf8',
|
|
490
639
|
});
|
|
@@ -672,7 +821,7 @@ export class DockerTestManager extends EventEmitter {
|
|
|
672
821
|
}
|
|
673
822
|
cleanupSyncWindows() {
|
|
674
823
|
try {
|
|
675
|
-
const containerIds = execFileSync(this.dockerPath, ['ps', '-a', '--filter',
|
|
824
|
+
const containerIds = execFileSync(this.dockerPath, ['ps', '-a', '--filter', `label=test.manager=${this.managerId}`, '-q'], {
|
|
676
825
|
encoding: 'utf8',
|
|
677
826
|
stdio: ['pipe', 'pipe', 'ignore'],
|
|
678
827
|
}).trim();
|
|
@@ -689,7 +838,7 @@ export class DockerTestManager extends EventEmitter {
|
|
|
689
838
|
catch {
|
|
690
839
|
}
|
|
691
840
|
this.log(`Removing container: ${trimmedId}`);
|
|
692
|
-
execFileSync(this.dockerPath, ['rm', '-f', trimmedId], { stdio: 'ignore' });
|
|
841
|
+
execFileSync(this.dockerPath, ['rm', '-f', '-v', trimmedId], { stdio: 'ignore' });
|
|
693
842
|
this.log(`Container removed: ${trimmedId}`);
|
|
694
843
|
}
|
|
695
844
|
catch (error) {
|
|
@@ -698,7 +847,7 @@ export class DockerTestManager extends EventEmitter {
|
|
|
698
847
|
}
|
|
699
848
|
}
|
|
700
849
|
try {
|
|
701
|
-
const networkIds = execFileSync(this.dockerPath, ['network', 'ls', '--filter',
|
|
850
|
+
const networkIds = execFileSync(this.dockerPath, ['network', 'ls', '--filter', `label=test.manager=${this.managerId}`, '-q'], {
|
|
702
851
|
encoding: 'utf8',
|
|
703
852
|
stdio: ['pipe', 'pipe', 'ignore'],
|
|
704
853
|
}).trim();
|
|
@@ -727,7 +876,7 @@ export class DockerTestManager extends EventEmitter {
|
|
|
727
876
|
}
|
|
728
877
|
cleanupSyncUnix() {
|
|
729
878
|
try {
|
|
730
|
-
const containerCmd = `"${this.dockerPath}" ps -a --filter "label=test.
|
|
879
|
+
const containerCmd = `"${this.dockerPath}" ps -a --filter "label=test.manager=${this.managerId}" -q`;
|
|
731
880
|
try {
|
|
732
881
|
const ids = execSync(containerCmd, { encoding: 'utf8', stdio: ['pipe', 'pipe', 'ignore'] }).trim();
|
|
733
882
|
if (ids) {
|
|
@@ -743,7 +892,7 @@ export class DockerTestManager extends EventEmitter {
|
|
|
743
892
|
catch {
|
|
744
893
|
}
|
|
745
894
|
this.log(`Removing container: ${trimmedId}`);
|
|
746
|
-
execFileSync(this.dockerPath, ['rm', '-f', trimmedId], { stdio: 'ignore' });
|
|
895
|
+
execFileSync(this.dockerPath, ['rm', '-f', '-v', trimmedId], { stdio: 'ignore' });
|
|
747
896
|
this.log(`Container removed: ${trimmedId}`);
|
|
748
897
|
}
|
|
749
898
|
catch (error) {
|
|
@@ -756,7 +905,7 @@ export class DockerTestManager extends EventEmitter {
|
|
|
756
905
|
this.logError('Failed to cleanup containers', error);
|
|
757
906
|
}
|
|
758
907
|
try {
|
|
759
|
-
const networkCmd = `"${this.dockerPath}" network ls --filter "label=test.
|
|
908
|
+
const networkCmd = `"${this.dockerPath}" network ls --filter "label=test.manager=${this.managerId}" -q`;
|
|
760
909
|
const ids = execSync(networkCmd, { encoding: 'utf8', stdio: ['pipe', 'pipe', 'ignore'] }).trim();
|
|
761
910
|
if (ids) {
|
|
762
911
|
const networkIds = ids.split('\n').filter((id) => id.trim());
|
|
@@ -777,7 +926,7 @@ export class DockerTestManager extends EventEmitter {
|
|
|
777
926
|
this.logError('Failed to cleanup networks', error);
|
|
778
927
|
}
|
|
779
928
|
try {
|
|
780
|
-
const volumeCmd = `"${this.dockerPath}" volume ls --filter "label=test.
|
|
929
|
+
const volumeCmd = `"${this.dockerPath}" volume ls --filter "label=test.manager=${this.managerId}" -q`;
|
|
781
930
|
const ids = execSync(volumeCmd, { encoding: 'utf8', stdio: ['pipe', 'pipe', 'ignore'] }).trim();
|
|
782
931
|
if (ids) {
|
|
783
932
|
const volumeIds = ids.split('\n').filter((id) => id.trim());
|