@fangyb/ahchat-bridge 0.1.12 → 0.1.13

package/dist/cli.cjs

@@ -50536,8 +50536,7 @@ function installClaudeCli() {
   const envPath = process.env.PATH ?? "(unset)";
   logger24.error("claude not found after successful npm install -g", {
     npmGlobalBin: npmBin ?? "unknown",
-    pathDirectories: envPath.split(":").slice(0, 10),
-    // first 10 to avoid log spam
+    pathDirectories: envPath.split(process.platform === "win32" ? ";" : ":").slice(0, 10),
     npmPrefix: (0, import_node_child_process2.execSync)("npm prefix -g", { timeout: 5e3 }).toString().trim() || "unknown"
   });
   return void 0;
@@ -51386,9 +51385,13 @@ var import_node_fs9 = __toESM(require("fs"), 1);
 var import_node_os12 = __toESM(require("os"), 1);
 var import_node_path20 = __toESM(require("path"), 1);
 var logger29 = createModuleLogger("bridge.protocol");
-function getBridgeExePath() {
-  const pkgDir = import_node_path20.default.resolve(__dirname, "..");
-  return import_node_path20.default.join(pkgDir, "dist", "cli.cjs");
+function getStableExePath() {
+  const bridgeDir = import_node_path20.default.join(import_node_os12.default.homedir(), ".ahchat", "bridge");
+  import_node_fs9.default.mkdirSync(bridgeDir, { recursive: true });
+  const stablePath = import_node_path20.default.join(bridgeDir, "cli.cjs");
+  import_node_fs9.default.copyFileSync(__filename, stablePath);
+  if (process.platform !== "win32") import_node_fs9.default.chmodSync(stablePath, 493);
+  return stablePath;
 }
 function registerProtocolHandler() {
   const platform = import_node_os12.default.platform();
@@ -51402,99 +51405,106 @@ function registerProtocolHandler() {
   logger29.info("Protocol handler registered", { platform });
 }
 function registerWindows() {
-  const exe = getBridgeExePath();
   const nodeExe = process.execPath;
-  const ahchatDir = import_node_path20.default.join(import_node_os12.default.homedir(), ".ahchat");
-  const urlFilePath = import_node_path20.default.join(ahchatDir, ".bridge-launch-url");
-  import_node_fs9.default.mkdirSync(ahchatDir, { recursive: true });
-  const psScriptPath = import_node_path20.default.join(ahchatDir, "launch-bridge.ps1");
-  const psContent = `param([string]$url)
-if (-not $url) {
-  if (Test-Path '${urlFilePath}') {
-    $url = Get-Content '${urlFilePath}' -Raw
+  const stableExePath = getStableExePath();
+  const bridgeDir = import_node_path20.default.join(import_node_os12.default.homedir(), ".ahchat", "bridge");
+  const psLauncherPath = import_node_path20.default.join(bridgeDir, "launch-bridge.ps1");
+  import_node_fs9.default.writeFileSync(
+    psLauncherPath,
+    [
+      `param([string]$url)`,
+      `& '${nodeExe.replace(/'/g, "''")}' '${stableExePath.replace(/'/g, "''")}' launch --url $url`
+    ].join("\r\n")
+  );
+  const handlerValue = `powershell -ExecutionPolicy Bypass -File "${psLauncherPath}" -url "%1"`;
+  const psRegisterPath = import_node_path20.default.join(bridgeDir, "register-protocol.ps1");
+  import_node_fs9.default.writeFileSync(
+    psRegisterPath,
+    [
+      `$handler = '${handlerValue.replace(/'/g, "''")}'`,
+      `$icon    = '${nodeExe.replace(/'/g, "''")}'`,
+      `New-Item         -Path 'HKCU:\\Software\\Classes\\ahchat' -Force | Out-Null`,
+      `Set-ItemProperty -Path 'HKCU:\\Software\\Classes\\ahchat' -Name '(Default)' -Value 'URL:ahchat' -Force`,
+      `New-ItemProperty -Path 'HKCU:\\Software\\Classes\\ahchat' -Name 'URL Protocol' -Value '' -PropertyType String -Force | Out-Null`,
+      `New-Item         -Path 'HKCU:\\Software\\Classes\\ahchat\\DefaultIcon' -Force | Out-Null`,
+      `Set-ItemProperty -Path 'HKCU:\\Software\\Classes\\ahchat\\DefaultIcon' -Name '(Default)' -Value $icon -Force`,
+      `New-Item         -Path 'HKCU:\\Software\\Classes\\ahchat\\shell\\open\\command' -Force | Out-Null`,
+      `Set-ItemProperty -Path 'HKCU:\\Software\\Classes\\ahchat\\shell\\open\\command' -Name '(Default)' -Value $handler -Force`
+    ].join("\r\n")
+  );
+  try {
+    (0, import_node_child_process3.execSync)(`powershell -ExecutionPolicy Bypass -File "${psRegisterPath}"`, { stdio: "pipe" });
+  } catch (e7) {
+    logger29.error("Failed to register Windows protocol handler", { error: e7 });
+    throw new Error("Failed to register Windows protocol handler");
   }
