@zukhruf/testing 0.8.23 → 0.8.25

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/README.md CHANGED
@@ -143,7 +143,7 @@ docker ps -a --filter label=dev.zukhruf.testing.shared=1
143
143
  docker stop <container-id>
144
144
  ```
145
145
 
146
- A shared server starts on the first `database()` call that needs it. When that call is in a test, the time limit of the test also counts the start of the server. Each fixture sets a time limit for the start, its readiness bound: Postgres 60 s, MySQL and MariaDB 90 s, SQL Server 180 s. When the server does not answer in that time, the call fails with "Container … was not ready" and the output of the container. The default time limit of `@zukhruf/nx/test` is 240 s: the slowest readiness bound plus 60 s for the test (see [the test area](../nx/README.md#what-the-test-target-runs)). When you change a readiness bound, change that default with it.
146
+ A shared server starts on the first `database()` call that needs it. When that call is in a test, the time limit of the test also counts the start of the server. Each fixture sets a time limit for the start, its readiness bound: Postgres 60 s, MySQL and MariaDB 90 s, SQL Server 180 s. When the server does not answer in that time, the call fails with "Container … was not ready" and the output of the container. In a run, the first call of a test process that uses the engine also holds the reaper of the run, with a readiness bound of 60 s. When the hold is not ready in that time, the call fails with "The hold of the reaper … was not ready". One test can pay these readiness steps in a row: the hold of the reaper, then the start of a server. Thus the default time limit of `@zukhruf/nx/test` is their sum plus 60 s for the test: the hold 60 s, the slowest server (SQL Server) 180 s and the test 60 s, 300 s (see [the test area](../nx/README.md#what-the-test-target-runs)). When you change a readiness bound, change that default with it.
147
147
 
148
148
  ## A killed run
149
149
 
@@ -169,7 +169,7 @@ node --test --test-force-exit --test-global-setup=src/testing/docker-global-setu
169
169
 
170
170
  The global setup sets `ZUKHRUF_TESTING_RUN_ID` and `ZUKHRUF_TESTING_RUN_DIR` for the test processes. A `DockerTestbed` reads them from its `environment` and labels what it creates with the run. It records SSH forwards and host directories in the run's directory. It also writes a process record for its test process, and for each SSH command that it starts, while that command runs. In a run, `database()` puts the run's id in the name of each database that it creates on a shared server: `test_<run id>_<16 hex>`.
171
171
 
172
- Before a test process creates anything on an engine, its `DockerTestbed` holds the run's reaper there: a container of the image `docker:28.5.2-cli` with the engine's socket mounted, one for each run on each engine ([ADR 0020](./docs/adr/0020-a-reaper-container-removes-a-runs-engine-objects-when-the-attach-that-holds-it-closes-and-recovery-keeps-the-local-records.md)). The first test process creates it. Each test process holds it with one `cat` exec whose connection ends when the process exits, also when it is killed. The hold does not keep the process running. A hold that ends while its process lives, for example at a break of the SSH connection, is taken again at once. About 2 s after the last test process of the run ended, the reaper:
172
+ Before a test process creates anything on an engine, its `DockerTestbed` holds the run's reaper there: a container of the image `docker:28.5.2-cli`, one for each run on each engine ([ADR 0020](./docs/adr/0020-a-reaper-container-removes-a-runs-engine-objects-when-the-attach-that-holds-it-closes-and-recovery-keeps-the-local-records.md)). The reaper mounts a socket of the engine's host, and lets no test process in until it finds itself through that socket. The hold tries `/var/run/docker.sock` first, then the path of the client's socket when the client goes to the engine through a `unix://` host. When no socket goes to the reaper's own engine, the hold fails with the result of each. The first test process creates it. Each test process holds it with one `cat` exec whose connection ends when the process exits, also when it is killed. The hold does not keep the process running. A hold that ends while its process lives, for example at a break of the SSH connection, is taken again at once. About 2 s after the last test process of the run ended, the reaper:
173
173
 
174
174
  1. removes the labeled containers with their anonymous volumes, and the labeled volumes. It never removes a shared server;
175
175
  2. drops, on each running shared server of `Postgres`, `Mysql`, `Mariadb` and `SqlServer`, the databases whose name has the run's id, with the client in the server's image ([ADR 0011](./docs/adr/0011-the-run-id-in-a-databases-name-is-its-owner-reference-and-one-collector-for-each-kind-drops-a-dead-runs-databases.md));
@@ -1 +1 @@
1
- {"version":3,"file":"settle-within.d.ts","sourceRoot":"","sources":["../../src/async/settle-within.ts"],"names":[],"mappings":"AAEA,wBAAsB,YAAY,CAAC,CAAC,EAClC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,EACvB,KAAK,EAAE,MAAM,EACb,SAAS,SAAQ,GAChB,OAAO,CAAC,CAAC,CAAC,CAWZ"}
1
+ {"version":3,"file":"settle-within.d.ts","sourceRoot":"","sources":["../../src/async/settle-within.ts"],"names":[],"mappings":"AAEA,wBAAsB,YAAY,CAAC,CAAC,EAClC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,EACvB,KAAK,EAAE,MAAM,EACb,SAAS,SAAQ,GAChB,OAAO,CAAC,CAAC,CAAC,CAYZ"}
@@ -1,8 +1,9 @@
1
1
  import { timeout } from '@zukhruf/async';
