@decentnetwork/lan 0.1.45 → 0.1.47

package/dist/cli/commands.d.ts

@@ -81,6 +81,34 @@ export declare function cmdFriendRequest(args: {
     configDir?: string;
     waitMs?: number;
 }): Promise<void>;
+/**
+ * Send friend requests to MANY addresses in a single Carrier session.
+ *
+ * The expensive parts of a standalone friend-request — start, joinNetwork,
+ * announceSelf, and the relay-delivery wait — are PER-SESSION, not
+ * per-recipient. Sending N requests by calling cmdFriendRequest N times
+ * pays them N times (~25s each). This opens the peer once, joins/announces
+ * once, fires all requests, waits once, and stops once — so friending 4
+ * doras costs about the same as friending 1 (~25s instead of ~100s).
+ *
+ * Used by `agentnet init` to friend all federated default doras. Returns
+ * per-address ok/error so the caller can report which landed. If the
+ * daemon is already running, each request is routed via IPC (no peer).
+ */
+export declare function cmdFriendRequestMany(args: {
+    targets: {
+        address: string;
+        label: string;
+    }[];
+    hello?: string;
+    configDir?: string;
+    waitMs?: number;
+}): Promise<{
+    label: string;
+    address: string;
+    ok: boolean;
+    error?: string;
+}[]>;
 /**
  * Accept a pending friend request.
  * Run while daemon is DOWN — opens a temporary peer, accepts, exits.

package/dist/cli/commands.js

@@ -139,21 +139,27 @@ export async function cmdInit(args) {
     // them gives redundancy: any one staying up is enough to get an IP.
     const configuredUserids = new Set(config.dora?.userids ?? []);
     const dorasToFriend = DEFAULT_DORAS.filter((d) => configuredUserids.has(d.userid));
-    for (const dora of dorasToFriend) {
-        console.log(`\nFriending ${dora.name} (${dora.userid.slice(0, 16)}...) so the daemon can join the shared network on first start.`);
+    if (dorasToFriend.length > 0) {
+        console.log(`\nFriending ${dorasToFriend.length} default dora${dorasToFriend.length > 1 ? "s" : ""} (${dorasToFriend
+            .map((d) => d.name)
+            .join(", ")}) in one Carrier session so the daemon can join the shared network on first start.`);
         try {
-            await cmdFriendRequest({
-                address: dora.address,
+            const results = await cmdFriendRequestMany({
+                targets: dorasToFriend.map((d) => ({ address: d.address, label: d.name })),
                 hello: `decentlan init (${nodeName})`,
                 waitMs: 8000,
                 configDir: dir,
             });
-            console.log(`  Friend-request dispatched. Auto-accept on the dora side will take it from here.`);
+            const failed = results.filter((r) => !r.ok);
+            for (const f of failed) {
+                console.warn(`  ${f.label} failed: ${f.error} — re-run later: agentnet dora enable --address ${f.address}`);
+            }
+            console.log(`  Friended ${results.length - failed.length}/${results.length} doras. Auto-accept on their side takes it from here (you only need one to get an IP).`);
         }
         catch (err) {
             const msg = err instanceof Error ? err.message : String(err);
-            console.warn(`  Friend-request to ${dora.name} failed: ${msg}`);
-            console.warn(`  Re-run later: agentnet dora enable --address ${dora.address}`);
+            console.warn(`  Friend-requests failed: ${msg}`);
+            console.warn(`  Re-run later with: agentnet up --real-tun (the daemon retries joining a dora on start).`);
         }
     }
     console.log(`\nNext: sudo agentnet service install   # or 'agentnet up --real-tun' to run in foreground`);
@@ -476,6 +482,78 @@ export async function cmdFriendRequest(args) {
     console.log(`pick it up on next start (and still auto-accept). Only run 'agentnet friend-accept --pubkey ${myPubkey}'`);
     console.log(`manually if their daemon is down AND they've disabled autoAccept.`);
 }
+/**
+ * Send friend requests to MANY addresses in a single Carrier session.
+ *
+ * The expensive parts of a standalone friend-request — start, joinNetwork,
+ * announceSelf, and the relay-delivery wait — are PER-SESSION, not
+ * per-recipient. Sending N requests by calling cmdFriendRequest N times
+ * pays them N times (~25s each). This opens the peer once, joins/announces
+ * once, fires all requests, waits once, and stops once — so friending 4
+ * doras costs about the same as friending 1 (~25s instead of ~100s).
+ *
+ * Used by `agentnet init` to friend all federated default doras. Returns
+ * per-address ok/error so the caller can report which landed. If the
+ * daemon is already running, each request is routed via IPC (no peer).
+ */
+export async function cmdFriendRequestMany(args) {
+    const dir = args.configDir || ConfigLoader.defaultConfigDir();
+    const config = await ConfigLoader.load(resolve(dir, "config.yaml"));
+    const results = [];
+    // Daemon up → route each via IPC (no second peer, no announce cost).
+    const livePid = daemonPid(config);
+    if (livePid !== null) {
+        console.log(`Daemon is running (pid ${livePid}); routing friend-requests via IPC...`);
+        for (const t of args.targets) {
+            const res = await ipcCall(config, { op: "friend-request", address: t.address, hello: args.hello });
+            results.push({ label: t.label, address: t.address, ok: res.ok, error: res.ok ? undefined : res.error });
+            console.log(res.ok ? `  ✓ ${t.label}` : `  ✗ ${t.label}: ${res.error}`);
+        }
+        return results;
+    }
+    // Daemon down → one standalone peer session for ALL requests.
+    const { Peer } = await import("@decentnetwork/peer");
+    const keyFile = resolve(config.carrier.dataDir, "keypair.json");
+    console.log(`Opening peer with identity at ${keyFile}...`);
+    const peer = await Peer.create({
+        keyFile,
+        compatibilityMode: "legacy",
+        bootstrapNodes: config.carrier.bootstrapNodes,
+        expressNodes: config.carrier.expressNodes,
+    });
+    await peer.start();
+    console.log(`My address: ${peer.address()}`);
+    console.log(`My pubkey: ${peer.pubkey()}`);
+    console.log(`Joining Carrier network...`);
+    const joinResult = await peer.joinNetwork();
+    console.log(`Joined via ${joinResult.respondingNode.host}:${joinResult.respondingNode.port}`);
+    console.log(`Announcing self (15s)...`);
+    await peer.announceSelf(15000).catch((err) => {
+        console.warn(`Self-announce failed: ${err.message}`);
+    });
+    // Fire all requests on the one announced session.
+    for (const t of args.targets) {
+        try {
+            console.log(`Sending friend request to ${t.label} (${t.address.slice(0, 16)}...)...`);
+            await peer.sendFriendRequest(t.address, args.hello || "Decent AgentNet friend request");
+            results.push({ label: t.label, address: t.address, ok: true });
+        }
+        catch (err) {
+            const msg = err instanceof Error ? err.message : String(err);
+            console.warn(`  Failed to send to ${t.label}: ${msg}`);
+            results.push({ label: t.label, address: t.address, ok: false, error: msg });
+        }
+    }
+    // Single shared wait for relay delivery of all requests above.
+    const waitMs = args.waitMs ?? 8000;
+    console.log(`Waiting ${waitMs}ms for relay delivery...`);
+    await new Promise((r) => setTimeout(r, waitMs));
+    const myUserid = peer.userid();
+    await peer.stop();
+    console.log(`\nFriend requests sent. Recipients running with autoAccept (the default) have already`);
+    console.log(`accepted — they can confirm with 'agentnet diag' and look for userid ${myUserid}.`);
+    return results;
+}
 /**
  * Accept a pending friend request.
  * Run while daemon is DOWN — opens a temporary peer, accepts, exits.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decentnetwork/lan",
-  "version": "0.1.45",
+  "version": "0.1.47",
   "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",
@@ -75,7 +75,7 @@
   },
   "dependencies": {
     "@decentnetwork/dora": "^0.1.0",
-    "@decentnetwork/peer": "^0.1.19",
+    "@decentnetwork/peer": "^0.1.20",
     "js-yaml": "^4.1.0",
     "yargs": "^17.7.2"
   },