+  logger29.info("Windows protocol handler registered", { psLauncherPath });
 }
-if (-not $url) {
-  Write-Error "No URL provided"
-  exit 1
-}
-& '${nodeExe}' '${exe}' launch --url $url
-`;
-  import_node_fs9.default.writeFileSync(psScriptPath, psContent);
-  const handler = `powershell -ExecutionPolicy Bypass -File "${psScriptPath}" -url "%1"`;
-  const regCommands = [
-    `REG ADD "HKCU\\Software\\Classes\\ahchat" /ve /d "URL:ahchat" /f`,
-    `REG ADD "HKCU\\Software\\Classes\\ahchat" /v "URL Protocol" /d "" /f`,
-    `REG ADD "HKCU\\Software\\Classes\\ahchat\\DefaultIcon" /ve /d "${nodeExe}" /f`,
-    `REG ADD "HKCU\\Software\\Classes\\ahchat\\shell\\open\\command" /ve /t REG_SZ /d "${handler}" /f`
-  ];
-  for (const cmd of regCommands) {
+function registerMacOS() {
+  const appDir = import_node_path20.default.join(import_node_os12.default.homedir(), "Applications", "AHChatBridge.app");
+  const nodeExe = process.execPath;
+  const stableExePath = getStableExePath();
+  const bridgeDir = import_node_path20.default.join(import_node_os12.default.homedir(), ".ahchat", "bridge");
+  const launchScriptPath = import_node_path20.default.join(bridgeDir, "launch-bridge.sh");
+  import_node_fs9.default.writeFileSync(
+    launchScriptPath,
+    `#!/bin/bash
+exec ${JSON.stringify(nodeExe)} ${JSON.stringify(stableExePath)} launch --url "$1"
+`
+  );
+  import_node_fs9.default.chmodSync(launchScriptPath, 493);
+  const escapedScriptPath = launchScriptPath.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+  const appleScript = [
+    `on open location thisURL`,
+    `  set launchScript to "${escapedScriptPath}"`,
+    `  do shell script "/bin/bash " & (quoted form of launchScript) & " " & (quoted form of thisURL) & " >/tmp/ahchat-bridge.log 2>&1 &"`,
+    `end open location`
+  ].join("\n");
+  const tmpScript = import_node_path20.default.join(import_node_os12.default.tmpdir(), "AHChatBridge.applescript");
+  import_node_fs9.default.writeFileSync(tmpScript, appleScript);
+  try {
+    import_node_fs9.default.rmSync(appDir, { recursive: true, force: true });
+  } catch {
+  }
+  try {
+    (0, import_node_child_process3.execSync)(`osacompile -o ${JSON.stringify(appDir)} ${JSON.stringify(tmpScript)}`, { stdio: "pipe" });
+  } finally {
     try {
-      (0, import_node_child_process3.execSync)(cmd, { stdio: "pipe" });
-    } catch (e7) {
-      logger29.error("Failed to register Windows protocol handler", { error: e7, cmd });
-      throw new Error(`Failed to register protocol handler: ${cmd}`);
+      import_node_fs9.default.unlinkSync(tmpScript);
+    } catch {
     }
   }
-  logger29.info("Windows protocol handler registered", { psScriptPath });
-}
-function registerMacOS() {
-  const appDir = import_node_path20.default.join(import_node_os12.default.homedir(), "Applications", "AHChatBridge.app");
-  const contentsDir = import_node_path20.default.join(appDir, "Contents");
-  const macosDir = import_node_path20.default.join(contentsDir, "MacOS");
-  const resourcesDir = import_node_path20.default.join(contentsDir, "Resources");
-  import_node_fs9.default.mkdirSync(macosDir, { recursive: true });
-  import_node_fs9.default.mkdirSync(resourcesDir, { recursive: true });
-  const infoPlist = `<?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>CFBundleName</key>
-  <string>AHChatBridge</string>
-  <key>CFBundleDisplayName</key>
-  <string>AHChat Bridge</string>
-  <key>CFBundleIdentifier</key>
-  <string>com.fangyb.ahchat-bridge</string>
-  <key>CFBundleVersion</key>
-  <string>0.1.0</string>
-  <key>CFBundlePackageType</key>
-  <string>APPL</string>
-  <key>CFBundleExecutable</key>
-  <string>launch.sh</string>
-  <key>CFBundleURLTypes</key>
-  <array>
-    <dict>
-      <key>CFBundleURLName</key>
-      <string>AHChat Bridge</string>
-      <key>CFBundleURLSchemes</key>
-      <array>
-        <string>ahchat</string>
-      </array>
-    </dict>
-  </array>
-</dict>
-</plist>`;
-  const launchScript = `#!/bin/bash
-URL="$1"
-exec "${process.execPath}" "${getBridgeExePath()}" launch --url "$URL"`;
-  import_node_fs9.default.writeFileSync(import_node_path20.default.join(contentsDir, "Info.plist"), infoPlist);
-  import_node_fs9.default.writeFileSync(import_node_path20.default.join(macosDir, "launch.sh"), launchScript);
-  import_node_fs9.default.chmodSync(import_node_path20.default.join(macosDir, "launch.sh"), 493);
+  const plistPath = import_node_path20.default.join(appDir, "Contents", "Info.plist");
+  const urlTypes = JSON.stringify([{ CFBundleURLName: "AHChat Bridge", CFBundleURLSchemes: ["ahchat"] }]);
+  (0, import_node_child_process3.execSync)(
+    `/usr/bin/plutil -insert CFBundleURLTypes -json ${JSON.stringify(urlTypes)} ${JSON.stringify(plistPath)}`,
+    { stdio: "pipe" }
+  );
+  const lsregister = "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/Support/lsregister";
+  try {
+    (0, import_node_child_process3.execSync)(`${lsregister} -f ${JSON.stringify(appDir)}`, { stdio: "pipe" });
+  } catch (e7) {
+    logger29.warn("lsregister failed; URL scheme registration may be delayed", { error: e7 });
+  }
   logger29.info("macOS protocol handler registered", { appDir });
 }
 function registerLinux() {
-  const desktopFile = `[Desktop Entry]
-Name=AHChat Bridge
-Exec=${process.execPath} ${getBridgeExePath()} launch --url %u
-Type=Application
-NoDisplay=true
-MimeType=x-scheme-handler/ahchat;`;
+  const stableExePath = getStableExePath();
+  const desktopFile = [
+    `[Desktop Entry]`,
+    `Name=AHChat Bridge`,
+    `Exec=${process.execPath} ${stableExePath} launch --url %u`,
+    `Type=Application`,
+    `NoDisplay=true`,
+    `MimeType=x-scheme-handler/ahchat;`
+  ].join("\n");
   const desktopPath = import_node_path20.default.join(import_node_os12.default.homedir(), ".local", "share", "applications", "ahchat-bridge.desktop");
   import_node_fs9.default.mkdirSync(import_node_path20.default.dirname(desktopPath), { recursive: true });
   import_node_fs9.default.writeFileSync(desktopPath, desktopFile);
   try {
     (0, import_node_child_process3.execSync)("update-desktop-database ~/.local/share/applications/", { stdio: "pipe" });
-  } catch {
+  } catch (e7) {
+    logger29.warn("update-desktop-database not available; run it manually if needed", { error: e7 });
   }
   logger29.info("Linux protocol handler registered", { desktopPath });
 }
@@ -51502,16 +51512,16 @@ function unregisterProtocolHandler() {
   const platform = import_node_os12.default.platform();
   if (platform === "win32") {
     try {
-      (0, import_node_child_process3.execSync)('REG DELETE "HKCU\\Software\\Classes\\ahchat" /f', { stdio: "pipe" });
-      const psScriptPath = import_node_path20.default.join(import_node_os12.default.homedir(), ".ahchat", "launch-bridge.ps1");
-      const urlFilePath = import_node_path20.default.join(import_node_os12.default.homedir(), ".ahchat", ".bridge-launch-url");
-      try {
-        import_node_fs9.default.unlinkSync(psScriptPath);
-      } catch {
-      }
-      try {
-        import_node_fs9.default.unlinkSync(urlFilePath);
-      } catch {
+      (0, import_node_child_process3.execSync)(
+        `powershell -ExecutionPolicy Bypass -Command "Remove-Item -Path 'HKCU:\\Software\\Classes\\ahchat' -Recurse -Force -ErrorAction SilentlyContinue"`,
+        { stdio: "pipe" }
+      );
+      const bridgeDir = import_node_path20.default.join(import_node_os12.default.homedir(), ".ahchat", "bridge");
+      for (const f7 of ["launch-bridge.ps1", "register-protocol.ps1"]) {
+        try {
+          import_node_fs9.default.unlinkSync(import_node_path20.default.join(bridgeDir, f7));
+        } catch {
+        }
       }
       logger29.info("Windows protocol handler unregistered");
     } catch (e7) {
@@ -51581,7 +51591,7 @@ async function run(args) {
   }
   if (args.token) config2 = { ...config2, bridgeToken: args.token };
   if (args.dataDir) {
-    const resolved = args.dataDir.startsWith("~/") ? import_node_path21.default.join(import_node_os13.default.homedir(), args.dataDir.slice(2)) : args.dataDir;
+    const resolved = /^~[/\\]/.test(args.dataDir) ? import_node_path21.default.join(import_node_os13.default.homedir(), args.dataDir.slice(2)) : args.dataDir;
     config2 = { ...config2, dataDir: resolved };
   }
   if (args.logLevel) config2 = { ...config2, logLevel: args.logLevel };

package/dist/index.js

@@ -49949,8 +49949,7 @@ function installClaudeCli() {
   const envPath = process.env.PATH ?? "(unset)";
   logger24.error("claude not found after successful npm install -g", {
     npmGlobalBin: npmBin ?? "unknown",
-    pathDirectories: envPath.split(":").slice(0, 10),
-    // first 10 to avoid log spam
+    pathDirectories: envPath.split(process.platform === "win32" ? ";" : ":").slice(0, 10),
     npmPrefix: execSync("npm prefix -g", { timeout: 5e3 }).toString().trim() || "unknown"
   });
   return void 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fangyb/ahchat-bridge",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "files": [
     "dist"
   ],