Fix Bun v1.1.42 compatibility, daemon startup race conditions, and CLI polling reliability (Vibed some parts of it, but tested by me)

README.md

@@ -66,6 +66,9 @@ cocod history --watch
 cocod logs
 cocod logs --follow
 cocod logs --path
+
+# Debug a stuck init/unlock in another terminal
+cocod logs --follow
 ```
 
 ## NPC (Lightning Address)
@@ -98,15 +101,16 @@ cocod x-cashu handle "<encoded-x-cashu-request>"
 
 Defaults:
 
-- Socket: `~/.cocod/cocod.sock` (or `COCOD_SOCKET`)
-- PID file: `~/.cocod/cocod.pid` (or `COCOD_PID`)
-- Daemon log: `~/.cocod/daemon.log` (or `COCOD_LOG_FILE`)
-- Config: `~/.cocod/config.json`
-- Database: `~/.cocod/coco.db`
+- Base directory: `~/.cocod` (or `COCOD_DIR`)
+- Socket: `<base>/cocod.sock` (or `COCOD_SOCKET`)
+- PID file: `<base>/cocod.pid` (or `COCOD_PID`)
+- Daemon log: `<base>/daemon.log` (or `COCOD_LOG_FILE`)
+- Config: `<base>/config.json`
+- Database: `<base>/coco.db`
 
 Logging defaults:
 
-- Structured JSON logs are written to `~/.cocod/daemon.log`
+- Structured JSON logs are written to `<base>/daemon.log`
 - Rotation keeps 5 files at 5 MiB each by default
 - Override with `COCOD_LOG_LEVEL`, `COCOD_LOG_MAX_BYTES`, and `COCOD_LOG_MAX_FILES`
 

docs/API.md

@@ -59,8 +59,8 @@ All commands are available under `cocod`.
 
 The CLI talks to the daemon over HTTP on a UNIX socket.
 
-- Socket path env var: `COCOD_SOCKET`
-- Default socket: `~/.cocod/cocod.sock`
+- Base directory env var: `COCOD_DIR` (default `~/.cocod`)
+- Socket path env var: `COCOD_SOCKET` (default `<COCOD_DIR>/cocod.sock`)
 
 ### Response shape
 

docs/daemon-api.json

@@ -3,8 +3,10 @@
   "version": "0.0.12",
   "transport": {
     "protocol": "http",
+    "baseDirEnv": "COCOD_DIR",
+    "defaultBaseDir": "~/.cocod",
     "unixSocketEnv": "COCOD_SOCKET",
-    "defaultUnixSocket": "~/.cocod/cocod.sock"
+    "defaultUnixSocket": "<COCOD_DIR>/cocod.sock"
   },
   "responseContract": {
     "success": {

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "cocod",
-  "version": "0.0.16",
+  "name": "@routstr/cocod",
+  "version": "0.0.20",
   "module": "src/index.ts",
   "type": "module",
   "private": false,

src/cli-shared.ts

@@ -1,7 +1,6 @@
 import { program } from "commander";
 
-const CONFIG_DIR = `${process.env.HOME || process.env.USERPROFILE}/.cocod`;
-const SOCKET_PATH = process.env.COCOD_SOCKET || `${CONFIG_DIR}/cocod.sock`;
+import { LOG_FILE, SOCKET_PATH } from "./utils/config";
 
 export interface CommandResponse {
   output?: unknown;
@@ -42,6 +41,64 @@ export async function isDaemonRunning(): Promise<boolean> {
   }
 }
 
+const DAEMON_POLL_INTERVAL_MS = 1_000;
+const DAEMON_SLOW_START_WARNING_MS = 30_000;
+const DAEMON_START_TIMEOUT_MS = 60_000;
+const DAEMON_START_LOG_LINES = 40;
+
+function sleep(ms: number): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+async function waitForDaemonReady(startedAt: number, warningShown: { value: boolean }): Promise<void> {
+  for (;;) {
+    try {
+      const result = await callDaemon("/status");
+      if (typeof result.output === "string") {
+        return;
+      }
+    } catch {
+      // Daemon may not be accepting requests yet
+    }
+
+    const elapsedMs = Date.now() - startedAt;
+
+    if (!warningShown.value && elapsedMs >= DAEMON_SLOW_START_WARNING_MS) {
+      warningShown.value = true;
+      console.log("Daemon is taking longer than expected, please wait...");
+    }
+
+    if (elapsedMs >= DAEMON_START_TIMEOUT_MS) {
+      throw new Error("Daemon failed to start after 1 minute");
+    }
+
+    await sleep(DAEMON_POLL_INTERVAL_MS);
+  }
+}
+
+function printProgressStep(message: string): void {
+  console.log(`• ${message}`);
+}
+
+function maybePrintFriendlyProgress(path: string, body?: object): void {
+  if (path === "/init") {
+    const mintUrl =
+      body && "mintUrl" in body && typeof body.mintUrl === "string"
+        ? body.mintUrl
+        : "https://mint.minibits.cash/Bitcoin";
+
+    printProgressStep("Preparing wallet...");
+    printProgressStep(`Connecting to mint: ${mintUrl}`);
+    printProgressStep("This can take a few seconds on first run.");
+    return;
+  }
+
+  if (path === "/unlock") {
+    printProgressStep("Unlocking wallet...");
+    printProgressStep("Reconnecting wallet services...");
+  }
+}
+
 export async function startDaemonProcess(): Promise<void> {
   const proc = Bun.spawn({
     cmd: ["bun", "run", `${import.meta.dir}/index.ts`, "daemon"],
@@ -51,14 +108,30 @@ export async function startDaemonProcess(): Promise<void> {
   });
   proc.unref();
 
-  for (let i = 0; i < 50; i++) {
-    await new Promise((resolve) => setTimeout(resolve, 100));
+  const startedAt = Date.now();
+  const warningShown = { value: false };
+
+  for (;;) {
+    await sleep(DAEMON_POLL_INTERVAL_MS);
     if (await isDaemonRunning()) {
+      await waitForDaemonReady(startedAt, warningShown);
       return;
     }
-  }
 
-  throw new Error("Daemon failed to start within 5 seconds");
+    const elapsedMs = Date.now() - startedAt;
+
+    if (!warningShown.value && elapsedMs >= DAEMON_SLOW_START_WARNING_MS) {
+      warningShown.value = true;
+      console.log("Daemon is taking longer than expected, please wait...");
+      console.log(
+        `Tip: run 'cocod logs --follow' or 'tail -n ${DAEMON_START_LOG_LINES} ${LOG_FILE}' in another terminal.`,
+      );
+    }
+
+    if (elapsedMs >= DAEMON_START_TIMEOUT_MS) {
+      throw new Error("Daemon failed to start after 1 minute");
+    }
+  }
 }
 
 export async function ensureDaemonRunning(): Promise<void> {
@@ -76,6 +149,7 @@ export async function handleDaemonCommand(
 ): Promise<CommandResponse> {
   try {
     await ensureDaemonRunning();
+    maybePrintFriendlyProgress(path, options.body);
     const result = await callDaemon(path, options);
 
     if (result.error) {