@decentnetwork/lan 0.1.42 → 0.1.44

package/config/default-doras.yaml

@@ -0,0 +1,35 @@
+# Default dora registries shipped with @decentnetwork/lan.
+#
+# `agentnet init` seeds these into a new client's ~/.agentnet/config.yaml
+# (dora.userids) and sends each a one-time friend-request, so a fresh
+# install auto-joins the shared network with zero extra commands.
+#
+# They are FEDERATED with NON-OVERLAPPING IP segments: the client merges
+# every roster, and any single registry staying up is enough to get an IP
+# allocation — redundancy against any one dora being down.
+#
+# To add/replace a registry, edit this file (data, not code) and republish,
+# or override locally with `agentnet dora enable --userid <id> --address <addr>`.
+#
+# Each entry needs:
+#   userid   — to talk to the registry over Carrier (goes into dora.userids)
+#   address  — so `agentnet init` can send the one-time friend-request
+#   name     — label only (logs / comments)
+#   segment  — informational: the IP band this registry allocates from
+doras:
+  - name: dora-mac
+    userid: 98rsHv17h8G6AP9RagyrBiT1kmw4cn8MFPEembS6ZVjv
+    address: Jt7w1pKkyLT5GVue9h6ZPkjg1EeuuTbD6JVSLycXLsdm6nvBGSUd
+    segment: 10.86.1.10-10.86.63.254
+  - name: dora-beagle
+    userid: AxKFEZFLDi23EmnJFNP6gjUM4CaNMPfWUvbFR9ixtMBN
+    address: NsuN81dZdEoyvwEFgWaHkT8SPJB6UWeRmdYcCGFV5CdbbPXoK2RM
+    segment: 10.86.64.10-10.86.127.254
+  - name: dora-sh
+    userid: GMEMLmCWLMBK6BJiMkbLPNkEjF4S2xRf1SqR9hM8fWV3
+    address: ajg1ZMBw86UyujmEJzqKSCbi3wwEtg6tdGFTdESakyqujyxmqJZK
+    segment: 10.86.128.10-10.86.191.254
+  - name: dora-tokyo
+    userid: AB6BZfbrTFWw9eUoVpHdJqhhRnY8bTttp4CHTZ2Xfzxi
+    address: MAW2eBqBuQ6SmaXTrnZRRayQjAj3aLatwPy4xmBp7spnJeV569op
+    segment: 10.86.192.10-10.86.254.254

package/dist/cli/commands.js

@@ -4,7 +4,7 @@
 import { resolve, dirname } from "path";
 import { existsSync, mkdirSync, readFileSync } from "fs";
 import { createConnection } from "net";
-import { ConfigLoader, DEFAULT_DORA_USERID, DEFAULT_DORA_ADDRESS } from "../config/loader.js";
+import { ConfigLoader, DEFAULT_DORAS } from "../config/loader.js";
 import { ipcSocketPath } from "../daemon/ipc.js";
 import { DaemonServer } from "../daemon/server.js";
 import { Ipam } from "../ipam/ipam.js";
