@staff0rd/assist 0.1002.0 → 0.1003.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/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.1003.0",
|
|
10
10
|
type: "module",
|
|
11
11
|
main: "dist/index.js",
|
|
12
12
|
bin: {
|
|
@@ -128,6 +128,7 @@ var package_default = {
|
|
|
128
128
|
oxfmt: "^0.54.0",
|
|
129
129
|
oxlint: "^1.69.0",
|
|
130
130
|
playwright: "^1.64.1",
|
|
131
|
+
"qrcode.react": "^4.2.0",
|
|
131
132
|
react: "^19.2.4",
|
|
132
133
|
"react-dom": "^19.2.4",
|
|
133
134
|
"react-router": "^7.14.0",
|
|
@@ -1587,19 +1588,6 @@ function planServe(status2, serveConfig, port, httpsPort = port) {
|
|
|
1587
1588
|
};
|
|
1588
1589
|
}
|
|
1589
1590
|
|
|
1590
|
-
// src/commands/sessions/nodes/runningStatus.ts
|
|
1591
|
-
async function runningStatus(status2) {
|
|
1592
|
-
let current;
|
|
1593
|
-
try {
|
|
1594
|
-
current = await status2();
|
|
1595
|
-
} catch (error) {
|
|
1596
|
-
if (error.code === "ENOENT")
|
|
1597
|
-
return `skipped, ${tailscaleCli()} is not installed`;
|
|
1598
|
-
throw error;
|
|
1599
|
-
}
|
|
1600
|
-
return current.BackendState === "Running" ? current : `skipped, Tailscale is ${current.BackendState ?? "not running"}`;
|
|
1601
|
-
}
|
|
1602
|
-
|
|
1603
1591
|
// src/commands/sessions/nodes/runTailscale.ts
|
|
1604
1592
|
import { execFile as execFile2 } from "child_process";
|
|
1605
1593
|
import { promisify as promisify2 } from "util";
|
|
@@ -1613,6 +1601,25 @@ async function runTailscale(args) {
|
|
|
1613
1601
|
return stdout;
|
|
1614
1602
|
}
|
|
1615
1603
|
|
|
1604
|
+
// src/commands/sessions/nodes/readServeConfig.ts
|
|
1605
|
+
async function readServeConfig() {
|
|
1606
|
+
const stdout = (await runTailscale(["serve", "status", "--json"])).trim();
|
|
1607
|
+
return stdout ? JSON.parse(stdout) : {};
|
|
1608
|
+
}
|
|
1609
|
+
|
|
1610
|
+
// src/commands/sessions/nodes/runningStatus.ts
|
|
1611
|
+
async function runningStatus(status2) {
|
|
1612
|
+
let current;
|
|
1613
|
+
try {
|
|
1614
|
+
current = await status2();
|
|
1615
|
+
} catch (error) {
|
|
1616
|
+
if (error.code === "ENOENT")
|
|
1617
|
+
return `skipped, ${tailscaleCli()} is not installed`;
|
|
1618
|
+
throw error;
|
|
1619
|
+
}
|
|
1620
|
+
return current.BackendState === "Running" ? current : `skipped, Tailscale is ${current.BackendState ?? "not running"}`;
|
|
1621
|
+
}
|
|
1622
|
+
|
|
1616
1623
|
// src/commands/sessions/nodes/tailnetHttpsPort.ts
|
|
1617
1624
|
var MIRRORED_WSL_OWNS_PORT_OFFSET = 1e3;
|
|
1618
1625
|
function tailnetHttpsPort(port) {
|
|
@@ -1624,10 +1631,7 @@ var SERVE_WRITE_ATTEMPTS = 5;
|
|
|
1624
1631
|
var defaultDeps = {
|
|
1625
1632
|
enabled: () => loadConfig().sessions?.tailscaleServe !== false,
|
|
1626
1633
|
status: tailscaleStatus,
|
|
1627
|
-
serveStatus:
|
|
1628
|
-
const stdout = (await runTailscale(["serve", "status", "--json"])).trim();
|
|
1629
|
-
return stdout ? JSON.parse(stdout) : {};
|
|
1630
|
-
},
|
|
1634
|
+
serveStatus: readServeConfig,
|
|
1631
1635
|
serve: async (args) => {
|
|
1632
1636
|
await runTailscale(args);
|
|
1633
1637
|
},
|
|
@@ -4314,6 +4318,62 @@ async function clientErrors(req, res) {
|
|
|
4314
4318
|
respondJson(res, 200, { received: parsed.data.failures.length });
|
|
4315
4319
|
}
|
|
4316
4320
|
|
|
4321
|
+
// src/commands/sessions/web/connectMobile/resolveTarget.ts
|
|
4322
|
+
var RESTART = "then restart the web server so it runs tailscale serve";
|
|
4323
|
+
async function resolveTarget(port, deps2) {
|
|
4324
|
+
if (!deps2.enabled())
|
|
4325
|
+
return notServing(
|
|
4326
|
+
"sessions.tailscaleServe is false on this node",
|
|
4327
|
+
`Run \`assist config set sessions.tailscaleServe true --node\`, ${RESTART}`
|
|
4328
|
+
);
|
|
4329
|
+
const current = await runningStatus(deps2.status);
|
|
4330
|
+
if (typeof current === "string")
|
|
4331
|
+
return notServing(
|
|
4332
|
+
current.replace(/^skipped, /, ""),
|
|
4333
|
+
`Install Tailscale and run \`${tailscaleCli()} up\`, ${RESTART}`
|
|
4334
|
+
);
|
|
4335
|
+
const plan2 = planServe(
|
|
4336
|
+
current,
|
|
4337
|
+
await deps2.serveStatus(),
|
|
4338
|
+
port,
|
|
4339
|
+
deps2.httpsPort(port)
|
|
4340
|
+
);
|
|
4341
|
+
if (!plan2.alreadyServing)
|
|
4342
|
+
return notServing(
|
|
4343
|
+
`tailscale serve is not proxying ${plan2.url} to ${plan2.target}`,
|
|
4344
|
+
"Restart the web server, then check the `tailscale serve:` line in its log"
|
|
4345
|
+
);
|
|
4346
|
+
return { ok: true, url: plan2.url, name: deps2.nodeName() };
|
|
4347
|
+
}
|
|
4348
|
+
function notServing(reason4, remediation) {
|
|
4349
|
+
return { ok: false, reason: reason4, remediation };
|
|
4350
|
+
}
|
|
4351
|
+
|
|
4352
|
+
// src/commands/sessions/web/connectMobileTarget.ts
|
|
4353
|
+
var defaultDeps2 = {
|
|
4354
|
+
enabled: () => loadConfig().sessions?.tailscaleServe !== false,
|
|
4355
|
+
status: tailscaleStatus,
|
|
4356
|
+
serveStatus: readServeConfig,
|
|
4357
|
+
httpsPort: tailnetHttpsPort,
|
|
4358
|
+
nodeName: resolveNodeName
|
|
4359
|
+
};
|
|
4360
|
+
async function connectMobileTarget(port, deps2 = {}) {
|
|
4361
|
+
try {
|
|
4362
|
+
return await resolveTarget(port, { ...defaultDeps2, ...deps2 });
|
|
4363
|
+
} catch (error) {
|
|
4364
|
+
return {
|
|
4365
|
+
ok: false,
|
|
4366
|
+
reason: error instanceof Error ? error.message : String(error),
|
|
4367
|
+
remediation: `Fix the above, ${RESTART}`
|
|
4368
|
+
};
|
|
4369
|
+
}
|
|
4370
|
+
}
|
|
4371
|
+
|
|
4372
|
+
// src/commands/sessions/web/connectMobile.ts
|
|
4373
|
+
async function connectMobile(req, res) {
|
|
4374
|
+
respondJson(res, 200, await connectMobileTarget(req.socket.localPort ?? 0));
|
|
4375
|
+
}
|
|
4376
|
+
|
|
4317
4377
|
// src/commands/sessions/shared/readLogTail.ts
|
|
4318
4378
|
import { closeSync as closeSync2, fstatSync, openSync as openSync2, readSync } from "fs";
|
|
4319
4379
|
var MAX_TAIL_BYTES = 4 * 1024 * 1024;
|
|
@@ -12663,6 +12723,7 @@ var routes2 = {
|
|
|
12663
12723
|
"GET /": htmlHandler,
|
|
12664
12724
|
...staticRoutes,
|
|
12665
12725
|
"GET /api/health": health,
|
|
12726
|
+
"GET /api/connect-mobile": connectMobile,
|
|
12666
12727
|
"GET /api/daemon-log": daemonLogTail,
|
|
12667
12728
|
"GET /api/items": listItems,
|
|
12668
12729
|
"GET /api/backlog/summary": getBacklogSummary,
|
|
@@ -37152,7 +37213,7 @@ function computeSpecifier(fromFile, toFile) {
|
|
|
37152
37213
|
function isAffected(edge, moveMap) {
|
|
37153
37214
|
return moveMap.has(edge.target) || moveMap.has(edge.source);
|
|
37154
37215
|
}
|
|
37155
|
-
function
|
|
37216
|
+
function resolveTarget2(edge, moveMap) {
|
|
37156
37217
|
return moveMap.get(edge.target) ?? edge.target;
|
|
37157
37218
|
}
|
|
37158
37219
|
function createRewrite(edge, newSpecifier) {
|
|
@@ -37165,7 +37226,7 @@ function rewriteEdge(edge, newFile, moveMap) {
|
|
|
37165
37226
|
if (!isAffected(edge, moveMap)) return null;
|
|
37166
37227
|
return rewriteIfChanged(
|
|
37167
37228
|
edge,
|
|
37168
|
-
computeSpecifier(newFile,
|
|
37229
|
+
computeSpecifier(newFile, resolveTarget2(edge, moveMap))
|
|
37169
37230
|
);
|
|
37170
37231
|
}
|
|
37171
37232
|
function fileEdges(edges, file) {
|
|
@@ -54119,7 +54180,7 @@ function handleCreateRun(client, m, d) {
|
|
|
54119
54180
|
}
|
|
54120
54181
|
|
|
54121
54182
|
// src/commands/sessions/daemon/handleOutputRequest.ts
|
|
54122
|
-
function
|
|
54183
|
+
function resolveTarget3(m, d) {
|
|
54123
54184
|
const server = d.server;
|
|
54124
54185
|
if (!server) return { sessionId: d.sessionId };
|
|
54125
54186
|
const run4 = m.liveServerRun(server.origin, server.group);
|
|
@@ -54128,7 +54189,7 @@ function resolveTarget2(m, d) {
|
|
|
54128
54189
|
};
|
|
54129
54190
|
}
|
|
54130
54191
|
var handleOutputRequest = (client, m, d) => {
|
|
54131
|
-
const target =
|
|
54192
|
+
const target = resolveTarget3(m, d);
|
|
54132
54193
|
if ("error" in target) {
|
|
54133
54194
|
daemonLog(`output requested: ${target.error}`);
|
|
54134
54195
|
sendTo(client, { type: "session-output", error: target.error });
|
|
@@ -55286,7 +55347,7 @@ function lastLines(scrollback, count10) {
|
|
|
55286
55347
|
}
|
|
55287
55348
|
|
|
55288
55349
|
// src/commands/sessions/sessionOutput.ts
|
|
55289
|
-
function
|
|
55350
|
+
function resolveTarget4(sessionId, server) {
|
|
55290
55351
|
if (sessionId && server)
|
|
55291
55352
|
return "Pass either a session id or --server, not both";
|
|
55292
55353
|
if (server)
|
|
@@ -55305,7 +55366,7 @@ async function sessionOutput(sessionId, options2) {
|
|
|
55305
55366
|
const count10 = Number.parseInt(options2.lines, 10);
|
|
55306
55367
|
if (!Number.isInteger(count10) || count10 < 1)
|
|
55307
55368
|
return fail11(`-n must be a positive integer, got ${options2.lines}`);
|
|
55308
|
-
const target =
|
|
55369
|
+
const target = resolveTarget4(sessionId, options2.server);
|
|
55309
55370
|
if (typeof target === "string") return fail11(target);
|
|
55310
55371
|
try {
|
|
55311
55372
|
const scrollback = await requestSessionOutput(target);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@staff0rd/assist",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.1003.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"bin": {
|
|
@@ -122,6 +122,7 @@
|
|
|
122
122
|
"oxfmt": "^0.54.0",
|
|
123
123
|
"oxlint": "^1.69.0",
|
|
124
124
|
"playwright": "^1.64.1",
|
|
125
|
+
"qrcode.react": "^4.2.0",
|
|
125
126
|
"react": "^19.2.4",
|
|
126
127
|
"react-dom": "^19.2.4",
|
|
127
128
|
"react-router": "^7.14.0",
|