@moxt-ai/mobius 0.0.335 → 0.0.336
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 +283 -123
- package/dist/cli.js.map +3 -3
- package/dist/daemon/control/protocol.d.ts +2 -0
- package/dist/daemon/control/protocol.d.ts.map +1 -1
- package/dist/daemon/control/protocol.js +25 -0
- package/dist/daemon/control/protocol.js.map +1 -1
- package/dist/daemon/control/switch-status.d.ts.map +1 -1
- package/dist/daemon/control/switch-status.js +3 -3
- package/dist/daemon/control/switch-status.js.map +1 -1
- package/dist/daemon/lifecycle/manager-client.d.ts.map +1 -1
- package/dist/daemon/lifecycle/manager-client.js +12 -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 +4 -9
- package/dist/daemon/lifecycle/manager.js.map +1 -1
- package/dist/daemon/upgrades/upgrade.d.ts.map +1 -1
- package/dist/daemon/upgrades/upgrade.js +4 -4
- package/dist/daemon/upgrades/upgrade.js.map +1 -1
- package/dist/runtime/relay/run-relay-connection.d.ts.map +1 -1
- package/dist/runtime/relay/run-relay-connection.js +5 -57
- package/dist/runtime/relay/run-relay-connection.js.map +1 -1
- package/dist/runtime.js +236 -93
- package/dist/runtime.js.map +3 -3
- package/dist/session/live/session-configurations.d.ts.map +1 -1
- package/dist/session/live/session-configurations.js +8 -1
- package/dist/session/live/session-configurations.js.map +1 -1
- package/dist/session/turn/execution-receipts.d.ts.map +1 -1
- package/dist/session/turn/execution-receipts.js +6 -3
- package/dist/session/turn/execution-receipts.js.map +1 -1
- package/dist/storage/session/execution-receipt-table.d.ts.map +1 -1
- package/dist/storage/session/execution-receipt-table.js +5 -2
- package/dist/storage/session/execution-receipt-table.js.map +1 -1
- package/package.json +2 -2
|
@@ -145,4 +145,6 @@ export declare const lifecycleResponse: z.ZodReadonly<z.ZodDiscriminatedUnion<[z
|
|
|
145
145
|
message: z.ZodString;
|
|
146
146
|
}, z.core.$strip>], "kind">>;
|
|
147
147
|
export type LifecycleResponse = z.infer<typeof lifecycleResponse>;
|
|
148
|
+
export declare const decodeKnownLifecycleCommand: (value: unknown) => z.infer<typeof lifecycleCommand> | null;
|
|
149
|
+
export declare const decodeKnownLifecycleResponse: (value: unknown) => LifecycleResponse | null;
|
|
148
150
|
//# sourceMappingURL=protocol.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../../src/daemon/control/protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,YAAY;;;;kBAMV,CAAC;AAChB,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAC;AAQxD,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4BAcf,CAAC;AAChB,MAAM,MAAM,wBAAwB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAEzE,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;4BAad,CAAC;AAChB,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4BAYf,CAAC;AAChB,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../../src/daemon/control/protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,YAAY;;;;kBAMV,CAAC;AAChB,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAC;AAQxD,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4BAcf,CAAC;AAChB,MAAM,MAAM,wBAAwB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAEzE,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;4BAad,CAAC;AAChB,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4BAYf,CAAC;AAChB,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAgBlE,eAAO,MAAM,2BAA2B,UAAW,OAAO,KAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,GAAG,IACT,CAAC;AAExF,eAAO,MAAM,4BAA4B,UAAW,OAAO,KAAG,iBAAiB,GAAG,IAejF,CAAC"}
|
|
@@ -54,4 +54,29 @@ export const lifecycleResponse = z
|
|
|
54
54
|
z.object({ kind: z.literal("error"), code: z.string(), message: z.string() }),
|
|
55
55
|
])
|
|
56
56
|
.readonly();
|
|
57
|
+
const lifecycleCommandKinds = new Set(["ensure", "status", "stop", "switch", "switch-status"]);
|
|
58
|
+
const lifecycleResponseKinds = new Set(["error", "status", "stopped", "switching", "switch-status"]);
|
|
59
|
+
const daemonSwitchStateKinds = new Set(["rolled-back", "switched", "switching"]);
|
|
60
|
+
function hasUnknownKind(value, known) {
|
|
61
|
+
return (typeof value === "object" &&
|
|
62
|
+
value !== null &&
|
|
63
|
+
"kind" in value &&
|
|
64
|
+
typeof value.kind === "string" &&
|
|
65
|
+
!known.has(value.kind));
|
|
66
|
+
}
|
|
67
|
+
export const decodeKnownLifecycleCommand = (value) => hasUnknownKind(value, lifecycleCommandKinds) ? null : lifecycleCommand.parse(value);
|
|
68
|
+
export const decodeKnownLifecycleResponse = (value) => {
|
|
69
|
+
if (hasUnknownKind(value, lifecycleResponseKinds)) {
|
|
70
|
+
return null;
|
|
71
|
+
}
|
|
72
|
+
if (typeof value === "object" &&
|
|
73
|
+
value !== null &&
|
|
74
|
+
"kind" in value &&
|
|
75
|
+
value.kind === "switch-status" &&
|
|
76
|
+
"state" in value &&
|
|
77
|
+
hasUnknownKind(value.state, daemonSwitchStateKinds)) {
|
|
78
|
+
return lifecycleResponse.parse({ ...value, state: null });
|
|
79
|
+
}
|
|
80
|
+
return lifecycleResponse.parse(value);
|
|
81
|
+
};
|
|
57
82
|
//# sourceMappingURL=protocol.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protocol.js","sourceRoot":"","sources":["../../../src/daemon/control/protocol.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"protocol.js","sourceRoot":"","sources":["../../../src/daemon/control/protocol.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"switch-status.d.ts","sourceRoot":"","sources":["../../../src/daemon/control/switch-status.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kDAAkD,CAAC;AAE9F,OAAO,EAAE,KAAK,wBAAwB,
|
|
1
|
+
{"version":3,"file":"switch-status.d.ts","sourceRoot":"","sources":["../../../src/daemon/control/switch-status.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kDAAkD,CAAC;AAE9F,OAAO,EAAE,KAAK,wBAAwB,EAAgC,MAAM,eAAe,CAAC;AAE5F,wBAAsB,gBAAgB,CAClC,SAAS,EAAE,qBAAqB,EAChC,MAAM,EAAE,WAAW,EACnB,IAAI,UAAQ,GACb,OAAO,CAAC,wBAAwB,GAAG,IAAI,CAAC,CAQ1C"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { sendLocalRequest } from "./local-client.js";
|
|
2
|
-
import {
|
|
2
|
+
import { decodeKnownLifecycleResponse } from "./protocol.js";
|
|
3
3
|
export async function readSwitchStatus(directory, signal, wait = false) {
|
|
4
|
-
const response =
|
|
5
|
-
if (response
|
|
4
|
+
const response = decodeKnownLifecycleResponse(await sendLocalRequest(directory, "manager", { kind: "switch-status", wait }, signal));
|
|
5
|
+
if (response?.kind !== "switch-status") {
|
|
6
6
|
throw new Error("The manager could not return the switch status");
|
|
7
7
|
}
|
|
8
8
|
return response.state;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"switch-status.js","sourceRoot":"","sources":["../../../src/daemon/control/switch-status.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAiC,
|
|
1
|
+
{"version":3,"file":"switch-status.js","sourceRoot":"","sources":["../../../src/daemon/control/switch-status.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAiC,4BAA4B,EAAE,MAAM,eAAe,CAAC;AAE5F,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAClC,SAAgC,EAChC,MAAmB,EACnB,IAAI,GAAG,KAAK;IAEZ,MAAM,QAAQ,GAAG,4BAA4B,CACzC,MAAM,gBAAgB,CAAC,SAAS,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,EAAE,MAAM,CAAC,CACxF,CAAC;IACF,IAAI,QAAQ,EAAE,IAAI,KAAK,eAAe,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;IACtE,CAAC;IACD,OAAO,QAAQ,CAAC,KAAK,CAAC;AAC1B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager-client.d.ts","sourceRoot":"","sources":["../../../src/daemon/lifecycle/manager-client.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kDAAkD,CAAC;AAI9F,OAAO,
|
|
1
|
+
{"version":3,"file":"manager-client.d.ts","sourceRoot":"","sources":["../../../src/daemon/lifecycle/manager-client.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kDAAkD,CAAC;AAI9F,OAAO,EAAgC,KAAK,iBAAiB,EAAqB,MAAM,wBAAwB,CAAC;AAyCjH,wBAAsB,oBAAoB,CACtC,cAAc,EAAE,qBAAqB,EACrC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,WAAW,GACpB,OAAO,CAAC,MAAM,CAAC,CAgBjB;AAID,wBAAsB,yBAAyB,CAC3C,cAAc,EAAE,qBAAqB,EACrC,MAAM,EAAE,WAAW,GACpB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAcxB;AA8CD,wBAAsB,WAAW,CAC7B,cAAc,EAAE,qBAAqB,EACrC,MAAM,EAAE,WAAW,GACpB,OAAO,CAAC,OAAO,CAAC,iBAAiB,EAAE;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,CAAC,CAAC,CAmB1D"}
|
|
@@ -5,7 +5,7 @@ import { readCurrentDataVersion } from "../../storage/daemon/version-data.js";
|
|
|
5
5
|
import { readStateDirectory } from "../../storage/state-directory.js";
|
|
6
6
|
import { isNodeError } from "../../util/node-error.js";
|
|
7
7
|
import { CONTROL_TIMEOUT_MILLISECONDS, sendLocalRequest } from "../control/local-client.js";
|
|
8
|
-
import {
|
|
8
|
+
import { decodeKnownLifecycleResponse } from "../control/protocol.js";
|
|
9
9
|
import { prepareDaemonReleaseVersion } from "../upgrades/package.js";
|
|
10
10
|
async function spawnManager(launch) {
|
|
11
11
|
const child = spawn(launch.executable, [launch.entry, "__manager"], {
|
|
@@ -48,11 +48,11 @@ export async function ensureWorkingProcess(stateDirectory, cliVersion, signal) {
|
|
|
48
48
|
const launch = await prepareDaemonReleaseVersion(version, signal);
|
|
49
49
|
const deadline = AbortSignal.any([signal, AbortSignal.timeout(CONTROL_TIMEOUT_MILLISECONDS)]);
|
|
50
50
|
await ensureManager(stateDirectory, launch, deadline);
|
|
51
|
-
const response =
|
|
52
|
-
if (response
|
|
51
|
+
const response = decodeKnownLifecycleResponse(await sendLocalRequest(stateDirectory, "manager", { kind: "ensure", launch }, deadline));
|
|
52
|
+
if (response?.kind === "error") {
|
|
53
53
|
throw new Error(response.message);
|
|
54
54
|
}
|
|
55
|
-
if (response
|
|
55
|
+
if (response?.kind !== "status" || response.worker?.version !== version) {
|
|
56
56
|
throw new Error("The working daemon did not start");
|
|
57
57
|
}
|
|
58
58
|
return version;
|
|
@@ -61,9 +61,9 @@ export async function ensureWorkingProcess(stateDirectory, cliVersion, signal) {
|
|
|
61
61
|
// reports one. Callers fall back to ensureWorkingProcess to start a daemon.
|
|
62
62
|
export async function readWorkingProcessVersion(stateDirectory, signal) {
|
|
63
63
|
try {
|
|
64
|
-
const response =
|
|
65
|
-
if (response
|
|
66
|
-
return response.
|
|
64
|
+
const response = decodeKnownLifecycleResponse(await sendLocalRequest(stateDirectory, "manager", { kind: "status" }, signal));
|
|
65
|
+
if (response?.kind === "status") {
|
|
66
|
+
return response.worker?.version ?? null;
|
|
67
67
|
}
|
|
68
68
|
}
|
|
69
69
|
catch (cause) {
|
|
@@ -77,8 +77,8 @@ async function ensureManager(stateDirectory, launch, signal) {
|
|
|
77
77
|
let managerStarted = false;
|
|
78
78
|
while (!signal.aborted) {
|
|
79
79
|
try {
|
|
80
|
-
const response =
|
|
81
|
-
if (response
|
|
80
|
+
const response = decodeKnownLifecycleResponse(await sendLocalRequest(stateDirectory, "manager", { kind: "status" }, signal));
|
|
81
|
+
if (response?.kind === "status") {
|
|
82
82
|
if (managerStarted) {
|
|
83
83
|
process.stdout.write(`Mobius daemon ${launch.version} started\n`);
|
|
84
84
|
}
|
|
@@ -113,11 +113,11 @@ async function ensureManager(stateDirectory, launch, signal) {
|
|
|
113
113
|
}
|
|
114
114
|
export async function stopManager(stateDirectory, signal) {
|
|
115
115
|
try {
|
|
116
|
-
const response =
|
|
117
|
-
if (response
|
|
116
|
+
const response = decodeKnownLifecycleResponse(await sendLocalRequest(stateDirectory, "manager", { kind: "stop" }, signal));
|
|
117
|
+
if (response?.kind === "error") {
|
|
118
118
|
throw new Error(response.message);
|
|
119
119
|
}
|
|
120
|
-
if (response
|
|
120
|
+
if (response?.kind !== "stopped") {
|
|
121
121
|
throw new Error("The Mobius manager returned an unexpected response");
|
|
122
122
|
}
|
|
123
123
|
await waitForManagerExit(stateDirectory, signal);
|
|
@@ -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,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAE9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,4BAA4B,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC5F,OAAO,
|
|
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,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAE9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,4BAA4B,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC5F,OAAO,EAAE,4BAA4B,EAA6C,MAAM,wBAAwB,CAAC;AACjH,OAAO,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAErE,KAAK,UAAU,YAAY,CAAC,MAAoB;IAC5C,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,EAAE;QAChE,QAAQ,EAAE,IAAI;QACd,WAAW,EAAE,IAAI;QACjB,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,KAAK,EAAE,QAAQ;KAClB,CAAC,CAAC;IACH,KAAK,CAAC,KAAK,EAAE,CAAC;IACd,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,MAAoB;IAC7C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,MAAM,CAAC,OAAO,IAAI,CAAC,CAAC;IACnE,MAAM,YAAY,CAAC,MAAM,CAAC,CAAC;AAC/B,CAAC;AAED,KAAK,UAAU,kBAAkB,CAAC,cAAqC,EAAE,MAAmB;IACxF,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACxE,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;QACvB,IAAI,CAAC,CAAC,MAAM,iBAAiB,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC;YAC7C,OAAO;QACX,CAAC;QACD,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACxC,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACvC,MAAM,KAAK,GAAG,GAAS,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAClD,SAAS,MAAM,CAAC,KAAe;gBAC3B,YAAY,CAAC,OAAO,CAAC,CAAC;gBACtB,QAAQ,CAAC,mBAAmB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;gBAC7C,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACpD,CAAC;YACD,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;IACP,CAAC;IACD,MAAM,QAAQ,CAAC,MAAM,CAAC;AAC1B,CAAC;AAED,+GAA+G;AAC/G,6GAA6G;AAC7G,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACtC,cAAqC,EACrC,UAAkB,EAClB,MAAmB;IAEnB,MAAM,OAAO,GAAG,MAAM,sBAAsB,CAAC,kBAAkB,EAAE,EAAE,MAAM,CAAC,CAAC;IAC3E,MAAM,OAAO,GAAG,OAAO,KAAK,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC;IACnF,MAAM,MAAM,GAAG,MAAM,2BAA2B,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAClE,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAC,CAAC,CAAC;IAC9F,MAAM,aAAa,CAAC,cAAc,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,4BAA4B,CACzC,MAAM,gBAAgB,CAAC,cAAc,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,QAAQ,CAAC,CAC1F,CAAC;IACF,IAAI,QAAQ,EAAE,IAAI,KAAK,OAAO,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;IACD,IAAI,QAAQ,EAAE,IAAI,KAAK,QAAQ,IAAI,QAAQ,CAAC,MAAM,EAAE,OAAO,KAAK,OAAO,EAAE,CAAC;QACtE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACxD,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC;AAED,2EAA2E;AAC3E,4EAA4E;AAC5E,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC3C,cAAqC,EACrC,MAAmB;IAEnB,IAAI,CAAC;QACD,MAAM,QAAQ,GAAG,4BAA4B,CACzC,MAAM,gBAAgB,CAAC,cAAc,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,MAAM,CAAC,CAChF,CAAC;QACF,IAAI,QAAQ,EAAE,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,QAAQ,CAAC,MAAM,EAAE,OAAO,IAAI,IAAI,CAAC;QAC5C,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,cAAc,CAAC,EAAE,CAAC;YACvE,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,KAAK,UAAU,aAAa,CACxB,cAAqC,EACrC,MAAoB,EACpB,MAAmB;IAEnB,IAAI,cAAc,GAAG,KAAK,CAAC;IAC3B,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACrB,IAAI,CAAC;YACD,MAAM,QAAQ,GAAG,4BAA4B,CACzC,MAAM,gBAAgB,CAAC,cAAc,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,MAAM,CAAC,CAChF,CAAC;YACF,IAAI,QAAQ,EAAE,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC9B,IAAI,cAAc,EAAE,CAAC;oBACjB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,MAAM,CAAC,OAAO,YAAY,CAAC,CAAC;gBACtE,CAAC;gBACD,OAAO;YACX,CAAC;YACD,0FAA0F;YAC1F,MAAM,WAAW,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;YAC1C,MAAM,aAAa,CAAC,MAAM,CAAC,CAAC;YAC5B,cAAc,GAAG,IAAI,CAAC;QAC1B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,cAAc,CAAC,EAAE,CAAC;gBACvE,MAAM,KAAK,CAAC;YAChB,CAAC;YACD,IAAI,CAAC,cAAc,EAAE,CAAC;gBAClB,MAAM,aAAa,CAAC,MAAM,CAAC,CAAC;gBAC5B,cAAc,GAAG,IAAI,CAAC;YAC1B,CAAC;YACD,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACxC,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gBACvC,MAAM,KAAK,GAAG,GAAS,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAChD,SAAS,MAAM,CAAC,KAAe;oBAC3B,YAAY,CAAC,OAAO,CAAC,CAAC;oBACtB,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;oBAC3C,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACpD,CAAC;gBACD,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5D,CAAC,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IACD,MAAM,MAAM,CAAC,MAAM,CAAC;AACxB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAC7B,cAAqC,EACrC,MAAmB;IAEnB,IAAI,CAAC;QACD,MAAM,QAAQ,GAAG,4BAA4B,CACzC,MAAM,gBAAgB,CAAC,cAAc,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,CAAC,CAC9E,CAAC;QACF,IAAI,QAAQ,EAAE,IAAI,KAAK,OAAO,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACtC,CAAC;QACD,IAAI,QAAQ,EAAE,IAAI,KAAK,SAAS,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;QAC1E,CAAC;QACD,MAAM,kBAAkB,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;QACjD,OAAO,QAAQ,CAAC;IACpB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,IAAI,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,WAAW,CAAC,KAAK,EAAE,cAAc,CAAC,EAAE,CAAC;YACrE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAC/B,CAAC;QACD,MAAM,KAAK,CAAC;IAChB,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../../src/daemon/lifecycle/manager.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kDAAkD,CAAC;AAa9F,wBAAsB,UAAU,CAAC,cAAc,EAAE,qBAAqB,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":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kDAAkD,CAAC;AAa9F,wBAAsB,UAAU,CAAC,cAAc,EAAE,qBAAqB,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAkN1G"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { setTimeout } from "node:timers/promises";
|
|
2
2
|
import { acquireManagerLock } from "../../storage/daemon/manager-lock.js";
|
|
3
3
|
import { serveLocalControl } from "../control/local-server.js";
|
|
4
|
-
import {
|
|
4
|
+
import { decodeKnownLifecycleCommand, } from "../control/protocol.js";
|
|
5
5
|
import { discardRolledBackData } from "../upgrades/data.js";
|
|
6
6
|
import { surviveUnhandledRejections } from "./unhandled-rejection.js";
|
|
7
7
|
import { WorkerLifecycleLog } from "./worker-lifecycle-log.js";
|
|
@@ -108,15 +108,10 @@ export async function runManager(stateDirectory, signal) {
|
|
|
108
108
|
}
|
|
109
109
|
};
|
|
110
110
|
const handle = async (value, requestSignal) => {
|
|
111
|
-
const
|
|
112
|
-
if (
|
|
113
|
-
return
|
|
114
|
-
kind: "error",
|
|
115
|
-
code: "unsupported_lifecycle_command",
|
|
116
|
-
message: "The manager only accepts lifecycle commands",
|
|
117
|
-
};
|
|
111
|
+
const command = decodeKnownLifecycleCommand(value);
|
|
112
|
+
if (command === null) {
|
|
113
|
+
return null;
|
|
118
114
|
}
|
|
119
|
-
const command = parsed.data;
|
|
120
115
|
// The new worker needs its source version before it can announce readiness.
|
|
121
116
|
if (command.kind === "switch-status" && !command.wait) {
|
|
122
117
|
return { kind: "switch-status", state: switchState };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../src/daemon/lifecycle/manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAE1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,
|
|
1
|
+
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../src/daemon/lifecycle/manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade.d.ts","sourceRoot":"","sources":["../../../src/daemon/upgrades/upgrade.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,KAAK,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAG3F,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AACvF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kDAAkD,CAAC;AAG9F,OAAO,EAAE,KAAK,wBAAwB,
|
|
1
|
+
{"version":3,"file":"upgrade.d.ts","sourceRoot":"","sources":["../../../src/daemon/upgrades/upgrade.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,KAAK,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAG3F,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AACvF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kDAAkD,CAAC;AAG9F,OAAO,EAAE,KAAK,wBAAwB,EAAmD,MAAM,wBAAwB,CAAC;AASxH,wBAAsB,+BAA+B,CACjD,IAAI,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,EAC5C,MAAM,EAAE,WAAW,GACpB,OAAO,CAAC,IAAI,CAAC,CA+Bf;AAID,wBAAsB,wBAAwB,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAehH;AAED,MAAM,MAAM,2BAA2B,GACjC;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAA;CAAE,GAC5B;IAAE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAEpF,MAAM,MAAM,0BAA0B,GAChC,OAAO,CAAC,wBAAwB,EAAE;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,CAAC,GACvD,OAAO,CAAC,wBAAwB,EAAE;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,CAAC,CAAC;AAKjE,wBAAsB,2BAA2B,CAC7C,cAAc,EAAE,qBAAqB,EACrC,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,WAAW,GACpB,OAAO,CAAC,2BAA2B,CAAC,CAOtC;AAuBD,wBAAsB,wBAAwB,CAC1C,cAAc,EAAE,qBAAqB,EACrC,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,WAAW,GACpB,OAAO,CAAC,0BAA0B,CAAC,CA+BrC"}
|
|
@@ -57,7 +57,7 @@ import packageMetadata from "../../../package.json" with { type: "json" };
|
|
|
57
57
|
import { RuntimeDiagnosticLog } from "../../runtime/observability/diagnostic-log.js";
|
|
58
58
|
import { isNodeError } from "../../util/node-error.js";
|
|
59
59
|
import { sendLocalRequest } from "../control/local-client.js";
|
|
60
|
-
import {
|
|
60
|
+
import { decodeKnownLifecycleResponse } from "../control/protocol.js";
|
|
61
61
|
import { readSwitchStatus } from "../control/switch-status.js";
|
|
62
62
|
import { openMobiusControlInstallation } from "../pairing/pair-local-machine.js";
|
|
63
63
|
import { DaemonReleaseUpgradeError, findNewDaemonReleaseVersion, installDaemonReleaseVersion } from "./package.js";
|
|
@@ -130,11 +130,11 @@ export async function requestDaemonReleaseUpgrade(stateDirectory, currentVersion
|
|
|
130
130
|
}
|
|
131
131
|
async function requestInstalledDaemonReleaseSwitch(stateDirectory, launch, signal) {
|
|
132
132
|
const id = randomUUID();
|
|
133
|
-
const response =
|
|
134
|
-
if (response
|
|
133
|
+
const response = decodeKnownLifecycleResponse(await sendLocalRequest(stateDirectory, "manager", { kind: "switch", id, context: "npm", launch }, signal));
|
|
134
|
+
if (response?.kind === "error") {
|
|
135
135
|
throw new DaemonReleaseUpgradeError(response.code, response.message);
|
|
136
136
|
}
|
|
137
|
-
if (response
|
|
137
|
+
if (response?.kind !== "switching") {
|
|
138
138
|
throw new DaemonReleaseUpgradeError("manager_incompatible", "The manager does not support daemon switching");
|
|
139
139
|
}
|
|
140
140
|
return { kind: "requested", id, version: launch.version };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../../../src/daemon/upgrades/upgrade.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAA6B,MAAM,8BAA8B,CAAC;AAC3F,OAAO,eAAe,MAAM,uBAAuB,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,+CAA+C,CAAC;AAGrF,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAiC,
|
|
1
|
+
{"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../../../src/daemon/upgrades/upgrade.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,
|
|
1
|
+
{"version":3,"file":"run-relay-connection.d.ts","sourceRoot":"","sources":["../../../src/runtime/relay/run-relay-connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,KAAK,oBAAoB,EAC5B,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AACrE,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;AAejF,MAAM,WAAW,sBAAsB;IACnC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,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,YAAY,EACZ,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,CA4LxC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { decodeKnownServiceToDaemonMessage, RUNTIME_HEARTBEAT_ACK_KIND, RUNTIME_LIVENESS_READY_KIND, } from "@moxt-ai/mobius-sdk/protocol";
|
|
2
2
|
import { WebSocket } from "undici";
|
|
3
3
|
import { createRuntimeCommandDispatcher } from "../command/dispatcher.js";
|
|
4
4
|
import { send } from "../command/transport.js";
|
|
@@ -19,46 +19,6 @@ function closeRelaySocket(socket, code, reason) {
|
|
|
19
19
|
}
|
|
20
20
|
}
|
|
21
21
|
}
|
|
22
|
-
/**
|
|
23
|
-
* Reads correlation identifiers from a command the daemon rejected. The
|
|
24
|
-
* message failed schema validation, so its fields are untrusted and are
|
|
25
|
-
* echoed only when they already satisfy the identifier contract.
|
|
26
|
-
*/
|
|
27
|
-
function readCommandCorrelation(encoded) {
|
|
28
|
-
let value;
|
|
29
|
-
try {
|
|
30
|
-
value = JSON.parse(encoded);
|
|
31
|
-
}
|
|
32
|
-
catch {
|
|
33
|
-
return { requestId: "unsupported", sessionId: "" };
|
|
34
|
-
}
|
|
35
|
-
if (typeof value !== "object" || value === null || Array.isArray(value)) {
|
|
36
|
-
return { requestId: "unsupported", sessionId: "" };
|
|
37
|
-
}
|
|
38
|
-
const requestId = Reflect.get(value, "requestId");
|
|
39
|
-
const sessionId = Reflect.get(value, "sessionId");
|
|
40
|
-
return {
|
|
41
|
-
requestId: typeof requestId === "string" && isIdentifier(requestId) ? requestId : "unsupported",
|
|
42
|
-
sessionId: typeof sessionId === "string" && isIdentifier(sessionId) ? sessionId : "",
|
|
43
|
-
};
|
|
44
|
-
}
|
|
45
|
-
/**
|
|
46
|
-
* Answers a command kind this daemon does not implement. The connection stays
|
|
47
|
-
* open for adjacent-version senders, but the caller learns immediately that
|
|
48
|
-
* the operation will not run instead of waiting for its own deadline.
|
|
49
|
-
*/
|
|
50
|
-
function rejectUnsupportedCommand(socket, correlation, rejection) {
|
|
51
|
-
if (socket.readyState !== WebSocket.OPEN) {
|
|
52
|
-
return;
|
|
53
|
-
}
|
|
54
|
-
send(socket, {
|
|
55
|
-
code: rejection.code,
|
|
56
|
-
kind: SESSION_OPERATION_FAILED_KIND,
|
|
57
|
-
message: "The Relay sent a command this daemon does not support",
|
|
58
|
-
requestId: correlation.requestId,
|
|
59
|
-
sessionId: correlation.sessionId,
|
|
60
|
-
});
|
|
61
|
-
}
|
|
62
22
|
export async function runRelayConnection({ resolveAgent, config, reportUpgradeAvailability, directories, sessionTurns, nativeSessions, operations, publisher, eventProjection, externalContent, sessions, connectionEpoch, diagnostics, onConnected, signal, timer, }) {
|
|
63
23
|
const relayUrl = new URL(config.relayUrl);
|
|
64
24
|
relayUrl.searchParams.set("liveness", "1");
|
|
@@ -187,7 +147,10 @@ export async function runRelayConnection({ resolveAgent, config, reportUpgradeAv
|
|
|
187
147
|
return;
|
|
188
148
|
}
|
|
189
149
|
try {
|
|
190
|
-
const message =
|
|
150
|
+
const message = decodeKnownServiceToDaemonMessage(encoded);
|
|
151
|
+
if (message === null) {
|
|
152
|
+
return;
|
|
153
|
+
}
|
|
191
154
|
const kind = message.kind;
|
|
192
155
|
if (kind === RUNTIME_LIVENESS_READY_KIND) {
|
|
193
156
|
if (ready) {
|
|
@@ -206,21 +169,6 @@ export async function runRelayConnection({ resolveAgent, config, reportUpgradeAv
|
|
|
206
169
|
commands.dispatch(message);
|
|
207
170
|
}
|
|
208
171
|
catch (error) {
|
|
209
|
-
if (error instanceof UnsupportedProtocolMessageKindError) {
|
|
210
|
-
const correlation = readCommandCorrelation(encoded);
|
|
211
|
-
console.warn("Mobius daemon rejected an unsupported Relay command", {
|
|
212
|
-
code: error.code,
|
|
213
|
-
direction: error.direction,
|
|
214
|
-
messageKind: error.messageKind,
|
|
215
|
-
});
|
|
216
|
-
diagnostics.daemonDiagnostic("relay_command_unsupported", correlation.requestId, {
|
|
217
|
-
code: error.code,
|
|
218
|
-
direction: error.direction,
|
|
219
|
-
messageKind: error.messageKind,
|
|
220
|
-
}, error);
|
|
221
|
-
rejectUnsupportedCommand(socket, correlation, error);
|
|
222
|
-
return;
|
|
223
|
-
}
|
|
224
172
|
console.error("Mobius daemon rejected a message", error);
|
|
225
173
|
failAndClose(new Error("Relay sent an invalid protocol message", { cause: error }), 4008, "Invalid protocol message", "protocol");
|
|
226
174
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-relay-connection.js","sourceRoot":"","sources":["../../../src/runtime/relay/run-relay-connection.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,
|
|
1
|
+
{"version":3,"file":"run-relay-connection.js","sourceRoot":"","sources":["../../../src/runtime/relay/run-relay-connection.ts"],"names":[],"mappings":"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"}
|