2
2
  export async function settleWithin(promise, label, timeoutMs = 5_000) {
3
3
  // A real deadline: it bounds how long the test waits, so a fake clock that
4
- // the test moves must not end it.
5
- using limit = timeout(timeoutMs, { clock: globalThis });
4
+ // the test moves must not end it. It keeps the process alive, so a promise
5
+ // that never settles fails with the label.
6
+ using limit = timeout(timeoutMs, { clock: globalThis, ref: true });
6
7
  const expired = Promise.withResolvers();
7
8
  limit.signal.addEventListener('abort', () => expired.reject(new Error(`timed out waiting for: ${label}`)), { once: true });
8
9
  return await Promise.race([promise, expired.promise]);
@@ -1 +1 @@
1
- {"version":3,"file":"settle-within.js","sourceRoot":"","sources":["../../src/async/settle-within.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,OAAuB,EACvB,KAAa,EACb,SAAS,GAAG,KAAK;IAEjB,2EAA2E;IAC3E,kCAAkC;IAClC,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;IACxD,MAAM,OAAO,GAAG,OAAO,CAAC,aAAa,EAAS,CAAC;IAC/C,KAAK,CAAC,MAAM,CAAC,gBAAgB,CAC3B,OAAO,EACP,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,0BAA0B,KAAK,EAAE,CAAC,CAAC,EAClE,EAAE,IAAI,EAAE,IAAI,EAAE,CACf,CAAC;IACF,OAAO,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;AACxD,CAAC"}
1
+ {"version":3,"file":"settle-within.js","sourceRoot":"","sources":["../../src/async/settle-within.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,OAAuB,EACvB,KAAa,EACb,SAAS,GAAG,KAAK;IAEjB,2EAA2E;IAC3E,2EAA2E;IAC3E,2CAA2C;IAC3C,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;IACnE,MAAM,OAAO,GAAG,OAAO,CAAC,aAAa,EAAS,CAAC;IAC/C,KAAK,CAAC,MAAM,CAAC,gBAAgB,CAC3B,OAAO,EACP,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,0BAA0B,KAAK,EAAE,CAAC,CAAC,EAClE,EAAE,IAAI,EAAE,IAAI,EAAE,CACf,CAAC;IACF,OAAO,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;AACxD,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"directory.d.ts","sourceRoot":"","sources":["../../src/docker/directory.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,UAAU,EAAS,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,KAAK,UAAU,EAAmB,MAAM,kBAAkB,CAAC;AAEpE,+EAA+E;AAC/E,qBAAa,eAAgB,YAAW,eAAe;;IACrD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAG1B,OAAO;WAUM,MAAM,CACjB,IAAI,EAAE,UAAU,EAChB,GAAG,EAAE,UAAU,GAAG,SAAS,GAC1B,OAAO,CAAC,eAAe,CAAC;IAS3B,OAAO,CAAC,OAAO;IAMT,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMlC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,SAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAarE,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAWvC,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOhD,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOpD,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC;CAM7C"}
1
+ {"version":3,"file":"directory.d.ts","sourceRoot":"","sources":["../../src/docker/directory.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAS,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,KAAK,UAAU,EAAmB,MAAM,kBAAkB,CAAC;AAEpE,+EAA+E;AAC/E,qBAAa,eAAgB,YAAW,eAAe;;IACrD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAG1B,OAAO;WAUM,MAAM,CACjB,IAAI,EAAE,UAAU,EAChB,GAAG,EAAE,UAAU,GAAG,SAAS,GAC1B,OAAO,CAAC,eAAe,CAAC;IAqB3B,OAAO,CAAC,OAAO;IAMT,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMlC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,SAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAarE,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAWvC,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOhD,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOpD,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC;CAG7C"}
@@ -1,28 +1,39 @@
1
1
  import { randomUUID } from 'node:crypto';
2
- import { chmod, mkdir, readFile, rm, symlink, writeFile, } from 'node:fs/promises';
3
- import { tmpdir } from 'node:os';
4
- import { join, posix } from 'node:path';
2
+ import { chmod, mkdir, readFile, symlink, writeFile } from 'node:fs/promises';
3
+ import { posix } from 'node:path';
4
+ import { TemporaryFiles } from '@zukhruf/fs';
5
5
  import { DockerHost, quote } from "./host.js";
6
6
  import { directoryPrefix } from "./run-records.js";
7
7
  /** A disposable fixture directory on the selected daemon's host filesystem. */
8
8
  export class DockerDirectory {
9
9
  path;
10
10
  host;
11
- #record;
12
- constructor(path, host, record) {
11
+ #owned;
12
+ constructor(path, host, owned) {
13
13
  this.path = path;
14
14
  this.host = host;
15
- this.#record = record;
15
+ this.#owned = owned;
16
16
  }
17
17
  static async create(host, run) {
18
- const name = `${directoryPrefix(run?.id)}${randomUUID()}`;
19
- const path = host.remote ? `/tmp/${name}` : join(tmpdir(), name);
18
+ // The record outlives the directory: the global teardown removes the
19
+ // directory if this process dies before it removed the directory itself.
20
+ await using resources = new AsyncDisposableStack();
21
+ await using directory = new AsyncDisposableStack();
22
+ const prefix = directoryPrefix(run?.id);
23
+ const path = host.remote
24
+ ? `/tmp/${prefix}${randomUUID()}`
25
+ : directory.use(await new TemporaryFiles().directory(prefix)).path;
20
26
  const record = await run?.records.record('directory', path);
21
- if (host.remote)
27
+ if (record)
28
+ resources.use(record);
29
+ if (host.remote) {
22
30
  await host.shell(`mkdir -m 700 -- ${quote(path)}`);
23
- else
24
- await mkdir(path, { mode: 0o700 });
25
- return new DockerDirectory(path, host, record);
31
+ directory.defer(async () => {
32
+ await host.shell(`rm -rf -- ${quote(path)}`);
33
+ });
34
+ }
35
+ resources.use(directory.move());
36
+ return new DockerDirectory(path, host, resources.move());
26
37
  }
27
38
  resolve(name) {
28
39
  if (posix.isAbsolute(name) || name.split('/').includes('..'))
@@ -67,11 +78,7 @@ export class DockerDirectory {
67
78
  await symlink(target, path);
68
79
  }
69
80
  async [Symbol.asyncDispose]() {
70
- if (this.host.remote)
71
- await this.host.shell(`rm -rf -- ${quote(this.path)}`);
72
- else
73
- await rm(this.path, { recursive: true, force: true });
74
- await this.#record?.[Symbol.asyncDispose]();
81
+ await this.#owned.disposeAsync();
75
82
  }
76
83
  }
77
84
  //# sourceMappingURL=directory.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"directory.js","sourceRoot":"","sources":["../../src/docker/directory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EACL,KAAK,EACL,KAAK,EACL,QAAQ,EACR,EAAE,EACF,OAAO,EACP,SAAS,GACV,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAmB,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEpE,+EAA+E;AAC/E,MAAM,OAAO,eAAe;IACjB,IAAI,CAAS;IACb,IAAI,CAAa;IACjB,OAAO,CAA8B;IAE9C,YACE,IAAY,EACZ,IAAgB,EAChB,MAAmC;QAEnC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,CACjB,IAAgB,EAChB,GAA2B;QAE3B,MAAM,IAAI,GAAG,GAAG,eAAe,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,UAAU,EAAE,EAAE,CAAC;QAC1D,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,CAAC;QACjE,MAAM,MAAM,GAAG,MAAM,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QAC5D,IAAI,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,CAAC,KAAK,CAAC,mBAAmB,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;;YAC/D,MAAM,KAAK,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QACxC,OAAO,IAAI,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IACjD,CAAC;IAEO,OAAO,CAAC,IAAY;QAC1B,IAAI,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;YAC1D,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;QACpE,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,IAAY;QACtB,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;;YACrE,MAAM,KAAK,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,IAAY,EAAE,OAAe,EAAE,IAAI,GAAG,KAAK;QACzD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM;YAClB,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CACnB,SAAS,KAAK,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,EACrE,OAAO,CACR,CAAC;aACC,CAAC;YACJ,MAAM,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC/B,MAAM,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAY;QACzB,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAChC,4EAA4E;QAC5E,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM;YAClB,OAAO,MAAM,CAAC,IAAI,CAChB,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,EACzD,QAAQ,CACT,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACrB,OAAO,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,IAAY,EAAE,IAAY;QACpC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM;YAClB,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;;YAClE,MAAM,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,MAAc,EAAE,IAAY;QACxC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM;YAClB,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;;YAC/D,MAAM,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC;QACzB,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM;YAClB,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;;YACpD,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3D,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;IAC9C,CAAC;CACF"}
1
+ {"version":3,"file":"directory.js","sourceRoot":"","sources":["../../src/docker/directory.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"engine-lease.d.ts","sourceRoot":"","sources":["../../src/docker/engine-lease.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAW,MAAM,gBAAgB,CAAC;AACrD,OAAO,EACL,KAAK,aAAa,EAKlB,KAAK,MAAM,EAGZ,MAAM,iBAAiB,CAAC;AAEzB,8HAA8H;AAC9H,eAAO,MAAM,WAAW,8BAA8B,CAAC;AAEvD,2EAA2E;AAC3E,eAAO,MAAM,mBAAmB,qCAAqC,CAAC;AAEtE,8EAA8E;AAC9E,eAAO,MAAM,WAAW,mBAAmB,CAAC;AAQ5C,sFAAsF;AACtF,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAE1D;AA2BD;;;;;GAKG;AACH,qBAAa,WAAY,YAAW,eAAe;;IAIjD,OAAO;IAKP,wDAAwD;IAClD,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B;;;;OAIG;WACU,IAAI,CACf,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9B,OAAO,GAAE,aAAa,GAAG;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAO,GAC9C,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAgCnC;;;;OAIG;WACU,IAAI,CACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,EAAE,KAAK,EAAE,GAAG,MAAM,EAAE,EAAE,aAAa,GAAG;QAAE,KAAK,EAAE,KAAK,CAAA;KAAE,GACrD,OAAO,CAAC,IAAI,CAAC;IAoBhB,mDAAmD;IAC7C,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC;CAI7C"}
1
+ {"version":3,"file":"engine-lease.d.ts","sourceRoot":"","sources":["../../src/docker/engine-lease.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAW,MAAM,gBAAgB,CAAC;AACrD,OAAO,EACL,KAAK,aAAa,EAKlB,KAAK,MAAM,EAGZ,MAAM,iBAAiB,CAAC;AAEzB,8HAA8H;AAC9H,eAAO,MAAM,WAAW,8BAA8B,CAAC;AAEvD,2EAA2E;AAC3E,eAAO,MAAM,mBAAmB,qCAAqC,CAAC;AAEtE,8EAA8E;AAC9E,eAAO,MAAM,WAAW,mBAAmB,CAAC;AAQ5C,sFAAsF;AACtF,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAE1D;AA2BD;;;;;GAKG;AACH,qBAAa,WAAY,YAAW,eAAe;;IAIjD,OAAO;IAKP,wDAAwD;IAClD,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B;;;;OAIG;WACU,IAAI,CACf,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9B,OAAO,GAAE,aAAa,GAAG;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAO,GAC9C,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAiCnC;;;;OAIG;WACU,IAAI,CACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,EAAE,KAAK,EAAE,GAAG,MAAM,EAAE,EAAE,aAAa,GAAG;QAAE,KAAK,EAAE,KAAK,CAAA;KAAE,GACrD,OAAO,CAAC,IAAI,CAAC;IAoBhB,mDAAmD;IAC7C,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC;CAI7C"}
@@ -63,7 +63,8 @@ export class EngineLease {
63
63
  container = await docker.containers.create({
64
64
  Image: LEASE_IMAGE,
65
65
  Entrypoint: ['cat'],
66
- Cmd: [],
66
+ // socktainer 1.6.1 runs the image's own Cmd when Cmd is empty (#4205).
67
+ Cmd: ['-'],
67
68
  OpenStdin: true,
68
69
  StdinOnce: true,
69
70
  AttachStdin: true,
@@ -1 +1 @@
1
- {"version":3,"file":"engine-lease.js","sourceRoot":"","sources":["../../src/docker/engine-lease.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"engine-lease.js","sourceRoot":"","sources":["../../src/docker/engine-lease.ts"],"names":[],"mappings":"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"}
@@ -28,13 +28,24 @@ export interface ReaperSettings {
28
28
  sweepTries: number;
29
29
  /** The time a `created` sweep lease gets to start before the reaper removes it. */
30
30
  leasePatience: number;
31
+ /**
32
+ * The readiness bound of a hold: the longest that a process waits for it,
33
+ * with its image pull, create, start, check of the socket and answer
34
+ * (ADR 0020, item 15).
35
+ */
36
+ readiness: number;
31
37
  }
32
- /** The values of the probe and of Ryuk, and of ADR 0014 and ADR 0019. */
38
+ /** The values of the probe and of Ryuk, and of ADR 0014, ADR 0019 and ADR 0020. */
33
39
  export declare const REAPER_DEFAULTS: ReaperSettings;
34
40
  /** The name of the reaper of the run `runId` on an engine: one reaper for each run (ADR 0020, item 7). */
35
41
  export declare const reaperName: (runId: string) => string;
36
- /** The body of the reaper of the run `runId`, with its inputs in its environment. */
37
- export declare function reaperRequest(runId: string, settings: ReaperSettings): EngineApi.ContainerCreateRequest;
42
+ /**
43
+ * The body of the reaper of the run `runId`, with its inputs in its
44
+ * environment and the file `socket` of the engine's host as its socket. The
45
+ * mount is a `bind` mount, so a `socket` that the engine's host does not have
46
+ * fails the create and creates no directory there.
47
+ */
48
+ export declare function reaperRequest(runId: string, settings: ReaperSettings, socket: string): EngineApi.ContainerCreateRequest;
38
49
  /**
39
50
  * The longest that a reaper can run after it closed its door: its first pass
40
51
  * and its re-check passes, `interval` apart, its expiry pass with one sweep,
@@ -54,7 +65,8 @@ export declare function closingTime(settings: ReaperSettings): number;
54
65
  * `ref: false` that holds the door of the reaper (ADR 0020, item 7). It ends
55
66
  * when this process exits, for any reason. When it ends while this process
56
67
  * lives, it is taken again at once: on the same reaper, or on the next one
57
- * when that reaper closed.
68
+ * when that reaper closed. The source of the socket of the first reaper that
69
+ * it held is tried first for each next reaper (item 14).
58
70
  */
59
71
  export declare class ReaperHold {
60
72
  #private;
@@ -74,10 +86,11 @@ export declare class ReaperHold {
74
86
  held(): Promise<void>;
75
87
  }
76
88
  /**
77
- * Starts the reaper of the dead run `runId` with no wait for a first holder,
78
- * and does not wait for it (ADR 0020, item 9). A reaper of the run that still
79
- * runs keeps the run. One that ended is replaced, at most `settings.retries`
80
- * more times.
89
+ * Starts the reaper of the dead run `runId`, and does not wait for it to act
90
+ * (ADR 0020, item 9). It holds that reaper only until the reaper verified its
91
+ * socket (item 14), and ends that hold at once. A reaper of the run that
92
+ * still runs keeps the run. One that ended is replaced, at most
93
+ * `settings.retries` more times, within the readiness bound of the hold.
81
94
  */
82
95
  export declare function startReaper(docker: Docker, runId: string, settings?: ReaperSettings): Promise<void>;
83
96
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"reaper.d.ts","sourceRoot":"","sources":["../../src/docker/reaper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,KAAK,EAA+B,MAAM,gBAAgB,CAAC;AACzE,OAAO,EAIL,KAAK,MAAM,EACX,KAAK,SAAS,EAIf,MAAM,iBAAiB,CAAC;AAkBzB,gEAAgE;AAChE,eAAO,MAAM,YAAY,sBAAsB,CAAC;AAEhD,+GAA+G;AAC/G,eAAO,MAAM,YAAY,+BAA+B,CAAC;AAEzD,uDAAuD;AACvD,eAAO,MAAM,YAAY,+BAA+B,CAAC;AAEzD,uFAAuF;AACvF,MAAM,WAAW,cAAc;IAC7B,mEAAmE;IACnE,KAAK,EAAE,MAAM,CAAC;IACd,mCAAmC;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,sCAAsC;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,oDAAoD;IACpD,cAAc,EAAE,MAAM,CAAC;IACvB,kDAAkD;IAClD,OAAO,EAAE,MAAM,CAAC;IAChB,oDAAoD;IACpD,WAAW,EAAE,MAAM,CAAC;IACpB,oGAAoG;IACpG,SAAS,EAAE,MAAM,CAAC;IAClB,sGAAsG;IACtG,SAAS,EAAE,MAAM,CAAC;IAClB,uDAAuD;IACvD,UAAU,EAAE,MAAM,CAAC;IACnB,mFAAmF;IACnF,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,yEAAyE;AACzE,eAAO,MAAM,eAAe,EAAE,cAW7B,CAAC;AAEF,0GAA0G;AAC1G,eAAO,MAAM,UAAU,GAAI,OAAO,MAAM,KAAG,MACR,CAAC;AA2NpC,qFAAqF;AACrF,wBAAgB,aAAa,CAC3B,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,cAAc,GACvB,SAAS,CAAC,sBAAsB,CAwBlC;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,cAAc,GAAG,MAAM,CAO5D;AAsHD;;;;;;GAMG;AACH,qBAAa,UAAU;;IAMrB,OAAO;IAYP;;;;;OAKG;WACU,IAAI,CACf,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,KAAK,GACX,OAAO,CAAC,UAAU,CAAC;IAMtB;;;;OAIG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAsE5B;AAED;;;;;GAKG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,QAAQ,GAAE,cAAgC,GACzC,OAAO,CAAC,IAAI,CAAC,CAQf;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,KAAK,GACX,OAAO,CAAC,MAAM,EAAE,CAAC,CAyCnB;AAED;;;;GAIG;AACH,wBAAsB,MAAM,CAC1B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,GAC1C,OAAO,CAAC,OAAO,CAAC,CAUlB"}
1
+ {"version":3,"file":"reaper.d.ts","sourceRoot":"","sources":["../../src/docker/reaper.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,KAAK,EAA+B,MAAM,gBAAgB,CAAC;AACzE,OAAO,EAML,KAAK,MAAM,EACX,KAAK,SAAS,EAIf,MAAM,iBAAiB,CAAC;AAkBzB,gEAAgE;AAChE,eAAO,MAAM,YAAY,sBAAsB,CAAC;AAEhD,+GAA+G;AAC/G,eAAO,MAAM,YAAY,+BAA+B,CAAC;AAWzD,uDAAuD;AACvD,eAAO,MAAM,YAAY,+BAA+B,CAAC;AAEzD,uFAAuF;AACvF,MAAM,WAAW,cAAc;IAC7B,mEAAmE;IACnE,KAAK,EAAE,MAAM,CAAC;IACd,mCAAmC;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,sCAAsC;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,oDAAoD;IACpD,cAAc,EAAE,MAAM,CAAC;IACvB,kDAAkD;IAClD,OAAO,EAAE,MAAM,CAAC;IAChB,oDAAoD;IACpD,WAAW,EAAE,MAAM,CAAC;IACpB,oGAAoG;IACpG,SAAS,EAAE,MAAM,CAAC;IAClB,sGAAsG;IACtG,SAAS,EAAE,MAAM,CAAC;IAClB,uDAAuD;IACvD,UAAU,EAAE,MAAM,CAAC;IACnB,mFAAmF;IACnF,aAAa,EAAE,MAAM,CAAC;IACtB;;;;OAIG;IACH,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,mFAAmF;AACnF,eAAO,MAAM,eAAe,EAAE,cAY7B,CAAC;AAEF,0GAA0G;AAC1G,eAAO,MAAM,UAAU,GAAI,OAAO,MAAM,KAAG,MACR,CAAC;AA6PpC;;;;;GAKG;AACH,wBAAgB,aAAa,CAC3B,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,MAAM,GACb,SAAS,CAAC,sBAAsB,CA8BlC;AAcD;;;;;;;;;;;;GAYG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,cAAc,GAAG,MAAM,CAO5D;AAkSD;;;;;;;GAOG;AACH,qBAAa,UAAU;;IAQrB,OAAO;IAaP;;;;;OAKG;WACU,IAAI,CACf,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,KAAK,GACX,OAAO,CAAC,UAAU,CAAC;IAMtB;;;;OAIG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAoE5B;AAED;;;;;;GAMG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,QAAQ,GAAE,cAAgC,GACzC,OAAO,CAAC,IAAI,CAAC,CAQf;AA8BD;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,KAAK,GACX,OAAO,CAAC,MAAM,EAAE,CAAC,CAyCnB;AAED;;;;GAIG;AACH,wBAAsB,MAAM,CAC1B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,GAC1C,OAAO,CAAC,OAAO,CAAC,CAUlB"}
@@ -1,6 +1,7 @@
1
+ import { randomUUID } from 'node:crypto';
1
2
  import pMemoize, { pMemoizeClear } from 'p-memoize';
2
3
  import { poll, timeout, untilAborted } from '@zukhruf/async';
3
- import { ContainerNotFoundError, ContainerNotRunningError, ImageNotFoundError, IncompleteOutputError, } from '@zukhruf/docker';
4
+ import { BindSourceNotFoundError, ContainerNotFoundError, ContainerNotRunningError, ImageNotFoundError, IncompleteOutputError, } from '@zukhruf/docker';
4
5
  import { KIND_LABEL, ownedNames, } from "../databases/collector.js";
5
6
  import { mariadb, mysql } from "../databases/mysql-family-collector.js";
6
7
  import { postgres } from "../databases/postgres-collector.js";
@@ -11,9 +12,15 @@ import { TEST_RUN_LABEL } from "./run-records.js";
11
12
  export const REAPER_IMAGE = 'docker:28.5.2-cli';
12
13
  /** Marks the reaper of a run, with the run's id. It is not the run's label: the reaper would remove itself. */
13
14
  export const REAPER_LABEL = 'dev.zukhruf.testing.reaper';
15
+ /** Marks a reaper with a value of its own, which it looks for through its socket (ADR 0020, item 14). */
16
+ const SELF_LABEL = 'dev.zukhruf.testing.reaper.self';
17
+ /** Marks a reaper with the source of its socket on the engine's host (ADR 0020, item 14). */
18
+ const SOCKET_LABEL = 'dev.zukhruf.testing.reaper.socket';
19
+ /** The path of the engine's socket in a reaper, where its `docker` CLI looks by default. */
20
+ const SOCKET = '/var/run/docker.sock';
14
21
  /** Marks a server that `reuse()` shares (ADR 0019). */
15
22
  export const SERVER_LABEL = 'dev.zukhruf.testing.server';
16
- /** The values of the probe and of Ryuk, and of ADR 0014 and ADR 0019. */
23
+ /** The values of the probe and of Ryuk, and of ADR 0014, ADR 0019 and ADR 0020. */
17
24
  export const REAPER_DEFAULTS = {
18
25
  grace: 2_000,
19
26
  interval: 1_000,
@@ -25,6 +32,7 @@ export const REAPER_DEFAULTS = {
25
32
  sweepWait: 30_000,
26
33
  sweepTries: 3,
27
34
  leasePatience: 5_000,
35
+ readiness: 60_000,
28
36
  };
29
37
  /** The name of the reaper of the run `runId` on an engine: one reaper for each run (ADR 0020, item 7). */
30
38
  export const reaperName = (runId) => `zukhruf-testing-reaper-${runId}`;
@@ -33,14 +41,27 @@ const COLLECTORS = [postgres, mysql, mariadb, sqlserver];
33
41
  /** The lock file of the reaper: a holder holds it shared, and the reaper closes it exclusive (ADR 0020, item 7). */
34
42
  const DOOR = '/tmp/door';
35
43
  /**
36
- * The exec of a holder. Its answer is its first line: `held` once it holds
37
- * the door shared, then its `cat` keeps the lock until the hold ends, or
38
- * `closing` when the reaper closed its door.
44
+ * The file of the reaper's check of its socket: `verified` when the socket
45
+ * reaches the reaper's own engine, else the reason why not (ADR 0020, item 14).
46
+ */
47
+ const BIND = '/tmp/bind';
48
+ /**
49
+ * The mark of a first holder: a holder writes it once it holds the door, so
50
+ * a hold that ended before the reaper looked still ends the wait for a first
51
+ * holder (ADR 0020, item 9).
52
+ */
53
+ const CAME = '/tmp/came';
54
+ /**
55
+ * The exec of a holder. It waits for the check of the reaper's socket. Its
56
+ * answer is its first line: `unverified` and the reason when the socket does
57
+ * not reach the reaper's engine, `held` once it holds the door shared and
58
+ * wrote the mark of a first holder, then its `cat` keeps the lock until the
59
+ * hold ends, or `closing` when the reaper closed its door.
39
60
  */
40
61
  const HOLD = [
41
62
  'sh',
42
63
  '-c',
43
- `exec 8>>${DOOR}; flock -n -s 8 || { echo closing; exit 0; }; echo held; exec cat`,
64
+ `until [ -e ${BIND} ]; do sleep 0.05; done; read -r bind < ${BIND}; [ "$bind" = verified ] || { echo "unverified $bind"; exit 0; }; exec 8>>${DOOR}; flock -n -s 8 || { echo closing; exit 0; }; : > ${CAME}; echo held; exec cat`,
44
65
  ];
45
66
  /** A word of `sh` in double quotes. Each `\u0000name\u0000` in `text` becomes the variable `name`. */
46
67
  function word(text) {
@@ -149,6 +170,8 @@ gone() {
149
170
  }
150
171
 
151
172
  # Takes the sweep lease of the fingerprint $1: a cat that ends with this reaper.
173
+ # The - after the image: socktainer 1.6.1 runs the image's own Cmd when the
174
+ # command is empty (#4205).
152
175
  lease() {
153
176
  name="${sweepLeaseName('$1')}"
154
177
  fifo=/tmp/lease-$1
@@ -158,7 +181,7 @@ lease() {
158
181
  tries=$((tries + 1))
159
182
  rm -f "$fifo" "$fifo.id" "$fifo.err"
160
183
  mkfifo "$fifo"
161
- docker run -i --rm --name "$name" --cidfile "$fifo.id" --label "${LEASE_LABEL}=sweep" --label "${LEASED_SERVER_LABEL}=$1" --entrypoint cat ${LEASE_IMAGE} < "$fifo" > /dev/null 2> "$fifo.err" &
184
+ docker run -i --rm --name "$name" --cidfile "$fifo.id" --label "${LEASE_LABEL}=sweep" --label "${LEASED_SERVER_LABEL}=$1" --entrypoint cat ${LEASE_IMAGE} - < "$fifo" > /dev/null 2> "$fifo.err" &
162
185
  job=$!
163
186
  exec 9> "$fifo"
164
187
  started=$(($(now) + REAPER_REQUEST_TIMEOUT))
@@ -215,8 +238,25 @@ revive() {
215
238
  done
216
239
  }
217
240
 
241
+ # Looks through the socket for this reaper, by the value of its own label
242
+ # (ADR 0020, item 14). A socket that does not answer, or that reaches another
243
+ # engine, is not the socket of this reaper's engine. Then the reaper removes
244
+ # nothing: it writes why, for a holder to read, and waits for that holder to
245
+ # remove it.
246
+ if found=$(once docker ps -a -q --filter "label=${SELF_LABEL}=$REAPER_SELF" 2>&1); then
247
+ if [ -n "$found" ]; then bind=verified; else bind="the socket reaches an engine that does not run this reaper"; fi
248
+ else
249
+ reason=$(echo "$found" | tail -n 1)
250
+ bind="the socket does not answer: \${reason:-no answer within $REAPER_REQUEST_TIMEOUT ms}"
251
+ fi
252
+ echo "$bind" > ${BIND}.new && mv ${BIND}.new ${BIND}
253
+ if [ "$bind" != verified ]; then
254
+ sleep "$(seconds $((REAPER_FIRST_HOLDER + REAPER_REQUEST_TIMEOUT)))"
255
+ exit 1
256
+ fi
257
+
218
258
  first=$(($(now) + REAPER_FIRST_HOLDER))
219
- until [ "$(holders)" -gt 0 ] || [ "$(now)" -ge "$first" ]; do sleep $tick; done
259
+ until [ "$(holders)" -gt 0 ] || [ -e ${CAME} ] || [ "$(now)" -ge "$first" ]; do sleep $tick; done
220
260
  while :; do
221
261
  while [ "$(holders)" -gt 0 ]; do sleep $tick; done
222
262
  quiet "$REAPER_GRACE" || continue
@@ -237,14 +277,21 @@ while :; do
237
277
  done
238
278
  `;
239
279
  }
240
- /** The body of the reaper of the run `runId`, with its inputs in its environment. */
241
- export function reaperRequest(runId, settings) {
280
+ /**
281
+ * The body of the reaper of the run `runId`, with its inputs in its
282
+ * environment and the file `socket` of the engine's host as its socket. The
283
+ * mount is a `bind` mount, so a `socket` that the engine's host does not have
284
+ * fails the create and creates no directory there.
285
+ */
286
+ export function reaperRequest(runId, settings, socket) {
287
+ const self = randomUUID();
242
288
  return {
243
289
  Image: REAPER_IMAGE,
244
290
  Entrypoint: ['sh', '-c', script()],
245
291
  Cmd: [],
246
292
  Env: [
247
293
  `REAPER_RUN=${runId}`,
294
+ `REAPER_SELF=${self}`,
248
295
  `REAPER_GRACE=${settings.grace}`,
249
296
  `REAPER_INTERVAL=${settings.interval}`,
250
297
  `REAPER_PASSES=${settings.passes}`,
@@ -256,13 +303,29 @@ export function reaperRequest(runId, settings) {
256
303
  `REAPER_SWEEP_TRIES=${settings.sweepTries}`,
257
304
  `REAPER_LEASE_PATIENCE=${settings.leasePatience}`,
258
305
  ],
259
- Labels: { [REAPER_LABEL]: runId },
306
+ Labels: {
307
+ [REAPER_LABEL]: runId,
308
+ [SELF_LABEL]: self,
309
+ [SOCKET_LABEL]: socket,
310
+ },
260
311
  HostConfig: {
261
312
  AutoRemove: true,
262
- Binds: ['/var/run/docker.sock:/var/run/docker.sock'],
313
+ Mounts: [{ Type: 'bind', Source: socket, Target: SOCKET }],
263
314
  },
264
315
  };
265
316
  }
317
+ /**
318
+ * The sources of the reaper's socket on the engine's host, in the order a
319
+ * hold tries them (ADR 0020, item 14): the socket of the engine's host, and
320
+ * the path of the client's socket when the client reaches the engine at a
321
+ * `unix://` host.
322
+ */
323
+ function socketSources(docker) {
324
+ if (!docker.host.startsWith('unix://'))
325
+ return [SOCKET];
326
+ const own = new URL(docker.host).pathname;
327
+ return own === SOCKET ? [SOCKET] : [SOCKET, own];
328
+ }
266
329
  /**
267
330
  * The longest that a reaper can run after it closed its door: its first pass
268
331
  * and its re-check passes, `interval` apart, its expiry pass with one sweep,
@@ -286,15 +349,16 @@ export function closingTime(settings) {
286
349
  }
287
350
  /**
288
351
  * Resolves when the engine removed `reaper`, which closed its door. Its waits
289
- * keep no process running. Fails after the closing time of the reaper.
352
+ * keep no process running. Fails after the closing time of the reaper, or
353
+ * with the reason of `signal`.
290
354
  */
291
- async function closed(docker, reaper, settings, clock) {
355
+ async function closed(docker, reaper, settings, clock, signal) {
292
356
  const ms = closingTime(settings);
293
- const removed = await poll(async () => (await docker.containers.find(reaper.id)) === undefined
357
+ const removed = await poll(async () => (await docker.containers.find(reaper.id, { signal })) === undefined
294
358
  ? true
295
359
  : undefined, {
296
360
  interval: settings.interval,
297
- signal: undefined,
361
+ signal,
298
362
  clock,
299
363
  deadline: clock.performance.now() + ms,
300
364
  ref: false,
@@ -303,34 +367,41 @@ async function closed(docker, reaper, settings, clock) {
303
367
  throw new Error(`The reaper ${reaper.id} closed and was not removed within ${ms} ms`);
304
368
  }
305
369
  /**
306
- * The reaper of `runId`, created when it does not exist, and started when it
307
- * did not start. Gives undefined once a reaper that ends is gone: a later call
308
- * gets a new one. A missing image is pulled. A reaper that ended and stays,
309
- * for example one whose removal by the engine failed, is removed here: nobody
310
- * else removes it.
370
+ * The reaper of `runId`, created with `socket` as its socket when it does not
371
+ * exist, and started when it did not start. Gives undefined once a reaper
372
+ * that ends is gone: a later call gets a new one. A missing image is pulled.
373
+ * A reaper that ended and stays, for example one whose removal by the engine
374
+ * failed, is removed here: nobody else removes it. A `socket` that the
375
+ * engine's host does not have rejects with BindSourceNotFoundError. Each
376
+ * call to the engine stops when `signal` aborts.
311
377
  */
312
- async function running(docker, runId, settings, clock) {
313
- const request = reaperRequest(runId, settings);
378
+ async function running(docker, runId, settings, clock, socket, signal) {
379
+ const request = reaperRequest(runId, settings, socket);
314
380
  const name = reaperName(runId);
315
381
  let reaper;
316
382
  try {
317
383
  ({ container: reaper } = await docker.containers.createOrGet(request, {
318
384
  name,
385
+ signal,
319
386
  }));
320
387
  }
321
388
  catch (error) {
322
389
  if (!(error instanceof ImageNotFoundError))
323
390
  throw error;
324
- await docker.images.pull(error.image);
391
+ await docker.images.pull(error.image, { signal });
325
392
  ({ container: reaper } = await docker.containers.createOrGet(request, {
326
393
  name,
394
+ signal,
327
395
  }));
328
396
  }
329
397
  let state;
398
+ let source;
330
399
  try {
331
- state = (await reaper.inspect()).State?.Status;
400
+ const inspected = await reaper.inspect({ signal });
401
+ state = inspected.State?.Status;
402
+ source = inspected.Config?.Labels?.[SOCKET_LABEL];
332
403
  if (state === 'created') {
333
- await reaper.start();
404
+ await reaper.start({ signal });
334
405
  state = 'running';
335
406
  }
336
407
  }
@@ -340,11 +411,11 @@ async function running(docker, runId, settings, clock) {
340
411
  throw error;
341
412
  }
342
413
  if (state === 'running')
343
- return reaper;
414
+ return { container: reaper, socket: source ?? socket };
344
415
  if (state === 'exited' || state === 'dead')
345
- await reaper.remove({ force: true });
416
+ await reaper.remove({ force: true, signal });
346
417
  else
347
- await closed(docker, reaper, settings, clock);
418
+ await closed(docker, reaper, settings, clock, signal);
348
419
  return undefined;
349
420
  }
350
421
  /** The codes of a connection to the engine that ended under a read: a dead peer. */
@@ -389,23 +460,124 @@ async function drained(output) {
389
460
  throw error;
390
461
  }
391
462
  }
463
+ /** The reason in an answer `unverified <reason>` of HOLD. */
464
+ const UNVERIFIED = /^unverified (.*)$/;
465
+ /**
466
+ * Asks the reaper of `runId` for a hold, and creates it when the run has
467
+ * none on this engine (ADR 0020, item 14). A reaper answers only after it
468
+ * found itself through its socket. A reaper whose socket does not reach its
469
+ * engine is removed, and the next of `sources` is tried. Rejects with an
470
+ * error that names the engine and each source with its result when no source
471
+ * reaches it. Each call to the engine stops when `signal` aborts.
472
+ */
473
+ async function answer(docker, runId, settings, clock, sources, signal) {
474
+ const results = new Map();
475
+ for (;;) {
476
+ const socket = sources.find((source) => !results.has(source));
477
+ if (socket === undefined)
478
+ throw new Error(`The reaper ${reaperName(runId)} found no socket of the engine ${docker.host} that reaches that engine: ${[
479
+ ...results,
480
+ ]
481
+ .map(([source, result]) => `${source}: ${result}`)
482
+ .join('; ')}`);
483
+ let reaper;
484
+ try {
485
+ reaper = await running(docker, runId, settings, clock, socket, signal);
486
+ }
487
+ catch (error) {
488
+ if (!(error instanceof BindSourceNotFoundError))
489
+ throw error;
490
+ results.set(socket, 'the engine’s host has no file at this path');
491
+ continue;
492
+ }
493
+ if (reaper === undefined)
494
+ return { kind: 'ended' };
495
+ const reply = await ask(reaper.container, signal);
496
+ if (reply === undefined)
497
+ return { kind: 'ended' };
498
+ const { line, holder, output } = reply;
499
+ if (line === 'held')
500
+ return { kind: 'held', socket: reaper.socket, holder, output };
501
+ if (line === 'closing')
502
+ return {
503
+ kind: 'closing',
504
+ socket: reaper.socket,
505
+ reaper: reaper.container,
506
+ };
507
+ const reason = UNVERIFIED.exec(line)?.[1];
508
+ if (reason === undefined)
509
+ throw new Error(`The reaper ${reaperName(runId)} gave an unknown answer: ${line}`);
510
+ // The run's reaper can have another socket than the one asked for, when
511
+ // another process of the run created it first. Both sources are marked,
512
+ // so each round marks one more source, and the loop ends.
513
+ results.set(socket, reaper.socket === socket
514
+ ? reason
515
+ : `the run's reaper uses the source ${reaper.socket}: ${reason}`);
516
+ results.set(reaper.socket, reason);
517
+ await reaper.container
518
+ .remove({ force: true, signal })
519
+ .catch((error) => {
520
+ if (!(error instanceof ContainerNotFoundError))
521
+ throw error;
522
+ });
523
+ }
524
+ }
525
+ /**
526
+ * Asks `reaper` for a hold with HOLD, and gives its first line and its exec.
527
+ * Undefined when the reaper ended first. An abort of `signal` before the
528
+ * caller's hold settled ends the exec.
529
+ */
530
+ async function ask(reaper, signal) {
531
+ let holder;
532
+ try {
533
+ holder = await reaper.spawn({ Cmd: HOLD }, { stdin: true, ref: false, signal });
534
+ }
535
+ catch (error) {
536
+ // The reaper ended between the inspect and the exec.
537
+ if (error instanceof ContainerNotRunningError ||
538
+ error instanceof ContainerNotFoundError)
539
+ return undefined;
540
+ throw error;
541
+ }
542
+ const output = holder[Symbol.asyncIterator]();
543
+ const line = await firstLine(output);
544
+ return line === undefined ? undefined : { line, holder, output };
545
+ }
546
+ /**
547
+ * Runs `hold`, a hold of the reaper of `runId`, within its readiness bound
548
+ * (ADR 0020, item 15). The waits of a hold keep no process running, as its
549
+ * exec does not; the timer of the bound does, unless `ref` is false. Past the
550
+ * bound, the signal of the hold aborts with an error that names the reaper
551
+ * and the bound: each call to the engine of the hold stops, and the hold
552
+ * rejects with that error, also for each caller that joined it.
553
+ */
554
+ async function whileHeld(hold, runId, settings, clock, ref) {
555
+ using limit = timeout(settings.readiness, { clock, ref });
556
+ const bound = new AbortController();
557
+ limit.signal.addEventListener('abort', () => bound.abort(new Error(`The hold of the reaper ${reaperName(runId)} was not ready within its readiness bound of ${settings.readiness} ms`, { cause: limit.signal.reason })), { once: true });
558
+ await untilAborted(hold(bound.signal), bound.signal);
559
+ }
392
560
  /**
393
561
  * The hold of this process on the reaper of its run: one `cat` exec with
394
562
  * `ref: false` that holds the door of the reaper (ADR 0020, item 7). It ends
395
563
  * when this process exits, for any reason. When it ends while this process
396
564
  * lives, it is taken again at once: on the same reaper, or on the next one
397
- * when that reaper closed.
565
+ * when that reaper closed. The source of the socket of the first reaper that
566
+ * it held is tried first for each next reaper (item 14).
398
567
  */
399
568
  export class ReaperHold {
400
569
  #docker;
401
570
  #runId;
402
571
  #settings;
403
572
  #clock;
573
+ /** The sources of the reaper's socket, in the order a hold tries them: the source of the last reaper that answered comes first. */
574
+ #sources;
404
575
  constructor(docker, runId, settings, clock) {
405
576
  this.#docker = docker;
406
577
  this.#runId = runId;
407
578
  this.#settings = settings;
408
579
  this.#clock = clock;
580
+ this.#sources = socketSources(docker);
409
581
  }
410
582
  /**
411
583
  * Holds the reaper of `runId`, and creates it when the run has none on this
@@ -424,77 +596,65 @@ export class ReaperHold {
424
596
  * again by the next call.
425
597
  */
426
598
  async held() {
427
- // The waits of a hold keep no process running, as its exec does not. A
428
- // caller that waits for the hold keeps this process running while it
429
- // waits, as the request that it waits to make would, for at most each
430
- // try of the hold: one exec and the closing time of a reaper.
431
- const ms = (this.#settings.retries + 1) *
432
- (this.#settings.requestTimeout + closingTime(this.#settings));
433
- using alive = timeout(ms, { clock: this.#clock });
434
- try {
435
- await untilAborted(this.#hold(), alive.signal);
436
- }
437
- catch (error) {
438
- if (!alive.signal.aborted)
439
- throw error;
440
- throw new Error(`The hold of the reaper ${reaperName(this.#runId)} did not end within ${ms} ms`, { cause: error });
441
- }
599
+ await whileHeld((signal) => this.#hold(signal), this.#runId, this.#settings, this.#clock, true);
442
600
  }
443
- /** The hold, once at a time: it is cleared when the hold ends, and a failed one is not kept. */
444
- #hold = pMemoize(async () => {
601
+ /**
602
+ * The hold, once at a time: it is cleared when the hold ends, and a failed
603
+ * one is not kept. A call while one runs waits for that one, which stops at
604
+ * the signal of the call that started it.
605
+ */
606
+ #hold = pMemoize(async (signal) => {
445
607
  const { retries } = this.#settings;
446
608
  for (let attempt = 0; attempt <= retries; attempt++) {
447
- const reaper = await running(this.#docker, this.#runId, this.#settings, this.#clock);
448
- if (reaper === undefined)
609
+ const reply = await answer(this.#docker, this.#runId, this.#settings, this.#clock, this.#sources, signal);
610
+ if (reply.kind === 'ended')
449
611
  continue;
450
- const answer = await this.#ask(reaper);
451
- if (answer === 'held')
612
+ const { socket } = reply;
613
+ this.#sources = [
614
+ socket,
615
+ ...this.#sources.filter((source) => source !== socket),
616
+ ];
617
+ if (reply.kind === 'held') {
618
+ void this.#watch(reply.output);
452
619
  return;
453
- if (answer === 'closing')
454
- await closed(this.#docker, reaper, this.#settings, this.#clock);
620
+ }
621
+ await closed(this.#docker, reply.reaper, this.#settings, this.#clock, signal);
455
622
  }
456
623
  throw new Error(`The reaper ${reaperName(this.#runId)} ended or closed on each of ${retries + 1} tries to hold it`);
457
- });
458
- /** Asks `reaper` for a hold, and gives its answer. A hold that it gives is watched. */
459
- async #ask(reaper) {
460
- let holder;
461
- try {
462
- holder = await reaper.spawn({ Cmd: HOLD }, { stdin: true, ref: false });
463
- }
464
- catch (error) {
465
- // The reaper ended between the inspect and the exec.
466
- if (error instanceof ContainerNotRunningError ||
467
- error instanceof ContainerNotFoundError)
468
- return undefined;
469
- throw error;
470
- }
471
- const output = holder[Symbol.asyncIterator]();
472
- const answer = await firstLine(output);
473
- if (answer === 'held')
474
- void this.#watch(output);
475
- return answer;
476
- }
624
+ }, { cacheKey: () => 'hold' });
477
625
  /**
478
626
  * Takes the hold again at once when its output ends while this process
479
- * lives. A failure of that hold is not kept: the next held() tries again.
627
+ * lives, within its readiness bound, whose timer keeps no process running.
628
+ * A failure of that hold is not kept: the next held() tries again.
480
629
  */
481
630
  async #watch(output) {
482
631
  await drained(output);
483
632
  pMemoizeClear(this.#hold);
484
- await this.#hold().catch(() => { });
633
+ await whileHeld((signal) => this.#hold(signal), this.#runId, this.#settings, this.#clock, false).catch(() => { });
485
634
  }
486
635
  }
487
636
  /**
488
- * Starts the reaper of the dead run `runId` with no wait for a first holder,
489
- * and does not wait for it (ADR 0020, item 9). A reaper of the run that still
490
- * runs keeps the run. One that ended is replaced, at most `settings.retries`
491
- * more times.
637
+ * Starts the reaper of the dead run `runId`, and does not wait for it to act
638
+ * (ADR 0020, item 9). It holds that reaper only until the reaper verified its
639
+ * socket (item 14), and ends that hold at once. A reaper of the run that
640
+ * still runs keeps the run. One that ended is replaced, at most
641
+ * `settings.retries` more times, within the readiness bound of the hold.
492
642
  */
493
643
  export async function startReaper(docker, runId, settings = REAPER_DEFAULTS) {
494
- const immediate = { ...settings, firstHolder: 0 };
495
- for (let attempt = 0; attempt <= settings.retries; attempt++)
496
- if ((await running(docker, runId, immediate, globalThis)) !== undefined)
644
+ await whileHeld((signal) => started(docker, runId, settings, signal), runId, settings, globalThis, true);
645
+ }
646
+ /** The hold of startReaper: until the reaper verified its socket, or until it closed. */
647
+ async function started(docker, runId, settings, signal) {
648
+ for (let attempt = 0; attempt <= settings.retries; attempt++) {
649
+ const reply = await answer(docker, runId, settings, globalThis, socketSources(docker), signal);
650
+ if (reply.kind === 'closing')
497
651
  return;
652
+ if (reply.kind === 'held') {
653
+ await reply.holder.stdin?.close();
654
+ await drained(reply.output);
655
+ return;
656
+ }
657
+ }
498
658
  throw new Error(`The reaper ${reaperName(runId)} ended on each of ${settings.retries + 1} tries to start it`);
499
659
  }
500
660
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"reaper.js","sourceRoot":"","sources":["../../src/docker/reaper.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,EAAE,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAEpD,OAAO,EAAc,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACzE,OAAO,EAEL,sBAAsB,EACtB,wBAAwB,EAGxB,kBAAkB,EAClB,qBAAqB,GAEtB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAEL,UAAU,EACV,UAAU,GACX,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAChE,OAAO,EACL,mBAAmB,EACnB,WAAW,EACX,WAAW,EACX,cAAc,GACf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,gEAAgE;AAChE,MAAM,CAAC,MAAM,YAAY,GAAG,mBAAmB,CAAC;AAEhD,+GAA+G;AAC/G,MAAM,CAAC,MAAM,YAAY,GAAG,4BAA4B,CAAC;AAEzD,uDAAuD;AACvD,MAAM,CAAC,MAAM,YAAY,GAAG,4BAA4B,CAAC;AA0BzD,yEAAyE;AACzE,MAAM,CAAC,MAAM,eAAe,GAAmB;IAC7C,KAAK,EAAE,KAAK;IACZ,QAAQ,EAAE,KAAK;IACf,MAAM,EAAE,CAAC;IACT,cAAc,EAAE,MAAM;IACtB,OAAO,EAAE,EAAE;IACX,WAAW,EAAE,MAAM;IACnB,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAClC,SAAS,EAAE,MAAM;IACjB,UAAU,EAAE,CAAC;IACb,aAAa,EAAE,KAAK;CACrB,CAAC;AAEF,0GAA0G;AAC1G,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAa,EAAU,EAAE,CAClD,0BAA0B,KAAK,EAAE,CAAC;AAEpC,8DAA8D;AAC9D,MAAM,UAAU,GAAyB,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;AAE/E,oHAAoH;AACpH,MAAM,IAAI,GAAG,WAAW,CAAC;AAEzB;;;;GAIG;AACH,MAAM,IAAI,GAAG;IACX,IAAI;IACJ,IAAI;IACJ,WAAW,IAAI,mEAAmE;CACnF,CAAC;AAEF,sGAAsG;AACtG,SAAS,IAAI,CAAC,IAAY;IACxB,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,KAAK,SAAS,EAAE,CAAC,CAAC;IAC7E,OAAO,IAAI,OAAO,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,IAAY,EAAE,EAAE,CAAC,MAAM,IAAI,GAAG,CAAC,GAAG,CAAC;AACrF,CAAC;AAED,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAU,EAAE,CAAC,KAAK,IAAI,IAAI,CAAC;AAEzD,yGAAyG;AACzG,SAAS,UAAU,CAAC,SAAoB;IACtC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC,UAAU,CAAC;IAC1D,MAAM,GAAG,GAAG,CAAC,GAAW,EAAE,EAAE,CAC1B,SAAS;SACN,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;SAC9C,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACzB,IAAI,CAAC,GAAG,CAAC,CAAC;IACf,OAAO;MACH,SAAS,CAAC,IAAI;2BACO,IAAI;QACvB,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,sCAAsC,IAAI,CAAC,QAAQ,CAAC,EAAE;aAC/E,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;sCACK,GAAG,CAAC,MAAM,CAAC;4DACW,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;eAC9E,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;gCACrB,GAAG,CAAC,MAAM,CAAC;cAC7B,CAAC;AACf,CAAC;AAED;;;;;;GAMG;AACH,SAAS,MAAM;IACb,OAAO;;UAEC,IAAI;gBACE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cAkChB,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;;;;;yFAKc,YAAY;;;;;wDAK7C,YAAY,qBAAqB,UAAU,iCAAiC,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UA6BpI,cAAc,CAAC,IAAI,CAAC;;;;;;;;sEAQwC,WAAW,oBAAoB,mBAAmB,yBAAyB,WAAW;;;;;;;;;;;;;;;;;;gDAkB5G,WAAW,6BAA6B,mBAAmB;;;;;;;;2DAQhD,YAAY,iCAAiC,YAAY;;;;;;;;;;;;;;;;0DAgB1D,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmCrE,CAAC;AACF,CAAC;AAED,qFAAqF;AACrF,MAAM,UAAU,aAAa,CAC3B,KAAa,EACb,QAAwB;IAExB,OAAO;QACL,KAAK,EAAE,YAAY;QACnB,UAAU,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QAClC,GAAG,EAAE,EAAE;QACP,GAAG,EAAE;YACH,cAAc,KAAK,EAAE;YACrB,gBAAgB,QAAQ,CAAC,KAAK,EAAE;YAChC,mBAAmB,QAAQ,CAAC,QAAQ,EAAE;YACtC,iBAAiB,QAAQ,CAAC,MAAM,EAAE;YAClC,0BAA0B,QAAQ,CAAC,cAAc,EAAE;YACnD,kBAAkB,QAAQ,CAAC,OAAO,EAAE;YACpC,uBAAuB,QAAQ,CAAC,WAAW,EAAE;YAC7C,qBAAqB,QAAQ,CAAC,SAAS,EAAE;YACzC,qBAAqB,QAAQ,CAAC,SAAS,EAAE;YACzC,sBAAsB,QAAQ,CAAC,UAAU,EAAE;YAC3C,yBAAyB,QAAQ,CAAC,aAAa,EAAE;SAClD;QACD,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE;QACjC,UAAU,EAAE;YACV,UAAU,EAAE,IAAI;YAChB,KAAK,EAAE,CAAC,2CAA2C,CAAC;SACrD;KACF,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,WAAW,CAAC,QAAwB;IAClD,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAC;IAC1E,MAAM,OAAO,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,cAAc,GAAG,OAAO,GAAG,QAAQ,CAAC;IACpE,MAAM,IAAI,GAAG,CAAC,GAAG,OAAO,GAAG,cAAc,CAAC;IAC1C,MAAM,MAAM,GAAG,CAAC,GAAG,cAAc,GAAG,SAAS,CAAC;IAC9C,MAAM,OAAO,GAAG,CAAC,GAAG,cAAc,CAAC;IACnC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,CAAC;AACpE,CAAC;AAED;;;GAGG;AACH,KAAK,UAAU,MAAM,CACnB,MAAc,EACd,MAAiB,EACjB,QAAwB,EACxB,KAAY;IAEZ,MAAM,EAAE,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;IACjC,MAAM,OAAO,GAAG,MAAM,IAAI,CACxB,KAAK,IAAI,EAAE,CACT,CAAC,MAAM,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,KAAK,SAAS;QACrD,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,SAAS,EACf;QACE,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,MAAM,EAAE,SAAS;QACjB,KAAK;QACL,QAAQ,EAAE,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE;QACtC,GAAG,EAAE,KAAK;KACX,CACF,CAAC;IACF,IAAI,OAAO,KAAK,SAAS;QACvB,MAAM,IAAI,KAAK,CACb,cAAc,MAAM,CAAC,EAAE,sCAAsC,EAAE,KAAK,CACrE,CAAC;AACN,CAAC;AAED;;;;;;GAMG;AACH,KAAK,UAAU,OAAO,CACpB,MAAc,EACd,KAAa,EACb,QAAwB,EACxB,KAAY;IAEZ,MAAM,OAAO,GAAG,aAAa,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAC/C,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;IAC/B,IAAI,MAAiB,CAAC;IACtB,IAAI,CAAC;QACH,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,OAAO,EAAE;YACpE,IAAI;SACL,CAAC,CAAC,CAAC;IACN,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,CAAC,KAAK,YAAY,kBAAkB,CAAC;YAAE,MAAM,KAAK,CAAC;QACxD,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACtC,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,OAAO,EAAE;YACpE,IAAI;SACL,CAAC,CAAC,CAAC;IACN,CAAC;IACD,IAAI,KAAyB,CAAC;IAC9B,IAAI,CAAC;QACH,KAAK,GAAG,CAAC,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC;QAC/C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;YACrB,KAAK,GAAG,SAAS,CAAC;QACpB,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,sBAAsB;YAAE,OAAO,SAAS,CAAC;QAC9D,MAAM,KAAK,CAAC;IACd,CAAC;IACD,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,MAAM,CAAC;IACvC,IAAI,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,MAAM;QACxC,MAAM,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;;QAClC,MAAM,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;IACnD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,oFAAoF;AACpF,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;AAExD,kFAAkF;AAClF,MAAM,eAAe,GAAG,CAAC,KAAc,EAAW,EAAE,CAClD,KAAK,YAAY,qBAAqB;IACtC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QACnB,MAAM,IAAI,KAAK;QACf,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ;QAC9B,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;AAErC,uFAAuF;AACvF,KAAK,UAAU,SAAS,CACtB,MAAkC;IAElC,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;IAClC,IAAI,IAAI,GAAG,EAAE,CAAC;IACd,IAAI,CAAC;QACH,SAAS,CAAC;YACR,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;YAClC,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI;gBAAE,OAAO,SAAS,CAAC;YAC1C,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,KAAK,QAAQ;gBAAE,SAAS;YAC9C,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3D,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC/B,IAAI,GAAG,KAAK,CAAC,CAAC;gBAAE,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QAC5C,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,eAAe,CAAC,KAAK,CAAC;YAAE,OAAO,SAAS,CAAC;QAC7C,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,oEAAoE;AACpE,KAAK,UAAU,OAAO,CAAC,MAAkC;IACvD,IAAI,CAAC;QACH,OAAO,CAAC,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,KAAK,IAAI;YAAC,CAAC;IAC9C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC;YAAE,MAAM,KAAK,CAAC;IAC3C,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACH,MAAM,OAAO,UAAU;IACZ,OAAO,CAAS;IAChB,MAAM,CAAS;IACf,SAAS,CAAiB;IAC1B,MAAM,CAAQ;IAEvB,YACE,MAAc,EACd,KAAa,EACb,QAAwB,EACxB,KAAY;QAEZ,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACtB,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,KAAK,CAAC,IAAI,CACf,MAAc,EACd,KAAa,EACb,QAAwB,EACxB,KAAY;QAEZ,MAAM,IAAI,GAAG,IAAI,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;QAC5D,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,IAAI;QACR,uEAAuE;QACvE,qEAAqE;QACrE,sEAAsE;QACtE,8DAA8D;QAC9D,MAAM,EAAE,GACN,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,GAAG,CAAC,CAAC;YAC5B,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,GAAG,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QAChE,MAAM,KAAK,GAAG,OAAO,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QAClD,IAAI,CAAC;YACH,MAAM,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QACjD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO;gBAAE,MAAM,KAAK,CAAC;YACvC,MAAM,IAAI,KAAK,CACb,0BAA0B,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,uBAAuB,EAAE,KAAK,EAC/E,EAAE,KAAK,EAAE,KAAK,EAAE,CACjB,CAAC;QACJ,CAAC;IACH,CAAC;IAED,gGAAgG;IACvF,KAAK,GAAG,QAAQ,CAAC,KAAK,IAAmB,EAAE;QAClD,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC;QACnC,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC;YACpD,MAAM,MAAM,GAAG,MAAM,OAAO,CAC1B,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,MAAM,CACZ,CAAC;YACF,IAAI,MAAM,KAAK,SAAS;gBAAE,SAAS;YACnC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACvC,IAAI,MAAM,KAAK,MAAM;gBAAE,OAAO;YAC9B,IAAI,MAAM,KAAK,SAAS;gBACtB,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACpE,CAAC;QACD,MAAM,IAAI,KAAK,CACb,cAAc,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,+BAA+B,OAAO,GAAG,CAAC,mBAAmB,CACnG,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,uFAAuF;IACvF,KAAK,CAAC,IAAI,CAAC,MAAiB;QAC1B,IAAI,MAAM,CAAC;QACX,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;QAC1E,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,qDAAqD;YACrD,IACE,KAAK,YAAY,wBAAwB;gBACzC,KAAK,YAAY,sBAAsB;gBAEvC,OAAO,SAAS,CAAC;YACnB,MAAM,KAAK,CAAC;QACd,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;QAC9C,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,CAAC;QACvC,IAAI,MAAM,KAAK,MAAM;YAAE,KAAK,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAChD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,MAAM,CAAC,MAAkC;QAC7C,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;QACtB,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1B,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IACrC,CAAC;CACF;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,MAAc,EACd,KAAa,EACb,WAA2B,eAAe;IAE1C,MAAM,SAAS,GAAG,EAAE,GAAG,QAAQ,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC;IAClD,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE;QAC1D,IAAI,CAAC,MAAM,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,KAAK,SAAS;YACrE,OAAO;IACX,MAAM,IAAI,KAAK,CACb,cAAc,UAAU,CAAC,KAAK,CAAC,qBAAqB,QAAQ,CAAC,OAAO,GAAG,CAAC,oBAAoB,CAC7F,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,MAAc,EACd,QAAwB,EACxB,KAAY;IAEZ,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,MAAM,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC;QACxD,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,YAAY,EAAE,UAAU,CAAC,EAAE;KAC/C,CAAC,EAAE,CAAC;QACH,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAC/B,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC,UAAU,CAAC,CAC5C,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAChD,IAAI,SAAS,KAAK,SAAS,IAAI,MAAM,KAAK,SAAS;YAAE,SAAS;QAC9D,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC,UAAU,CAAC;QACpD,MAAM,UAAU,GACd,CAAC,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CACnD,KAAK,CAAC,UAAU,CAAC,GAAG,QAAQ,GAAG,CAAC,CACjC,EAAE,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,QAAQ,CAAC;QAC5C,IAAI,UAAU,KAAK,SAAS;YAAE,SAAS;QACvC,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QAC1D,IAAI,MAAM,CAAC;QACX,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,CACxB,EAAE,GAAG,EAAE,SAAS,CAAC,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC,IAAI,CAAC,EAAE,EACtD,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CACzB,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IACE,KAAK,CAAC,MAAM,CAAC,OAAO;gBACpB,KAAK,YAAY,wBAAwB;gBACzC,KAAK,YAAY,sBAAsB;gBAEvC,SAAS;YACX,MAAM,KAAK,CAAC;QACd,CAAC;QACD,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC;YAAE,SAAS;QACpC,KAAK,CAAC,IAAI,CACR,GAAG,MAAM,CAAC,MAAM;aACb,KAAK,CAAC,IAAI,CAAC;aACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;aAC1B,MAAM,CAAC,OAAO,CAAC,CACnB,CAAC;IACJ,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,MAAM,CAC1B,MAAc,EACd,KAAa,EACb,SAA2C;IAE3C,IAAI,CAAC,MAAM,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS;QACjE,OAAO,KAAK,CAAC;IACf,MAAM,OAAO,GAAG,EAAE,KAAK,EAAE,CAAC,GAAG,cAAc,IAAI,KAAK,EAAE,CAAC,EAAE,CAAC;IAC1D,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IACxE,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,YAAY,CAAC,KAAK,SAAS,CAAC;QACvE,OAAO,KAAK,CAAC;IACf,IAAI,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC;IACtE,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;IAChE,OAAO,CAAC,CAAC,MAAM,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AAC/D,CAAC"}
1
+ {"version":3,"file":"reaper.js","sourceRoot":"","sources":["../../src/docker/reaper.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zukhruf/testing",
3
- "version": "0.8.23",
3
+ "version": "0.8.25",
4
4
  "description": "Disposable fixtures for integration tests: Docker containers, database servers, SQLite and DuckDB databases, HTTP servers, streams, temporary directories and intercepted requests. Node's global setup and teardown remove what a killed test run left behind.",
5
5
  "license": "MIT",
6
6
  "repository": {
@@ -145,9 +145,9 @@
145
145
  "pg": "^8.23.1"
146
146
  },
147
147
  "dependencies": {
148
- "@zukhruf/async": "^0.8.23",
149
- "@zukhruf/docker": "^0.8.23",
150
- "@zukhruf/fs": "^0.8.23",
148
+ "@zukhruf/async": "^0.8.25",
149
+ "@zukhruf/docker": "^0.8.25",
150
+ "@zukhruf/fs": "^0.8.25",
151
151
  "nano-spawn": "^2.1.0",
152
152
  "p-memoize": "^8.0.0",
153
153
  "p-retry": "^8.0.1"