@decentnetwork/lan 0.1.52 → 0.1.54

package/dist/cli/commands.d.ts

@@ -269,6 +269,16 @@ export declare function cmdDnsHosts(args: {
 export declare function cmdDiag(args: {
     configDir?: string;
 }): Promise<void>;
+/**
+ * `agentnet doctor` — a self-service health check. Walks the common
+ * failure points we keep hitting (config in the wrong place under sudo,
+ * daemon down, no dora, peers stuck "connecting" because the other end
+ * runs old code) and prints the exact fix for each, so a user can debug
+ * without reading source or asking anyone.
+ */
+export declare function cmdDoctor(args: {
+    configDir?: string;
+}): Promise<void>;
 /**
  * Enable dora integration. Accepts either `--address` (preferred — the
  * full Carrier address of the dora server; we derive its userid and

package/dist/cli/commands.js

@@ -1267,6 +1267,86 @@ export async function cmdDiag(args) {
     }
     console.log(JSON.stringify(res.data, null, 2));
 }
+/**
+ * `agentnet doctor` — a self-service health check. Walks the common
+ * failure points we keep hitting (config in the wrong place under sudo,
+ * daemon down, no dora, peers stuck "connecting" because the other end
+ * runs old code) and prints the exact fix for each, so a user can debug
+ * without reading source or asking anyone.
+ */
+export async function cmdDoctor(args) {
+    const ok = (s) => console.log(`  ✓ ${s}`);
+    const bad = (s, fix) => {
+        console.log(`  ✗ ${s}`);
+        if (fix)
+            console.log(`      → ${fix}`);
+    };
+    const info = (s) => console.log(`  · ${s}`);
+    console.log("agentnet doctor\n");
+    // 1. Resolve config dir, working around the sudo HOME trap: under
+    // `sudo` ~ resolves to /root, but the config usually lives in the
+    // invoking user's home — the #1 "Not initialized" confusion.
+    let dir = args.configDir || ConfigLoader.defaultConfigDir();
+    let configPath = resolve(dir, "config.yaml");
+    if (!existsSync(configPath) && process.env.SUDO_USER) {
+        const altDir = resolve(`/home/${process.env.SUDO_USER}`, ".agentnet");
+        if (existsSync(resolve(altDir, "config.yaml"))) {
+            info(`Config not in ${dir} (running under sudo); using ${altDir}`);
+            dir = altDir;
+            configPath = resolve(altDir, "config.yaml");
+        }
+    }
+    if (!existsSync(configPath)) {
+        bad(`No config at ${configPath}`, "run:  agentnet init");
+        return;
+    }
+    ok(`Config: ${configPath}`);
+    const config = await ConfigLoader.load(configPath);
+    // 2. Daemon running?
+    const pid = daemonPid(config);
+    if (pid === null) {
+        bad("Daemon is not running", `start it:  sudo agentnet up --real-tun --config-dir ${dir}`);
+        info("Logs go to /var/log/agentnet.log (NOT journalctl) when run as a service.");
+        return;
+    }
+    ok(`Daemon running (pid ${pid})`);
+    const res = await ipcCall(config, { op: "diag" });
+    if (!res.ok) {
+        bad(`Daemon not responding over IPC: ${res.error}`, "restart it");
+        return;
+    }
+    const d = res.data;
+    if (d.identity?.address)
+        ok(`Identity: ${d.identity.address}`);
+    const ip = d.tun?.ip || d.allocatedIp;
+    if (ip)
+        ok(`Virtual IP: ${ip}`);
+    // 3. Dora connectivity — needed for auto-discovery of peers.
+    const friends = d.friends ?? [];
+    const ipamMap = new Map((d.ipam ?? []).map((p) => [p.carrierId ?? "", p]));
+    const doraIds = new Set(DEFAULT_DORAS.map((x) => x.userid));
+    const idOf = (f) => f.carrierId || f.pubkey || "";
+    const nameOf = (f) => {
+        const real = f.name && f.name !== "@decentnetwork/peer" ? f.name : undefined;
+        const ix = ipamMap.get(idOf(f));
+        const ipPart = ix?.virtualIp ? ` ${ix.virtualIp}` : "";
+        return `${real || ix?.name || idOf(f).slice(0, 8) + "…"}${ipPart}`;
+    };
+    const doraOnline = friends.filter((f) => doraIds.has(idOf(f)) && f.status === "online");
+    if (doraOnline.length > 0)
+        ok(`Dora registry connected (${doraOnline.length} online) — peer auto-discovery active`);
+    else
+        bad("No dora registry online — can't auto-discover peers", "give it ~60s after start; check internet / that a dora is up");
+    // 4. Friends — who's connected vs stuck connecting (and why).
+    const online = friends.filter((f) => f.status === "online");
+    const connecting = friends.filter((f) => f.status !== "online");
+    info(`Peers: ${online.length} connected, ${connecting.length} connecting`);
+    for (const f of online)
+        ok(`${nameOf(f)} — connected`);
+    for (const f of connecting)
+        info(`${nameOf(f)} — connecting (other end offline, or upgraded-but-not-restarted: restart its daemon)`);
+    console.log("\n  Watch live: sudo tail -f /var/log/agentnet.log  (\"Peers:\" line every 30s)");
+}
 /**
  * Enable dora integration. Accepts either `--address` (preferred — the
  * full Carrier address of the dora server; we derive its userid and

package/dist/cli/index.js

@@ -10,7 +10,7 @@ import { hideBin } from "yargs/helpers";
 // Belt-and-braces — also raise it here in case the CLI is run directly
 // (e.g. `node dist/cli/index.js` rather than via dist/index.js).
 EventEmitter.defaultMaxListeners = 100;
-import { cmdInit, cmdIdentityShow, cmdPeersList, cmdIpamAssign, cmdGrant, cmdRevoke, cmdResolve, cmdStatus, cmdUp, cmdAuditLog, cmdFriendRequest, cmdFriendAccept, cmdFriendsList, cmdFriendsPending, cmdFriendsAccept, cmdFriendsReject, cmdProxyEnable, cmdProxyDisable, cmdProxyStatus, cmdProxyAllowHost, cmdProxyRevokeHost, cmdProxyListHosts, cmdProxyUse, cmdProxyRouter, cmdDoraEnable, cmdDoraDisable, cmdDoraStatus, cmdDoraAutofriend, cmdDiag, cmdDnsInstall, cmdDnsHosts, cmdServiceInstall, cmdRestart, cmdServiceStatus, } from "./commands.js";
+import { cmdInit, cmdIdentityShow, cmdPeersList, cmdIpamAssign, cmdGrant, cmdRevoke, cmdResolve, cmdStatus, cmdUp, cmdAuditLog, cmdFriendRequest, cmdFriendAccept, cmdFriendsList, cmdFriendsPending, cmdFriendsAccept, cmdFriendsReject, cmdProxyEnable, cmdProxyDisable, cmdProxyStatus, cmdProxyAllowHost, cmdProxyRevokeHost, cmdProxyListHosts, cmdProxyUse, cmdProxyRouter, cmdDoraEnable, cmdDoraDisable, cmdDoraStatus, cmdDoraAutofriend, cmdDiag, cmdDoctor, cmdDnsInstall, cmdDnsHosts, cmdServiceInstall, cmdRestart, cmdServiceStatus, } from "./commands.js";
 async function main() {
     await yargs(hideBin(process.argv))
         .scriptName("agentnet")
@@ -85,6 +85,9 @@ async function main() {
     })
         .command("diag", "Query the running daemon over IPC for a JSON snapshot of its runtime state (stats, friends, IPAM)", (y) => y.option("config-dir", { type: "string" }), async (argv) => {
         await cmdDiag({ configDir: argv["config-dir"] });
+    })
+        .command("doctor", "Self-check: diagnoses config/daemon/dora/peer problems and prints the fix for each", (y) => y.option("config-dir", { type: "string" }), async (argv) => {
+        await cmdDoctor({ configDir: argv["config-dir"] });
     })
         .command("dns", "Manage OS-side DNS resolver wiring for the .decent zone", (y) => y
         .command("install", "Route .decent queries to the local daemon (writes /etc/resolver on macOS or resolvectl on Linux)", (yy) => yy

package/dist/dora/dora-integration.d.ts

@@ -41,9 +41,17 @@ export declare class DoraIntegration {
     private retryBootstrapTimer?;
     /** The IP dora handed us. Falls back to preferredIp on registry failure. */
     private allocatedIp;
-    /** Userids we've already attempted to friend this session — keeps the
-     *  60s roster refresh from spamming sendFriendRequest. */
-    private friendRequested;
+    /** Userid -> last time (ms) we sent an auto-friend request. Keeps the
+     *  60s roster refresh from spamming sendFriendRequest, but — unlike a
+     *  plain "sent once" Set — lets us RE-send periodically to a peer that's
+     *  still not connected. A single missed delivery (express hiccup, or the
+     *  peer's daemon was offline/running old code when we first sent) used to
+     *  strand the friendship until a client restart; re-asserting every few
+     *  minutes self-heals it the moment the other end comes back. */
+    private friendRequestedAt;
+    /** Re-send an auto-friend request to a still-unconnected roster peer at
+     *  most this often. */
+    private static readonly AUTOFRIEND_RESEND_MS;
     /** Set once we've successfully registered. The retry-bootstrap loop
      *  uses this to know when to stop trying. */
     private registered;

package/dist/dora/dora-integration.js

@@ -21,9 +21,17 @@ export class DoraIntegration {
     retryBootstrapTimer;
     /** The IP dora handed us. Falls back to preferredIp on registry failure. */
     allocatedIp;
-    /** Userids we've already attempted to friend this session — keeps the
-     *  60s roster refresh from spamming sendFriendRequest. */
-    friendRequested = new Set();
+    /** Userid -> last time (ms) we sent an auto-friend request. Keeps the
+     *  60s roster refresh from spamming sendFriendRequest, but — unlike a
+     *  plain "sent once" Set — lets us RE-send periodically to a peer that's
+     *  still not connected. A single missed delivery (express hiccup, or the
+     *  peer's daemon was offline/running old code when we first sent) used to
+     *  strand the friendship until a client restart; re-asserting every few
+     *  minutes self-heals it the moment the other end comes back. */
+    friendRequestedAt = new Map();
+    /** Re-send an auto-friend request to a still-unconnected roster peer at
+     *  most this often. */
+    static AUTOFRIEND_RESEND_MS = 5 * 60_000;
     /** Set once we've successfully registered. The retry-bootstrap loop
      *  uses this to know when to stop trying. */
     registered = false;
@@ -362,10 +370,17 @@ export class DoraIntegration {
      * re-register the peer or fall back to a manual friend-request.
      */
     maybeFriend(entry) {
-        if (this.friendRequested.has(entry.userid))
-            return;
+        // Already connected → nothing to do (and clear any resend timer).
         if (this.opts.peerManager.isFriend(entry.userid)) {
-            this.friendRequested.add(entry.userid);
+            this.friendRequestedAt.set(entry.userid, Date.now());
+            return;
+        }
+        // Not connected yet: send the first time, then RE-send at most every
+        // AUTOFRIEND_RESEND_MS. This is the self-heal — a peer that was offline
+        // or running old code when we first sent gets re-asserted once it's back,
+        // instead of staying stranded until a client restart.
+        const lastSent = this.friendRequestedAt.get(entry.userid);
+        if (lastSent !== undefined && Date.now() - lastSent < DoraIntegration.AUTOFRIEND_RESEND_MS) {
             return;
         }
         // Policy gate. The undefined default is "all" because a peer
@@ -389,19 +404,22 @@ export class DoraIntegration {
         if (!entry.address) {
             this.logger.warn(`Roster entry ${entry.name} (${entry.userid.slice(0, 12)}...) has no address — can't auto-friend. ` +
                 `Have them re-register against a newer dora server, or run 'agentnet friend-request' manually.`);
-            this.friendRequested.add(entry.userid); // don't keep warning every 60s
+            // Re-warn at most once per resend window, not every 60s.
+            this.friendRequestedAt.set(entry.userid, Date.now());
             return;
         }
-        this.friendRequested.add(entry.userid);
+        const isResend = lastSent !== undefined;
+        this.friendRequestedAt.set(entry.userid, Date.now());
         this.opts.peerManager
             .sendFriendRequest(entry.address, `dora roster auto-friend (${this.opts.nodeName})`)
             .then(() => {
-            this.logger.info(`Auto-friend sent to ${entry.name} (${entry.userid.slice(0, 12)}...)`);
+            this.logger.info(`Auto-friend ${isResend ? "re-sent" : "sent"} to ${entry.name} (${entry.userid.slice(0, 12)}...)`);
         })
             .catch((err) => {
             this.logger.warn(`Auto-friend ${entry.name}: ${err instanceof Error ? err.message : err}`);
-            // Allow another attempt on the next refresh cycle.
-            this.friendRequested.delete(entry.userid);
+            // Clear the timestamp so the next refresh cycle retries immediately
+            // rather than waiting out the resend window.
+            this.friendRequestedAt.delete(entry.userid);
         });
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decentnetwork/lan",
-  "version": "0.1.52",
+  "version": "0.1.54",
   "description": "Private virtual LAN for self-hosted services and AI agents, built on Elastos Carrier. NAT-traversal, name service, ACL, all over a peer-to-peer mesh — no public IP required.",
   "type": "module",
   "main": "./dist/index.js",