@kud/foxhop-cli 1.1.2 → 1.1.3

package/dist/cli.js

@@ -3,7 +3,7 @@
 // src/cli.ts
 import { defineCommand, runMain } from "citty";
 import { spawn } from "child_process";
-import { existsSync as existsSync3 } from "fs";
+import { existsSync as existsSync3, unlinkSync } from "fs";
 
 // src/config.ts
 import { mkdirSync, readFileSync, writeFileSync, existsSync } from "fs";
@@ -197,11 +197,19 @@ var install = () => {
   const distDir = dirname(fileURLToPath(import.meta.url));
   const hostEntry = join3(distDir, "host-cli.js");
   chmodSync(hostEntry, 493);
+  const wrapperPath = join3(distDir, "host-launch.sh");
+  writeFileSync2(
+    wrapperPath,
+    `#!/bin/sh
+exec ${JSON.stringify(process.execPath)} ${JSON.stringify(hostEntry)} "$@"
+`
+  );
+  chmodSync(wrapperPath, 493);
   mkdirSync2(MANIFEST_DIR, { recursive: true });
   const manifest = {
     name: HOST_NAME,
     description: "foxhop native messaging host",
-    path: hostEntry,
+    path: wrapperPath,
     type: "stdio",
     allowed_extensions: [EXTENSION_ID]
   };
@@ -209,7 +217,8 @@ var install = () => {
   process.stdout.write(
     `foxhop: installed native host manifest
   manifest \u2192 ${MANIFEST_PATH}
-  host     \u2192 ${hostEntry}
+  host     \u2192 ${wrapperPath}
+  node     \u2192 ${process.execPath}
 `
   );
 };
@@ -366,7 +375,22 @@ var focus = defineCommand({
       if (ack?.ok && ack.action !== "not-found") foreground();
       else
         console.error(fail(ack?.error ?? "no matching tab and no url to open"));
-    } catch {
+    } catch (error) {
+      const code = error?.code;
+      if (code === "ECONNREFUSED" || code === "ENOENT") {
+        if (existsSync3(SOCKET_PATH)) {
+          try {
+            unlinkSync(SOCKET_PATH);
+          } catch {
+          }
+        }
+        console.error(
+          fail(
+            "foxhop host not running. Run `foxhop install`, then restart Firefox (or reload the extension)."
+          )
+        );
+        process.exit(1);
+      }
       if ("url" in request && request.url) {
         openUrl(request.url);
       } else {

package/dist/host-cli.js

@@ -58,13 +58,18 @@ var runHost = () => {
       resolve(ack);
     })
   );
-  process.stdin.on("end", () => process.exit(0));
-  if (existsSync(SOCKET_PATH)) {
+  const cleanup = () => {
     try {
-      unlinkSync(SOCKET_PATH);
+      if (existsSync(SOCKET_PATH)) unlinkSync(SOCKET_PATH);
     } catch {
     }
-  }
+  };
+  process.stdin.on("end", () => {
+    cleanup();
+    process.exit(0);
+  });
+  process.on("exit", cleanup);
+  cleanup();
   const server = net.createServer((socket) => {
     socket.setEncoding("utf8");
     let raw = "";
@@ -107,11 +112,19 @@ var install = () => {
   const distDir = dirname(fileURLToPath(import.meta.url));
   const hostEntry = join2(distDir, "host-cli.js");
   chmodSync(hostEntry, 493);
+  const wrapperPath = join2(distDir, "host-launch.sh");
+  writeFileSync(
+    wrapperPath,
+    `#!/bin/sh
+exec ${JSON.stringify(process.execPath)} ${JSON.stringify(hostEntry)} "$@"
+`
+  );
+  chmodSync(wrapperPath, 493);
   mkdirSync(MANIFEST_DIR, { recursive: true });
   const manifest = {
     name: HOST_NAME,
     description: "foxhop native messaging host",
-    path: hostEntry,
+    path: wrapperPath,
     type: "stdio",
     allowed_extensions: [EXTENSION_ID]
   };
@@ -119,7 +132,8 @@ var install = () => {
   process.stdout.write(
     `foxhop: installed native host manifest
   manifest \u2192 ${MANIFEST_PATH}
-  host     \u2192 ${hostEntry}
+  host     \u2192 ${wrapperPath}
+  node     \u2192 ${process.execPath}
 `
   );
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kud/foxhop-cli",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "foxhop CLI and native messaging host — focus specific Firefox tabs from macOS",
   "type": "module",
   "license": "MIT",