@threadbase-sh/streamer 1.31.3 → 1.32.0

package/dist/cli.cjs

@@ -123460,6 +123460,97 @@ var require_semver2 = __commonJS({
   }
 });
 
+// src/lifecycle/conflict-check.ts
+var conflict_check_exports = {};
+__export(conflict_check_exports, {
+  KNOWN_STREAMER_LABELS: () => KNOWN_STREAMER_LABELS,
+  detectConflictingAgents: () => detectConflictingAgents,
+  formatConflictMessage: () => formatConflictMessage
+});
+function uidScope() {
+  return `gui/${process.getuid?.() ?? 501}`;
+}
+function resolveOwnLabel() {
+  if (process.env.LAUNCHD_LABEL) return process.env.LAUNCHD_LABEL;
+  try {
+    (0, import_node_child_process4.execFileSync)("launchctl", ["print", `${uidScope()}/homebrew.mxcl.tb-streamer`], {
+      stdio: "ignore"
+    });
+    return "homebrew.mxcl.tb-streamer";
+  } catch {
+    return LAUNCHD_LABEL;
+  }
+}
+function isLabelLoaded(label) {
+  try {
+    (0, import_node_child_process4.execFileSync)("launchctl", ["list", label], { stdio: "ignore" });
+    return true;
+  } catch {
+    return false;
+  }
+}
+function detectConflictingAgents() {
+  if (process.platform !== "darwin") return [];
+  const ownLabel = resolveOwnLabel();
+  const conflicts = [];
+  for (const label of KNOWN_STREAMER_LABELS) {
+    if (label === ownLabel) continue;
+    if (isLabelLoaded(label)) {
+      conflicts.push({
+        label,
+        resolution: label === "homebrew.mxcl.tb-streamer" ? "uninstall-homebrew" : "bootout"
+      });
+    }
+  }
+  try {
+    const out = (0, import_node_child_process4.execFileSync)("launchctl", ["list"], {
+      stdio: ["ignore", "pipe", "ignore"]
+    }).toString();
+    for (const line of out.split("\n")) {
+      const parts = line.trim().split(/\s+/);
+      const label = parts[2];
+      if (!label) continue;
+      if (LEGACY_PATTERN.test(label) && label !== ownLabel && !conflicts.some((c) => c.label === label)) {
+        conflicts.push({ label, resolution: "bootout" });
+      }
+    }
+  } catch {
+  }
+  return conflicts;
+}
+function formatConflictMessage(conflicts) {
+  if (conflicts.length === 0) return "";
+  const lines = ["Conflicting Threadbase streamer agents detected:", ""];
+  for (const c of conflicts) {
+    if (c.resolution === "uninstall-homebrew") {
+      lines.push(
+        `  \u2022 ${c.label} \u2014 run: brew services stop tb-streamer && brew uninstall tb-streamer`
+      );
+    } else {
+      lines.push(`  \u2022 ${c.label} \u2014 run: launchctl bootout gui/$(id -u)/${c.label}`);
+    }
+  }
+  lines.push(
+    "",
+    "Only one Threadbase streamer can bind port 8766. Remove the conflicting agent(s) to proceed."
+  );
+  return lines.join("\n");
+}
+var import_node_child_process4, KNOWN_STREAMER_LABELS, LEGACY_PATTERN;
+var init_conflict_check = __esm({
+  "src/lifecycle/conflict-check.ts"() {
+    "use strict";
+    import_node_child_process4 = require("child_process");
+    init_constants();
+    KNOWN_STREAMER_LABELS = [
+      "com.ronen.threadbase",
+      "homebrew.mxcl.tb-streamer",
+      "com.threadbase.streamer"
+    ];
+    LEGACY_PATTERN = /^com\.threadbase\.streamer/;
+  }
+});
+
 // src/lifecycle/launchd.ts
 var launchd_exports = {};
 __export(launchd_exports, {
@@ -123471,13 +123562,13 @@ __export(launchd_exports, {
   isAgentLoaded: () => isAgentLoaded,
   kickstartAgent: () => kickstartAgent
 });
-function uidScope() {
+function uidScope2() {
   return `gui/${process.getuid?.() ?? 501}`;
 }
 function resolveLoadedLabel() {
   if (process.env.LAUNCHD_LABEL) return process.env.LAUNCHD_LABEL;
   try {
-    (0, import_node_child_process4.execFileSync)("launchctl", ["print", `${uidScope()}/${BREW_LAUNCHD_LABEL2}`], {
+    (0, import_node_child_process5.execFileSync)("launchctl", ["print", `${uidScope2()}/${BREW_LAUNCHD_LABEL2}`], {
       stdio: "ignore"
     });
     return BREW_LAUNCHD_LABEL2;
@@ -123486,11 +123577,11 @@ function resolveLoadedLabel() {
   }
 }
 function fullTarget() {
-  return `${uidScope()}/${resolveLoadedLabel()}`;
+  return `${uidScope2()}/${resolveLoadedLabel()}`;
 }
 function isAgentLoaded() {
   try {
-    (0, import_node_child_process4.execFileSync)("launchctl", ["list", resolveLoadedLabel()], { stdio: "ignore" });
+    (0, import_node_child_process5.execFileSync)("launchctl", ["list", resolveLoadedLabel()], { stdio: "ignore" });
     return true;
   } catch {
     return false;
@@ -123498,7 +123589,7 @@ function isAgentLoaded() {
 }
 function bootoutAgent(timeoutMs = 2e3) {
   try {
-    (0, import_node_child_process4.execFileSync)("launchctl", ["bootout", fullTarget()], { stdio: "ignore" });
+    (0, import_node_child_process5.execFileSync)("launchctl", ["bootout", fullTarget()], { stdio: "ignore" });
   } catch {
   }
   const deadline = Date.now() + timeoutMs;
@@ -123510,7 +123601,7 @@ function bootoutAgent(timeoutMs = 2e3) {
 }
 function bootstrapAgent(plistPath) {
   try {
-    (0, import_node_child_process4.execFileSync)("launchctl", ["bootstrap", uidScope(), plistPath], {
+    (0, import_node_child_process5.execFileSync)("launchctl", ["bootstrap", uidScope2(), plistPath], {
       stdio: ["ignore", "ignore", "pipe"]
     });
   } catch (err) {
@@ -123523,7 +123614,7 @@ function bootstrapAgent(plistPath) {
   }
 }
 function kickstartAgent() {
-  (0, import_node_child_process4.execFileSync)("launchctl", ["kickstart", "-k", fullTarget()], { stdio: "ignore" });
+  (0, import_node_child_process5.execFileSync)("launchctl", ["kickstart", "-k", fullTarget()], { stdio: "ignore" });
 }
 function darwinPlistPath() {
   return `${process.env.HOME}/Library/LaunchAgents/${resolveLoadedLabel()}.plist`;
@@ -123534,7 +123625,7 @@ function getLogPaths() {
 }
 function getAgentPid() {
   try {
-    const out = (0, import_node_child_process4.execFileSync)("launchctl", ["list"], {
+    const out = (0, import_node_child_process5.execFileSync)("launchctl", ["list"], {
       stdio: ["ignore", "pipe", "ignore"]
     }).toString();
     const label = resolveLoadedLabel();
@@ -123550,11 +123641,11 @@ function getAgentPid() {
     return null;
   }
 }
-var import_node_child_process4, import_node_path25, BREW_LAUNCHD_LABEL2;
+var import_node_child_process5, import_node_path25, BREW_LAUNCHD_LABEL2;
 var init_launchd = __esm({
   "src/lifecycle/launchd.ts"() {
     "use strict";
-    import_node_child_process4 = require("child_process");
+    import_node_child_process5 = require("child_process");
     import_node_path25 = require("path");
     init_constants();
     BREW_LAUNCHD_LABEL2 = "homebrew.mxcl.tb-streamer";
@@ -123627,7 +123718,7 @@ __export(task_scheduler_exports, {
   kickstartAgent: () => kickstartAgent2
 });
 function ps2(command) {
-  return (0, import_node_child_process5.execFileSync)("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", command], {
+  return (0, import_node_child_process6.execFileSync)("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", command], {
     stdio: ["ignore", "pipe", "ignore"]
   }).toString();
 }
@@ -123673,11 +123764,11 @@ function getAgentPid2() {
     return null;
   }
 }
-var import_node_child_process5;
+var import_node_child_process6;
 var init_task_scheduler = __esm({
   "src/lifecycle/task-scheduler.ts"() {
     "use strict";
-    import_node_child_process5 = require("child_process");
+    import_node_child_process6 = require("child_process");
     init_constants();
   }
 });
@@ -124021,7 +124112,7 @@ __export(repo_exports, {
 });
 function getGitToplevel(cwd) {
   try {
-    return (0, import_node_child_process7.execFileSync)("git", ["rev-parse", "--show-toplevel"], {
+    return (0, import_node_child_process8.execFileSync)("git", ["rev-parse", "--show-toplevel"], {
       cwd,
       stdio: ["ignore", "pipe", "ignore"]
     }).toString().trim();
@@ -124029,11 +124120,11 @@ function getGitToplevel(cwd) {
     return null;
   }
 }
-var import_node_child_process7;
+var import_node_child_process8;
 var init_repo = __esm({
   "src/lifecycle/repo.ts"() {
     "use strict";
-    import_node_child_process7 = require("child_process");
+    import_node_child_process8 = require("child_process");
   }
 });
 
@@ -151006,8 +151097,9 @@ async function runInstall(opts) {
 }
 
 // cli/prod.ts
-var import_node_child_process6 = require("child_process");
+var import_node_child_process7 = require("child_process");
 var import_node_fs22 = require("fs");
+init_conflict_check();
 init_constants();
 init_launchd();
 init_marker();
@@ -151090,6 +151182,18 @@ async function runProdDoctor(opts) {
   if (!getSupervisor().isAgentLoaded()) {
     findings.push("launchd agent is not loaded \u2014 prod is fully down");
   }
+  const conflicts = detectConflictingAgents();
+  for (const c of conflicts) {
+    if (c.resolution === "uninstall-homebrew") {
+      findings.push(
+        `conflicting agent: ${c.label} \u2014 run: brew services stop tb-streamer && brew uninstall tb-streamer`
+      );
+    } else {
+      findings.push(
+        `conflicting agent: ${c.label} \u2014 run: launchctl bootout gui/$(id -u)/${c.label}`
+      );
+    }
+  }
   return { findings, repairs };
 }
 var defaultSpawnTail = ({ files, lines, follow }) => {
@@ -151104,7 +151208,7 @@ var defaultSpawnTail = ({ files, lines, follow }) => {
   if (follow) args.push("-F");
   args.push(...existing);
   return new Promise((resolve6) => {
-    const child = (0, import_node_child_process6.spawn)("tail", args, { stdio: ["ignore", "inherit", "inherit"] });
+    const child = (0, import_node_child_process7.spawn)("tail", args, { stdio: ["ignore", "inherit", "inherit"] });
     child.on("error", (err) => resolve6({ ok: false, message: `tail failed: ${err.message}` }));
     child.on("exit", (code) => resolve6({ ok: code === 0 }));
   });
@@ -151260,6 +151364,13 @@ program2.command("serve").description("Start the streamer server").option("-p, -
   const publicUrl = opts.publicUrl ?? loadPublicUrl() ?? null;
   const isProdInvocation = opts.prod === true || process.ppid === 1;
   if (!isProdInvocation) appendDevSessionMarker();
+  if (process.platform === "darwin") {
+    const { detectConflictingAgents: detectConflictingAgents2, formatConflictMessage: formatConflictMessage2 } = await Promise.resolve().then(() => (init_conflict_check(), conflict_check_exports));
+    const conflicts = detectConflictingAgents2();
+    if (conflicts.length > 0) {
+      log7.warn(formatConflictMessage2(conflicts), void 0, "console");
+    }
+  }
   let resolvedDefaultPermissionMode = opts.defaultPermissionMode;
   if (resolvedDefaultPermissionMode === void 0 && !isProdInvocation && process.env.THREADBASE_SKIP_PERMISSION_MODE_PROMPT !== "true" && loadDefaultPermissionMode() === void 0 && import_node_process3.stdin.isTTY) {
     const { interactivePermissionModePrompt: interactivePermissionModePrompt2 } = await Promise.resolve().then(() => (init_prompt(), prompt_exports));