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