@staff0rd/assist 0.1126.0 → 0.1127.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/dist/built-version +1 -1
- package/dist/commands/sessions/web/bundle.js +442 -442
- package/dist/index.js +113 -18
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -6,7 +6,7 @@ import { Command } from "commander";
|
|
|
6
6
|
// package.json
|
|
7
7
|
var package_default = {
|
|
8
8
|
name: "@staff0rd/assist",
|
|
9
|
-
version: "0.
|
|
9
|
+
version: "0.1127.0",
|
|
10
10
|
type: "module",
|
|
11
11
|
main: "dist/index.js",
|
|
12
12
|
bin: {
|
|
@@ -16419,21 +16419,122 @@ async function reloadDaemonLinks() {
|
|
|
16419
16419
|
}
|
|
16420
16420
|
}
|
|
16421
16421
|
|
|
16422
|
-
// src/commands/sessions/web/nodes/
|
|
16423
|
-
|
|
16422
|
+
// src/commands/sessions/web/nodes/linkConflict.ts
|
|
16423
|
+
function linkConflict(name2, url, links2) {
|
|
16424
|
+
if (name2.includes(":")) return `Node name ${name2} cannot contain ':'`;
|
|
16425
|
+
if (name2 === resolveNodeName())
|
|
16426
|
+
return `${name2} is this node; enter another machine's URL`;
|
|
16427
|
+
const existing = links2.find((link3) => link3.name === name2 || link3.url === url);
|
|
16428
|
+
if (existing) return `${existing.name} is already linked at ${existing.url}`;
|
|
16429
|
+
return null;
|
|
16430
|
+
}
|
|
16431
|
+
|
|
16432
|
+
// src/commands/sessions/nodes/parseLinkUrl.ts
|
|
16433
|
+
function parseLinkUrl(url) {
|
|
16434
|
+
const parsed = new URL(url);
|
|
16435
|
+
if (parsed.protocol !== "http:" && parsed.protocol !== "https:")
|
|
16436
|
+
throw new Error(`link url must be http(s): ${url}`);
|
|
16437
|
+
return parsed.origin;
|
|
16438
|
+
}
|
|
16439
|
+
|
|
16440
|
+
// src/commands/sessions/web/nodes/tryParseLinkUrl.ts
|
|
16441
|
+
function tryParseLinkUrl(raw) {
|
|
16424
16442
|
try {
|
|
16425
|
-
|
|
16426
|
-
return typeof name2 === "string" && name2 ? name2 : null;
|
|
16443
|
+
return parseLinkUrl(raw);
|
|
16427
16444
|
} catch {
|
|
16428
16445
|
return null;
|
|
16429
16446
|
}
|
|
16430
16447
|
}
|
|
16448
|
+
|
|
16449
|
+
// src/commands/sessions/web/nodes/readBodyFields.ts
|
|
16450
|
+
async function readBodyFields(req, keys) {
|
|
16451
|
+
let body;
|
|
16452
|
+
try {
|
|
16453
|
+
body = await readJsonBody(req) ?? {};
|
|
16454
|
+
} catch {
|
|
16455
|
+
return null;
|
|
16456
|
+
}
|
|
16457
|
+
const fields = {};
|
|
16458
|
+
for (const key of keys) {
|
|
16459
|
+
const value = body[key];
|
|
16460
|
+
if (typeof value !== "string" || !value.trim()) return null;
|
|
16461
|
+
fields[key] = value.trim();
|
|
16462
|
+
}
|
|
16463
|
+
return fields;
|
|
16464
|
+
}
|
|
16465
|
+
|
|
16466
|
+
// src/commands/sessions/web/nodes/postNodeLink.ts
|
|
16467
|
+
async function postNodeLink(req, res) {
|
|
16468
|
+
const fields = await readBodyFields(req, ["name", "url"]);
|
|
16469
|
+
const url = fields && tryParseLinkUrl(fields.url);
|
|
16470
|
+
if (!fields || !url) {
|
|
16471
|
+
respondJson(res, 400, { error: "Missing node name or http(s) URL" });
|
|
16472
|
+
return;
|
|
16473
|
+
}
|
|
16474
|
+
const links2 = await readLinks();
|
|
16475
|
+
const conflict = linkConflict(fields.name, url, links2);
|
|
16476
|
+
if (conflict) {
|
|
16477
|
+
respondJson(res, 409, { error: conflict });
|
|
16478
|
+
return;
|
|
16479
|
+
}
|
|
16480
|
+
await writeLinks([...links2, { name: fields.name, url }]);
|
|
16481
|
+
const daemon = await reloadDaemonLinks();
|
|
16482
|
+
console.log(`nodes: linked ${fields.name} (${url}); daemon ${daemon.kind}`);
|
|
16483
|
+
respondJson(res, 200, { ok: true, daemon });
|
|
16484
|
+
}
|
|
16485
|
+
|
|
16486
|
+
// src/commands/sessions/web/nodes/probePeer.ts
|
|
16487
|
+
function refuse(error) {
|
|
16488
|
+
return { ok: false, error };
|
|
16489
|
+
}
|
|
16490
|
+
async function probePeer(raw) {
|
|
16491
|
+
const url = tryParseLinkUrl(raw);
|
|
16492
|
+
if (!url) return refuse(`${raw} is not an http(s) URL`);
|
|
16493
|
+
let health2;
|
|
16494
|
+
try {
|
|
16495
|
+
health2 = await fetchPeerJson(url, "/api/health");
|
|
16496
|
+
} catch (error) {
|
|
16497
|
+
return refuse(`Could not reach ${url}: ${describePeerError(error)}`);
|
|
16498
|
+
}
|
|
16499
|
+
const name2 = health2.nodeName;
|
|
16500
|
+
if (!name2)
|
|
16501
|
+
return refuse(
|
|
16502
|
+
`${url} did not report a node name; is it an assist web server?`
|
|
16503
|
+
);
|
|
16504
|
+
const conflict = linkConflict(name2, url, await readLinks());
|
|
16505
|
+
if (conflict) return refuse(conflict);
|
|
16506
|
+
const protocol = health2.protocol ?? 0;
|
|
16507
|
+
if (protocol < PROTOCOL_VERSION)
|
|
16508
|
+
return refuse(
|
|
16509
|
+
`${name2} runs an older link protocol (${protocol}, this node ${PROTOCOL_VERSION}); run assist update on ${name2} first`
|
|
16510
|
+
);
|
|
16511
|
+
return { ok: true, name: name2, version: health2.version ?? "unknown", url };
|
|
16512
|
+
}
|
|
16513
|
+
|
|
16514
|
+
// src/commands/sessions/web/nodes/postNodeProbe.ts
|
|
16515
|
+
async function postNodeProbe(req, res) {
|
|
16516
|
+
const fields = await readBodyFields(req, ["url"]);
|
|
16517
|
+
if (!fields) {
|
|
16518
|
+
respondJson(res, 400, { error: "Enter the peer's web server URL" });
|
|
16519
|
+
return;
|
|
16520
|
+
}
|
|
16521
|
+
const result = await probePeer(fields.url);
|
|
16522
|
+
if (!result.ok) {
|
|
16523
|
+
respondJson(res, 422, { error: result.error });
|
|
16524
|
+
return;
|
|
16525
|
+
}
|
|
16526
|
+
const { name: name2, version: version2, url } = result;
|
|
16527
|
+
respondJson(res, 200, { name: name2, version: version2, url });
|
|
16528
|
+
}
|
|
16529
|
+
|
|
16530
|
+
// src/commands/sessions/web/nodes/postNodeUnlink.ts
|
|
16431
16531
|
async function postNodeUnlink(req, res) {
|
|
16432
|
-
const
|
|
16433
|
-
if (!
|
|
16532
|
+
const fields = await readBodyFields(req, ["name"]);
|
|
16533
|
+
if (!fields) {
|
|
16434
16534
|
respondJson(res, 400, { error: "Missing node name" });
|
|
16435
16535
|
return;
|
|
16436
16536
|
}
|
|
16537
|
+
const { name: name2 } = fields;
|
|
16437
16538
|
const links2 = await readLinks();
|
|
16438
16539
|
const remaining = links2.filter((link3) => link3.name !== name2);
|
|
16439
16540
|
if (remaining.length === links2.length) {
|
|
@@ -18325,6 +18426,8 @@ var routes2 = {
|
|
|
18325
18426
|
"GET /api/pr-preview/image": previewImage,
|
|
18326
18427
|
"POST /api/restart": restartWeb,
|
|
18327
18428
|
"GET /api/node-doctor": nodeDoctor,
|
|
18429
|
+
"POST /api/nodes/probe": postNodeProbe,
|
|
18430
|
+
"POST /api/nodes/link": postNodeLink,
|
|
18328
18431
|
"POST /api/nodes/unlink": postNodeUnlink,
|
|
18329
18432
|
"POST /api/self-update": selfUpdate,
|
|
18330
18433
|
"GET /api/github-url": githubUrl,
|
|
@@ -59304,7 +59407,7 @@ async function snapshotOrFail(s, args, traceId) {
|
|
|
59304
59407
|
}
|
|
59305
59408
|
|
|
59306
59409
|
// src/commands/sessions/daemon/transfer/transferSession.ts
|
|
59307
|
-
function
|
|
59410
|
+
function refuse2(client, id, message4) {
|
|
59308
59411
|
daemonLog(`session ${id} transfer refused: ${message4}`);
|
|
59309
59412
|
sendTo(client, { type: "error", message: `Transfer refused: ${message4}` });
|
|
59310
59413
|
}
|
|
@@ -59313,7 +59416,7 @@ async function transferSession(client, deps2, { sessionId: id, target, cwd }) {
|
|
|
59313
59416
|
const refused = transferRefusal(s, target, deps2.links);
|
|
59314
59417
|
const args = s && backlogRunArgs(s);
|
|
59315
59418
|
if (refused || !s || !args)
|
|
59316
|
-
return
|
|
59419
|
+
return refuse2(client, id, refused ?? "unknown session");
|
|
59317
59420
|
if (s.status === "running")
|
|
59318
59421
|
return queueTransfer(client, deps2.notify, s, target, cwd);
|
|
59319
59422
|
const traceId = newTraceId();
|
|
@@ -59326,7 +59429,7 @@ async function transferSession(client, deps2, { sessionId: id, target, cwd }) {
|
|
|
59326
59429
|
if (!pushed.ok) {
|
|
59327
59430
|
s.transfer = { target, error: pushed.error };
|
|
59328
59431
|
deps2.notify();
|
|
59329
|
-
return
|
|
59432
|
+
return refuse2(client, id, pushed.error);
|
|
59330
59433
|
}
|
|
59331
59434
|
await handOffToTarget(client, deps2, s, {
|
|
59332
59435
|
args,
|
|
@@ -63815,14 +63918,6 @@ function parsePort2(flag, value) {
|
|
|
63815
63918
|
return port;
|
|
63816
63919
|
}
|
|
63817
63920
|
|
|
63818
|
-
// src/commands/sessions/nodes/parseLinkUrl.ts
|
|
63819
|
-
function parseLinkUrl(url) {
|
|
63820
|
-
const parsed = new URL(url);
|
|
63821
|
-
if (parsed.protocol !== "http:" && parsed.protocol !== "https:")
|
|
63822
|
-
throw new Error(`link url must be http(s): ${url}`);
|
|
63823
|
-
return parsed.origin;
|
|
63824
|
-
}
|
|
63825
|
-
|
|
63826
63921
|
// src/commands/sessions/nodes/buildLink.ts
|
|
63827
63922
|
async function buildLink(name2, url, options2, resolveTailnetSuffix) {
|
|
63828
63923
|
if (url && options2.tailscale)
|