@moxt-ai/mobius 0.0.303 → 0.0.306
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli.js +335 -292
- package/dist/cli.js.map +4 -4
- package/dist/daemon/lifecycle/manager-client.d.ts.map +1 -1
- package/dist/daemon/lifecycle/manager-client.js +13 -12
- package/dist/daemon/lifecycle/manager-client.js.map +1 -1
- package/dist/daemon/lifecycle/manager.d.ts.map +1 -1
- package/dist/daemon/lifecycle/manager.js +11 -2
- package/dist/daemon/lifecycle/manager.js.map +1 -1
- package/dist/daemon/lifecycle/worker-process.d.ts +0 -1
- package/dist/daemon/lifecycle/worker-process.d.ts.map +1 -1
- package/dist/daemon/lifecycle/worker-process.js +1 -12
- package/dist/daemon/lifecycle/worker-process.js.map +1 -1
- package/dist/daemon/upgrades/package.d.ts +1 -0
- package/dist/daemon/upgrades/package.d.ts.map +1 -1
- package/dist/daemon/upgrades/package.js +70 -38
- package/dist/daemon/upgrades/package.js.map +1 -1
- package/dist/runtime/relay/connect.d.ts +6 -1
- package/dist/runtime/relay/connect.d.ts.map +1 -1
- package/dist/runtime/relay/connect.js +20 -2
- package/dist/runtime/relay/connect.js.map +1 -1
- package/dist/runtime/relay/run-relay-connection.d.ts.map +1 -1
- package/dist/runtime/relay/run-relay-connection.js +3 -1
- package/dist/runtime/relay/run-relay-connection.js.map +1 -1
- package/dist/runtime.js +24 -4
- package/dist/runtime.js.map +2 -2
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager-client.d.ts","sourceRoot":"","sources":["../../../src/daemon/lifecycle/manager-client.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,iBAAiB,
|
|
1
|
+
{"version":3,"file":"manager-client.d.ts","sourceRoot":"","sources":["../../../src/daemon/lifecycle/manager-client.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,iBAAiB,EAAwC,MAAM,wBAAwB,CAAC;AAuCtG,wBAAsB,oBAAoB,CACtC,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,WAAW,GACpB,OAAO,CAAC,IAAI,CAAC,CAaf;AAID,wBAAsB,yBAAyB,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAcnH;AA0CD,wBAAsB,WAAW,CAC7B,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,WAAW,GACpB,OAAO,CAAC,OAAO,CAAC,iBAAiB,EAAE;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,CAAC,CAAC,CAmB1D"}
|
|
@@ -3,9 +3,9 @@ import { managerLockExists } from "../../storage/daemon/manager-lock.js";
|
|
|
3
3
|
import { isNodeError } from "../../util/node-error.js";
|
|
4
4
|
import { CONTROL_TIMEOUT_MILLISECONDS, sendLocalRequest } from "../control/local-client.js";
|
|
5
5
|
import { lifecycleResponse } from "../control/protocol.js";
|
|
6
|
-
import {
|
|
7
|
-
async function spawnManager() {
|
|
8
|
-
const child = spawn(
|
|
6
|
+
import { prepareDaemonReleaseVersion } from "../upgrades/package.js";
|
|
7
|
+
async function spawnManager(launch) {
|
|
8
|
+
const child = spawn(launch.executable, [launch.entry, "__manager"], {
|
|
9
9
|
detached: true,
|
|
10
10
|
windowsHide: true,
|
|
11
11
|
env: process.env,
|
|
@@ -14,9 +14,9 @@ async function spawnManager() {
|
|
|
14
14
|
child.unref();
|
|
15
15
|
return child;
|
|
16
16
|
}
|
|
17
|
-
async function launchManager(
|
|
18
|
-
process.stdout.write(`Starting mobius daemon ${
|
|
19
|
-
await spawnManager();
|
|
17
|
+
async function launchManager(launch) {
|
|
18
|
+
process.stdout.write(`Starting mobius daemon ${launch.version}\n`);
|
|
19
|
+
await spawnManager(launch);
|
|
20
20
|
}
|
|
21
21
|
async function waitForManagerExit(stateDirectory, signal) {
|
|
22
22
|
const deadline = AbortSignal.any([signal, AbortSignal.timeout(30_000)]);
|
|
@@ -38,9 +38,10 @@ async function waitForManagerExit(stateDirectory, signal) {
|
|
|
38
38
|
throw deadline.reason;
|
|
39
39
|
}
|
|
40
40
|
export async function ensureWorkingProcess(stateDirectory, version, signal) {
|
|
41
|
+
const launch = await prepareDaemonReleaseVersion(version, signal);
|
|
41
42
|
const deadline = AbortSignal.any([signal, AbortSignal.timeout(CONTROL_TIMEOUT_MILLISECONDS)]);
|
|
42
|
-
await ensureManager(stateDirectory,
|
|
43
|
-
const response = lifecycleResponse.parse(await sendLocalRequest(stateDirectory, "manager", { kind: "ensure", launch
|
|
43
|
+
await ensureManager(stateDirectory, launch, deadline);
|
|
44
|
+
const response = lifecycleResponse.parse(await sendLocalRequest(stateDirectory, "manager", { kind: "ensure", launch }, deadline));
|
|
44
45
|
if (response.kind === "error") {
|
|
45
46
|
throw new Error(response.message);
|
|
46
47
|
}
|
|
@@ -64,20 +65,20 @@ export async function readWorkingProcessVersion(stateDirectory, signal) {
|
|
|
64
65
|
}
|
|
65
66
|
return null;
|
|
66
67
|
}
|
|
67
|
-
async function ensureManager(stateDirectory,
|
|
68
|
+
async function ensureManager(stateDirectory, launch, signal) {
|
|
68
69
|
let managerStarted = false;
|
|
69
70
|
while (!signal.aborted) {
|
|
70
71
|
try {
|
|
71
72
|
const response = lifecycleResponse.safeParse(await sendLocalRequest(stateDirectory, "manager", { kind: "status" }, signal));
|
|
72
73
|
if (response.success && response.data.kind === "status") {
|
|
73
74
|
if (managerStarted) {
|
|
74
|
-
process.stdout.write(`Mobius daemon ${
|
|
75
|
+
process.stdout.write(`Mobius daemon ${launch.version} started\n`);
|
|
75
76
|
}
|
|
76
77
|
return;
|
|
77
78
|
}
|
|
78
79
|
// Replace an older lifecycle protocol once; subsequent worker upgrades keep this manager.
|
|
79
80
|
await stopManager(stateDirectory, signal);
|
|
80
|
-
await launchManager(
|
|
81
|
+
await launchManager(launch);
|
|
81
82
|
managerStarted = true;
|
|
82
83
|
}
|
|
83
84
|
catch (cause) {
|
|
@@ -85,7 +86,7 @@ async function ensureManager(stateDirectory, managerVersion, signal) {
|
|
|
85
86
|
throw cause;
|
|
86
87
|
}
|
|
87
88
|
if (!managerStarted) {
|
|
88
|
-
await launchManager(
|
|
89
|
+
await launchManager(launch);
|
|
89
90
|
managerStarted = true;
|
|
90
91
|
}
|
|
91
92
|
await new Promise((resolve, reject) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager-client.js","sourceRoot":"","sources":["../../../src/daemon/lifecycle/manager-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,4BAA4B,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC5F,OAAO,EAA0B,iBAAiB,
|
|
1
|
+
{"version":3,"file":"manager-client.js","sourceRoot":"","sources":["../../../src/daemon/lifecycle/manager-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../../src/daemon/lifecycle/manager.ts"],"names":[],"mappings":"AAaA,wBAAsB,UAAU,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../../src/daemon/lifecycle/manager.ts"],"names":[],"mappings":"AAaA,wBAAsB,UAAU,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAsN3F"}
|
|
@@ -15,6 +15,7 @@ export async function runManager(stateDirectory, signal) {
|
|
|
15
15
|
const shutdown = new AbortController();
|
|
16
16
|
const combined = AbortSignal.any([signal, shutdown.signal]);
|
|
17
17
|
const lifecycle = new WorkerLifecycleLog(stateDirectory);
|
|
18
|
+
const workerExits = new Set();
|
|
18
19
|
let worker;
|
|
19
20
|
let switchState = null;
|
|
20
21
|
let queue = Promise.resolve();
|
|
@@ -54,7 +55,7 @@ export async function runManager(stateDirectory, signal) {
|
|
|
54
55
|
if (pid !== null) {
|
|
55
56
|
lifecycle.ready(pid, launch.version);
|
|
56
57
|
}
|
|
57
|
-
|
|
58
|
+
const exited = replacement.exited.then(async () => {
|
|
58
59
|
// Wait for the stderr pipe to drain before freezing the tail into
|
|
59
60
|
// the log; the restart below is not delayed by this.
|
|
60
61
|
await replacement.streamsSettled;
|
|
@@ -79,6 +80,8 @@ export async function runManager(stateDirectory, signal) {
|
|
|
79
80
|
}
|
|
80
81
|
}
|
|
81
82
|
});
|
|
83
|
+
workerExits.add(exited);
|
|
84
|
+
void exited.finally(() => workerExits.delete(exited));
|
|
82
85
|
};
|
|
83
86
|
const switchWorker = async (transition) => {
|
|
84
87
|
try {
|
|
@@ -161,7 +164,10 @@ export async function runManager(stateDirectory, signal) {
|
|
|
161
164
|
}
|
|
162
165
|
case "ensure": {
|
|
163
166
|
const launch = await decodeWorkerLaunch(command.launch);
|
|
164
|
-
if (!worker?.running ||
|
|
167
|
+
if (!worker?.running ||
|
|
168
|
+
worker.launch.version !== launch.version ||
|
|
169
|
+
worker.launch.entry !== launch.entry ||
|
|
170
|
+
worker.launch.executable !== launch.executable) {
|
|
165
171
|
await start(launch);
|
|
166
172
|
}
|
|
167
173
|
await worker?.ready;
|
|
@@ -202,6 +208,9 @@ export async function runManager(stateDirectory, signal) {
|
|
|
202
208
|
shutdown.abort();
|
|
203
209
|
await queue;
|
|
204
210
|
await worker?.close();
|
|
211
|
+
// Exit observers drain output and write the final lifecycle entry. Keep
|
|
212
|
+
// ownership until they finish, before quit can report the manager gone.
|
|
213
|
+
await Promise.all(workerExits);
|
|
205
214
|
rejectionGuard.release();
|
|
206
215
|
await release();
|
|
207
216
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../src/daemon/lifecycle/manager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../src/daemon/lifecycle/manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { type WorkerLaunch } from "../control/protocol.ts";
|
|
2
|
-
export declare function currentWorkerLaunch(version: string): WorkerLaunch;
|
|
3
2
|
export declare function decodeWorkerLaunch(value: unknown): Promise<WorkerLaunch>;
|
|
4
3
|
export declare class WorkerStartupError extends Error {
|
|
5
4
|
readonly code: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-process.d.ts","sourceRoot":"","sources":["../../../src/daemon/lifecycle/worker-process.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,YAAY,EAAgB,MAAM,wBAAwB,CAAC;AAEzE,
|
|
1
|
+
{"version":3,"file":"worker-process.d.ts","sourceRoot":"","sources":["../../../src/daemon/lifecycle/worker-process.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,YAAY,EAAgB,MAAM,wBAAwB,CAAC;AAEzE,wBAAsB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC,CAU9E;AAED,qBAAa,kBAAmB,SAAQ,KAAK;IACzC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,YAAY,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,EAAE,MAAM,SAAK,EAAE,MAAM,SAAK,EAK1F;CACJ;AAKD,MAAM,WAAW,UAAU;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;CAC1C;AAED,qBAAa,aAAa;;IAQtB,QAAQ,CAAC,MAAM,gBAAwB;IAIvC,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,CAAyB;IAC/D,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAEjC,YAAY,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,CAAC,UAAU,EA6DpF;IAOD,IAAI,OAAO,IAAI,OAAO,CAErB;IAED,IAAI,GAAG,IAAI,MAAM,CAMhB;IAID,IAAI,IAAI,IAAI,UAAU,CAKrB;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,QAAQ,CAAC,KAAK,QAAa,OAAO,CAAC,IAAI,CAAC,CAUtC;CA0BL"}
|
|
@@ -1,19 +1,8 @@
|
|
|
1
1
|
import { spawn } from "node:child_process";
|
|
2
|
-
import { isAbsolute
|
|
2
|
+
import { isAbsolute } from "node:path";
|
|
3
3
|
import { resolveLaunchFiles } from "../../util/process/local-executable.js";
|
|
4
4
|
import { isRecord } from "../../util/value-utils.js";
|
|
5
5
|
import { workerLaunch } from "../control/protocol.js";
|
|
6
|
-
export function currentWorkerLaunch(version) {
|
|
7
|
-
const entry = process.argv[1];
|
|
8
|
-
if (entry === undefined || entry.length === 0) {
|
|
9
|
-
throw new Error("The Mobius CLI entry path is unavailable");
|
|
10
|
-
}
|
|
11
|
-
return {
|
|
12
|
-
executable: process.execPath,
|
|
13
|
-
entry: resolve(entry),
|
|
14
|
-
version,
|
|
15
|
-
};
|
|
16
|
-
}
|
|
17
6
|
export async function decodeWorkerLaunch(value) {
|
|
18
7
|
const { entry, executable, version } = workerLaunch.parse(value);
|
|
19
8
|
if (!isAbsolute(entry) || !isAbsolute(executable)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-process.js","sourceRoot":"","sources":["../../../src/daemon/lifecycle/worker-process.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"worker-process.js","sourceRoot":"","sources":["../../../src/daemon/lifecycle/worker-process.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ export declare class DaemonReleaseUpgradeError extends Error {
|
|
|
3
3
|
readonly code: string;
|
|
4
4
|
constructor(code: string, message: string, options?: ErrorOptions);
|
|
5
5
|
}
|
|
6
|
+
export declare function prepareDaemonReleaseVersion(version: string, signal: AbortSignal): Promise<WorkerLaunch>;
|
|
6
7
|
export declare function installDaemonReleaseVersion(version: string, signal: AbortSignal): Promise<WorkerLaunch>;
|
|
7
8
|
export declare function findNewDaemonReleaseVersion(currentVersion: string, signal: AbortSignal): Promise<string | null>;
|
|
8
9
|
//# sourceMappingURL=package.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package.d.ts","sourceRoot":"","sources":["../../../src/daemon/upgrades/package.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"package.d.ts","sourceRoot":"","sources":["../../../src/daemon/upgrades/package.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAG3D,qBAAa,yBAA0B,SAAQ,KAAK;IAChD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,YAAY,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,EAGhE;CACJ;AAED,wBAAsB,2BAA2B,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,CA6B7G;AAED,wBAAsB,2BAA2B,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,CA0C7G;AA6DD,wBAAsB,2BAA2B,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAuBrH"}
|
|
@@ -5,6 +5,7 @@ import { z } from "zod";
|
|
|
5
5
|
import { readInstalledRelease, releasePrefix } from "../../storage/daemon/release-files.js";
|
|
6
6
|
import { canonicalPath, ensurePrivateDirectory } from "../../storage/files/local-files.js";
|
|
7
7
|
import { validateLocalPath } from "../../util/filesystem/private-path.js";
|
|
8
|
+
import { isNodeError } from "../../util/node-error.js";
|
|
8
9
|
import { findExecutableOnPath, runBoundedProcess } from "../../util/process/executable.js";
|
|
9
10
|
import { decodeWorkerLaunch } from "../lifecycle/worker-process.js";
|
|
10
11
|
export class DaemonReleaseUpgradeError extends Error {
|
|
@@ -14,6 +15,34 @@ export class DaemonReleaseUpgradeError extends Error {
|
|
|
14
15
|
this.code = code;
|
|
15
16
|
}
|
|
16
17
|
}
|
|
18
|
+
export async function prepareDaemonReleaseVersion(version, signal) {
|
|
19
|
+
runtimeUpgradeVersionSchema.parse(version);
|
|
20
|
+
signal.throwIfAborted();
|
|
21
|
+
const prefix = releasePrefix(version);
|
|
22
|
+
let installed;
|
|
23
|
+
try {
|
|
24
|
+
installed = await readInstalledRelease(prefix);
|
|
25
|
+
}
|
|
26
|
+
catch (cause) {
|
|
27
|
+
signal.throwIfAborted();
|
|
28
|
+
if (!isNodeError(cause, "ENOENT")) {
|
|
29
|
+
throw new DaemonReleaseUpgradeError("release_read_failed", "The installed Mobius release could not be read", { cause });
|
|
30
|
+
}
|
|
31
|
+
return await installDaemonReleaseVersion(version, signal);
|
|
32
|
+
}
|
|
33
|
+
try {
|
|
34
|
+
return await verifyInstalledDaemonRelease(installed, prefix, version, signal);
|
|
35
|
+
}
|
|
36
|
+
catch (cause) {
|
|
37
|
+
signal.throwIfAborted();
|
|
38
|
+
if (cause instanceof DaemonReleaseUpgradeError) {
|
|
39
|
+
throw cause;
|
|
40
|
+
}
|
|
41
|
+
throw new DaemonReleaseUpgradeError("release_invalid", "The installed Mobius release could not be verified", {
|
|
42
|
+
cause,
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
}
|
|
17
46
|
export async function installDaemonReleaseVersion(version, signal) {
|
|
18
47
|
runtimeUpgradeVersionSchema.parse(version);
|
|
19
48
|
const npm = await findExecutableOnPath("npm", process.env);
|
|
@@ -44,44 +73,7 @@ export async function installDaemonReleaseVersion(version, signal) {
|
|
|
44
73
|
timeoutMilliseconds: 300_000,
|
|
45
74
|
outputLimitBytes: 64 * 1024,
|
|
46
75
|
});
|
|
47
|
-
|
|
48
|
-
const metadata = z
|
|
49
|
-
.object({
|
|
50
|
-
name: z.literal("@moxt-ai/mobius"),
|
|
51
|
-
version: z.literal(version),
|
|
52
|
-
bin: z.object({ mobius: z.literal("dist/cli.js") }),
|
|
53
|
-
engines: z.object({ node: z.string().refine((value) => validRange(value) !== null) }),
|
|
54
|
-
})
|
|
55
|
-
.parse(JSON.parse(installed.manifest));
|
|
56
|
-
const entry = await canonicalPath(join(installed.packageRoot, metadata.bin.mobius));
|
|
57
|
-
const resolved = relative(await canonicalPath(prefix), entry);
|
|
58
|
-
if (resolved.startsWith("..") || isAbsolute(resolved)) {
|
|
59
|
-
throw new Error("Installed entry escaped npm prefix");
|
|
60
|
-
}
|
|
61
|
-
if (!satisfies(process.versions.node, metadata.engines.node)) {
|
|
62
|
-
throw new DaemonReleaseUpgradeError("node_incompatible", `Mobius ${version} requires Node.js ${metadata.engines.node}; the running daemon uses ${process.versions.node} at ${process.execPath}. Update Node.js before retrying.`);
|
|
63
|
-
}
|
|
64
|
-
// Run with the worker's actual executable before requesting any switch.
|
|
65
|
-
// An engines declaration alone cannot detect unsupported syntax or missing dependencies.
|
|
66
|
-
try {
|
|
67
|
-
const result = await runBoundedProcess({
|
|
68
|
-
command: process.execPath,
|
|
69
|
-
arguments: [entry, "--version"],
|
|
70
|
-
cwd: prefix,
|
|
71
|
-
environment: process.env,
|
|
72
|
-
signal,
|
|
73
|
-
timeoutMilliseconds: 30_000,
|
|
74
|
-
outputLimitBytes: 16 * 1024,
|
|
75
|
-
});
|
|
76
|
-
if (!result.stdout.split(/\r?\n/u).includes(`CLI: ${version}`)) {
|
|
77
|
-
throw new Error("Candidate did not report the requested CLI version");
|
|
78
|
-
}
|
|
79
|
-
}
|
|
80
|
-
catch (cause) {
|
|
81
|
-
signal.throwIfAborted();
|
|
82
|
-
throw new DaemonReleaseUpgradeError("release_startup_failed", `Mobius ${version} startup check failed; the current daemon is unchanged.`, { cause });
|
|
83
|
-
}
|
|
84
|
-
return await decodeWorkerLaunch({ executable: process.execPath, entry, version });
|
|
76
|
+
return await verifyInstalledDaemonRelease(await readInstalledRelease(prefix), prefix, version, signal);
|
|
85
77
|
}
|
|
86
78
|
catch (cause) {
|
|
87
79
|
signal.throwIfAborted();
|
|
@@ -91,6 +83,46 @@ export async function installDaemonReleaseVersion(version, signal) {
|
|
|
91
83
|
throw new DaemonReleaseUpgradeError("npm_install_failed", "npm could not install and verify the requested Mobius version", { cause });
|
|
92
84
|
}
|
|
93
85
|
}
|
|
86
|
+
async function verifyInstalledDaemonRelease(installed, prefix, version, signal) {
|
|
87
|
+
await validateLocalPath(prefix, true, true, signal);
|
|
88
|
+
const metadata = z
|
|
89
|
+
.object({
|
|
90
|
+
name: z.literal("@moxt-ai/mobius"),
|
|
91
|
+
version: z.literal(version),
|
|
92
|
+
bin: z.object({ mobius: z.literal("dist/cli.js") }),
|
|
93
|
+
engines: z.object({ node: z.string().refine((value) => validRange(value) !== null) }),
|
|
94
|
+
})
|
|
95
|
+
.parse(JSON.parse(installed.manifest));
|
|
96
|
+
const entry = await canonicalPath(join(installed.packageRoot, metadata.bin.mobius));
|
|
97
|
+
const resolved = relative(await canonicalPath(prefix), entry);
|
|
98
|
+
if (resolved.startsWith("..") || isAbsolute(resolved)) {
|
|
99
|
+
throw new Error("Installed entry escaped npm prefix");
|
|
100
|
+
}
|
|
101
|
+
if (!satisfies(process.versions.node, metadata.engines.node)) {
|
|
102
|
+
throw new DaemonReleaseUpgradeError("node_incompatible", `Mobius ${version} requires Node.js ${metadata.engines.node}; the running daemon uses ${process.versions.node} at ${process.execPath}. Update Node.js before retrying.`);
|
|
103
|
+
}
|
|
104
|
+
// Run with the worker's actual executable before requesting any switch.
|
|
105
|
+
// An engines declaration alone cannot detect unsupported syntax or missing dependencies.
|
|
106
|
+
try {
|
|
107
|
+
const result = await runBoundedProcess({
|
|
108
|
+
command: process.execPath,
|
|
109
|
+
arguments: [entry, "--version"],
|
|
110
|
+
cwd: prefix,
|
|
111
|
+
environment: process.env,
|
|
112
|
+
signal,
|
|
113
|
+
timeoutMilliseconds: 30_000,
|
|
114
|
+
outputLimitBytes: 16 * 1024,
|
|
115
|
+
});
|
|
116
|
+
if (!result.stdout.split(/\r?\n/u).includes(`CLI: ${version}`)) {
|
|
117
|
+
throw new Error("Candidate did not report the requested CLI version");
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
catch (cause) {
|
|
121
|
+
signal.throwIfAborted();
|
|
122
|
+
throw new DaemonReleaseUpgradeError("release_startup_failed", `Mobius ${version} startup check failed; the current daemon is unchanged.`, { cause });
|
|
123
|
+
}
|
|
124
|
+
return await decodeWorkerLaunch({ executable: process.execPath, entry, version });
|
|
125
|
+
}
|
|
94
126
|
// `npm view <package> <field> --json` prints the field's value through npm 11 and
|
|
95
127
|
// a one-element array from npm 12. Accept exactly those shapes; anything else is
|
|
96
128
|
// not a version npm reported.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package.js","sourceRoot":"","sources":["../../../src/daemon/upgrades/package.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACnD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,
|
|
1
|
+
{"version":3,"file":"package.js","sourceRoot":"","sources":["../../../src/daemon/upgrades/package.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,8 @@
|
|
|
1
1
|
import { WebSocket } from "undici";
|
|
2
|
-
export
|
|
2
|
+
export interface RelayConnection {
|
|
3
|
+
readonly socket: WebSocket;
|
|
4
|
+
/** Releases the underlying transport after the WebSocket close frame has been queued. */
|
|
5
|
+
readonly release: (reason: Error) => void;
|
|
6
|
+
}
|
|
7
|
+
export declare function connectRelay(url: URL, signal: AbortSignal): Promise<RelayConnection>;
|
|
3
8
|
//# sourceMappingURL=connect.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../../src/runtime/relay/connect.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../../src/runtime/relay/connect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,SAAS,EAAE,MAAM,QAAQ,CAAC;AAYpD,MAAM,WAAW,eAAe;IAC5B,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;IAC3B,yFAAyF;IACzF,QAAQ,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE,KAAK,KAAK,IAAI,CAAC;CAC7C;AAmBD,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,CA4GpF"}
|
|
@@ -20,13 +20,30 @@ class RelayConnectionError extends Error {
|
|
|
20
20
|
export function connectRelay(url, signal) {
|
|
21
21
|
signal.throwIfAborted();
|
|
22
22
|
return new Promise((resolve, reject) => {
|
|
23
|
+
let dispatchController;
|
|
24
|
+
const dispatcher = environmentProxyDispatcher.compose((dispatch) => (options, handler) => {
|
|
25
|
+
const trackedHandler = Object.create(handler);
|
|
26
|
+
trackedHandler.onRequestStart = (controller, context) => {
|
|
27
|
+
dispatchController = controller;
|
|
28
|
+
handler.onRequestStart?.(controller, context);
|
|
29
|
+
};
|
|
30
|
+
return dispatch(options, trackedHandler);
|
|
31
|
+
});
|
|
23
32
|
const endpoint = new URL(url);
|
|
24
33
|
const headers = relayAuthorization(endpoint);
|
|
25
34
|
endpoint.searchParams.delete("token");
|
|
26
35
|
const socket = new WebSocket(endpoint, {
|
|
27
|
-
dispatcher
|
|
36
|
+
dispatcher,
|
|
28
37
|
headers,
|
|
29
38
|
});
|
|
39
|
+
let released = false;
|
|
40
|
+
const release = (reason) => {
|
|
41
|
+
if (released) {
|
|
42
|
+
return;
|
|
43
|
+
}
|
|
44
|
+
released = true;
|
|
45
|
+
dispatchController?.abort(reason);
|
|
46
|
+
};
|
|
30
47
|
let finished = false;
|
|
31
48
|
const timeout = setTimeout(onTimeout, CONNECTION_TIMEOUT_MILLISECONDS);
|
|
32
49
|
const cleanup = () => {
|
|
@@ -43,6 +60,7 @@ export function connectRelay(url, signal) {
|
|
|
43
60
|
finished = true;
|
|
44
61
|
cleanup();
|
|
45
62
|
socket.close();
|
|
63
|
+
release(error);
|
|
46
64
|
reject(error);
|
|
47
65
|
};
|
|
48
66
|
const onAbort = () => {
|
|
@@ -70,7 +88,7 @@ export function connectRelay(url, signal) {
|
|
|
70
88
|
}
|
|
71
89
|
finished = true;
|
|
72
90
|
cleanup();
|
|
73
|
-
resolve(socket);
|
|
91
|
+
resolve({ release, socket });
|
|
74
92
|
};
|
|
75
93
|
function onTimeout() {
|
|
76
94
|
fail(new RelayConnectionError("relay_connection_timeout", "Relay connection timed out", {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../../src/runtime/relay/connect.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../../src/runtime/relay/connect.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-relay-connection.d.ts","sourceRoot":"","sources":["../../../src/runtime/relay/run-relay-connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAKH,KAAK,oBAAoB,EAG5B,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AAC5F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gDAAgD,CAAC;AAC3F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAChF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAClF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gDAAgD,CAAC;AAChG,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAGjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAElD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAGnE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,8BAA8B,CAAC;AAiEjF,MAAM,WAAW,sBAAsB;IACnC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;IAC/B,qFAAqF;IACrF,QAAQ,CAAC,yBAAyB,EAAE,CAChC,IAAI,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,EAC5C,MAAM,EAAE,WAAW,KAClB,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,QAAQ,CAAC,WAAW,EAAE,yBAAyB,CAAC;IAChD,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC;IAClC,QAAQ,CAAC,cAAc,EAAE,oBAAoB,CAAC;IAC9C,QAAQ,CAAC,UAAU,EAAE,iBAAiB,CAAC;IACvC,QAAQ,CAAC,SAAS,EAAE,4BAA4B,CAAC;IACjD,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAC1C,QAAQ,CAAC,eAAe,EAAE,oBAAoB,CAAC;IAC/C,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,WAAW,EAAE,0BAA0B,CAAC;IACjD,QAAQ,CAAC,WAAW,EAAE,MAAM,IAAI,CAAC;IACjC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;CACzB;AAED,wBAAsB,kBAAkB,CAAC,EACrC,MAAM,EACN,yBAAyB,EACzB,WAAW,EACX,YAAY,EACZ,cAAc,EACd,UAAU,EACV,SAAS,EACT,eAAe,EACf,eAAe,EACf,QAAQ,EACR,eAAe,EACf,WAAW,EACX,WAAW,EACX,MAAM,EACN,KAAK,GACR,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"run-relay-connection.d.ts","sourceRoot":"","sources":["../../../src/runtime/relay/run-relay-connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAKH,KAAK,oBAAoB,EAG5B,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AAC5F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gDAAgD,CAAC;AAC3F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAChF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAClF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gDAAgD,CAAC;AAChG,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAGjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAElD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAGnE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,8BAA8B,CAAC;AAiEjF,MAAM,WAAW,sBAAsB;IACnC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;IAC/B,qFAAqF;IACrF,QAAQ,CAAC,yBAAyB,EAAE,CAChC,IAAI,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,EAC5C,MAAM,EAAE,WAAW,KAClB,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,QAAQ,CAAC,WAAW,EAAE,yBAAyB,CAAC;IAChD,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC;IAClC,QAAQ,CAAC,cAAc,EAAE,oBAAoB,CAAC;IAC9C,QAAQ,CAAC,UAAU,EAAE,iBAAiB,CAAC;IACvC,QAAQ,CAAC,SAAS,EAAE,4BAA4B,CAAC;IACjD,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAC1C,QAAQ,CAAC,eAAe,EAAE,oBAAoB,CAAC;IAC/C,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,WAAW,EAAE,0BAA0B,CAAC;IACjD,QAAQ,CAAC,WAAW,EAAE,MAAM,IAAI,CAAC;IACjC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;CACzB;AAED,wBAAsB,kBAAkB,CAAC,EACrC,MAAM,EACN,yBAAyB,EACzB,WAAW,EACX,YAAY,EACZ,cAAc,EACd,UAAU,EACV,SAAS,EACT,eAAe,EACf,eAAe,EACf,QAAQ,EACR,eAAe,EACf,WAAW,EACX,WAAW,EACX,MAAM,EACN,KAAK,GACR,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmMxC"}
|
|
@@ -62,7 +62,8 @@ function rejectUnsupportedCommand(socket, correlation, rejection) {
|
|
|
62
62
|
export async function runRelayConnection({ config, reportUpgradeAvailability, directories, sessionTurns, nativeSessions, operations, publisher, eventProjection, externalContent, sessions, connectionEpoch, diagnostics, onConnected, signal, timer, }) {
|
|
63
63
|
const relayUrl = new URL(config.relayUrl);
|
|
64
64
|
relayUrl.searchParams.set("liveness", "1");
|
|
65
|
-
const
|
|
65
|
+
const relay = await connectRelay(relayUrl, signal);
|
|
66
|
+
const { socket } = relay;
|
|
66
67
|
diagnostics.connectionOpened(connectionEpoch);
|
|
67
68
|
const connectionController = new AbortController();
|
|
68
69
|
const commands = createRuntimeCommandDispatcher({
|
|
@@ -229,6 +230,7 @@ export async function runRelayConnection({ config, reportUpgradeAvailability, di
|
|
|
229
230
|
finally {
|
|
230
231
|
connectionController.abort();
|
|
231
232
|
await commands.settle();
|
|
233
|
+
relay.release(new Error("Relay connection released"));
|
|
232
234
|
}
|
|
233
235
|
}
|
|
234
236
|
//# sourceMappingURL=run-relay-connection.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-relay-connection.js","sourceRoot":"","sources":["../../../src/runtime/relay/run-relay-connection.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"run-relay-connection.js","sourceRoot":"","sources":["../../../src/runtime/relay/run-relay-connection.ts"],"names":[],"mappings":"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"}
|