@decentnetwork/beagle 0.1.57 → 0.1.58

package/dist/cli.js

@@ -28,6 +28,7 @@ function parseArgs(argv) {
             "  --config-dir <p>   identity/config dir (default ~/.agentnet)",
             "  --dora-dir <p>     dora roster dir, if this machine runs a dora",
             "  --backend <k>      force 'daemon' or 'embedded' (default: auto)",
+            "  --wait-daemon <s>  with --backend daemon, wait this long for it (default 60)",
             "  -h, --help         this text",
         ].join("\n"));
         process.exit(0);
@@ -40,6 +41,7 @@ function parseArgs(argv) {
         configDir: get("--config-dir") ?? defaultConfigDir(),
         doraDir: get("--dora-dir"),
         backend: get("--backend"),
+        waitDaemon: get("--wait-daemon"),
     };
 }
 const readJsonVer = (file) => {
@@ -109,6 +111,7 @@ async function main() {
             onAutoAcceptChange: (enabled) => saveAutoAccept(args.configDir, enabled),
             peerVersion: resolveVer("@decentnetwork/peer"),
             force: args.backend,
+            waitForDaemonMs: args.waitDaemon ? Number(args.waitDaemon) * 1000 : undefined,
         }));
     }
     catch (error) {

package/dist/desktop/app.js

@@ -1,4 +1,4 @@
-window.__DK_UI_VERSION="0.1.57";
+window.__DK_UI_VERSION="0.1.58";
 const ICON_PATHS = {
   // ---- tab bar (the four must feel like one set) ----
   users: '<path d="M16 21v-2a4 4 0 0 0-4-4H6a4 4 0 0 0-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M22 21v-2a4 4 0 0 0-3-3.87"/><path d="M16 3.13a4 4 0 0 1 0 7.75"/>',

package/dist/peer-host.d.ts

@@ -46,6 +46,8 @@ export interface OpenPeerHostOptions {
     /** Force a backend instead of auto-detecting. Mainly for testing the
      *  embedded path on a machine that also runs a daemon. */
     force?: BackendKind;
+    /** How long `force: "daemon"` waits for the daemon socket. Default 60s. */
+    waitForDaemonMs?: number;
 }
 /**
  * Pick a backend.

package/dist/peer-host.js

@@ -77,7 +77,35 @@ export async function openPeerHost(opts) {
         return { host: new DaemonHost(dataDir), why: `decentlan daemon at ${dataDir}` };
     }
     if (opts.force === "daemon") {
-        throw new Error(`--backend daemon was requested but no decentlan daemon is running (looked for ${ipcSocketPath(dataDir)}).`);
+        // Wait rather than die.
+        //
+        // A supervised beagle (pm2, systemd) routinely starts BEFORE the daemon it
+        // is meant to attach to. Throwing there turned a boot-order race into a
+        // permanent problem: beagle fell back to embedded, took <dataDir>/daemon.pid,
+        // and from then on `agentnet service restart` refused to start the daemon
+        // because a live process already held the identity — which is why upgrading
+        // needed a pm2 stop / restart / pm2 start dance instead of one command.
+        //
+        // Explicit --backend daemon means "this box's identity belongs to the
+        // daemon". Honour that by waiting for it to appear.
+        const waitMs = Math.max(0, opts.waitForDaemonMs ?? 60_000);
+        const deadline = Date.now() + waitMs;
+        let waited = false;
+        while (!daemonIsRunning(dataDir)) {
+            if (Date.now() >= deadline) {
+                throw new Error(`--backend daemon was requested but no decentlan daemon appeared within ${Math.round(waitMs / 1000)}s ` +
+                    `(looked for ${ipcSocketPath(dataDir)}).`);
+            }
+            if (!waited) {
+                waited = true;
+                console.log(`waiting up to ${Math.round(waitMs / 1000)}s for the decentlan daemon at ${ipcSocketPath(dataDir)}…`);
+            }
+            await new Promise((r) => setTimeout(r, 1000));
+        }
+        return {
+            host: new DaemonHost(dataDir),
+            why: waited ? `decentlan daemon at ${dataDir} (after waiting)` : `decentlan daemon at ${dataDir}`,
+        };
     }
     // Reuse decentlan's identity when it exists so friends carry over — this is
     // the same node, not a new one. The daemon is not running, so nothing else

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decentnetwork/beagle",
-  "version": "0.1.57",
+  "version": "0.1.58",
   "description": "Beagle — P2P chat, file transfer and calls for regular users, on the Decent Network. No admin privilege required.",
   "type": "module",
   "main": "./dist/index.js",