@staff0rd/assist 0.761.1 → 0.763.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.761.1",
+  version: "0.763.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -15033,20 +15033,26 @@ import {
 } from "http";
 import { request as httpsRequest } from "https";
 
-// src/commands/sessions/web/peerTimeoutMs.ts
-var peerTimeoutMs = 2e4;
-
 // src/commands/sessions/web/boundUpstream.ts
-function boundUpstream(upstream, res) {
+function boundUpstream(upstream, res, timeoutMs) {
   upstream.setTimeout(
-    peerTimeoutMs,
-    () => upstream.destroy(new Error(`no response after ${peerTimeoutMs}ms`))
+    timeoutMs,
+    () => upstream.destroy(new Error(`no response after ${timeoutMs}ms`))
   );
   res.on("close", () => {
     if (!res.writableFinished) upstream.destroy();
   });
 }
 
+// src/commands/sessions/web/peerTimeoutMs.ts
+var peerTimeoutMs = 2e4;
+
+// src/commands/sessions/web/peerTimeoutFor.ts
+var ASSIST_UPDATE_DURATION_MS = 6e5;
+function peerTimeoutFor(pathname) {
+  return pathname === "/api/self-update" ? ASSIST_UPDATE_DURATION_MS : peerTimeoutMs;
+}
+
 // src/commands/sessions/web/isQuietPoll.ts
 var POLLED_PATHS = /* @__PURE__ */ new Set(["/api/git-status"]);
 function isQuietPoll(pathname, status2) {
@@ -15085,7 +15091,7 @@ function forwardToPeer(req, res, node, url) {
       },
       (peer) => relayPeerResponse(peer, res, url.pathname, log2, resolve26)
     );
-    boundUpstream(upstream, res);
+    boundUpstream(upstream, res, peerTimeoutFor(url.pathname));
     upstream.on("error", (error) => {
       log2(`failed: ${error.message}`);
       if (res.headersSent) res.destroy();
@@ -15697,6 +15703,11 @@ async function restartDaemon() {
   );
 }
 
+// src/commands/sessions/web/linkedRequester.ts
+function linkedRequester(req) {
+  return `from=${req.headers["x-assist-linked-from"] ?? "local"} trace=${req.headers[TRACE_HEADER] ?? "none"}`;
+}
+
 // src/commands/sessions/web/restartMenu/reExecWebServer.ts
 import { spawnSync as spawnSync5 } from "child_process";
 function resolveExecve() {
@@ -15735,9 +15746,7 @@ async function restartWeb(req, res, deps2 = {}) {
     respondJson(res, 400, { error: "Invalid target" });
     return;
   }
-  console.log(
-    `restart ${target} from=${req.headers["x-assist-linked-from"] ?? "local"} trace=${req.headers[TRACE_HEADER] ?? "none"}`
-  );
+  console.log(`restart ${target} ${linkedRequester(req)}`);
   await new Promise((resolve26) => {
     res.once("finish", resolve26);
     respondJson(res, 200, { ok: true });
@@ -15861,9 +15870,11 @@ async function runAssistUpdate() {
   if (result.exitCode !== 0)
     throw new Error(`assist update exited with code ${result.exitCode}`);
 }
-async function selfUpdate(_req, res, deps2 = {}) {
+async function selfUpdate(req, res, deps2 = {}) {
   const { runUpdate = runAssistUpdate, ...restartDeps } = deps2;
-  console.log("self-update: requested by a linked node; running assist update");
+  console.log(
+    `self-update: requested ${linkedRequester(req)}; running assist update`
+  );
   try {
     await runUpdate();
   } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@staff0rd/assist",
-	"version": "0.761.1",
+	"version": "0.763.0",
 	"type": "module",
 	"main": "dist/index.js",
 	"bin": {