@@ -129,18 +129,21 @@ export async function cmdInit(args) {
     console.log(`  Config dir: ${dir}`);
     console.log(`  Subnet: ${config.network.subnet}`);
     console.log(`  Interface: ${config.network.interface}`);
-    // Send the one-time friend-request to the default dora so the daemon
+    // Send the one-time friend-request to each default dora so the daemon
     // can register on first start. Best-effort: a friend-request requires
     // joinNetwork + an announce round, ~10-30s; we cap the wait and
-    // surface a hint if it doesn't go through. Skipped when the user
-    // overrode dora.userids away from the default (i.e. they're pointing
-    // at a private dora — they'll run `agentnet dora enable` themselves).
-    const defaultDoraConfigured = (config.dora?.userids ?? []).includes(DEFAULT_DORA_USERID);
-    if (defaultDoraConfigured) {
-        console.log(`\nFriending the public dora (${DEFAULT_DORA_USERID.slice(0, 16)}...) so the daemon can join the shared network on first start.`);
+    // surface a hint if it doesn't go through. Skipped for any dora the
+    // user removed from dora.userids (i.e. they're pointing at a private
+    // set — they'll run `agentnet dora enable` themselves). The defaults
+    // are federated with non-overlapping IP segments, so friending all of
+    // 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.`);
         try {
             await cmdFriendRequest({
-                address: DEFAULT_DORA_ADDRESS,
+                address: dora.address,
                 hello: `decentlan init (${nodeName})`,
                 waitMs: 8000,
                 configDir: dir,
@@ -149,8 +152,8 @@ export async function cmdInit(args) {
         }
         catch (err) {
             const msg = err instanceof Error ? err.message : String(err);
-            console.warn(`  Friend-request to the default dora failed: ${msg}`);
-            console.warn(`  Re-run later: agentnet dora enable --address ${DEFAULT_DORA_ADDRESS}`);
+            console.warn(`  Friend-request to ${dora.name} failed: ${msg}`);
+            console.warn(`  Re-run later: agentnet dora enable --address ${dora.address}`);
         }
     }
     console.log(`\nNext: sudo agentnet service install   # or 'agentnet up --real-tun' to run in foreground`);

package/dist/config/loader.d.ts

@@ -1,17 +1,31 @@
 import type { DecentAgentNetConfig } from "../types.js";
 /**
- * Public dora server baked into `agentnet init` so an operator can join
+ * Public dora servers baked into `agentnet init` so an operator can join
  * the canonical Decent AgentNet without first hunting down a registry
  * address. Override by editing `dora.userids` (and re-running
  * `agentnet dora enable --address <yours>`) — or by running a private
  * dora and pointing your own peers at it.
  *
- * Both fields are required: the daemon needs `userid` to talk to the
- * server over Carrier, and `address` so `agentnet init` can send the
- * one-time friend-request that establishes the Carrier session.
+ * These are FEDERATED with NON-OVERLAPPING IP segments, so the client
+ * merges all their rosters and any one staying up is enough to get an
+ * IP allocation — redundancy against any single registry being down.
+ *
+ * The list is loaded from the data file `config/default-doras.yaml` that
+ * ships in the npm package (servers are config, not code — edit that file
+ * and republish to change the default network). The hardcoded array below
+ * is only a last-resort fallback if the data file is missing/unreadable.
+ *
+ * Each entry needs `userid` (to talk to the server over Carrier) and
+ * `address` (so `agentnet init` can send the one-time friend-request).
  */
-export declare const DEFAULT_DORA_USERID = "98rsHv17h8G6AP9RagyrBiT1kmw4cn8MFPEembS6ZVjv";
-export declare const DEFAULT_DORA_ADDRESS = "Jt7w1pKkyLT5GVue9h6ZPkjg1EeuuTbD6JVSLycXLsdm6nvBGSUd";
+export interface DefaultDora {
+    name: string;
+    userid: string;
+    address: string;
+}
+export declare const DEFAULT_DORAS: DefaultDora[];
+export declare const DEFAULT_DORA_USERID: string;
+export declare const DEFAULT_DORA_ADDRESS: string;
 export declare class ConfigLoader {
     static defaultConfigPath(): string;
     static defaultConfigDir(): string;

package/dist/config/loader.js

@@ -39,19 +39,32 @@ const DEFAULT_BOOTSTRAP_NODES = [
 const DEFAULT_EXPRESS_NODES = [
     { host: "lens.beagle.chat", port: 443, pk: "ECbs4GxwGzxGerNkmqDJFibEmevu8jAXqAZtikccvD95" },
 ];
-/**
- * Public dora server baked into `agentnet init` so an operator can join
- * the canonical Decent AgentNet without first hunting down a registry
- * address. Override by editing `dora.userids` (and re-running
- * `agentnet dora enable --address <yours>`) — or by running a private
- * dora and pointing your own peers at it.
- *
- * Both fields are required: the daemon needs `userid` to talk to the
- * server over Carrier, and `address` so `agentnet init` can send the
- * one-time friend-request that establishes the Carrier session.
- */
-export const DEFAULT_DORA_USERID = "98rsHv17h8G6AP9RagyrBiT1kmw4cn8MFPEembS6ZVjv";
-export const DEFAULT_DORA_ADDRESS = "Jt7w1pKkyLT5GVue9h6ZPkjg1EeuuTbD6JVSLycXLsdm6nvBGSUd";
+const DEFAULT_DORAS_FALLBACK = [
+    { name: "dora-mac", userid: "98rsHv17h8G6AP9RagyrBiT1kmw4cn8MFPEembS6ZVjv", address: "Jt7w1pKkyLT5GVue9h6ZPkjg1EeuuTbD6JVSLycXLsdm6nvBGSUd" }, // 10.86.1.10–63.254
+    { name: "dora-beagle", userid: "AxKFEZFLDi23EmnJFNP6gjUM4CaNMPfWUvbFR9ixtMBN", address: "NsuN81dZdEoyvwEFgWaHkT8SPJB6UWeRmdYcCGFV5CdbbPXoK2RM" }, // 10.86.64.10–127.254
+    { name: "dora-sh", userid: "GMEMLmCWLMBK6BJiMkbLPNkEjF4S2xRf1SqR9hM8fWV3", address: "ajg1ZMBw86UyujmEJzqKSCbi3wwEtg6tdGFTdESakyqujyxmqJZK" }, // 10.86.128.10–191.254
+    { name: "dora-tokyo", userid: "AB6BZfbrTFWw9eUoVpHdJqhhRnY8bTttp4CHTZ2Xfzxi", address: "MAW2eBqBuQ6SmaXTrnZRRayQjAj3aLatwPy4xmBp7spnJeV569op" }, // 10.86.192.10–254.254
+];
+function loadDefaultDoras() {
+    // dist/config/loader.js → package root is two levels up; data file ships
+    // at <pkg>/config/default-doras.yaml. Same path holds when running from
+    // src/ in dev. Fall back to the embedded list if it can't be read.
+    try {
+        const file = resolve(dirname(new URL(import.meta.url).pathname), "../../config/default-doras.yaml");
+        const parsed = yaml.load(readFileSync(file, "utf-8"));
+        const doras = (parsed?.doras ?? []).filter((d) => d && d.userid && d.address);
+        if (doras.length > 0)
+            return doras;
+    }
+    catch {
+        // missing/unreadable/malformed — use the fallback below
+    }
+    return DEFAULT_DORAS_FALLBACK;
+}
+export const DEFAULT_DORAS = loadDefaultDoras();
+// Back-compat single-value exports (first/primary dora).
+export const DEFAULT_DORA_USERID = DEFAULT_DORAS[0].userid;
+export const DEFAULT_DORA_ADDRESS = DEFAULT_DORAS[0].address;
 export class ConfigLoader {
     static defaultConfigPath() {
         return DEFAULT_CONFIG_FILE;
@@ -139,7 +152,7 @@ export class ConfigLoader {
             // replaces the default).
             dora: {
                 enabled: true,
-                userids: [DEFAULT_DORA_USERID],
+                userids: DEFAULT_DORAS.map((d) => d.userid),
                 refreshIntervalMs: 60_000,
                 // Default: auto-friend every peer in the dora roster. Dora
                 // membership IS the trust statement — joining a dora means

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decentnetwork/lan",
-  "version": "0.1.42",
+  "version": "0.1.44",
   "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",
@@ -18,6 +18,7 @@
   "files": [
     "dist",
     "bin",
+    "config/default-doras.yaml",
     "README.md",
     "LICENSE",
     "docs/INSTALL.md",