@kud/foxhop-cli 1.1.1 → 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}
 `
   );
 };
@@ -289,6 +298,20 @@ var clearScripts = (dir = defaultScriptsDir()) => {
 
 // src/cli.ts
 import { fileURLToPath as fileURLToPath2 } from "url";
+
+// src/ui.ts
+var enabled = Boolean(process.stdout.isTTY) && !process.env.NO_COLOR;
+var paint = (code) => (text) => enabled ? `\x1B[${code}m${text}\x1B[0m` : text;
+var bold = paint(1);
+var dim = paint(2);
+var red = paint(31);
+var green = paint(32);
+var yellow = paint(33);
+var cyan = paint(36);
+var ok = (message) => `${green("\u2713")} ${message}`;
+var fail = (message) => `${red("\u2717")} ${message}`;
+
+// src/cli.ts
 var browserApp = () => process.env.FOXHOP_BROWSER ?? "Firefox Nightly";
 var runOpen = (args) => {
   const child = spawn("/usr/bin/open", args, {
@@ -341,7 +364,9 @@ var focus = defineCommand({
     } : resolveNamed(String(args.name ?? ""));
     if (!request) {
       console.error(
-        `foxhop: no target named "${args.name}". Edit ${CONFIG_PATH}, or run \`foxhop list\` / \`foxhop init\`.`
+        fail(
+          `no target named "${args.name}". Edit ${CONFIG_PATH}, or run \`foxhop list\` / \`foxhop init\`.`
+        )
       );
       process.exit(1);
     }
@@ -349,15 +374,30 @@ var focus = defineCommand({
       const ack = await sendToHost(request);
       if (ack?.ok && ack.action !== "not-found") foreground();
       else
+        console.error(fail(ack?.error ?? "no matching tab and no url to open"));
+    } catch (error) {
+      const code = error?.code;
+      if (code === "ECONNREFUSED" || code === "ENOENT") {
+        if (existsSync3(SOCKET_PATH)) {
+          try {
+            unlinkSync(SOCKET_PATH);
+          } catch {
+          }
+        }
         console.error(
-          `foxhop: ${ack?.error ?? "no matching tab and no url to open"}`
+          fail(
+            "foxhop host not running. Run `foxhop install`, then restart Firefox (or reload the extension)."
+          )
         );
-    } catch {
+        process.exit(1);
+      }
       if ("url" in request && request.url) {
         openUrl(request.url);
       } else {
         console.error(
-          "foxhop: cannot reach the host \u2014 is Firefox running with the foxhop extension?"
+          fail(
+            "cannot reach the host \u2014 is Firefox running with the foxhop extension?"
+          )
         );
         process.exit(1);
       }
@@ -386,7 +426,9 @@ var list = defineCommand({
     }
     if (!targets.length) {
       console.log(
-        `No targets yet. Run \`foxhop init\` for an example, or edit ${CONFIG_PATH}.`
+        dim(
+          `No targets yet. Run \`foxhop init\` for an example, or edit ${CONFIG_PATH}.`
+        )
       );
       return;
     }
@@ -394,9 +436,12 @@ var list = defineCommand({
       ...targets.filter((target) => target.favorite),
       ...targets.filter((target) => !target.favorite)
     ];
+    const width = Math.max(...ordered.map((target) => target.name.length));
     for (const target of ordered) {
-      const star = target.favorite ? "\u2605 " : "  ";
-      console.log(`${star}${target.name.padEnd(16)} ${target.match}`);
+      const star = target.favorite ? yellow("\u2605") : " ";
+      console.log(
+        `${star} ${cyan(target.name.padEnd(width))}  ${dim(target.match)}`
+      );
     }
   }
 });
@@ -412,13 +457,13 @@ var tabs = defineCommand({
     }
     if (!openTabs.length) {
       console.error(
-        "foxhop: no tabs (is Firefox running with the foxhop extension?)"
+        fail("no tabs \u2014 is Firefox running with the foxhop extension?")
       );
       process.exit(1);
     }
     for (const tab of openTabs) {
-      console.log(`${tab.title}
-  ${tab.url}`);
+      console.log(`${bold(tab.title)}
+  ${dim(tab.url)}`);
     }
   }
 });
@@ -429,7 +474,7 @@ var init = defineCommand({
   },
   run: () => {
     const path = writeExampleConfig();
-    console.log(`foxhop: wrote example config and schema next to ${path}`);
+    console.log(ok(`wrote example config + schema \u2192 ${dim(path)}`));
   }
 });
 var installCommand = defineCommand({
@@ -463,7 +508,9 @@ var syncCommand = defineCommand({
         return;
       }
       console.log(
-        `foxhop: removed ${cleared.removed} script(s) from ${cleared.dir}`
+        ok(
+          `removed ${bold(String(cleared.removed))} script(s) \u2192 ${dim(cleared.dir)}`
+        )
       );
       return;
     }
@@ -477,10 +524,14 @@ var syncCommand = defineCommand({
       return;
     }
     console.log(
-      `foxhop: wrote ${result.written} script(s)` + (result.removed ? `, removed ${result.removed} stale` : "") + ` in ${result.dir}`
+      ok(
+        `wrote ${bold(String(result.written))} script(s)` + (result.removed ? `, removed ${result.removed} stale` : "") + ` \u2192 ${dim(result.dir)}`
+      )
     );
     console.log(
-      "Add that folder in Raycast \u2192 Extensions \u2192 Script Commands \u2192 Add Directories, then assign hotkeys."
+      dim(
+        "Add that folder in Raycast \u2192 Extensions \u2192 Script Commands \u2192 Add Directories, then assign hotkeys."
+      )
     );
   }
 });
@@ -519,7 +570,7 @@ var add = defineCommand({
     const matchArg = args.match ? String(args.match) : void 0;
     const source = url ?? matchArg;
     if (!source) {
-      console.error("foxhop: provide a URL or --match");
+      console.error(fail("provide a URL or --match"));
       process.exit(1);
     }
     const derived = deriveTarget(source);
@@ -534,7 +585,7 @@ var add = defineCommand({
       pick: args.pick,
       favorite: args.favorite || existing?.favorite ? true : void 0
     });
-    console.log(`foxhop: saved "${name}"`);
+    console.log(ok(`saved ${bold(name)}`));
     autoSync();
   }
 });
@@ -550,10 +601,10 @@ var remove = defineCommand({
   run: ({ args }) => {
     const { removed } = removeTarget(String(args.name));
     if (!removed) {
-      console.error(`foxhop: no target named "${args.name}"`);
+      console.error(fail(`no target named "${args.name}"`));
       process.exit(1);
     }
-    console.log(`foxhop: removed "${args.name}"`);
+    console.log(ok(`removed ${bold(String(args.name))}`));
     autoSync();
   }
 });
@@ -572,11 +623,13 @@ var fav = defineCommand({
   run: ({ args }) => {
     const { favorite, found } = toggleFavorite(String(args.name));
     if (!found) {
-      console.error(`foxhop: no target named "${args.name}"`);
+      console.error(fail(`no target named "${args.name}"`));
       process.exit(1);
     }
     console.log(
-      `foxhop: "${args.name}" ${favorite ? "favourited \u2605" : "unfavourited"}`
+      ok(
+        `${bold(String(args.name))} ${favorite ? yellow("favourited \u2605") : "unfavourited"}`
+      )
     );
   }
 });

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.1",
+  "version": "1.1.3",
   "description": "foxhop CLI and native messaging host — focus specific Firefox tabs from macOS",
   "type": "module",
   "license": "MIT",