@xemahq/xema 0.12.0 → 0.14.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/README.md +68 -20
- package/dist/assets/boot-graph.json +57 -15
- package/dist/assets/core/distribution.lock.json +668 -297
- package/dist/assets/core/images.lock.json +136 -136
- package/dist/assets/oss/distribution.lock.json +1532 -444
- package/dist/assets/oss/images.lock.json +423 -188
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +36 -1
- package/dist/cli.js.map +1 -1
- package/dist/commands/apply.d.ts.map +1 -1
- package/dist/commands/apply.js +1 -1
- package/dist/commands/apply.js.map +1 -1
- package/dist/commands/biome-dev.d.ts +3 -0
- package/dist/commands/biome-dev.d.ts.map +1 -0
- package/dist/commands/biome-dev.js +176 -0
- package/dist/commands/biome-dev.js.map +1 -0
- package/dist/commands/biome-validate.d.ts +10 -0
- package/dist/commands/biome-validate.d.ts.map +1 -0
- package/dist/commands/biome-validate.js +49 -0
- package/dist/commands/biome-validate.js.map +1 -0
- package/dist/commands/biome.d.ts.map +1 -1
- package/dist/commands/biome.js +359 -25
- package/dist/commands/biome.js.map +1 -1
- package/dist/commands/canopy.d.ts +3 -0
- package/dist/commands/canopy.d.ts.map +1 -0
- package/dist/commands/canopy.js +214 -0
- package/dist/commands/canopy.js.map +1 -0
- package/dist/commands/config.d.ts +3 -0
- package/dist/commands/config.d.ts.map +1 -0
- package/dist/commands/config.js +78 -0
- package/dist/commands/config.js.map +1 -0
- package/dist/commands/dev.d.ts.map +1 -1
- package/dist/commands/dev.js +71 -21
- package/dist/commands/dev.js.map +1 -1
- package/dist/commands/dist.js +1 -1
- package/dist/commands/dist.js.map +1 -1
- package/dist/commands/down.d.ts.map +1 -1
- package/dist/commands/down.js +40 -6
- package/dist/commands/down.js.map +1 -1
- package/dist/commands/import.d.ts.map +1 -1
- package/dist/commands/import.js +1 -1
- package/dist/commands/import.js.map +1 -1
- package/dist/commands/installation.d.ts +3 -0
- package/dist/commands/installation.d.ts.map +1 -0
- package/dist/commands/installation.js +101 -0
- package/dist/commands/installation.js.map +1 -0
- package/dist/commands/logs.d.ts.map +1 -1
- package/dist/commands/logs.js +6 -14
- package/dist/commands/logs.js.map +1 -1
- package/dist/commands/objects.d.ts.map +1 -1
- package/dist/commands/objects.js +85 -6
- package/dist/commands/objects.js.map +1 -1
- package/dist/commands/plan.d.ts.map +1 -1
- package/dist/commands/plan.js +1 -1
- package/dist/commands/plan.js.map +1 -1
- package/dist/commands/run.d.ts.map +1 -1
- package/dist/commands/run.js +61 -9
- package/dist/commands/run.js.map +1 -1
- package/dist/commands/serve.d.ts.map +1 -1
- package/dist/commands/serve.js +33 -13
- package/dist/commands/serve.js.map +1 -1
- package/dist/commands/shell.d.ts.map +1 -1
- package/dist/commands/shell.js +190 -6
- package/dist/commands/shell.js.map +1 -1
- package/dist/commands/source.d.ts +3 -0
- package/dist/commands/source.d.ts.map +1 -0
- package/dist/commands/source.js +120 -0
- package/dist/commands/source.js.map +1 -0
- package/dist/commands/status.d.ts.map +1 -1
- package/dist/commands/status.js +29 -3
- package/dist/commands/status.js.map +1 -1
- package/dist/commands/up.d.ts.map +1 -1
- package/dist/commands/up.js +55 -5
- package/dist/commands/up.js.map +1 -1
- package/dist/dev/env-defaults.d.ts.map +1 -1
- package/dist/dev/env-defaults.js +33 -11
- package/dist/dev/env-defaults.js.map +1 -1
- package/dist/dev/forked-worker.d.ts +15 -0
- package/dist/dev/forked-worker.d.ts.map +1 -1
- package/dist/dev/forked-worker.js +72 -14
- package/dist/dev/forked-worker.js.map +1 -1
- package/dist/dev/infra-preflight.d.ts +2 -1
- package/dist/dev/infra-preflight.d.ts.map +1 -1
- package/dist/dev/infra-preflight.js +10 -0
- package/dist/dev/infra-preflight.js.map +1 -1
- package/dist/dev/opa-policies.d.ts +3 -0
- package/dist/dev/opa-policies.d.ts.map +1 -0
- package/dist/dev/opa-policies.js +64 -0
- package/dist/dev/opa-policies.js.map +1 -0
- package/dist/lib/cli-errors.d.ts +7 -0
- package/dist/lib/cli-errors.d.ts.map +1 -0
- package/dist/lib/cli-errors.js +30 -0
- package/dist/lib/cli-errors.js.map +1 -0
- package/dist/lib/control-plane.d.ts.map +1 -1
- package/dist/lib/control-plane.js +5 -2
- package/dist/lib/control-plane.js.map +1 -1
- package/dist/lib/exit-codes.d.ts +3 -4
- package/dist/lib/exit-codes.d.ts.map +1 -1
- package/dist/lib/exit-codes.js +3 -4
- package/dist/lib/exit-codes.js.map +1 -1
- package/dist/lib/http-error.d.ts +2 -0
- package/dist/lib/http-error.d.ts.map +1 -0
- package/dist/lib/http-error.js +51 -0
- package/dist/lib/http-error.js.map +1 -0
- package/dist/lib/roster-profile.d.ts +10 -0
- package/dist/lib/roster-profile.d.ts.map +1 -0
- package/dist/lib/roster-profile.js +44 -0
- package/dist/lib/roster-profile.js.map +1 -0
- package/dist/runtime/biome-dev.d.ts +28 -0
- package/dist/runtime/biome-dev.d.ts.map +1 -0
- package/dist/runtime/biome-dev.js +131 -0
- package/dist/runtime/biome-dev.js.map +1 -0
- package/dist/runtime/biome-local-install.d.ts +29 -0
- package/dist/runtime/biome-local-install.d.ts.map +1 -0
- package/dist/runtime/biome-local-install.js +243 -0
- package/dist/runtime/biome-local-install.js.map +1 -0
- package/dist/runtime/biome-publish.d.ts +34 -0
- package/dist/runtime/biome-publish.d.ts.map +1 -0
- package/dist/runtime/biome-publish.js +214 -0
- package/dist/runtime/biome-publish.js.map +1 -0
- package/dist/runtime/biome-scaffold.d.ts +35 -0
- package/dist/runtime/biome-scaffold.d.ts.map +1 -0
- package/dist/runtime/biome-scaffold.js +153 -0
- package/dist/runtime/biome-scaffold.js.map +1 -0
- package/dist/runtime/biome-validate.d.ts +28 -0
- package/dist/runtime/biome-validate.d.ts.map +1 -0
- package/dist/runtime/biome-validate.js +450 -0
- package/dist/runtime/biome-validate.js.map +1 -0
- package/dist/runtime/boot-graph-loader.d.ts +1 -0
- package/dist/runtime/boot-graph-loader.d.ts.map +1 -1
- package/dist/runtime/boot-graph-loader.js +99 -7
- package/dist/runtime/boot-graph-loader.js.map +1 -1
- package/dist/runtime/canopy-refs.d.ts +8 -0
- package/dist/runtime/canopy-refs.d.ts.map +1 -0
- package/dist/runtime/canopy-refs.js +51 -0
- package/dist/runtime/canopy-refs.js.map +1 -0
- package/dist/runtime/canopy-replies.d.ts +14 -0
- package/dist/runtime/canopy-replies.d.ts.map +1 -0
- package/dist/runtime/canopy-replies.js +39 -0
- package/dist/runtime/canopy-replies.js.map +1 -0
- package/dist/runtime/capability-invoke.d.ts +35 -0
- package/dist/runtime/capability-invoke.d.ts.map +1 -0
- package/dist/runtime/capability-invoke.js +119 -0
- package/dist/runtime/capability-invoke.js.map +1 -0
- package/dist/runtime/config/dev-mode.d.ts +8 -0
- package/dist/runtime/config/dev-mode.d.ts.map +1 -0
- package/dist/runtime/config/dev-mode.js +84 -0
- package/dist/runtime/config/dev-mode.js.map +1 -0
- package/dist/runtime/config/init-presets.d.ts +1 -1
- package/dist/runtime/config/init-presets.d.ts.map +1 -1
- package/dist/runtime/config/init-presets.js +63 -11
- package/dist/runtime/config/init-presets.js.map +1 -1
- package/dist/runtime/config/loader.d.ts +1 -0
- package/dist/runtime/config/loader.d.ts.map +1 -1
- package/dist/runtime/config/loader.js +41 -5
- package/dist/runtime/config/loader.js.map +1 -1
- package/dist/runtime/config/schema.d.ts +27 -12
- package/dist/runtime/config/schema.d.ts.map +1 -1
- package/dist/runtime/config/schema.js +113 -8
- package/dist/runtime/config/schema.js.map +1 -1
- package/dist/runtime/config/sources-config.d.ts +14 -0
- package/dist/runtime/config/sources-config.d.ts.map +1 -0
- package/dist/runtime/config/sources-config.js +79 -0
- package/dist/runtime/config/sources-config.js.map +1 -0
- package/dist/runtime/distribution/compose.d.ts.map +1 -1
- package/dist/runtime/distribution/compose.js +3 -1
- package/dist/runtime/distribution/compose.js.map +1 -1
- package/dist/runtime/env-seeder.d.ts +5 -0
- package/dist/runtime/env-seeder.d.ts.map +1 -1
- package/dist/runtime/env-seeder.js +120 -17
- package/dist/runtime/env-seeder.js.map +1 -1
- package/dist/runtime/foreground.d.ts +4 -0
- package/dist/runtime/foreground.d.ts.map +1 -1
- package/dist/runtime/foreground.js +11 -0
- package/dist/runtime/foreground.js.map +1 -1
- package/dist/runtime/infra/infra-catalog.d.ts +1 -0
- package/dist/runtime/infra/infra-catalog.d.ts.map +1 -1
- package/dist/runtime/infra/infra-catalog.js +2 -1
- package/dist/runtime/infra/infra-catalog.js.map +1 -1
- package/dist/runtime/infra/infra-runner.d.ts +5 -0
- package/dist/runtime/infra/infra-runner.d.ts.map +1 -1
- package/dist/runtime/infra/infra-runner.js +82 -13
- package/dist/runtime/infra/infra-runner.js.map +1 -1
- package/dist/runtime/installation/compiler.d.ts +37 -0
- package/dist/runtime/installation/compiler.d.ts.map +1 -0
- package/dist/runtime/installation/compiler.js +190 -0
- package/dist/runtime/installation/compiler.js.map +1 -0
- package/dist/runtime/installation/contract.d.ts +125 -0
- package/dist/runtime/installation/contract.d.ts.map +1 -0
- package/dist/runtime/installation/contract.js +182 -0
- package/dist/runtime/installation/contract.js.map +1 -0
- package/dist/runtime/installation/diagnostics.d.ts +16 -0
- package/dist/runtime/installation/diagnostics.d.ts.map +1 -0
- package/dist/runtime/installation/diagnostics.js +21 -0
- package/dist/runtime/installation/diagnostics.js.map +1 -0
- package/dist/runtime/installation/diff.d.ts +17 -0
- package/dist/runtime/installation/diff.d.ts.map +1 -0
- package/dist/runtime/installation/diff.js +99 -0
- package/dist/runtime/installation/diff.js.map +1 -0
- package/dist/runtime/installation/format.d.ts +3 -0
- package/dist/runtime/installation/format.d.ts.map +1 -0
- package/dist/runtime/installation/format.js +22 -0
- package/dist/runtime/installation/format.js.map +1 -0
- package/dist/runtime/installation/from-current-config.d.ts +8 -0
- package/dist/runtime/installation/from-current-config.d.ts.map +1 -0
- package/dist/runtime/installation/from-current-config.js +75 -0
- package/dist/runtime/installation/from-current-config.js.map +1 -0
- package/dist/runtime/installation/index.d.ts +13 -0
- package/dist/runtime/installation/index.d.ts.map +1 -0
- package/dist/runtime/installation/index.js +29 -0
- package/dist/runtime/installation/index.js.map +1 -0
- package/dist/runtime/installation/lifecycle.d.ts +23 -0
- package/dist/runtime/installation/lifecycle.d.ts.map +1 -0
- package/dist/runtime/installation/lifecycle.js +70 -0
- package/dist/runtime/installation/lifecycle.js.map +1 -0
- package/dist/runtime/installation/serialization.d.ts +3 -0
- package/dist/runtime/installation/serialization.d.ts.map +1 -0
- package/dist/runtime/installation/serialization.js +39 -0
- package/dist/runtime/installation/serialization.js.map +1 -0
- package/dist/runtime/installation/state-store.d.ts +20 -0
- package/dist/runtime/installation/state-store.d.ts.map +1 -0
- package/dist/runtime/installation/state-store.js +257 -0
- package/dist/runtime/installation/state-store.js.map +1 -0
- package/dist/runtime/installation/status.d.ts +30 -0
- package/dist/runtime/installation/status.d.ts.map +1 -0
- package/dist/runtime/installation/status.js +138 -0
- package/dist/runtime/installation/status.js.map +1 -0
- package/dist/runtime/installation/support-bundle.d.ts +30 -0
- package/dist/runtime/installation/support-bundle.d.ts.map +1 -0
- package/dist/runtime/installation/support-bundle.js +130 -0
- package/dist/runtime/installation/support-bundle.js.map +1 -0
- package/dist/runtime/installation/validation.d.ts +8 -0
- package/dist/runtime/installation/validation.d.ts.map +1 -0
- package/dist/runtime/installation/validation.js +39 -0
- package/dist/runtime/installation/validation.js.map +1 -0
- package/dist/runtime/installation/validators/common.d.ts +4 -0
- package/dist/runtime/installation/validators/common.d.ts.map +1 -0
- package/dist/runtime/installation/validators/common.js +29 -0
- package/dist/runtime/installation/validators/common.js.map +1 -0
- package/dist/runtime/installation/validators/infrastructure.d.ts +4 -0
- package/dist/runtime/installation/validators/infrastructure.d.ts.map +1 -0
- package/dist/runtime/installation/validators/infrastructure.js +78 -0
- package/dist/runtime/installation/validators/infrastructure.js.map +1 -0
- package/dist/runtime/installation/validators/operational.d.ts +4 -0
- package/dist/runtime/installation/validators/operational.d.ts.map +1 -0
- package/dist/runtime/installation/validators/operational.js +126 -0
- package/dist/runtime/installation/validators/operational.js.map +1 -0
- package/dist/runtime/installation/validators/profile.d.ts +4 -0
- package/dist/runtime/installation/validators/profile.d.ts.map +1 -0
- package/dist/runtime/installation/validators/profile.js +78 -0
- package/dist/runtime/installation/validators/profile.js.map +1 -0
- package/dist/runtime/installation/validators/secrets.d.ts +4 -0
- package/dist/runtime/installation/validators/secrets.d.ts.map +1 -0
- package/dist/runtime/installation/validators/secrets.js +68 -0
- package/dist/runtime/installation/validators/secrets.js.map +1 -0
- package/dist/runtime/launch-plan-format.d.ts +3 -0
- package/dist/runtime/launch-plan-format.d.ts.map +1 -0
- package/dist/runtime/launch-plan-format.js +57 -0
- package/dist/runtime/launch-plan-format.js.map +1 -0
- package/dist/runtime/launch.d.ts +25 -3
- package/dist/runtime/launch.d.ts.map +1 -1
- package/dist/runtime/launch.js +264 -24
- package/dist/runtime/launch.js.map +1 -1
- package/dist/runtime/object-registry-client.d.ts +31 -0
- package/dist/runtime/object-registry-client.d.ts.map +1 -0
- package/dist/runtime/object-registry-client.js +54 -0
- package/dist/runtime/object-registry-client.js.map +1 -0
- package/dist/runtime/paths.d.ts +1 -0
- package/dist/runtime/paths.d.ts.map +1 -1
- package/dist/runtime/paths.js +2 -0
- package/dist/runtime/paths.js.map +1 -1
- package/dist/runtime/roster.d.ts +11 -4
- package/dist/runtime/roster.d.ts.map +1 -1
- package/dist/runtime/roster.js +78 -7
- package/dist/runtime/roster.js.map +1 -1
- package/dist/runtime/run-manifest.d.ts +23 -0
- package/dist/runtime/run-manifest.d.ts.map +1 -0
- package/dist/runtime/run-manifest.js +273 -0
- package/dist/runtime/run-manifest.js.map +1 -0
- package/dist/runtime/runner/container-runner.d.ts +6 -0
- package/dist/runtime/runner/container-runner.d.ts.map +1 -1
- package/dist/runtime/runner/container-runner.js +25 -6
- package/dist/runtime/runner/container-runner.js.map +1 -1
- package/dist/runtime/runner/docker-cli.d.ts +6 -1
- package/dist/runtime/runner/docker-cli.d.ts.map +1 -1
- package/dist/runtime/runner/docker-cli.js +47 -6
- package/dist/runtime/runner/docker-cli.js.map +1 -1
- package/dist/runtime/runner/native-runner.d.ts.map +1 -1
- package/dist/runtime/runner/native-runner.js +21 -14
- package/dist/runtime/runner/native-runner.js.map +1 -1
- package/dist/runtime/secrets/managed-local-store.d.ts +26 -0
- package/dist/runtime/secrets/managed-local-store.d.ts.map +1 -0
- package/dist/runtime/secrets/managed-local-store.js +202 -0
- package/dist/runtime/secrets/managed-local-store.js.map +1 -0
- package/dist/runtime/secrets/resolver.d.ts +23 -0
- package/dist/runtime/secrets/resolver.d.ts.map +1 -0
- package/dist/runtime/secrets/resolver.js +265 -0
- package/dist/runtime/secrets/resolver.js.map +1 -0
- package/dist/runtime/secrets/url-security.d.ts +3 -0
- package/dist/runtime/secrets/url-security.d.ts.map +1 -0
- package/dist/runtime/secrets/url-security.js +13 -0
- package/dist/runtime/secrets/url-security.js.map +1 -0
- package/dist/runtime/sources/credentials.d.ts.map +1 -1
- package/dist/runtime/sources/credentials.js +2 -1
- package/dist/runtime/sources/credentials.js.map +1 -1
- package/dist/runtime/sources/kinds/git.d.ts +6 -3
- package/dist/runtime/sources/kinds/git.d.ts.map +1 -1
- package/dist/runtime/sources/kinds/git.js +99 -22
- package/dist/runtime/sources/kinds/git.js.map +1 -1
- package/dist/runtime/sources/resolve-context.d.ts +7 -0
- package/dist/runtime/sources/resolve-context.d.ts.map +1 -0
- package/dist/runtime/sources/resolve-context.js +3 -0
- package/dist/runtime/sources/resolve-context.js.map +1 -0
- package/dist/runtime/sources/resolver.d.ts +2 -2
- package/dist/runtime/sources/resolver.d.ts.map +1 -1
- package/dist/runtime/sources/resolver.js +11 -5
- package/dist/runtime/sources/resolver.js.map +1 -1
- package/dist/runtime/store-client.d.ts +59 -0
- package/dist/runtime/store-client.d.ts.map +1 -0
- package/dist/runtime/store-client.js +71 -0
- package/dist/runtime/store-client.js.map +1 -0
- package/dist/runtime/supervisor.d.ts +6 -0
- package/dist/runtime/supervisor.d.ts.map +1 -1
- package/dist/runtime/supervisor.js +37 -5
- package/dist/runtime/supervisor.js.map +1 -1
- package/dist/runtime/waves.d.ts +1 -1
- package/dist/runtime/waves.d.ts.map +1 -1
- package/dist/runtime/waves.js +86 -19
- package/dist/runtime/waves.js.map +1 -1
- package/examples/01-local-native.yaml +4 -1
- package/examples/03-byo-infra.yaml +17 -7
- package/examples/05-appliance-helm.yaml +1 -1
- package/examples/06-biome-sources.yaml +4 -1
- package/package.json +6 -5
- package/xema.config.example.yaml +22 -18
|
@@ -0,0 +1,273 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.runManifestPath = runManifestPath;
|
|
4
|
+
exports.writeRunManifest = writeRunManifest;
|
|
5
|
+
exports.readRunManifest = readRunManifest;
|
|
6
|
+
exports.clearRunManifest = clearRunManifest;
|
|
7
|
+
exports.appendRunManifestEntry = appendRunManifestEntry;
|
|
8
|
+
exports.parsePidHandle = parsePidHandle;
|
|
9
|
+
exports.reapStaleServices = reapStaleServices;
|
|
10
|
+
const node_child_process_1 = require("node:child_process");
|
|
11
|
+
const node_fs_1 = require("node:fs");
|
|
12
|
+
const node_os_1 = require("node:os");
|
|
13
|
+
const node_path_1 = require("node:path");
|
|
14
|
+
const forked_worker_1 = require("../dev/forked-worker");
|
|
15
|
+
const REAP_GRACE_MS = 3_000;
|
|
16
|
+
const OWNERSHIP_PROBE_TIMEOUT_MS = 2_000;
|
|
17
|
+
const FORKED_MAIN_MODULE = 'dist/main.js';
|
|
18
|
+
const WATCH_TARGET_MODULE = 'src/main.ts';
|
|
19
|
+
const WATCH_RUNNER_MARKER = 'tsx';
|
|
20
|
+
const MAX_ANCESTRY_DEPTH = 16;
|
|
21
|
+
function runManifestPath() {
|
|
22
|
+
return (0, node_path_1.join)((0, node_os_1.homedir)(), '.xema', 'run', 'current.json');
|
|
23
|
+
}
|
|
24
|
+
function writeRunManifest(manifest) {
|
|
25
|
+
const path = runManifestPath();
|
|
26
|
+
(0, node_fs_1.mkdirSync)((0, node_path_1.dirname)(path), { recursive: true });
|
|
27
|
+
(0, node_fs_1.writeFileSync)(path, `${JSON.stringify(manifest, null, 2)}\n`, 'utf8');
|
|
28
|
+
}
|
|
29
|
+
function readRunManifest() {
|
|
30
|
+
return readRunManifestFile()?.services ?? [];
|
|
31
|
+
}
|
|
32
|
+
function readRunManifestFile() {
|
|
33
|
+
const path = runManifestPath();
|
|
34
|
+
if (!(0, node_fs_1.existsSync)(path)) {
|
|
35
|
+
return undefined;
|
|
36
|
+
}
|
|
37
|
+
let raw;
|
|
38
|
+
try {
|
|
39
|
+
raw = (0, node_fs_1.readFileSync)(path, 'utf8');
|
|
40
|
+
}
|
|
41
|
+
catch {
|
|
42
|
+
return undefined;
|
|
43
|
+
}
|
|
44
|
+
let parsed;
|
|
45
|
+
try {
|
|
46
|
+
parsed = JSON.parse(raw);
|
|
47
|
+
}
|
|
48
|
+
catch {
|
|
49
|
+
return undefined;
|
|
50
|
+
}
|
|
51
|
+
return normalizeManifest(parsed);
|
|
52
|
+
}
|
|
53
|
+
function clearRunManifest() {
|
|
54
|
+
try {
|
|
55
|
+
(0, node_fs_1.rmSync)(runManifestPath(), { force: true });
|
|
56
|
+
}
|
|
57
|
+
catch {
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
function appendRunManifestEntry(entry) {
|
|
61
|
+
const existing = readRunManifestFile();
|
|
62
|
+
const base = existing ?? {
|
|
63
|
+
startedAt: new Date().toISOString(),
|
|
64
|
+
pid: process.pid,
|
|
65
|
+
services: [],
|
|
66
|
+
};
|
|
67
|
+
const services = base.services.filter((s) => s.pid !== entry.pid);
|
|
68
|
+
services.push({ ...entry, mode: (0, forked_worker_1.resolveLaunchMode)() });
|
|
69
|
+
writeRunManifest({ ...base, services });
|
|
70
|
+
}
|
|
71
|
+
function parsePidHandle(handle) {
|
|
72
|
+
const prefix = 'pid:';
|
|
73
|
+
if (!handle.startsWith(prefix)) {
|
|
74
|
+
return undefined;
|
|
75
|
+
}
|
|
76
|
+
const pid = Number.parseInt(handle.slice(prefix.length), 10);
|
|
77
|
+
return Number.isInteger(pid) && pid > 0 ? pid : undefined;
|
|
78
|
+
}
|
|
79
|
+
function reapStaleServices() {
|
|
80
|
+
const killed = [];
|
|
81
|
+
const skipped = [];
|
|
82
|
+
const manifest = readRunManifestFile();
|
|
83
|
+
if (!manifest || manifest.services.length === 0) {
|
|
84
|
+
clearRunManifest();
|
|
85
|
+
return { killed, skipped };
|
|
86
|
+
}
|
|
87
|
+
const confirmed = [];
|
|
88
|
+
for (const entry of manifest.services) {
|
|
89
|
+
if (!isAlive(entry.pid)) {
|
|
90
|
+
continue;
|
|
91
|
+
}
|
|
92
|
+
const pids = resolveReapPids(entry);
|
|
93
|
+
if (pids !== null && pids.length > 0) {
|
|
94
|
+
confirmed.push({ entry, pids });
|
|
95
|
+
}
|
|
96
|
+
else {
|
|
97
|
+
skipped.push(entry);
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
const allPids = [...new Set(confirmed.flatMap((c) => c.pids))];
|
|
101
|
+
for (const pid of allPids) {
|
|
102
|
+
trySignal(pid, 'SIGTERM');
|
|
103
|
+
}
|
|
104
|
+
if (allPids.length > 0) {
|
|
105
|
+
sleepSync(REAP_GRACE_MS);
|
|
106
|
+
}
|
|
107
|
+
for (const pid of allPids) {
|
|
108
|
+
if (isAlive(pid)) {
|
|
109
|
+
trySignal(pid, 'SIGKILL');
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
for (const { entry } of confirmed) {
|
|
113
|
+
killed.push(entry);
|
|
114
|
+
}
|
|
115
|
+
clearRunManifest();
|
|
116
|
+
return { killed, skipped };
|
|
117
|
+
}
|
|
118
|
+
function resolveReapPids(entry) {
|
|
119
|
+
return entry.mode === forked_worker_1.LaunchMode.Watch
|
|
120
|
+
? resolveWatchReapPids(entry)
|
|
121
|
+
: resolveDistReapPids(entry);
|
|
122
|
+
}
|
|
123
|
+
function resolveDistReapPids(entry) {
|
|
124
|
+
const command = processCommand(entry.pid);
|
|
125
|
+
if (command !== null && command.includes(FORKED_MAIN_MODULE)) {
|
|
126
|
+
return [entry.pid];
|
|
127
|
+
}
|
|
128
|
+
if (listeningPids(entry.port).includes(entry.pid)) {
|
|
129
|
+
return [entry.pid];
|
|
130
|
+
}
|
|
131
|
+
return null;
|
|
132
|
+
}
|
|
133
|
+
function resolveWatchReapPids(entry) {
|
|
134
|
+
const command = processCommand(entry.pid);
|
|
135
|
+
const supervisorConfirmed = command !== null && looksLikeWatchSupervisor(command);
|
|
136
|
+
const ownedListeners = listeningPids(entry.port).filter((listener) => listener === entry.pid || isDescendantOf(listener, entry.pid));
|
|
137
|
+
if (!supervisorConfirmed && ownedListeners.length === 0) {
|
|
138
|
+
return null;
|
|
139
|
+
}
|
|
140
|
+
return [...new Set([entry.pid, ...ownedListeners])];
|
|
141
|
+
}
|
|
142
|
+
function normalizeManifest(value) {
|
|
143
|
+
if (typeof value !== 'object' || value === null) {
|
|
144
|
+
return undefined;
|
|
145
|
+
}
|
|
146
|
+
const obj = value;
|
|
147
|
+
const rawServices = Array.isArray(obj.services) ? obj.services : [];
|
|
148
|
+
const services = [];
|
|
149
|
+
for (const raw of rawServices) {
|
|
150
|
+
const entry = normalizeEntry(raw);
|
|
151
|
+
if (entry) {
|
|
152
|
+
services.push(entry);
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
return {
|
|
156
|
+
startedAt: typeof obj.startedAt === 'string' ? obj.startedAt : '',
|
|
157
|
+
pid: typeof obj.pid === 'number' ? obj.pid : 0,
|
|
158
|
+
services,
|
|
159
|
+
};
|
|
160
|
+
}
|
|
161
|
+
function normalizeEntry(value) {
|
|
162
|
+
if (typeof value !== 'object' || value === null) {
|
|
163
|
+
return undefined;
|
|
164
|
+
}
|
|
165
|
+
const obj = value;
|
|
166
|
+
if (typeof obj.name !== 'string' || typeof obj.pid !== 'number' || typeof obj.port !== 'number') {
|
|
167
|
+
return undefined;
|
|
168
|
+
}
|
|
169
|
+
if (!Number.isInteger(obj.pid) || obj.pid <= 0) {
|
|
170
|
+
return undefined;
|
|
171
|
+
}
|
|
172
|
+
const mode = parseLaunchMode(obj.mode);
|
|
173
|
+
if (mode === undefined) {
|
|
174
|
+
return undefined;
|
|
175
|
+
}
|
|
176
|
+
return { name: obj.name, pid: obj.pid, port: obj.port, mode };
|
|
177
|
+
}
|
|
178
|
+
function parseLaunchMode(value) {
|
|
179
|
+
if (value === forked_worker_1.LaunchMode.Dist || value === forked_worker_1.LaunchMode.Watch) {
|
|
180
|
+
return value;
|
|
181
|
+
}
|
|
182
|
+
return undefined;
|
|
183
|
+
}
|
|
184
|
+
function isAlive(pid) {
|
|
185
|
+
if (!Number.isInteger(pid) || pid <= 0) {
|
|
186
|
+
return false;
|
|
187
|
+
}
|
|
188
|
+
try {
|
|
189
|
+
process.kill(pid, 0);
|
|
190
|
+
return true;
|
|
191
|
+
}
|
|
192
|
+
catch (err) {
|
|
193
|
+
return err.code === 'EPERM';
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
function looksLikeWatchSupervisor(command) {
|
|
197
|
+
return (command.includes(WATCH_RUNNER_MARKER) &&
|
|
198
|
+
command.includes('watch') &&
|
|
199
|
+
command.includes(WATCH_TARGET_MODULE));
|
|
200
|
+
}
|
|
201
|
+
function processCommand(pid) {
|
|
202
|
+
try {
|
|
203
|
+
const out = (0, node_child_process_1.execFileSync)('ps', ['-p', String(pid), '-o', 'args='], {
|
|
204
|
+
encoding: 'utf8',
|
|
205
|
+
timeout: OWNERSHIP_PROBE_TIMEOUT_MS,
|
|
206
|
+
stdio: ['ignore', 'pipe', 'ignore'],
|
|
207
|
+
});
|
|
208
|
+
const line = out.trim();
|
|
209
|
+
return line.length > 0 ? line : null;
|
|
210
|
+
}
|
|
211
|
+
catch {
|
|
212
|
+
return null;
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
function listeningPids(port) {
|
|
216
|
+
if (!Number.isInteger(port) || port <= 0) {
|
|
217
|
+
return [];
|
|
218
|
+
}
|
|
219
|
+
try {
|
|
220
|
+
const out = (0, node_child_process_1.execFileSync)('lsof', ['-nP', `-iTCP:${String(port)}`, '-sTCP:LISTEN', '-t'], {
|
|
221
|
+
encoding: 'utf8',
|
|
222
|
+
timeout: OWNERSHIP_PROBE_TIMEOUT_MS,
|
|
223
|
+
stdio: ['ignore', 'pipe', 'ignore'],
|
|
224
|
+
});
|
|
225
|
+
return out
|
|
226
|
+
.split('\n')
|
|
227
|
+
.map((s) => s.trim())
|
|
228
|
+
.filter((s) => s.length > 0)
|
|
229
|
+
.map((s) => Number.parseInt(s, 10))
|
|
230
|
+
.filter((n) => Number.isInteger(n) && n > 0);
|
|
231
|
+
}
|
|
232
|
+
catch {
|
|
233
|
+
return [];
|
|
234
|
+
}
|
|
235
|
+
}
|
|
236
|
+
function parentPidOf(pid) {
|
|
237
|
+
try {
|
|
238
|
+
const out = (0, node_child_process_1.execFileSync)('ps', ['-p', String(pid), '-o', 'ppid='], {
|
|
239
|
+
encoding: 'utf8',
|
|
240
|
+
timeout: OWNERSHIP_PROBE_TIMEOUT_MS,
|
|
241
|
+
stdio: ['ignore', 'pipe', 'ignore'],
|
|
242
|
+
});
|
|
243
|
+
const ppid = Number.parseInt(out.trim(), 10);
|
|
244
|
+
return Number.isInteger(ppid) && ppid > 0 ? ppid : undefined;
|
|
245
|
+
}
|
|
246
|
+
catch {
|
|
247
|
+
return undefined;
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
function isDescendantOf(pid, ancestor) {
|
|
251
|
+
let cursor = parentPidOf(pid);
|
|
252
|
+
let depth = 0;
|
|
253
|
+
while (cursor !== undefined && cursor > 1 && depth < MAX_ANCESTRY_DEPTH) {
|
|
254
|
+
if (cursor === ancestor) {
|
|
255
|
+
return true;
|
|
256
|
+
}
|
|
257
|
+
cursor = parentPidOf(cursor);
|
|
258
|
+
depth += 1;
|
|
259
|
+
}
|
|
260
|
+
return false;
|
|
261
|
+
}
|
|
262
|
+
function trySignal(pid, signal) {
|
|
263
|
+
try {
|
|
264
|
+
process.kill(pid, signal);
|
|
265
|
+
}
|
|
266
|
+
catch {
|
|
267
|
+
}
|
|
268
|
+
}
|
|
269
|
+
function sleepSync(ms) {
|
|
270
|
+
const signal = new Int32Array(new SharedArrayBuffer(4));
|
|
271
|
+
Atomics.wait(signal, 0, 0, ms);
|
|
272
|
+
}
|
|
273
|
+
//# sourceMappingURL=run-manifest.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-manifest.js","sourceRoot":"","sources":["../../src/runtime/run-manifest.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,13 @@ export interface ContainerRunnerOptions {
|
|
|
3
3
|
readonly bin?: string;
|
|
4
4
|
readonly network: string;
|
|
5
5
|
readonly containerPort: number;
|
|
6
|
+
readonly distributionLockPath: string;
|
|
6
7
|
}
|
|
8
|
+
export interface DockerEnvironmentMaterialization {
|
|
9
|
+
readonly args: readonly string[];
|
|
10
|
+
readonly processEnv: NodeJS.ProcessEnv;
|
|
11
|
+
}
|
|
12
|
+
export declare function materializeDockerEnvironment(env: Readonly<Record<string, string>>, parentEnv?: NodeJS.ProcessEnv): DockerEnvironmentMaterialization;
|
|
7
13
|
export declare class ContainerRunner implements ServiceRunner {
|
|
8
14
|
private readonly opts;
|
|
9
15
|
readonly kind = ServiceRunnerKind.Container;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"container-runner.d.ts","sourceRoot":"","sources":["../../../src/runtime/runner/container-runner.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"container-runner.d.ts","sourceRoot":"","sources":["../../../src/runtime/runner/container-runner.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,iBAAiB,EACjB,KAAK,cAAc,EACnB,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACvB,MAAM,kBAAkB,CAAC;AAY1B,MAAM,WAAW,sBAAsB;IAErC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAEtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAEzB,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAS/B,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAC;CACvC;AAED,MAAM,WAAW,gCAAgC;IAC/C,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC;CACxC;AAED,wBAAgB,4BAA4B,CAC1C,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EACrC,SAAS,GAAE,MAAM,CAAC,UAAwB,GACzC,gCAAgC,CAWlC;AAED,qBAAa,eAAgB,YAAW,aAAa;IAIvC,OAAO,CAAC,QAAQ,CAAC,IAAI;IAHjC,QAAQ,CAAC,IAAI,+BAA+B;IAC5C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAY;gBAEN,IAAI,EAAE,sBAAsB;IAInD,KAAK,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,cAAc,CAAC;CA6D/D"}
|
|
@@ -1,9 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ContainerRunner = void 0;
|
|
4
|
+
exports.materializeDockerEnvironment = materializeDockerEnvironment;
|
|
5
|
+
const paths_1 = require("../paths");
|
|
4
6
|
const docker_cli_1 = require("./docker-cli");
|
|
5
7
|
const health_probe_1 = require("./health-probe");
|
|
6
8
|
const service_runner_1 = require("./service-runner");
|
|
9
|
+
function materializeDockerEnvironment(env, parentEnv = process.env) {
|
|
10
|
+
const processEnv = { ...parentEnv };
|
|
11
|
+
const args = [];
|
|
12
|
+
for (const [name, value] of Object.entries(env)) {
|
|
13
|
+
processEnv[name] = value;
|
|
14
|
+
args.push('-e', name);
|
|
15
|
+
}
|
|
16
|
+
return { args, processEnv };
|
|
17
|
+
}
|
|
7
18
|
class ContainerRunner {
|
|
8
19
|
opts;
|
|
9
20
|
kind = service_runner_1.ServiceRunnerKind.Container;
|
|
@@ -18,7 +29,9 @@ class ContainerRunner {
|
|
|
18
29
|
throw new Error(`${entry.name}: no imageRef in images.lock.json — cannot run in the container substrate. ` +
|
|
19
30
|
`Re-resolve the edition's images.lock or use the native substrate.`);
|
|
20
31
|
}
|
|
21
|
-
const image = entry.imageTag
|
|
32
|
+
const image = entry.imageTag
|
|
33
|
+
? `${entry.imageRef}:${entry.imageTag}`
|
|
34
|
+
: entry.imageRef;
|
|
22
35
|
const args = [
|
|
23
36
|
'run',
|
|
24
37
|
'-d',
|
|
@@ -32,12 +45,13 @@ class ContainerRunner {
|
|
|
32
45
|
'unless-stopped',
|
|
33
46
|
'-p',
|
|
34
47
|
`${String(port)}:${String(this.opts.containerPort)}`,
|
|
48
|
+
'-v',
|
|
49
|
+
`${this.opts.distributionLockPath}:${paths_1.CONTAINER_DISTRIBUTION_LOCK_PATH}:ro`,
|
|
35
50
|
];
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
}
|
|
51
|
+
const dockerEnvironment = materializeDockerEnvironment(env);
|
|
52
|
+
args.push(...dockerEnvironment.args);
|
|
39
53
|
args.push(image);
|
|
40
|
-
const containerId = (await this.docker.run(args)).trim();
|
|
54
|
+
const containerId = (await this.docker.run(args, { env: dockerEnvironment.processEnv })).trim();
|
|
41
55
|
const url = `http://127.0.0.1:${String(port)}`;
|
|
42
56
|
try {
|
|
43
57
|
await (0, health_probe_1.waitForReady)(url, readinessTimeoutMs);
|
|
@@ -51,7 +65,12 @@ class ContainerRunner {
|
|
|
51
65
|
url,
|
|
52
66
|
handle: containerId.slice(0, 12),
|
|
53
67
|
close: async (graceMs) => {
|
|
54
|
-
await this.docker.runQuiet([
|
|
68
|
+
await this.docker.runQuiet([
|
|
69
|
+
'stop',
|
|
70
|
+
'-t',
|
|
71
|
+
String(Math.ceil(graceMs / 1000)),
|
|
72
|
+
entry.name,
|
|
73
|
+
]);
|
|
55
74
|
await this.docker.runQuiet(['rm', '-f', entry.name]);
|
|
56
75
|
},
|
|
57
76
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"container-runner.js","sourceRoot":"","sources":["../../../src/runtime/runner/container-runner.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"container-runner.js","sourceRoot":"","sources":["../../../src/runtime/runner/container-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,16 @@
|
|
|
1
1
|
export declare const LAUNCHER_LABEL = "xema.launcher";
|
|
2
|
+
export interface DockerRunOptions {
|
|
3
|
+
readonly env?: NodeJS.ProcessEnv;
|
|
4
|
+
}
|
|
2
5
|
export declare class DockerCli {
|
|
3
6
|
private readonly bin;
|
|
4
7
|
constructor(bin?: string);
|
|
5
|
-
run(args: readonly string[]): Promise<string>;
|
|
8
|
+
run(args: readonly string[], opts?: DockerRunOptions): Promise<string>;
|
|
9
|
+
stream(args: readonly string[]): Promise<void>;
|
|
6
10
|
runQuiet(args: readonly string[]): Promise<string>;
|
|
7
11
|
available(): Promise<boolean>;
|
|
8
12
|
ensureNetwork(name: string): Promise<void>;
|
|
9
13
|
launcherContainers(): Promise<string[]>;
|
|
14
|
+
volumeExists(name: string): Promise<boolean>;
|
|
10
15
|
}
|
|
11
16
|
//# sourceMappingURL=docker-cli.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker-cli.d.ts","sourceRoot":"","sources":["../../../src/runtime/runner/docker-cli.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,cAAc,kBAAkB,CAAC;AAE9C,qBAAa,SAAS;IACR,OAAO,CAAC,QAAQ,CAAC,GAAG;gBAAH,GAAG,GAAE,MAAiB;IAEnD,GAAG,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"docker-cli.d.ts","sourceRoot":"","sources":["../../../src/runtime/runner/docker-cli.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,cAAc,kBAAkB,CAAC;AAE9C,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CAClC;AAED,qBAAa,SAAS;IACR,OAAO,CAAC,QAAQ,CAAC,GAAG;gBAAH,GAAG,GAAE,MAAiB;IAEnD,GAAG,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,EAAE,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;IAgC1E,MAAM,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IASxC,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IASlD,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAU7B,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoB1C,kBAAkB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAgBvC,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAcnD"}
|
|
@@ -8,9 +8,12 @@ class DockerCli {
|
|
|
8
8
|
constructor(bin = 'docker') {
|
|
9
9
|
this.bin = bin;
|
|
10
10
|
}
|
|
11
|
-
run(args) {
|
|
11
|
+
run(args, opts = {}) {
|
|
12
12
|
return new Promise((resolve, reject) => {
|
|
13
|
-
(0, node_child_process_1.execFile)(this.bin, [...args], {
|
|
13
|
+
(0, node_child_process_1.execFile)(this.bin, [...args], {
|
|
14
|
+
maxBuffer: 32 * 1024 * 1024,
|
|
15
|
+
...(opts.env !== undefined ? { env: opts.env } : {}),
|
|
16
|
+
}, (err, stdout, stderr) => {
|
|
14
17
|
if (err) {
|
|
15
18
|
reject(new Error(`${this.bin} ${args.join(' ')} failed: ${stderr || err.message}`));
|
|
16
19
|
return;
|
|
@@ -19,6 +22,13 @@ class DockerCli {
|
|
|
19
22
|
});
|
|
20
23
|
});
|
|
21
24
|
}
|
|
25
|
+
stream(args) {
|
|
26
|
+
return new Promise((resolve, reject) => {
|
|
27
|
+
const child = (0, node_child_process_1.spawn)(this.bin, [...args], { stdio: 'inherit' });
|
|
28
|
+
child.on('error', reject);
|
|
29
|
+
child.on('exit', () => resolve());
|
|
30
|
+
});
|
|
31
|
+
}
|
|
22
32
|
async runQuiet(args) {
|
|
23
33
|
try {
|
|
24
34
|
return await this.run(args);
|
|
@@ -28,12 +38,26 @@ class DockerCli {
|
|
|
28
38
|
}
|
|
29
39
|
}
|
|
30
40
|
async available() {
|
|
31
|
-
const out = await this.runQuiet([
|
|
41
|
+
const out = await this.runQuiet([
|
|
42
|
+
'version',
|
|
43
|
+
'--format',
|
|
44
|
+
'{{.Server.Version}}',
|
|
45
|
+
]);
|
|
32
46
|
return out.trim().length > 0;
|
|
33
47
|
}
|
|
34
48
|
async ensureNetwork(name) {
|
|
35
|
-
const existing = await this.runQuiet([
|
|
36
|
-
|
|
49
|
+
const existing = await this.runQuiet([
|
|
50
|
+
'network',
|
|
51
|
+
'ls',
|
|
52
|
+
'--filter',
|
|
53
|
+
`name=^${name}$`,
|
|
54
|
+
'--format',
|
|
55
|
+
'{{.Name}}',
|
|
56
|
+
]);
|
|
57
|
+
if (!existing
|
|
58
|
+
.split('\n')
|
|
59
|
+
.map((l) => l.trim())
|
|
60
|
+
.includes(name)) {
|
|
37
61
|
await this.runQuiet(['network', 'create', name]);
|
|
38
62
|
}
|
|
39
63
|
}
|
|
@@ -46,7 +70,24 @@ class DockerCli {
|
|
|
46
70
|
'--format',
|
|
47
71
|
'{{.Names}}',
|
|
48
72
|
]);
|
|
49
|
-
return out
|
|
73
|
+
return out
|
|
74
|
+
.split('\n')
|
|
75
|
+
.map((l) => l.trim())
|
|
76
|
+
.filter((l) => l.length > 0);
|
|
77
|
+
}
|
|
78
|
+
async volumeExists(name) {
|
|
79
|
+
const out = await this.runQuiet([
|
|
80
|
+
'volume',
|
|
81
|
+
'ls',
|
|
82
|
+
'--filter',
|
|
83
|
+
`name=^${name}$`,
|
|
84
|
+
'--format',
|
|
85
|
+
'{{.Name}}',
|
|
86
|
+
]);
|
|
87
|
+
return out
|
|
88
|
+
.split('\n')
|
|
89
|
+
.map((line) => line.trim())
|
|
90
|
+
.includes(name);
|
|
50
91
|
}
|
|
51
92
|
}
|
|
52
93
|
exports.DockerCli = DockerCli;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker-cli.js","sourceRoot":"","sources":["../../../src/runtime/runner/docker-cli.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"docker-cli.js","sourceRoot":"","sources":["../../../src/runtime/runner/docker-cli.ts"],"names":[],"mappings":";;;AAAA,2DAAqD;AAUxC,QAAA,cAAc,GAAG,eAAe,CAAC;AAM9C,MAAa,SAAS;IACS;IAA7B,YAA6B,MAAc,QAAQ;QAAtB,QAAG,GAAH,GAAG,CAAmB;IAAG,CAAC;IAEvD,GAAG,CAAC,IAAuB,EAAE,OAAyB,EAAE;QACtD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,IAAA,6BAAQ,EACN,IAAI,CAAC,GAAG,EACR,CAAC,GAAG,IAAI,CAAC,EACT;gBACE,SAAS,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI;gBAC3B,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACrD,EACD,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;gBACtB,IAAI,GAAG,EAAE,CAAC;oBACR,MAAM,CACJ,IAAI,KAAK,CACP,GAAG,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,MAAM,IAAI,GAAG,CAAC,OAAO,EAAE,CACjE,CACF,CAAC;oBACF,OAAO;gBACT,CAAC;gBACD,OAAO,CAAC,MAAM,CAAC,CAAC;YAClB,CAAC,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAUD,MAAM,CAAC,IAAuB;QAC5B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,KAAK,GAAG,IAAA,0BAAK,EAAC,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;YAC/D,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC1B,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;IACL,CAAC;IAGD,KAAK,CAAC,QAAQ,CAAC,IAAuB;QACpC,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC9B,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC;IAGD,KAAK,CAAC,SAAS;QACb,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC;YAC9B,SAAS;YACT,UAAU;YACV,qBAAqB;SACtB,CAAC,CAAC;QACH,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;IAC/B,CAAC;IAGD,KAAK,CAAC,aAAa,CAAC,IAAY;QAC9B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC;YACnC,SAAS;YACT,IAAI;YACJ,UAAU;YACV,SAAS,IAAI,GAAG;YAChB,UAAU;YACV,WAAW;SACZ,CAAC,CAAC;QACH,IACE,CAAC,QAAQ;aACN,KAAK,CAAC,IAAI,CAAC;aACX,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;aACpB,QAAQ,CAAC,IAAI,CAAC,EACjB,CAAC;YACD,MAAM,IAAI,CAAC,QAAQ,CAAC,CAAC,SAAS,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;QACnD,CAAC;IACH,CAAC;IAGD,KAAK,CAAC,kBAAkB;QACtB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC;YAC9B,IAAI;YACJ,IAAI;YACJ,UAAU;YACV,SAAS,sBAAc,EAAE;YACzB,UAAU;YACV,YAAY;SACb,CAAC,CAAC;QACH,OAAO,GAAG;aACP,KAAK,CAAC,IAAI,CAAC;aACX,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;aACpB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACjC,CAAC;IAGD,KAAK,CAAC,YAAY,CAAC,IAAY;QAC7B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC;YAC9B,QAAQ;YACR,IAAI;YACJ,UAAU;YACV,SAAS,IAAI,GAAG;YAChB,UAAU;YACV,WAAW;SACZ,CAAC,CAAC;QACH,OAAO,GAAG;aACP,KAAK,CAAC,IAAI,CAAC;aACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;aAC1B,QAAQ,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC;CACF;AAjHD,8BAiHC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native-runner.d.ts","sourceRoot":"","sources":["../../../src/runtime/runner/native-runner.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"native-runner.d.ts","sourceRoot":"","sources":["../../../src/runtime/runner/native-runner.ts"],"names":[],"mappings":"AASA,OAAO,EACL,iBAAiB,EACjB,KAAK,cAAc,EACnB,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACvB,MAAM,kBAAkB,CAAC;AAa1B,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;CAChC;AAED,qBAAa,YAAa,YAAW,aAAa;IAChD,QAAQ,CAAC,IAAI,4BAA4B;IACzC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;gBAE1B,IAAI,GAAE,mBAAwB;IAWpC,KAAK,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,cAAc,CAAC;YAoDhD,WAAW;IAoCzB,OAAO,CAAC,kBAAkB;CAiB3B"}
|
|
@@ -23,17 +23,28 @@ class NativeRunner {
|
|
|
23
23
|
throw new Error(`${entry.name}: no servicePath (platform-substrate service) — not bootable natively. ` +
|
|
24
24
|
`Use the container substrate for this service.`);
|
|
25
25
|
}
|
|
26
|
+
const watch = (0, forked_worker_1.resolveLaunchMode)() === forked_worker_1.LaunchMode.Watch;
|
|
26
27
|
const baseRoot = entry.sourceRoot ?? this.monorepoRoot;
|
|
27
|
-
const serviceRoot = this.resolveServiceRoot(entry.servicePath, baseRoot);
|
|
28
|
+
const serviceRoot = this.resolveServiceRoot(entry.servicePath, baseRoot, watch);
|
|
28
29
|
if (!serviceRoot) {
|
|
29
|
-
const
|
|
30
|
-
|
|
30
|
+
const marker = watch ? (0, node_path_1.join)('src', 'main.ts') : (0, node_path_1.join)('dist', 'main.js');
|
|
31
|
+
const primary = (0, node_path_1.join)(baseRoot, entry.servicePath, marker);
|
|
32
|
+
throw new Error(watch
|
|
33
|
+
? `${entry.name} source entry not found at ${primary}. --watch runs each ` +
|
|
34
|
+
`service from source; a source checkout of ${entry.name} is required.`
|
|
35
|
+
: `${entry.name} dist not found at ${primary}. Run \`pnpm --filter ${entry.name} build\` first.`);
|
|
31
36
|
}
|
|
32
|
-
|
|
33
|
-
return this.forkService(entry, serviceRoot, port, readinessTimeoutMs);
|
|
37
|
+
return this.forkService(entry, serviceRoot, port, readinessTimeoutMs, watch, env);
|
|
34
38
|
}
|
|
35
|
-
async forkService(entry, serviceRoot, port, readinessTimeoutMs) {
|
|
36
|
-
const child = await (0, forked_worker_1.spawnForkedWorker)({
|
|
39
|
+
async forkService(entry, serviceRoot, port, readinessTimeoutMs, watch, env) {
|
|
40
|
+
const child = await (0, forked_worker_1.spawnForkedWorker)({
|
|
41
|
+
name: entry.name,
|
|
42
|
+
port,
|
|
43
|
+
siblingAppDir: serviceRoot,
|
|
44
|
+
readinessTimeoutMs,
|
|
45
|
+
watch,
|
|
46
|
+
env,
|
|
47
|
+
}, '/');
|
|
37
48
|
return {
|
|
38
49
|
name: entry.name,
|
|
39
50
|
url: child.url,
|
|
@@ -41,13 +52,14 @@ class NativeRunner {
|
|
|
41
52
|
close: () => child.close(),
|
|
42
53
|
};
|
|
43
54
|
}
|
|
44
|
-
resolveServiceRoot(servicePath, baseRoot) {
|
|
55
|
+
resolveServiceRoot(servicePath, baseRoot, watch) {
|
|
56
|
+
const marker = watch ? (0, node_path_1.join)('src', 'main.ts') : (0, node_path_1.join)('dist', 'main.js');
|
|
45
57
|
const candidates = [
|
|
46
58
|
(0, node_path_1.join)(baseRoot, servicePath),
|
|
47
59
|
(0, node_path_1.join)(baseRoot, (0, node_path_1.dirname)(servicePath)),
|
|
48
60
|
];
|
|
49
61
|
for (const candidate of candidates) {
|
|
50
|
-
if ((0, node_fs_1.existsSync)((0, node_path_1.join)(candidate,
|
|
62
|
+
if ((0, node_fs_1.existsSync)((0, node_path_1.join)(candidate, marker))) {
|
|
51
63
|
return candidate;
|
|
52
64
|
}
|
|
53
65
|
}
|
|
@@ -55,9 +67,4 @@ class NativeRunner {
|
|
|
55
67
|
}
|
|
56
68
|
}
|
|
57
69
|
exports.NativeRunner = NativeRunner;
|
|
58
|
-
function applyEnv(env) {
|
|
59
|
-
for (const [k, v] of Object.entries(env)) {
|
|
60
|
-
process.env[k] = v;
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
70
|
//# sourceMappingURL=native-runner.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native-runner.js","sourceRoot":"","sources":["../../../src/runtime/runner/native-runner.ts"],"names":[],"mappings":";;;AAAA,qCAAqC;AACrC,yCAA0C;AAE1C,
|
|
1
|
+
{"version":3,"file":"native-runner.js","sourceRoot":"","sources":["../../../src/runtime/runner/native-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
export interface InfrastructureCredentialPair {
|
|
2
|
+
readonly username: string;
|
|
3
|
+
readonly password: string;
|
|
4
|
+
}
|
|
5
|
+
export interface LocalInfrastructureCredentials {
|
|
6
|
+
readonly postgres?: InfrastructureCredentialPair;
|
|
7
|
+
readonly objectStore?: InfrastructureCredentialPair;
|
|
8
|
+
}
|
|
9
|
+
export interface ManagedLocalCredentials extends LocalInfrastructureCredentials {
|
|
10
|
+
readonly postgres: InfrastructureCredentialPair;
|
|
11
|
+
readonly objectStore: InfrastructureCredentialPair;
|
|
12
|
+
}
|
|
13
|
+
export interface ManagedLocalCredentialStoreOptions {
|
|
14
|
+
readonly installationIdentity: string;
|
|
15
|
+
readonly stateRoot?: string;
|
|
16
|
+
}
|
|
17
|
+
export declare class ManagedLocalCredentialStore {
|
|
18
|
+
readonly installationId: string;
|
|
19
|
+
readonly directory: string;
|
|
20
|
+
readonly path: string;
|
|
21
|
+
constructor(opts: ManagedLocalCredentialStoreOptions);
|
|
22
|
+
load(): Promise<ManagedLocalCredentials | undefined>;
|
|
23
|
+
getOrCreate(): Promise<ManagedLocalCredentials>;
|
|
24
|
+
purge(): Promise<boolean>;
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=managed-local-store.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"managed-local-store.d.ts","sourceRoot":"","sources":["../../../src/runtime/secrets/managed-local-store.ts"],"names":[],"mappings":"AAmBA,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B;AAGD,MAAM,WAAW,8BAA8B;IAC7C,QAAQ,CAAC,QAAQ,CAAC,EAAE,4BAA4B,CAAC;IACjD,QAAQ,CAAC,WAAW,CAAC,EAAE,4BAA4B,CAAC;CACrD;AAGD,MAAM,WAAW,uBACf,SAAQ,8BAA8B;IACtC,QAAQ,CAAC,QAAQ,EAAE,4BAA4B,CAAC;IAChD,QAAQ,CAAC,WAAW,EAAE,4BAA4B,CAAC;CACpD;AAOD,MAAM,WAAW,kCAAkC;IAEjD,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAC;IAEtC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC7B;AAUD,qBAAa,2BAA2B;IACtC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;gBAEV,IAAI,EAAE,kCAAkC;IAc9C,IAAI,IAAI,OAAO,CAAC,uBAAuB,GAAG,SAAS,CAAC;IAmEpD,WAAW,IAAI,OAAO,CAAC,uBAAuB,CAAC;IAiE/C,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC;CAqBhC"}
|