tono 0.2.1 → 0.3.1
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 +125 -20
- package/dist/cli/checks.js +504 -0
- package/dist/cli/checks.js.map +1 -0
- package/dist/cli/commands/config.js +20 -3
- package/dist/cli/commands/config.js.map +1 -1
- package/dist/cli/commands/configure.js +1 -1
- package/dist/cli/commands/configure.js.map +1 -1
- package/dist/cli/commands/doctor.js +22 -0
- package/dist/cli/commands/doctor.js.map +1 -0
- package/dist/cli/commands/gateway.js +39 -14
- package/dist/cli/commands/gateway.js.map +1 -1
- package/dist/cli/commands/init.js +22 -3
- package/dist/cli/commands/init.js.map +1 -1
- package/dist/cli/commands/start.js +69 -19
- package/dist/cli/commands/start.js.map +1 -1
- package/dist/cli/commands/worker.js +500 -0
- package/dist/cli/commands/worker.js.map +1 -0
- package/dist/cli/index.js +28 -9
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/launchd.js +5 -5
- package/dist/cli/launchd.js.map +1 -1
- package/dist/server/app.js +130 -35
- package/dist/server/app.js.map +1 -1
- package/dist/server/config/load.js +19 -1
- package/dist/server/config/load.js.map +1 -1
- package/dist/server/config/schema.json +19 -0
- package/dist/server/db/client.js +73 -2
- package/dist/server/db/client.js.map +1 -1
- package/dist/server/db/queries.js +126 -3
- package/dist/server/db/queries.js.map +1 -1
- package/dist/server/db/schema.sql +36 -21
- package/dist/server/events.js.map +1 -1
- package/dist/server/server.js +28 -11
- package/dist/server/server.js.map +1 -1
- package/dist/server/worker/agent.js +441 -0
- package/dist/server/worker/agent.js.map +1 -0
- package/dist/server/worker/pty-bridge.js +27 -0
- package/dist/server/worker/pty-bridge.js.map +1 -0
- package/dist/server/workers/github-poller.js +26 -8
- package/dist/server/workers/github-poller.js.map +1 -1
- package/dist/server/workers/reaper.js +44 -0
- package/dist/server/workers/reaper.js.map +1 -0
- package/dist/server/workers/registry.js +174 -0
- package/dist/server/workers/registry.js.map +1 -0
- package/dist/server/workers/scheduler.js +79 -130
- package/dist/server/workers/scheduler.js.map +1 -1
- package/dist/server/ws/pty.js +71 -54
- package/dist/server/ws/pty.js.map +1 -1
- package/dist/server/ws/workers.js +241 -0
- package/dist/server/ws/workers.js.map +1 -0
- package/dist/shared/types.js +4 -1
- package/dist/shared/types.js.map +1 -1
- package/dist/shared/worker-protocol.js +28 -0
- package/dist/shared/worker-protocol.js.map +1 -0
- package/dist/web/assets/index-BsiC8WMV.js +129 -0
- package/dist/web/assets/index-CjzMqxyT.css +1 -0
- package/dist/web/index.html +2 -2
- package/package.json +18 -26
- package/dist/web/assets/index-5VFn-lxF.js +0 -129
- package/dist/web/assets/index-CZHd5NaX.css +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../../../src/server/workers/scheduler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../../../src/server/workers/scheduler.ts"],"names":[],"mappings":"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"}
|
package/dist/server/ws/pty.js
CHANGED
|
@@ -1,6 +1,12 @@
|
|
|
1
1
|
const PATH_RE = /^\/api\/sessions\/([^/]+)\/pty\/?$/;
|
|
2
|
-
|
|
3
|
-
|
|
2
|
+
/**
|
|
3
|
+
* Browser PTY proxy. The session's owning worker is looked up from the DB; we
|
|
4
|
+
* stream frames out of the gateway-side scrollback ring + live fan-out from
|
|
5
|
+
* the registry, and forward inbound input/resize back to the worker over the
|
|
6
|
+
* worker's control WS.
|
|
7
|
+
*/
|
|
8
|
+
export function attachPtyWs(deps) {
|
|
9
|
+
const { wss, registry, q } = deps;
|
|
4
10
|
wss.on("connection", (ws, req) => {
|
|
5
11
|
const url = req.url ?? "";
|
|
6
12
|
const m = url.match(PATH_RE);
|
|
@@ -9,64 +15,75 @@ export function attachPtyWs(args) {
|
|
|
9
15
|
return;
|
|
10
16
|
}
|
|
11
17
|
const sessionId = decodeURIComponent(m[1]);
|
|
12
|
-
|
|
13
|
-
|
|
18
|
+
// Live sessions (shells AND running task agents) are in the registry.
|
|
19
|
+
// Ended task sessions only exist in the DB. Try the registry first so
|
|
20
|
+
// shells (which are never persisted to the DB) work.
|
|
21
|
+
const sessionState = registry.getSession(sessionId);
|
|
22
|
+
const dbRow = q.getSession(sessionId);
|
|
23
|
+
if (!sessionState && !dbRow) {
|
|
14
24
|
ws.close(1008, "unknown session");
|
|
15
25
|
return;
|
|
16
26
|
}
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
}
|
|
34
|
-
// 3. Stream live data.
|
|
35
|
-
const onData = (chunk) => {
|
|
36
|
-
if (ws.readyState === ws.OPEN)
|
|
37
|
-
ws.send(chunk, { binary: true });
|
|
38
|
-
};
|
|
39
|
-
const onExit = (info) => {
|
|
40
|
-
if (ws.readyState === ws.OPEN) {
|
|
41
|
-
ws.send(JSON.stringify({ type: "exit", ...info }));
|
|
42
|
-
ws.close(1000, "session ended");
|
|
43
|
-
}
|
|
44
|
-
};
|
|
45
|
-
session.on("data", onData);
|
|
46
|
-
session.once("exit", onExit);
|
|
47
|
-
// 4. Inputs from the browser.
|
|
48
|
-
ws.on("message", (raw, isBinary) => {
|
|
49
|
-
if (isBinary) {
|
|
50
|
-
session.write(raw.toString("utf8"));
|
|
51
|
-
return;
|
|
27
|
+
const workerId = sessionState?.workerId ?? dbRow?.workerId ?? null;
|
|
28
|
+
const taskId = sessionState?.taskId ?? dbRow?.taskId ?? null;
|
|
29
|
+
const ended = !sessionState && !!dbRow?.endedAt;
|
|
30
|
+
// Header so the client knows session metadata up front.
|
|
31
|
+
ws.send(JSON.stringify({
|
|
32
|
+
type: "hello",
|
|
33
|
+
sessionId,
|
|
34
|
+
taskId,
|
|
35
|
+
status: ended ? "exited" : "running",
|
|
36
|
+
size: { cols: sessionState?.cols ?? 120, rows: sessionState?.rows ?? 32 },
|
|
37
|
+
workerId,
|
|
38
|
+
}));
|
|
39
|
+
// Replay scrollback as a binary frame.
|
|
40
|
+
const scrollback = registry.scrollbackFor(sessionId);
|
|
41
|
+
if (scrollback.length > 0) {
|
|
42
|
+
ws.send(scrollback, { binary: true });
|
|
52
43
|
}
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
catch {
|
|
44
|
+
if (ended) {
|
|
45
|
+
// Session already ended: replay buffer and close cleanly.
|
|
46
|
+
ws.send(JSON.stringify({ type: "exit", exitCode: 0, signal: 0 }));
|
|
47
|
+
ws.close(1000, "session already ended");
|
|
58
48
|
return;
|
|
59
49
|
}
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
50
|
+
// Live data fan-out from the registry.
|
|
51
|
+
const unsubscribe = registry.subscribe(sessionId, (chunk) => {
|
|
52
|
+
if (ws.readyState === ws.OPEN)
|
|
53
|
+
ws.send(chunk, { binary: true });
|
|
54
|
+
});
|
|
55
|
+
// Inputs from the browser → forward to the worker.
|
|
56
|
+
ws.on("message", (raw, isBinary) => {
|
|
57
|
+
if (!workerId)
|
|
58
|
+
return;
|
|
59
|
+
if (isBinary) {
|
|
60
|
+
const buf = Buffer.isBuffer(raw) ? raw : Buffer.from(raw);
|
|
61
|
+
registry.sendInput(workerId, sessionId, buf);
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
64
|
+
let msg;
|
|
65
|
+
try {
|
|
66
|
+
msg = JSON.parse(raw.toString("utf8"));
|
|
67
|
+
}
|
|
68
|
+
catch {
|
|
69
|
+
return;
|
|
70
|
+
}
|
|
71
|
+
if (msg.type === "input" && typeof msg.data === "string") {
|
|
72
|
+
registry.sendInput(workerId, sessionId, Buffer.from(msg.data, "utf8"));
|
|
73
|
+
}
|
|
74
|
+
else if (msg.type === "resize" && Number.isFinite(msg.cols) && Number.isFinite(msg.rows)) {
|
|
75
|
+
registry.sendControl(workerId, {
|
|
76
|
+
type: "session.resize",
|
|
77
|
+
sessionId,
|
|
78
|
+
cols: msg.cols,
|
|
79
|
+
rows: msg.rows,
|
|
80
|
+
});
|
|
81
|
+
registry.setSessionSize(sessionId, msg.cols, msg.rows);
|
|
82
|
+
}
|
|
83
|
+
});
|
|
84
|
+
ws.on("close", () => {
|
|
85
|
+
unsubscribe();
|
|
86
|
+
});
|
|
70
87
|
});
|
|
71
88
|
}
|
|
72
89
|
//# sourceMappingURL=pty.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pty.js","sourceRoot":"","sources":["../../../src/server/ws/pty.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pty.js","sourceRoot":"","sources":["../../../src/server/ws/pty.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,241 @@
|
|
|
1
|
+
import { decodePtyFrame, } from "../../shared/worker-protocol.js";
|
|
2
|
+
import { parsePrUrl } from "../github/gh.js";
|
|
3
|
+
import { VERSION } from "../../shared/version.js";
|
|
4
|
+
export function attachWorkersWs(deps) {
|
|
5
|
+
const { wss, registry, q, bus, log } = deps;
|
|
6
|
+
wss.on("connection", (ws, req) => {
|
|
7
|
+
const url = req.url ?? "";
|
|
8
|
+
if (!url.startsWith("/api/workers/connect"))
|
|
9
|
+
return;
|
|
10
|
+
let workerId = null;
|
|
11
|
+
let hostname = "(unknown)";
|
|
12
|
+
const helloDeadline = setTimeout(() => {
|
|
13
|
+
if (!workerId) {
|
|
14
|
+
try {
|
|
15
|
+
ws.close(4001, "hello timeout");
|
|
16
|
+
}
|
|
17
|
+
catch { /* ignore */ }
|
|
18
|
+
}
|
|
19
|
+
}, 10_000);
|
|
20
|
+
ws.on("message", (raw, isBinary) => {
|
|
21
|
+
if (isBinary) {
|
|
22
|
+
if (!workerId)
|
|
23
|
+
return;
|
|
24
|
+
const buf = Buffer.isBuffer(raw) ? raw : Buffer.from(raw);
|
|
25
|
+
const decoded = decodePtyFrame(buf);
|
|
26
|
+
if (!decoded)
|
|
27
|
+
return;
|
|
28
|
+
registry.appendSessionData(decoded.sessionId, decoded.payload);
|
|
29
|
+
return;
|
|
30
|
+
}
|
|
31
|
+
let msg;
|
|
32
|
+
try {
|
|
33
|
+
msg = JSON.parse(raw.toString("utf8"));
|
|
34
|
+
}
|
|
35
|
+
catch {
|
|
36
|
+
log(`[workers-ws] bad JSON from ${workerId ?? "(pre-hello)"}; closing`);
|
|
37
|
+
try {
|
|
38
|
+
ws.close(1003, "bad json");
|
|
39
|
+
}
|
|
40
|
+
catch { /* ignore */ }
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
if (!workerId) {
|
|
44
|
+
if (msg.type !== "worker.hello") {
|
|
45
|
+
log(`[workers-ws] expected worker.hello, got ${msg.type}; closing`);
|
|
46
|
+
try {
|
|
47
|
+
ws.close(4002, "hello required first");
|
|
48
|
+
}
|
|
49
|
+
catch { /* ignore */ }
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
clearTimeout(helloDeadline);
|
|
53
|
+
workerId = msg.workerId;
|
|
54
|
+
hostname = msg.hostname;
|
|
55
|
+
q.upsertWorker({
|
|
56
|
+
id: msg.workerId,
|
|
57
|
+
hostname: msg.hostname,
|
|
58
|
+
os: msg.os,
|
|
59
|
+
arch: msg.arch,
|
|
60
|
+
capabilities: msg.capabilities,
|
|
61
|
+
});
|
|
62
|
+
const running = new Map(msg.runningSessions.map((r) => [r.sessionId, r]));
|
|
63
|
+
const workerVersion = msg.tonoVersion ?? null;
|
|
64
|
+
registry.register({
|
|
65
|
+
workerId: msg.workerId,
|
|
66
|
+
hostname: msg.hostname,
|
|
67
|
+
os: msg.os,
|
|
68
|
+
arch: msg.arch,
|
|
69
|
+
capabilities: msg.capabilities,
|
|
70
|
+
capacity: msg.capacity,
|
|
71
|
+
runningSessions: running,
|
|
72
|
+
ws,
|
|
73
|
+
connectedAt: new Date(),
|
|
74
|
+
lastHeartbeatAt: new Date(),
|
|
75
|
+
tonoVersion: workerVersion,
|
|
76
|
+
});
|
|
77
|
+
const sameMinor = workerVersion ? minorOf(workerVersion) === minorOf(VERSION) : false;
|
|
78
|
+
if (!workerVersion) {
|
|
79
|
+
log(`[workers-ws] worker ${msg.workerId} (${msg.hostname}) did not report a version (pre-0.3.1); proceeding`);
|
|
80
|
+
}
|
|
81
|
+
else if (workerVersion !== VERSION) {
|
|
82
|
+
if (sameMinor) {
|
|
83
|
+
log(`[workers-ws] worker ${msg.workerId} (${msg.hostname}) running tono ${workerVersion}; gateway is ${VERSION} (same minor — should be compatible)`);
|
|
84
|
+
}
|
|
85
|
+
else {
|
|
86
|
+
log(`[workers-ws] WARNING: worker ${msg.workerId} (${msg.hostname}) running tono ${workerVersion} differs from gateway ${VERSION} on the minor — protocol drift is possible. Upgrade both sides to the same minor.`);
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
// Reconcile sessions: for ones we still know about, clear the
|
|
90
|
+
// disconnect flag. For ones the worker reports that we don't claim
|
|
91
|
+
// anymore (terminal / cleaned), tell the worker to kill them.
|
|
92
|
+
for (const ref of msg.runningSessions) {
|
|
93
|
+
const dbSession = q.getSession(ref.sessionId);
|
|
94
|
+
if (dbSession && !dbSession.endedAt) {
|
|
95
|
+
q.clearSessionDisconnected(ref.sessionId);
|
|
96
|
+
}
|
|
97
|
+
else {
|
|
98
|
+
log(`[workers-ws] worker ${workerId} reports orphaned session ${ref.sessionId}; killing`);
|
|
99
|
+
try {
|
|
100
|
+
ws.send(JSON.stringify({ type: "session.kill", sessionId: ref.sessionId }));
|
|
101
|
+
}
|
|
102
|
+
catch { /* ignore */ }
|
|
103
|
+
deps.onOrphanSession?.(msg.workerId, ref.sessionId);
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
log(`[workers-ws] worker connected: ${msg.workerId} (${msg.hostname}) — ${msg.runningSessions.length} live session(s)`);
|
|
107
|
+
bus.emit("worker:connected", { workerId: msg.workerId, hostname: msg.hostname });
|
|
108
|
+
return;
|
|
109
|
+
}
|
|
110
|
+
switch (msg.type) {
|
|
111
|
+
case "worker.heartbeat": {
|
|
112
|
+
q.touchWorker(workerId);
|
|
113
|
+
registry.updateHeartbeat(workerId, msg.capacity, msg.runningSessions);
|
|
114
|
+
break;
|
|
115
|
+
}
|
|
116
|
+
case "task.accepted": {
|
|
117
|
+
// Worker is committing to start the task. Status flip to 'running'
|
|
118
|
+
// happens once session.started arrives.
|
|
119
|
+
break;
|
|
120
|
+
}
|
|
121
|
+
case "task.nacked": {
|
|
122
|
+
log(`[workers-ws] worker ${workerId} nacked task #${msg.taskId}: ${msg.reason}`);
|
|
123
|
+
q.clearTaskAssignment(msg.taskId);
|
|
124
|
+
// Reset to queued so the scheduler picks it up again.
|
|
125
|
+
const t = q.getTask(msg.taskId);
|
|
126
|
+
if (t && t.status === "assigning") {
|
|
127
|
+
q.resetForRetry(msg.taskId);
|
|
128
|
+
const updated = q.getTask(msg.taskId);
|
|
129
|
+
if (updated)
|
|
130
|
+
bus.emit("task:queued", { task: updated });
|
|
131
|
+
}
|
|
132
|
+
break;
|
|
133
|
+
}
|
|
134
|
+
case "session.started": {
|
|
135
|
+
q.insertSession({
|
|
136
|
+
id: msg.sessionId,
|
|
137
|
+
taskId: msg.taskId,
|
|
138
|
+
workerId,
|
|
139
|
+
pid: msg.pid,
|
|
140
|
+
worktreePath: msg.worktreePath,
|
|
141
|
+
});
|
|
142
|
+
q.setTaskStatus(msg.taskId, "running");
|
|
143
|
+
registry.ensureSession(msg.sessionId, workerId, msg.taskId);
|
|
144
|
+
const updated = q.getTask(msg.taskId);
|
|
145
|
+
if (updated)
|
|
146
|
+
bus.emit("task:updated", { task: updated });
|
|
147
|
+
break;
|
|
148
|
+
}
|
|
149
|
+
case "session.exit": {
|
|
150
|
+
q.endSession(msg.sessionId);
|
|
151
|
+
const cur = q.getTask(msg.taskId);
|
|
152
|
+
const preserveStatuses = new Set(["completed", "pr_open", "pr_closed", "merged", "cleaned"]);
|
|
153
|
+
if (cur && preserveStatuses.has(cur.status)) {
|
|
154
|
+
log(`[workers-ws] task #${msg.taskId} session ended (exit ${msg.exitCode}); status ${cur.status} preserved`);
|
|
155
|
+
q.clearTaskAssignment(msg.taskId);
|
|
156
|
+
registry.forgetSession(msg.sessionId);
|
|
157
|
+
bus.emit("task:updated", { task: cur });
|
|
158
|
+
break;
|
|
159
|
+
}
|
|
160
|
+
// Last-chance PR URL detection from the gateway-side scrollback ring,
|
|
161
|
+
// mirroring the old scheduler behavior. (The worker also reports its
|
|
162
|
+
// own detected URL via task.update; this is the fallback.)
|
|
163
|
+
const prUrl = msg.prUrl ?? parsePrUrl(registry.scrollbackFor(msg.sessionId).toString("utf8"));
|
|
164
|
+
const status = msg.exitCode === 0 ? "completed" : "failed";
|
|
165
|
+
q.setTaskStatus(msg.taskId, status, { exitCode: msg.exitCode, prUrl });
|
|
166
|
+
q.clearTaskAssignment(msg.taskId);
|
|
167
|
+
registry.forgetSession(msg.sessionId);
|
|
168
|
+
const post = q.getTask(msg.taskId);
|
|
169
|
+
if (post)
|
|
170
|
+
bus.emit("task:updated", { task: post });
|
|
171
|
+
break;
|
|
172
|
+
}
|
|
173
|
+
case "task.update": {
|
|
174
|
+
if (msg.agentSessionId)
|
|
175
|
+
q.setAgentSessionId(msg.taskId, msg.agentSessionId);
|
|
176
|
+
if (msg.prUrl) {
|
|
177
|
+
const t = q.getTask(msg.taskId);
|
|
178
|
+
if (t && t.kind === "implement" && (t.status === "running" || t.status === "assigning")) {
|
|
179
|
+
q.setTaskStatus(msg.taskId, "pr_open", { prUrl: msg.prUrl, exitCode: 0 });
|
|
180
|
+
log(`[workers-ws] task #${msg.taskId} -> pr_open (${msg.prUrl})`);
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
const post = q.getTask(msg.taskId);
|
|
184
|
+
if (post)
|
|
185
|
+
bus.emit("task:updated", { task: post });
|
|
186
|
+
break;
|
|
187
|
+
}
|
|
188
|
+
case "session.scrollback": {
|
|
189
|
+
// We rebuild scrollback from incoming PTY frames already; this is
|
|
190
|
+
// only used when the worker proactively flushes a buffer (e.g. on
|
|
191
|
+
// re-attach). Append directly into the gateway ring.
|
|
192
|
+
const payload = Buffer.from(msg.data, "base64");
|
|
193
|
+
registry.appendSessionData(msg.sessionId, payload);
|
|
194
|
+
registry.setSessionSize(msg.sessionId, msg.cols, msg.rows);
|
|
195
|
+
break;
|
|
196
|
+
}
|
|
197
|
+
case "shell.started": {
|
|
198
|
+
// Free-form shells aren't tracked in the DB; the registry holds
|
|
199
|
+
// them in-memory until exit. ensureSession also pre-allocates the
|
|
200
|
+
// scrollback ring so frames that arrive before the browser attaches
|
|
201
|
+
// aren't lost.
|
|
202
|
+
registry.ensureSession(msg.sessionId, workerId, null, {
|
|
203
|
+
kind: "shell",
|
|
204
|
+
cwd: msg.cwd,
|
|
205
|
+
});
|
|
206
|
+
break;
|
|
207
|
+
}
|
|
208
|
+
case "shell.exit": {
|
|
209
|
+
registry.forgetSession(msg.sessionId);
|
|
210
|
+
break;
|
|
211
|
+
}
|
|
212
|
+
default: {
|
|
213
|
+
// Unknown control type — ignore.
|
|
214
|
+
break;
|
|
215
|
+
}
|
|
216
|
+
}
|
|
217
|
+
});
|
|
218
|
+
ws.on("close", () => {
|
|
219
|
+
clearTimeout(helloDeadline);
|
|
220
|
+
if (!workerId)
|
|
221
|
+
return;
|
|
222
|
+
log(`[workers-ws] worker disconnected: ${workerId} (${hostname})`);
|
|
223
|
+
// Mark all sessions this worker owned as disconnected. The reaper will
|
|
224
|
+
// fail them if the worker doesn't reconnect within graceMs.
|
|
225
|
+
const owned = q.listSessionsForWorker(workerId);
|
|
226
|
+
for (const s of owned)
|
|
227
|
+
q.markSessionDisconnected(s.id);
|
|
228
|
+
registry.unregister(workerId);
|
|
229
|
+
bus.emit("worker:disconnected", { workerId, hostname });
|
|
230
|
+
});
|
|
231
|
+
ws.on("error", (err) => {
|
|
232
|
+
log(`[workers-ws] ws error from ${workerId ?? "(pre-hello)"}: ${err.message}`);
|
|
233
|
+
});
|
|
234
|
+
});
|
|
235
|
+
}
|
|
236
|
+
/** Extract the major.minor part of a semver, e.g. "0.3.1" -> "0.3". */
|
|
237
|
+
function minorOf(v) {
|
|
238
|
+
const parts = v.split(".");
|
|
239
|
+
return `${parts[0] ?? "0"}.${parts[1] ?? "0"}`;
|
|
240
|
+
}
|
|
241
|
+
//# sourceMappingURL=workers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"workers.js","sourceRoot":"","sources":["../../../src/server/ws/workers.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,cAAc,GAEf,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAYlD,MAAM,UAAU,eAAe,CAAC,IAAmB;IACjD,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAE5C,GAAG,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,EAAa,EAAE,GAAoB,EAAE,EAAE;QAC3D,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC;QAC1B,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,sBAAsB,CAAC;YAAE,OAAO;QAEpD,IAAI,QAAQ,GAAkB,IAAI,CAAC;QACnC,IAAI,QAAQ,GAAG,WAAW,CAAC;QAE3B,MAAM,aAAa,GAAG,UAAU,CAAC,GAAG,EAAE;YACpC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,IAAI,CAAC;oBAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;gBAAC,CAAC;gBAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC;YACjE,CAAC;QACH,CAAC,EAAE,MAAM,CAAC,CAAC;QAEX,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE;YACjC,IAAI,QAAQ,EAAE,CAAC;gBACb,IAAI,CAAC,QAAQ;oBAAE,OAAO;gBACtB,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAkB,CAAC,CAAC;gBACzE,MAAM,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;gBACpC,IAAI,CAAC,OAAO;oBAAE,OAAO;gBACrB,QAAQ,CAAC,iBAAiB,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;gBAC/D,OAAO;YACT,CAAC;YAED,IAAI,GAAuB,CAAC;YAC5B,IAAI,CAAC;gBACH,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;YACzC,CAAC;YAAC,MAAM,CAAC;gBACP,GAAG,CAAC,8BAA8B,QAAQ,IAAI,aAAa,WAAW,CAAC,CAAC;gBACxE,IAAI,CAAC;oBAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;gBAAC,CAAC;gBAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC;gBAC1D,OAAO;YACT,CAAC;YAED,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,IAAI,GAAG,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;oBAChC,GAAG,CAAC,2CAA2C,GAAG,CAAC,IAAI,WAAW,CAAC,CAAC;oBACpE,IAAI,CAAC;wBAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;oBAAC,CAAC;oBAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC;oBACtE,OAAO;gBACT,CAAC;gBACD,YAAY,CAAC,aAAa,CAAC,CAAC;gBAC5B,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;gBACxB,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;gBACxB,CAAC,CAAC,YAAY,CAAC;oBACb,EAAE,EAAE,GAAG,CAAC,QAAQ;oBAChB,QAAQ,EAAE,GAAG,CAAC,QAAQ;oBACtB,EAAE,EAAE,GAAG,CAAC,EAAE;oBACV,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,YAAY,EAAE,GAAG,CAAC,YAAY;iBAC/B,CAAC,CAAC;gBACH,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC1E,MAAM,aAAa,GAAG,GAAG,CAAC,WAAW,IAAI,IAAI,CAAC;gBAC9C,QAAQ,CAAC,QAAQ,CAAC;oBAChB,QAAQ,EAAE,GAAG,CAAC,QAAQ;oBACtB,QAAQ,EAAE,GAAG,CAAC,QAAQ;oBACtB,EAAE,EAAE,GAAG,CAAC,EAAE;oBACV,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,YAAY,EAAE,GAAG,CAAC,YAAY;oBAC9B,QAAQ,EAAE,GAAG,CAAC,QAAQ;oBACtB,eAAe,EAAE,OAAO;oBACxB,EAAE;oBACF,WAAW,EAAE,IAAI,IAAI,EAAE;oBACvB,eAAe,EAAE,IAAI,IAAI,EAAE;oBAC3B,WAAW,EAAE,aAAa;iBAC3B,CAAC,CAAC;gBACH,MAAM,SAAS,GAAG,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;gBACtF,IAAI,CAAC,aAAa,EAAE,CAAC;oBACnB,GAAG,CAAC,uBAAuB,GAAG,CAAC,QAAQ,KAAK,GAAG,CAAC,QAAQ,oDAAoD,CAAC,CAAC;gBAChH,CAAC;qBAAM,IAAI,aAAa,KAAK,OAAO,EAAE,CAAC;oBACrC,IAAI,SAAS,EAAE,CAAC;wBACd,GAAG,CAAC,uBAAuB,GAAG,CAAC,QAAQ,KAAK,GAAG,CAAC,QAAQ,kBAAkB,aAAa,gBAAgB,OAAO,sCAAsC,CAAC,CAAC;oBACxJ,CAAC;yBAAM,CAAC;wBACN,GAAG,CAAC,gCAAgC,GAAG,CAAC,QAAQ,KAAK,GAAG,CAAC,QAAQ,kBAAkB,aAAa,yBAAyB,OAAO,mFAAmF,CAAC,CAAC;oBACvN,CAAC;gBACH,CAAC;gBACD,8DAA8D;gBAC9D,mEAAmE;gBACnE,8DAA8D;gBAC9D,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,eAAe,EAAE,CAAC;oBACtC,MAAM,SAAS,GAAG,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;oBAC9C,IAAI,SAAS,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;wBACpC,CAAC,CAAC,wBAAwB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;oBAC5C,CAAC;yBAAM,CAAC;wBACN,GAAG,CAAC,uBAAuB,QAAQ,6BAA6B,GAAG,CAAC,SAAS,WAAW,CAAC,CAAC;wBAC1F,IAAI,CAAC;4BACH,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;wBAC9E,CAAC;wBAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC;wBACxB,IAAI,CAAC,eAAe,EAAE,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;oBACtD,CAAC;gBACH,CAAC;gBACD,GAAG,CAAC,kCAAkC,GAAG,CAAC,QAAQ,KAAK,GAAG,CAAC,QAAQ,OAAO,GAAG,CAAC,eAAe,CAAC,MAAM,kBAAkB,CAAC,CAAC;gBACxH,GAAG,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACjF,OAAO;YACT,CAAC;YAED,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;gBACjB,KAAK,kBAAkB,CAAC,CAAC,CAAC;oBACxB,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;oBACxB,QAAQ,CAAC,eAAe,CAAC,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC;oBACtE,MAAM;gBACR,CAAC;gBACD,KAAK,eAAe,CAAC,CAAC,CAAC;oBACrB,mEAAmE;oBACnE,wCAAwC;oBACxC,MAAM;gBACR,CAAC;gBACD,KAAK,aAAa,CAAC,CAAC,CAAC;oBACnB,GAAG,CAAC,uBAAuB,QAAQ,iBAAiB,GAAG,CAAC,MAAM,KAAK,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;oBACjF,CAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;oBAClC,sDAAsD;oBACtD,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;oBAChC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;wBAClC,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;wBAC5B,MAAM,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;wBACtC,IAAI,OAAO;4BAAE,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;oBAC1D,CAAC;oBACD,MAAM;gBACR,CAAC;gBACD,KAAK,iBAAiB,CAAC,CAAC,CAAC;oBACvB,CAAC,CAAC,aAAa,CAAC;wBACd,EAAE,EAAE,GAAG,CAAC,SAAS;wBACjB,MAAM,EAAE,GAAG,CAAC,MAAM;wBAClB,QAAQ;wBACR,GAAG,EAAE,GAAG,CAAC,GAAG;wBACZ,YAAY,EAAE,GAAG,CAAC,YAAY;qBAC/B,CAAC,CAAC;oBACH,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;oBACvC,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;oBAC5D,MAAM,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;oBACtC,IAAI,OAAO;wBAAE,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;oBACzD,MAAM;gBACR,CAAC;gBACD,KAAK,cAAc,CAAC,CAAC,CAAC;oBACpB,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;oBAC5B,MAAM,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;oBAClC,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,CAAC,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC;oBAC7F,IAAI,GAAG,IAAI,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;wBAC5C,GAAG,CAAC,sBAAsB,GAAG,CAAC,MAAM,wBAAwB,GAAG,CAAC,QAAQ,aAAa,GAAG,CAAC,MAAM,YAAY,CAAC,CAAC;wBAC7G,CAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;wBAClC,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;wBACtC,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;wBACxC,MAAM;oBACR,CAAC;oBACD,sEAAsE;oBACtE,qEAAqE;oBACrE,2DAA2D;oBAC3D,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,IAAI,UAAU,CAAC,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;oBAC9F,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC;oBAC3D,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;oBACvE,CAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;oBAClC,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;oBACtC,MAAM,IAAI,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;oBACnC,IAAI,IAAI;wBAAE,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;oBACnD,MAAM;gBACR,CAAC;gBACD,KAAK,aAAa,CAAC,CAAC,CAAC;oBACnB,IAAI,GAAG,CAAC,cAAc;wBAAE,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,cAAc,CAAC,CAAC;oBAC5E,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;wBACd,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;wBAChC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,WAAW,IAAI,CAAC,CAAC,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,CAAC,MAAM,KAAK,WAAW,CAAC,EAAE,CAAC;4BACxF,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC;4BAC1E,GAAG,CAAC,sBAAsB,GAAG,CAAC,MAAM,gBAAgB,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC;wBACpE,CAAC;oBACH,CAAC;oBACD,MAAM,IAAI,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;oBACnC,IAAI,IAAI;wBAAE,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;oBACnD,MAAM;gBACR,CAAC;gBACD,KAAK,oBAAoB,CAAC,CAAC,CAAC;oBAC1B,kEAAkE;oBAClE,kEAAkE;oBAClE,qDAAqD;oBACrD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;oBAChD,QAAQ,CAAC,iBAAiB,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;oBACnD,QAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;oBAC3D,MAAM;gBACR,CAAC;gBACD,KAAK,eAAe,CAAC,CAAC,CAAC;oBACrB,gEAAgE;oBAChE,kEAAkE;oBAClE,oEAAoE;oBACpE,eAAe;oBACf,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE;wBACpD,IAAI,EAAE,OAAO;wBACb,GAAG,EAAE,GAAG,CAAC,GAAG;qBACb,CAAC,CAAC;oBACH,MAAM;gBACR,CAAC;gBACD,KAAK,YAAY,CAAC,CAAC,CAAC;oBAClB,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;oBACtC,MAAM;gBACR,CAAC;gBACD,OAAO,CAAC,CAAC,CAAC;oBACR,iCAAiC;oBACjC,MAAM;gBACR,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YAClB,YAAY,CAAC,aAAa,CAAC,CAAC;YAC5B,IAAI,CAAC,QAAQ;gBAAE,OAAO;YACtB,GAAG,CAAC,qCAAqC,QAAQ,KAAK,QAAQ,GAAG,CAAC,CAAC;YACnE,uEAAuE;YACvE,4DAA4D;YAC5D,MAAM,KAAK,GAAG,CAAC,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;YAChD,KAAK,MAAM,CAAC,IAAI,KAAK;gBAAE,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACvD,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YAC9B,GAAG,CAAC,IAAI,CAAC,qBAAqB,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YACrB,GAAG,CAAC,8BAA8B,QAAQ,IAAI,aAAa,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QACjF,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,uEAAuE;AACvE,SAAS,OAAO,CAAC,CAAS;IACxB,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3B,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC;AACjD,CAAC"}
|
package/dist/shared/types.js
CHANGED
|
@@ -18,6 +18,9 @@ export function labelForAgentKind(agent, kind) {
|
|
|
18
18
|
const short = agentShortName(agent);
|
|
19
19
|
return kind === "implement" ? `tono-${short}` : `tono-${short}-review`;
|
|
20
20
|
}
|
|
21
|
+
/** The bare default-agent labels (no agent suffix). */
|
|
22
|
+
export const DEFAULT_IMPLEMENT_LABEL = "tono";
|
|
23
|
+
export const DEFAULT_REVIEW_LABEL = "tono-review";
|
|
21
24
|
export const TERMINAL_STATUSES = ["merged", "pr_closed", "cleaned"];
|
|
22
|
-
export const ACTIVE_STATUSES = ["queued", "running", "pr_open"];
|
|
25
|
+
export const ACTIVE_STATUSES = ["queued", "assigning", "running", "pr_open"];
|
|
23
26
|
//# sourceMappingURL=types.js.map
|
package/dist/shared/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/shared/types.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,WAAW,GAAgB,CAAC,aAAa,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;AAQ7E,MAAM,CAAC,MAAM,UAAU,GAAe,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;AAE9D;;;;;;;;;;GAUG;AACH,MAAM,UAAU,cAAc,CAAC,KAAgB;IAC7C,OAAO,KAAK,KAAK,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC;AACpD,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAAgB,EAAE,IAAc;IAChE,MAAM,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IACpC,OAAO,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,QAAQ,KAAK,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,SAAS,CAAC;AACzE,CAAC;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/shared/types.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,WAAW,GAAgB,CAAC,aAAa,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;AAQ7E,MAAM,CAAC,MAAM,UAAU,GAAe,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;AAE9D;;;;;;;;;;GAUG;AACH,MAAM,UAAU,cAAc,CAAC,KAAgB;IAC7C,OAAO,KAAK,KAAK,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC;AACpD,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAAgB,EAAE,IAAc;IAChE,MAAM,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IACpC,OAAO,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,QAAQ,KAAK,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,SAAS,CAAC;AACzE,CAAC;AA4CD,uDAAuD;AACvD,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC;AAC9C,MAAM,CAAC,MAAM,oBAAoB,GAAG,aAAa,CAAC;AA+DlD,MAAM,CAAC,MAAM,iBAAiB,GAAiB,CAAC,QAAQ,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;AAClF,MAAM,CAAC,MAAM,eAAe,GAAiB,CAAC,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
// Wire protocol between tono workers and the gateway. Both sides import this.
|
|
2
|
+
//
|
|
3
|
+
// Transport: a single multiplexed WebSocket from worker → gateway. Gateway is
|
|
4
|
+
// the WS server, worker is the client. Both directions exchange:
|
|
5
|
+
//
|
|
6
|
+
// - JSON text frames for the control plane (assignment, lifecycle, status).
|
|
7
|
+
// - Binary frames for PTY data, formatted as <36 bytes UTF-8 sessionId><payload>.
|
|
8
|
+
// Direction is implicit: worker→gateway = pty output; gateway→worker = pty input.
|
|
9
|
+
// ---- binary frame helpers ----
|
|
10
|
+
//
|
|
11
|
+
// Binary frame layout: <36 bytes UTF-8 sessionId><payload bytes...>
|
|
12
|
+
// Both worker and gateway use the same encoder/decoder.
|
|
13
|
+
export const SESSION_ID_BYTES = 36;
|
|
14
|
+
export function encodePtyFrame(sessionId, payload) {
|
|
15
|
+
if (sessionId.length !== SESSION_ID_BYTES) {
|
|
16
|
+
throw new Error(`encodePtyFrame: sessionId must be ${SESSION_ID_BYTES} chars, got ${sessionId.length}`);
|
|
17
|
+
}
|
|
18
|
+
const head = Buffer.from(sessionId, "utf8");
|
|
19
|
+
return Buffer.concat([head, payload]);
|
|
20
|
+
}
|
|
21
|
+
export function decodePtyFrame(frame) {
|
|
22
|
+
if (frame.length < SESSION_ID_BYTES)
|
|
23
|
+
return null;
|
|
24
|
+
const sessionId = frame.subarray(0, SESSION_ID_BYTES).toString("utf8");
|
|
25
|
+
const payload = frame.subarray(SESSION_ID_BYTES);
|
|
26
|
+
return { sessionId, payload };
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=worker-protocol.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"worker-protocol.js","sourceRoot":"","sources":["../../src/shared/worker-protocol.ts"],"names":[],"mappings":"AAAA,8EAA8E;AAC9E,EAAE;AACF,8EAA8E;AAC9E,iEAAiE;AACjE,EAAE;AACF,8EAA8E;AAC9E,oFAAoF;AACpF,sFAAsF;AA0MtF,iCAAiC;AACjC,EAAE;AACF,oEAAoE;AACpE,wDAAwD;AAExD,MAAM,CAAC,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAEnC,MAAM,UAAU,cAAc,CAAC,SAAiB,EAAE,OAAe;IAC/D,IAAI,SAAS,CAAC,MAAM,KAAK,gBAAgB,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,qCAAqC,gBAAgB,eAAe,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;IAC1G,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAC5C,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,KAAa;IAC1C,IAAI,KAAK,CAAC,MAAM,GAAG,gBAAgB;QAAE,OAAO,IAAI,CAAC;IACjD,MAAM,SAAS,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACvE,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IACjD,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC;AAChC,CAAC"}
|