@rehpic/vcli 0.1.0-beta.51.1 → 0.1.0-beta.52.1

package/dist/index.js

@@ -1114,6 +1114,11 @@ var LIVE_ACTIVITIES_CACHE = join(CONFIG_DIR, "live-activities.json");
 var LAUNCHAGENT_DIR = join(homedir2(), "Library", "LaunchAgents");
 var LAUNCHAGENT_PLIST = join(LAUNCHAGENT_DIR, "com.vector.bridge.plist");
 var LAUNCHAGENT_LABEL = "com.vector.bridge";
+var LEGACY_MENUBAR_LAUNCHAGENT_LABEL = "com.vector.menubar";
+var LEGACY_MENUBAR_LAUNCHAGENT_PLIST = join(
+  LAUNCHAGENT_DIR,
+  `${LEGACY_MENUBAR_LAUNCHAGENT_LABEL}.plist`
+);
 var HEARTBEAT_INTERVAL_MS = 3e4;
 var COMMAND_POLL_INTERVAL_MS = 5e3;
 var PROCESS_DISCOVERY_INTERVAL_MS = 6e4;
@@ -1403,40 +1408,10 @@ function installLaunchAgent(vcliPath) {
   </dict>
 </dict>
 </plist>`;
-  const menuBarCandidates = [
-    join(CONFIG_DIR, "VectorMenuBar"),
-    "/usr/local/bin/VectorMenuBar",
-    join(homedir2(), ".local", "bin", "VectorMenuBar")
-  ];
-  const menuBarBinary = menuBarCandidates.find((p) => existsSync(p));
-  if (menuBarBinary) {
-    const menuBarPlist = `<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>Label</key>
-  <string>com.vector.menubar</string>
-  <key>ProgramArguments</key>
-  <array>
-    <string>${menuBarBinary}</string>
-  </array>
-  <key>RunAtLoad</key>
-  <true/>
-  <key>KeepAlive</key>
-  <false/>
-</dict>
-</plist>`;
-    const menuBarPlistPath = join(LAUNCHAGENT_DIR, "com.vector.menubar.plist");
-    writeFileSync(menuBarPlistPath, menuBarPlist);
-    try {
-      execSync(`launchctl load ${menuBarPlistPath}`, { stdio: "pipe" });
-      console.log("Menu bar helper installed.");
-    } catch {
-    }
-  }
   if (!existsSync(LAUNCHAGENT_DIR)) {
     mkdirSync(LAUNCHAGENT_DIR, { recursive: true });
   }
+  removeLegacyMenuBarLaunchAgent();
   writeFileSync(LAUNCHAGENT_PLIST, plist);
   console.log(`Installed LaunchAgent: ${LAUNCHAGENT_PLIST}`);
 }
@@ -1460,72 +1435,82 @@ function unloadLaunchAgent() {
 }
 function uninstallLaunchAgent() {
   unloadLaunchAgent();
+  removeLegacyMenuBarLaunchAgent();
   try {
     unlinkSync(LAUNCHAGENT_PLIST);
     console.log("LaunchAgent removed.");
   } catch {
   }
 }
-var MENUBAR_BINARY = join(CONFIG_DIR, "VectorMenuBar");
-var MENUBAR_SWIFT_URL = "https://raw.githubusercontent.com/xrehpicx/vector/main/cli/macos/VectorMenuBar.swift";
-async function ensureMenuBarBinary() {
-  if (platform() !== "darwin") return null;
-  if (existsSync(MENUBAR_BINARY)) return MENUBAR_BINARY;
+var MENUBAR_PID_FILE = join(CONFIG_DIR, "menubar.pid");
+function removeLegacyMenuBarLaunchAgent() {
+  if (platform() !== "darwin" || !existsSync(LEGACY_MENUBAR_LAUNCHAGENT_PLIST)) {
+    return;
+  }
   try {
-    execSync("which swiftc", { stdio: "pipe" });
+    execSync(`launchctl unload ${LEGACY_MENUBAR_LAUNCHAGENT_PLIST}`, {
+      stdio: "pipe"
+    });
   } catch {
-    return null;
   }
-  const localSource = join(
-    process.cwd(),
-    "cli",
-    "macos",
-    "VectorMenuBar.swift"
-  );
-  let swiftSource;
-  if (existsSync(localSource)) {
-    swiftSource = localSource;
-  } else {
-    const downloadPath = join(CONFIG_DIR, "VectorMenuBar.swift");
-    try {
-      execSync(`curl -fsSL "${MENUBAR_SWIFT_URL}" -o "${downloadPath}"`, {
-        stdio: "pipe",
-        timeout: 15e3
-      });
-      swiftSource = downloadPath;
-    } catch {
-      return null;
-    }
+  try {
+    unlinkSync(LEGACY_MENUBAR_LAUNCHAGENT_PLIST);
+  } catch {
   }
+}
+function findMenuBarScript() {
+  const candidates = [
+    join(import.meta.dirname ?? "", "menubar.js"),
+    join(import.meta.dirname ?? "", "..", "dist", "menubar.js")
+  ];
+  for (const p of candidates) {
+    if (existsSync(p)) return p;
+  }
+  return null;
+}
+function isKnownMenuBarProcess(pid) {
   try {
-    execSync(
-      `swiftc -o "${MENUBAR_BINARY}" "${swiftSource}" -framework AppKit`,
-      { stdio: "pipe", timeout: 3e4 }
-    );
-    const assetsSource = join(swiftSource, "..", "assets");
-    const assetsDest = join(CONFIG_DIR, "assets");
-    if (existsSync(assetsSource)) {
-      mkdirSync(assetsDest, { recursive: true });
-      for (const f of ["vector-menubar.png", "vector-menubar@2x.png"]) {
-        const src = join(assetsSource, f);
-        if (existsSync(src))
-          writeFileSync(join(assetsDest, f), readFileSync(src));
+    const command = execSync(`ps -p ${pid} -o args=`, {
+      encoding: "utf-8",
+      timeout: 3e3
+    });
+    return command.includes("menubar.js") || command.includes("menubar.ts") || command.includes("VectorMenuBar");
+  } catch {
+    return false;
+  }
+}
+function killExistingMenuBar() {
+  if (existsSync(MENUBAR_PID_FILE)) {
+    try {
+      const pid = Number(readFileSync(MENUBAR_PID_FILE, "utf-8").trim());
+      if (Number.isFinite(pid) && pid > 0 && isKnownMenuBarProcess(pid)) {
+        process.kill(pid, "SIGTERM");
       }
+    } catch {
+    }
+    try {
+      unlinkSync(MENUBAR_PID_FILE);
+    } catch {
     }
-    return MENUBAR_BINARY;
-  } catch {
-    return null;
   }
 }
 async function launchMenuBar() {
   if (platform() !== "darwin") return;
-  const binary = await ensureMenuBarBinary();
-  if (!binary) return;
+  removeLegacyMenuBarLaunchAgent();
+  const script = findMenuBarScript();
+  if (!script) return;
+  killExistingMenuBar();
   try {
     const { spawn: spawnChild } = await import("child_process");
-    const child = spawnChild(binary, [], { detached: true, stdio: "ignore" });
+    const child = spawnChild(process.execPath, [script], {
+      detached: true,
+      stdio: "ignore",
+      env: { ...process.env }
+    });
     child.unref();
-    console.log("Menu bar started.");
+    if (child.pid) {
+      writeFileSync(MENUBAR_PID_FILE, String(child.pid));
+    }
   } catch {
   }
 }
@@ -1560,6 +1545,7 @@ function getBridgeStatus() {
   return { configured: true, running, starting, pid, config };
 }
 function stopBridge() {
+  killExistingMenuBar();
   if (!existsSync(PID_FILE)) return false;
   const pid = Number(readFileSync(PID_FILE, "utf-8").trim());
   try {
@@ -3596,7 +3582,6 @@ serviceCommand.command("start").description("Start the bridge service via Launch
     const vcliPath = process.argv[1] ?? "vcli";
     installLaunchAgent(vcliPath);
     loadLaunchAgent();
-    await launchMenuBar();
     s.stop("Bridge service started.");
   } else {
     console.log(
@@ -3620,6 +3605,9 @@ serviceCommand.command("run").description("Run the bridge service in the foregro
     if (!user) throw new Error("Not logged in. Run `vcli auth login` first.");
     config = await setupBridgeDevice(runtime.convexUrl, user._id);
   }
+  if (osPlatform() === "darwin") {
+    await launchMenuBar();
+  }
   const bridge = new BridgeService(config);
   await bridge.run();
 });
@@ -3681,9 +3669,6 @@ serviceCommand.command("install").description("Install the bridge as a system se
   s.start("Starting bridge service...");
   loadLaunchAgent();
   s.stop("Bridge service started");
-  s.start("Launching menu bar...");
-  await launchMenuBar();
-  s.stop("Menu bar ready");
   console.log("");
   console.log(
     "Bridge installed and running. Will start automatically on login."