@decentnetwork/lan 0.1.91 → 0.1.92

package/dist/ui/server.js

@@ -17,6 +17,7 @@ import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { fileURLToPath } from "node:url";
 import { dirname, join } from "node:path";
 import yaml from "js-yaml";
+import { DEFAULT_EXITS } from "../config/loader.js";
 // Directory holding the built desktop UI bundle (index.html, app.js, vendor/).
 // scripts/build-ui.mjs emits it next to this compiled module at dist/ui/desktop/.
 const DESKTOP_DIR = join(dirname(fileURLToPath(import.meta.url)), "desktop");
@@ -194,27 +195,65 @@ export function startFriendUi(opts) {
                     via: "lan",
                     time: "",
                 }));
-                // Exit nodes from routes.yaml regions, online-status resolved via ipam.
+                // Exit nodes = the AVAILABLE exits this node knows about, grouped by
+                // region. The authoritative list is the shipped DEFAULT_EXITS
+                // (config/default-exits.yaml) — every install has it, so the panel is
+                // populated out-of-the-box even on a node with no routes.yaml. Any
+                // extra exit IPs an operator added to routes.yaml are folded in too.
+                // online status: is that exit a currently-connected friend (by userid,
+                // else by its virtual ip showing up as a live peer).
                 let routes = { regions: [], default: "direct" };
                 if (existsSync(opts.routesPath)) {
                     routes = yaml.load(readFileSync(opts.routesPath, "utf-8")) ?? routes;
                 }
+                const onlineUserids = new Set();
                 const onlineIps = new Set();
-                for (const [uid, ip] of ipByUserid) {
-                    const s = sessByUserid.get(uid);
-                    if (s && s.transport && s.transport !== "none")
-                        onlineIps.add(ip);
+                for (const f of diagFriends) {
+                    const uid = f.carrierId || f.pubkey || "";
+                    const s = f.session;
+                    if (uid && s && s.transport && s.transport !== "none") {
+                        onlineUserids.add(uid);
+                        const ip = ipByUserid.get(uid);
+                        if (ip)
+                            onlineIps.add(ip);
+                    }
                 }
-                const exits = (routes.regions ?? []).map((r) => ({
-                    region: r.name,
-                    flag: (r.name || "?").slice(0, 2).toUpperCase(),
-                    label: r.name,
-                    nodes: (r.exits ?? []).map((ip, i) => ({
-                        ip,
-                        online: onlineIps.has(ip),
+                const regionMeta = {
+                    china: { flag: "CN", label: "China" },
+                    japan: { flag: "JP", label: "Japan" },
+                    us: { flag: "US", label: "United States" },
+                };
+                const byRegion = new Map();
+                for (const e of DEFAULT_EXITS) {
+                    if (!e.virtual_ip)
+                        continue;
+                    const region = e.region || "other";
+                    if (!byRegion.has(region))
+                        byRegion.set(region, []);
+                    byRegion.get(region).push({
+                        ip: e.virtual_ip,
+                        host: e.name,
+                        online: onlineUserids.has(e.userid) || onlineIps.has(e.virtual_ip),
                         ping: null,
-                        host: `${(r.name || "ex").slice(0, 2)}-${String(i + 1).padStart(2, "0")}`,
-                    })),
+                    });
+                }
+                // Fold in any extra exit IPs from routes.yaml not already covered.
+                const knownIps = new Set(DEFAULT_EXITS.flatMap((e) => (e.virtual_ip ? [e.virtual_ip] : [])));
+                for (const r of routes.regions ?? []) {
+                    for (const ip of r.exits ?? []) {
+                        if (knownIps.has(ip))
+                            continue;
+                        knownIps.add(ip);
+                        if (!byRegion.has(r.name))
+                            byRegion.set(r.name, []);
+                        byRegion.get(r.name).push({ ip, host: ip, online: onlineIps.has(ip), ping: null });
+                    }
+                }
+                const exits = [...byRegion.entries()].map(([region, nodes]) => ({
+                    region,
+                    flag: regionMeta[region]?.flag ?? region.slice(0, 2).toUpperCase(),
+                    label: regionMeta[region]?.label ?? region,
+                    nodes,
                 }));
                 const activeExit = routes.default && routes.default !== "direct" ? routes.default : null;
                 sendJson(res, 200, { me, peers, requests, exits, activeExit });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decentnetwork/lan",
-  "version": "0.1.91",
+  "version": "0.1.92",
   "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",