@snowyroad/braid 0.79.5 → 0.80.0

package/dist/cli.js

@@ -6959,6 +6959,7 @@ function startUpdateNotifier(opts) {
 
 // src/cli.ts
 import { readFileSync as readFileSync9 } from "fs";
+import { fileURLToPath as fileURLToPath3 } from "url";
 
 // src/cliArgs.ts
 var USAGE = `Usage: braid <command>
@@ -7189,10 +7190,42 @@ function parseCliArgs(argv) {
     if (!parsed.ok) return { kind: "usage", error: parsed.error };
     return { kind: "run", argv };
   }
-  if (first === void 0) return { kind: "usage" };
+  if (first === "tui") {
+    return { kind: "tui", bare: false, args: argv.slice(1) };
+  }
+  if (first === void 0) return { kind: "tui", bare: true, args: [] };
   return { kind: "usage", error: `Unknown command: ${first}` };
 }
 
+// src/launchTui.ts
+import { spawn as spawn2 } from "child_process";
+import { createRequire } from "module";
+import { dirname as dirname6, join as join8 } from "path";
+function resolveTuiEntry() {
+  try {
+    const require2 = createRequire(import.meta.url);
+    const pkgPath = require2.resolve("arp-tui/package.json");
+    const pkg = require2("arp-tui/package.json");
+    const rel = typeof pkg.bin === "string" ? pkg.bin : pkg.bin?.["arp-tui"];
+    return rel ? join8(dirname6(pkgPath), rel) : null;
+  } catch {
+    return null;
+  }
+}
+function runTui(args, env, selfCliPath) {
+  const entry = resolveTuiEntry();
+  if (!entry) {
+    console.error("[braid] the interactive UI is not installed \u2014 reinstall @snowyroad/braid");
+    return Promise.resolve(1);
+  }
+  const childEnv = { ...env, ARP_TUI_BRIDGE_CMD: `${process.execPath} ${selfCliPath}` };
+  return new Promise((resolve2) => {
+    const child = spawn2(process.execPath, [entry, ...args], { stdio: "inherit", env: childEnv });
+    child.on("error", () => resolve2(1));
+    child.on("close", (code) => resolve2(code ?? 1));
+  });
+}
+
 // src/enroll.ts
 var ENROLL_STDIN_MAX_BYTES = 16 * 1024;
 function readBoundedStdin(stream, maxBytes) {
@@ -8477,7 +8510,7 @@ import { homedir as homedir6 } from "os";
 
 // src/service/manager.ts
 import { mkdirSync as mkdirSync7, writeFileSync as writeFileSync7, rmSync as rmSync2, existsSync as existsSync6 } from "fs";
-import { join as join9 } from "path";
+import { join as join10 } from "path";
 
 // src/service/templates.ts
 function escapeXml(s) {
@@ -8649,17 +8682,17 @@ function schtasksXml(p) {
 
 // src/service/win32.ts
 import { mkdirSync as mkdirSync6, writeFileSync as writeFileSync6, readdirSync as readdirSync4, readFileSync as readFileSync7, unlinkSync as unlinkSync3 } from "fs";
-import { join as join8 } from "path";
+import { join as join9 } from "path";
 function win32LogDir(homeDir) {
-  return join8(homeDir, "AppData", "Local", "braid", "logs");
+  return join9(homeDir, "AppData", "Local", "braid", "logs");
 }
 function win32Manager(ctx) {
-  const serviceDir = join8(ctx.braidDir, "service");
+  const serviceDir = join9(ctx.braidDir, "service");
   const task = (name) => schtasksLabel(name);
   const legacyTask = (name) => legacySchtasksLabel(name);
-  const xmlPath = (name) => join8(serviceDir, `${task(name)}.xml`);
-  const wrapperPath = (name) => join8(serviceDir, `${task(name)}.cmd`);
-  const launcherPath = (name) => join8(serviceDir, `${task(name)}.vbs`);
+  const xmlPath = (name) => join9(serviceDir, `${task(name)}.xml`);
+  const wrapperPath = (name) => join9(serviceDir, `${task(name)}.cmd`);
+  const launcherPath = (name) => join9(serviceDir, `${task(name)}.vbs`);
   const st = (...args) => ctx.exec("schtasks", args);
   const stx = async (...args) => {
     const res = await st(...args);
@@ -8670,18 +8703,18 @@ function win32Manager(ctx) {
   };
   const killBridgeProcess = async (name) => {
     const legacyAgents = legacyTwinPath(ctx.braidDir, ["agents"]);
-    const agentDirs = [join8(ctx.braidDir, "agents"), ...legacyAgents ? [legacyAgents] : []];
+    const agentDirs = [join9(ctx.braidDir, "agents"), ...legacyAgents ? [legacyAgents] : []];
     const hostDirs = [];
     for (const agentsDir of agentDirs) {
       try {
-        for (const host of readdirSync4(agentsDir)) hostDirs.push(join8(agentsDir, host));
+        for (const host of readdirSync4(agentsDir)) hostDirs.push(join9(agentsDir, host));
       } catch {
       }
     }
     for (const hostDir of hostDirs) {
       let pid = NaN;
       try {
-        pid = Number(readFileSync7(join8(hostDir, `${name}.json.lock`), "utf8").trim());
+        pid = Number(readFileSync7(join9(hostDir, `${name}.json.lock`), "utf8").trim());
       } catch {
         continue;
       }
@@ -8725,7 +8758,7 @@ function win32Manager(ctx) {
       await st("/delete", "/tn", task(name), "/f");
       await st("/delete", "/tn", legacyTask(name), "/f");
       try {
-        unlinkSync3(join8(runDir(ctx.braidDir), `${name}.token`));
+        unlinkSync3(join9(runDir(ctx.braidDir), `${name}.token`));
       } catch {
       }
       const legacyToken = legacyTwinPath(ctx.braidDir, ["run", `${name}.token`]);
@@ -8763,7 +8796,7 @@ function win32Manager(ctx) {
       return { installed, loaded, running };
     },
     logsPath(name) {
-      return join8(win32LogDir(ctx.homeDir), `${name}.err.log`);
+      return join9(win32LogDir(ctx.homeDir), `${name}.err.log`);
     }
   };
 }
@@ -8777,7 +8810,7 @@ var NotSupportedError = class extends Error {
 };
 function makeServiceManager(platform, exec, deps = {}) {
   const homeDir = deps.homeDir ?? process.env.HOME ?? "";
-  const braidDir = deps.braidDir ?? join9(homeDir, ".braid");
+  const braidDir = deps.braidDir ?? join10(homeDir, ".braid");
   const uid = deps.uid ?? (typeof process.getuid === "function" ? process.getuid() : 0);
   const nodePath = deps.nodePath ?? process.execPath;
   const entryPath = pinnedEntryPath({ braidDir });
@@ -8802,11 +8835,11 @@ function notSupportedManager(platform) {
   };
 }
 function darwinManager(ctx) {
-  const launchAgentsDir = join9(ctx.homeDir, "Library", "LaunchAgents");
-  const logDir = join9(ctx.homeDir, "Library", "Logs", "braid");
-  const legacyLogDir = join9(ctx.homeDir, "Library", "Logs", "arp-bridge");
-  const plistPath = (name) => join9(launchAgentsDir, `${launchdLabel(name)}.plist`);
-  const legacyPlistPath = (name) => join9(launchAgentsDir, `${legacyLaunchdLabel(name)}.plist`);
+  const launchAgentsDir = join10(ctx.homeDir, "Library", "LaunchAgents");
+  const logDir = join10(ctx.homeDir, "Library", "Logs", "braid");
+  const legacyLogDir = join10(ctx.homeDir, "Library", "Logs", "arp-bridge");
+  const plistPath = (name) => join10(launchAgentsDir, `${launchdLabel(name)}.plist`);
+  const legacyPlistPath = (name) => join10(launchAgentsDir, `${legacyLaunchdLabel(name)}.plist`);
   const legacyInstalled = (name) => !existsSync6(plistPath(name)) && existsSync6(legacyPlistPath(name));
   const domainTarget = `gui/${ctx.uid}`;
   const serviceTarget = (name) => `${domainTarget}/${legacyInstalled(name) ? legacyLaunchdLabel(name) : launchdLabel(name)}`;
@@ -8871,16 +8904,16 @@ function darwinManager(ctx) {
       };
     },
     logsPath(name) {
-      return join9(legacyInstalled(name) ? legacyLogDir : logDir, `${name}.err.log`);
+      return join10(legacyInstalled(name) ? legacyLogDir : logDir, `${name}.err.log`);
     }
   };
 }
 function linuxManager(ctx) {
-  const unitDir = join9(ctx.homeDir, ".config", "systemd", "user");
+  const unitDir = join10(ctx.homeDir, ".config", "systemd", "user");
   const newUnitName = (name) => `braid-${name}.service`;
   const legacyUnitName = (name) => `arp-bridge-${name}.service`;
-  const newUnitPath = (name) => join9(unitDir, newUnitName(name));
-  const legacyUnitPath = (name) => join9(unitDir, legacyUnitName(name));
+  const newUnitPath = (name) => join10(unitDir, newUnitName(name));
+  const legacyUnitPath = (name) => join10(unitDir, legacyUnitName(name));
   const legacyInstalled = (name) => !existsSync6(newUnitPath(name)) && existsSync6(legacyUnitPath(name));
   const unitName = (name) => legacyInstalled(name) ? legacyUnitName(name) : newUnitName(name);
   const unitPath = (name) => legacyInstalled(name) ? legacyUnitPath(name) : newUnitPath(name);
@@ -9162,7 +9195,7 @@ function printStatusHuman(name, st, logsPath) {
 
 // src/service/serviceLog.ts
 import { createWriteStream, mkdirSync as mkdirSync8 } from "fs";
-import { dirname as dirname6, join as join10 } from "path";
+import { dirname as dirname7, join as join11 } from "path";
 
 // src/service/logRotation.ts
 import {
@@ -9215,16 +9248,16 @@ function rotateLogFileIfNeeded(logPath, opts = {}) {
 
 // src/service/serviceLog.ts
 function darwinLogDir(homeDir) {
-  return join10(homeDir, "Library", "Logs", "braid");
+  return join11(homeDir, "Library", "Logs", "braid");
 }
 function serviceLogTargets(name, platform, homeDir) {
   if (platform === "darwin") {
     const d = darwinLogDir(homeDir);
-    return [join10(d, `${name}.out.log`), join10(d, `${name}.err.log`)];
+    return [join11(d, `${name}.out.log`), join11(d, `${name}.err.log`)];
   }
   if (platform === "win32") {
     const d = win32LogDir(homeDir);
-    return [join10(d, `${name}.out.log`), join10(d, `${name}.err.log`)];
+    return [join11(d, `${name}.out.log`), join11(d, `${name}.err.log`)];
   }
   return [];
 }
@@ -9274,7 +9307,7 @@ function initServiceLogging(opts) {
   };
 }
 function defaultTeeStream(path4) {
-  mkdirSync8(dirname6(path4), { recursive: true });
+  mkdirSync8(dirname7(path4), { recursive: true });
   const stream = createWriteStream(path4, { flags: "a" });
   stream.on("error", () => {
   });
@@ -9486,6 +9519,14 @@ async function main() {
   applyEnvAliases();
   installCrashGuard();
   const invocation = parseCliArgs(process.argv.slice(2));
+  if (invocation.kind === "tui") {
+    if (invocation.bare && !process.stdout.isTTY) {
+      console.error(USAGE);
+      process.exit(1);
+    }
+    const selfCli = fileURLToPath3(import.meta.url);
+    process.exit(await runTui(invocation.args, process.env, selfCli));
+  }
   if (invocation.kind === "usage") {
     if (invocation.error) console.error(`[braid] ${invocation.error}`);
     console.error(USAGE);