@telorun/runner-core 0.8.2 → 0.10.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 +33 -2
- package/dist/backend.d.ts +107 -23
- package/dist/backend.d.ts.map +1 -1
- package/dist/config.d.ts +56 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +36 -0
- package/dist/config.js.map +1 -1
- package/dist/contract.d.ts +210 -15
- package/dist/contract.d.ts.map +1 -1
- package/dist/contract.js +9 -0
- package/dist/contract.js.map +1 -1
- package/dist/debug/ports-resolved.d.ts +26 -0
- package/dist/debug/ports-resolved.d.ts.map +1 -0
- package/dist/debug/ports-resolved.js +42 -0
- package/dist/debug/ports-resolved.js.map +1 -0
- package/dist/debug/relay.d.ts.map +1 -1
- package/dist/debug/relay.js +34 -6
- package/dist/debug/relay.js.map +1 -1
- package/dist/debug/run-projection.d.ts +53 -0
- package/dist/debug/run-projection.d.ts.map +1 -0
- package/dist/debug/run-projection.js +115 -0
- package/dist/debug/run-projection.js.map +1 -0
- package/dist/index.d.ts +8 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +7 -1
- package/dist/index.js.map +1 -1
- package/dist/routes/apps.d.ts +1 -1
- package/dist/routes/apps.d.ts.map +1 -1
- package/dist/routes/apps.js +14 -4
- package/dist/routes/apps.js.map +1 -1
- package/dist/routes/io.d.ts.map +1 -1
- package/dist/routes/io.js +42 -9
- package/dist/routes/io.js.map +1 -1
- package/dist/routes/session-start.d.ts +18 -13
- package/dist/routes/session-start.d.ts.map +1 -1
- package/dist/routes/session-start.js +95 -14
- package/dist/routes/session-start.js.map +1 -1
- package/dist/routes/sessions.d.ts +11 -1
- package/dist/routes/sessions.d.ts.map +1 -1
- package/dist/routes/sessions.js +465 -5
- package/dist/routes/sessions.js.map +1 -1
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +21 -1
- package/dist/server.js.map +1 -1
- package/dist/session/byte-ring-buffer.d.ts +6 -1
- package/dist/session/byte-ring-buffer.d.ts.map +1 -1
- package/dist/session/byte-ring-buffer.js +2 -2
- package/dist/session/byte-ring-buffer.js.map +1 -1
- package/dist/session/registry.d.ts +144 -13
- package/dist/session/registry.d.ts.map +1 -1
- package/dist/session/registry.js +166 -25
- package/dist/session/registry.js.map +1 -1
- package/dist/session/watch-supervisor.d.ts +42 -0
- package/dist/session/watch-supervisor.d.ts.map +1 -0
- package/dist/session/watch-supervisor.js +99 -0
- package/dist/session/watch-supervisor.js.map +1 -0
- package/dist/session/workspace-app.d.ts +4 -0
- package/dist/session/workspace-app.d.ts.map +1 -0
- package/dist/session/workspace-app.js +26 -0
- package/dist/session/workspace-app.js.map +1 -0
- package/dist/session/workspace-client.d.ts +33 -0
- package/dist/session/workspace-client.d.ts.map +1 -0
- package/dist/session/workspace-client.js +62 -0
- package/dist/session/workspace-client.js.map +1 -0
- package/dist/session/workspace-marker.d.ts +25 -0
- package/dist/session/workspace-marker.d.ts.map +1 -0
- package/dist/session/workspace-marker.js +35 -0
- package/dist/session/workspace-marker.js.map +1 -0
- package/dist/sse/channel.d.ts.map +1 -1
- package/dist/sse/channel.js +4 -0
- package/dist/sse/channel.js.map +1 -1
- package/package.json +4 -3
- package/src/app-catalog.test.ts +49 -1
- package/src/backend.ts +111 -22
- package/src/config.ts +98 -0
- package/src/contract.ts +213 -16
- package/src/debug/ports-resolved.test.ts +66 -0
- package/src/debug/ports-resolved.ts +43 -0
- package/src/debug/relay.ts +32 -4
- package/src/debug/run-projection.test.ts +155 -0
- package/src/debug/run-projection.ts +122 -0
- package/src/index.ts +20 -1
- package/src/routes/apps.ts +14 -5
- package/src/routes/io.ts +58 -12
- package/src/routes/session-start.ts +115 -27
- package/src/routes/sessions.ts +538 -7
- package/src/server.ts +22 -1
- package/src/session/byte-ring-buffer.ts +8 -2
- package/src/session/registry.ts +288 -28
- package/src/session/ring-buffer.test.ts +4 -3
- package/src/session/watch-lifetime.test.ts +203 -0
- package/src/session/watch-supervisor.ts +112 -0
- package/src/session/workspace-app.ts +27 -0
- package/src/session/workspace-client.ts +80 -0
- package/src/session/workspace-marker.test.ts +35 -0
- package/src/session/workspace-marker.ts +39 -0
- package/src/sse/channel.ts +5 -0
- package/workspace-app/telo.yaml +228 -0
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { isEventFrame } from "@telorun/debug-wire";
|
|
2
|
+
import { RunProjection } from "../debug/run-projection.js";
|
|
2
3
|
import { ACCEPTED_TERMS_HEADER, SessionStartError, } from "../contract.js";
|
|
3
4
|
import { generateSessionId } from "../session/session-id.js";
|
|
4
|
-
import { SessionLimitError } from "../session/registry.js";
|
|
5
|
+
import { SessionLimitError, } from "../session/registry.js";
|
|
5
6
|
/** JSON Schema for the `ports` body field, shared by every session-creating
|
|
6
7
|
* route so bundle and app sessions validate port mappings identically. */
|
|
7
8
|
export const portsSchema = {
|
|
@@ -40,11 +41,21 @@ export function enforceTerms(req, reply, terms) {
|
|
|
40
41
|
* created through, everything after creation lives in the one session
|
|
41
42
|
* collection (status, DELETE, events, io).
|
|
42
43
|
*/
|
|
43
|
-
export async function startWorkloadSession(app, deps, args, reply
|
|
44
|
+
export async function startWorkloadSession(app, deps, args, reply,
|
|
45
|
+
/** Things the route decided about this session that the client would
|
|
46
|
+
* otherwise have to infer from an absence — an agent dropped because its
|
|
47
|
+
* port collided with an application's. Emitted on the stream, because the
|
|
48
|
+
* 201 is sent before the workload starts and has nowhere to carry them. */
|
|
49
|
+
notices) {
|
|
44
50
|
const sessionId = generateSessionId();
|
|
45
51
|
let entry;
|
|
46
52
|
try {
|
|
47
|
-
entry = deps.registry.register({
|
|
53
|
+
entry = deps.registry.register({
|
|
54
|
+
sessionId,
|
|
55
|
+
mode: args.mode,
|
|
56
|
+
agent: args.agent?.name,
|
|
57
|
+
apps: args.apps.map((a) => ({ name: a.name, io: a.io, ports: a.ports })),
|
|
58
|
+
});
|
|
48
59
|
}
|
|
49
60
|
catch (err) {
|
|
50
61
|
if (err instanceof SessionLimitError) {
|
|
@@ -59,9 +70,9 @@ export async function startWorkloadSession(app, deps, args, reply) {
|
|
|
59
70
|
// whitespace from an editor input doesn't flow into the workload.
|
|
60
71
|
const configRegistryUrl = args.config.registryUrl?.trim() || undefined;
|
|
61
72
|
const registryUrl = configRegistryUrl ?? deps.defaultRegistryUrl;
|
|
62
|
-
const sessionEnv = registryUrl && !("TELO_REGISTRY_URL" in args.env)
|
|
73
|
+
const sessionEnv = withoutCacheOverride(registryUrl && !("TELO_REGISTRY_URL" in args.env)
|
|
63
74
|
? { ...args.env, TELO_REGISTRY_URL: registryUrl }
|
|
64
|
-
: args.env;
|
|
75
|
+
: args.env);
|
|
65
76
|
// Respond as soon as the session is registered — BEFORE the backend starts.
|
|
66
77
|
// `backend.start()` now spans the on-cluster image build and pod bring-up,
|
|
67
78
|
// which can take seconds-to-minutes; awaiting it here would hide the event
|
|
@@ -74,28 +85,82 @@ export async function startWorkloadSession(app, deps, args, reply) {
|
|
|
74
85
|
streamUrl: `/v1/sessions/${sessionId}/events`,
|
|
75
86
|
createdAt: entry.createdAt.toISOString(),
|
|
76
87
|
});
|
|
88
|
+
for (const message of notices ?? []) {
|
|
89
|
+
deps.registry.emit(sessionId, { type: "progress", phase: "provision", message });
|
|
90
|
+
}
|
|
91
|
+
// Every app's first generation is attributed to the session coming up; a
|
|
92
|
+
// reload after that is a watch reload unless a route says otherwise.
|
|
93
|
+
const projection = new RunProjection(deps.registry, sessionId);
|
|
94
|
+
projection.expectAll("initial");
|
|
95
|
+
// Parked on the entry so the reload / resume routes can attribute the
|
|
96
|
+
// generation they are about to cause.
|
|
97
|
+
entry.attribution = projection;
|
|
98
|
+
const launch = { ...args, env: sessionEnv };
|
|
99
|
+
entry.launch = launch;
|
|
100
|
+
launchWorkload(app, deps, launch, entry);
|
|
101
|
+
}
|
|
102
|
+
/**
|
|
103
|
+
* Wire a backend workload to an EXISTING registry entry and start it in the
|
|
104
|
+
* background. Shared by session creation and by `resume`, which builds a fresh
|
|
105
|
+
* pod from the checkpoint under the same session id — the callback wiring is the
|
|
106
|
+
* contract's, so a second copy of it would be a second place run outcomes,
|
|
107
|
+
* output routing and the credential boundary could drift.
|
|
108
|
+
*/
|
|
109
|
+
export function launchWorkload(app, deps, args, entry) {
|
|
110
|
+
const sessionId = entry.sessionId;
|
|
111
|
+
const projection = entry.attribution;
|
|
77
112
|
deps.backend
|
|
78
113
|
.start({
|
|
79
114
|
sessionId,
|
|
80
115
|
bundle: args.bundle,
|
|
81
|
-
|
|
82
|
-
env: sessionEnv,
|
|
83
|
-
ports: args.ports,
|
|
116
|
+
env: args.env,
|
|
84
117
|
config: args.config,
|
|
85
118
|
selfContained: args.selfContained,
|
|
86
119
|
inspect: args.inspect,
|
|
120
|
+
mode: args.mode,
|
|
121
|
+
apps: args.apps,
|
|
122
|
+
agent: args.agent,
|
|
87
123
|
onStatus: (status) => deps.registry.emit(sessionId, { type: "status", status }),
|
|
88
|
-
onProgress: (phase, message, done) => deps.registry.emit(sessionId, { type: "progress", phase, message, done }),
|
|
89
|
-
onOutput: (chunk) => deps.registry.pushBytes(sessionId, chunk),
|
|
124
|
+
onProgress: (phase, message, done, app) => deps.registry.emit(sessionId, { type: "progress", app, phase, message, done }),
|
|
125
|
+
onOutput: (app, chunk, stream) => deps.registry.pushBytes(sessionId, app, chunk, stream),
|
|
90
126
|
// Relay only kernel *event* frames to the client. stdout/stderr already
|
|
91
127
|
// arrive over the byte channel (onOutput), so forwarding log frames would
|
|
92
128
|
// double the traffic and let log spam evict lifecycle events from the
|
|
93
129
|
// byte-capped replay buffer. The editor discards relayed logs anyway.
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
130
|
+
//
|
|
131
|
+
// The projection sees EVERY frame, including the ones not relayed — run
|
|
132
|
+
// outcomes are derived from lifecycle events, not from what a client
|
|
133
|
+
// happens to be shown.
|
|
134
|
+
onDebug: (appName, frame) => {
|
|
135
|
+
projection?.frame(appName, frame);
|
|
136
|
+
if (isEventFrame(frame)) {
|
|
137
|
+
deps.registry.emit(sessionId, { type: "debug", app: appName, frame });
|
|
138
|
+
}
|
|
139
|
+
},
|
|
140
|
+
// A watch session's app dying is a RUN outcome, not a session status: the
|
|
141
|
+
// rest of the session is still up, and the next edit starts the next
|
|
142
|
+
// generation. The projection owns generation identity, so the ending goes
|
|
143
|
+
// through it rather than being emitted directly.
|
|
144
|
+
onRunEnded: (appName, outcome) => projection?.endGeneration(appName, outcome) ??
|
|
145
|
+
deps.registry.finishGeneration(sessionId, appName, {
|
|
146
|
+
phase: "failed",
|
|
147
|
+
reason: outcome.reason ?? "workload ended",
|
|
148
|
+
}),
|
|
149
|
+
onReachability: (app, port, state) => deps.registry.emit(sessionId, { type: "reachability", app, port, state }),
|
|
150
|
+
onEndpoints: (appName, change) => {
|
|
151
|
+
// The registry's own channel is what `GET /v1/sessions/:id` reports, so
|
|
152
|
+
// the delta has to land there too — otherwise the session document keeps
|
|
153
|
+
// describing the port set the session STARTED with, forever.
|
|
154
|
+
const channel = entry.apps.get(appName);
|
|
155
|
+
if (channel) {
|
|
156
|
+
const removed = new Set((change.removed ?? []).map((e) => `${e.protocol}/${e.port}`));
|
|
157
|
+
channel.ports = [
|
|
158
|
+
...channel.ports.filter((p) => !removed.has(`${p.protocol}/${p.port}`)),
|
|
159
|
+
...(change.added ?? []).map((e) => ({ port: e.port, protocol: e.protocol })),
|
|
160
|
+
];
|
|
161
|
+
}
|
|
162
|
+
deps.registry.emit(sessionId, { type: "endpoints", app: appName, ...change });
|
|
97
163
|
},
|
|
98
|
-
onReachability: (port, state) => deps.registry.emit(sessionId, { type: "reachability", port, state }),
|
|
99
164
|
isUserStopped: () => entry.userStopped,
|
|
100
165
|
})
|
|
101
166
|
.then(async (session) => {
|
|
@@ -126,4 +191,20 @@ export async function startWorkloadSession(app, deps, args, reply) {
|
|
|
126
191
|
deps.registry.emit(sessionId, { type: "status", status: { kind: "failed", message } });
|
|
127
192
|
});
|
|
128
193
|
}
|
|
194
|
+
/**
|
|
195
|
+
* Drop a client-supplied `TELO_CACHE_DIR`.
|
|
196
|
+
*
|
|
197
|
+
* It OUTRANKS the `telo-workspace.yaml` marker the session seeds at its
|
|
198
|
+
* workspace root, so a client that sets it silently gives every app its own
|
|
199
|
+
* module cache — the exact thing the marker exists to prevent. Where a cache
|
|
200
|
+
* root is genuinely needed (the workspace container, whose manifest lives
|
|
201
|
+
* outside the workspace) the backend sets it itself.
|
|
202
|
+
*/
|
|
203
|
+
function withoutCacheOverride(env) {
|
|
204
|
+
if (!("TELO_CACHE_DIR" in env))
|
|
205
|
+
return env;
|
|
206
|
+
const rest = { ...env };
|
|
207
|
+
delete rest.TELO_CACHE_DIR;
|
|
208
|
+
return rest;
|
|
209
|
+
}
|
|
129
210
|
//# sourceMappingURL=session-start.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-start.js","sourceRoot":"","sources":["../../src/routes/session-start.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,EACL,qBAAqB,EACrB,iBAAiB,
|
|
1
|
+
{"version":3,"file":"session-start.js","sourceRoot":"","sources":["../../src/routes/session-start.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,12 @@
|
|
|
1
1
|
import type { FastifyPluginAsync } from "fastify";
|
|
2
2
|
import type { RunnerBackend } from "../backend.js";
|
|
3
|
-
import type {
|
|
3
|
+
import type { ResolvedRunnerApp, WatchSessionConfig } from "../config.js";
|
|
4
|
+
import { type RunnerTerms, type SessionConfig } from "../contract.js";
|
|
4
5
|
import type { SessionRegistry } from "../session/registry.js";
|
|
6
|
+
/** The part of the operator's watch settings this route enforces. A projection
|
|
7
|
+
* of `WatchSessionConfig` rather than a second shape, so the two cannot
|
|
8
|
+
* disagree about what a field means. */
|
|
9
|
+
export type WatchConfig = Pick<WatchSessionConfig, "enabled" | "maxSessions" | "reloadLimitPerMinute">;
|
|
5
10
|
export interface SessionsRouteDeps {
|
|
6
11
|
backend: RunnerBackend;
|
|
7
12
|
registry: SessionRegistry;
|
|
@@ -17,6 +22,11 @@ export interface SessionsRouteDeps {
|
|
|
17
22
|
* the source of truth, so this re-checks what `/v1/capabilities` advertises
|
|
18
23
|
* (e.g. an `image` allowlist) against a client that skipped the editor. */
|
|
19
24
|
validateConfig?: (config: SessionConfig) => string | undefined;
|
|
25
|
+
/** The operator catalog a session's `agent` is resolved against — the same
|
|
26
|
+
* catalog `POST /v1/apps/:name/sessions` uses, because a co-resident agent IS
|
|
27
|
+
* an operator-predefined application, just one sharing a pod. */
|
|
28
|
+
apps?: Record<string, ResolvedRunnerApp>;
|
|
29
|
+
watch: WatchConfig;
|
|
20
30
|
}
|
|
21
31
|
export declare function sessionsRoute(deps: SessionsRouteDeps): FastifyPluginAsync;
|
|
22
32
|
//# sourceMappingURL=sessions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../src/routes/sessions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAmB,kBAAkB,EAAgB,MAAM,SAAS,CAAC;AAEjF,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../src/routes/sessions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAmB,kBAAkB,EAAgB,MAAM,SAAS,CAAC;AAEjF,OAAO,KAAK,EAAkB,aAAa,EAAE,MAAM,eAAe,CAAC;AACnE,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAC1E,OAAO,EAIL,KAAK,WAAW,EAEhB,KAAK,aAAa,EAGnB,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,EAAgB,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI5E;;yCAEyC;AACzC,MAAM,MAAM,WAAW,GAAG,IAAI,CAC5B,kBAAkB,EAClB,SAAS,GAAG,aAAa,GAAG,sBAAsB,CACnD,CAAC;AAEF,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,aAAa,CAAC;IACvB,QAAQ,EAAE,eAAe,CAAC;IAC1B,WAAW,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;IAC5B;kEAC8D;IAC9D,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B;gEAC4D;IAC5D,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB;;;gFAG4E;IAC5E,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,MAAM,GAAG,SAAS,CAAC;IAC/D;;sEAEkE;IAClE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IACzC,KAAK,EAAE,WAAW,CAAC;CACpB;AA0FD,wBAAgB,aAAa,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB,CAuRzE"}
|