@decentnetwork/lan 0.1.299 → 0.1.301

package/dist/carrier/peer-manager.d.ts

@@ -226,6 +226,21 @@ export declare class PeerManager extends EventEmitter {
      * through PacketSession.
      */
     sendText(pubkey: string, text: string): Promise<void>;
+    /** Send a text to a friend who is NOT connected: the SDK posts it to the
+     *  express store-and-forward relay, and the friend's client collects it on
+     *  its next pull — the same path the browser client and the phones already
+     *  use towards us. Resolves "offline" when it was posted, "acked" when a
+     *  session turned out to be live after all; throws when there is no express
+     *  node to post to.
+     *
+     *  Two shapes, because the SDK has two send paths. A friend known to speak
+     *  the delivery envelope (a JS peer, protoVersion >= 2) is sent through
+     *  sendTextUntilAck with a stable deliveryId and a 250 ms window: one post,
+     *  no retry loop (offline, the ACK cannot come, and the 15 s loop would post
+     *  the same message to the relay three times), and the receiver de-dupes on
+     *  the id if it ever sees it twice. A friend whose client is unknown or
+     *  native gets the plain packet — phones do not read the envelope. */
+    sendTextOffline(pubkey: string, text: string, deliveryId: string): Promise<"offline" | "acked">;
     /**
      * Open an outbound packet session (initiator).
      * Sends HANDSHAKE_REQ and waits for HANDSHAKE_ACK.

package/dist/carrier/peer-manager.js

@@ -493,6 +493,42 @@ export class PeerManager extends EventEmitter {
         }
         await this.peer.sendText(pubkey, text);
     }
+    /** Send a text to a friend who is NOT connected: the SDK posts it to the
+     *  express store-and-forward relay, and the friend's client collects it on
+     *  its next pull — the same path the browser client and the phones already
+     *  use towards us. Resolves "offline" when it was posted, "acked" when a
+     *  session turned out to be live after all; throws when there is no express
+     *  node to post to.
+     *
+     *  Two shapes, because the SDK has two send paths. A friend known to speak
+     *  the delivery envelope (a JS peer, protoVersion >= 2) is sent through
+     *  sendTextUntilAck with a stable deliveryId and a 250 ms window: one post,
+     *  no retry loop (offline, the ACK cannot come, and the 15 s loop would post
+     *  the same message to the relay three times), and the receiver de-dupes on
+     *  the id if it ever sees it twice. A friend whose client is unknown or
+     *  native gets the plain packet — phones do not read the envelope. */
+    async sendTextOffline(pubkey, text, deliveryId) {
+        if (!this.peer) {
+            throw new Error("Peer not created. Call create() first.");
+        }
+        const friend = this.peer.friends().find((f) => f.pubkey === pubkey || f.userid === pubkey);
+        if ((friend?.protoVersion ?? 0) >= 2) {
+            try {
+                await this.peer.sendTextUntilAck(pubkey, text, { deliveryId, timeoutMs: 250, retryIntervalMs: 250 });
+                return "acked";
+            }
+            catch (e) {
+                // The one outcome where nothing was thrown by the send itself: the
+                // packet went out (to express, since there is no live session) and
+                // no ACK arrived in the window — which offline it cannot.
+                if (/ACK timed out/i.test(e.message))
+                    return "offline";
+                throw e;
+            }
+        }
+        const r = await this.peer.sendText(pubkey, text);
+        return r?.delivery === "offline" ? "offline" : "acked";
+    }
     /**
      * Open an outbound packet session (initiator).
      * Sends HANDSHAKE_REQ and waits for HANDSHAKE_ACK.

package/dist/daemon/message-store.d.ts

@@ -66,6 +66,9 @@ export declare class MessageStore {
      *  Used to flip a "queued" message to delivered once it's actually sent.
      *  No-op if the id isn't found or is a file entry. Returns true if patched. */
     setStatus(peer: string, id: string, status?: "sending" | "queued" | "sent" | "failed"): boolean;
+    /** Record how a text message travelled: "online" over a live session,
+     *  "offline" posted to the express relay for the friend to collect. */
+    setVia(peer: string, id: string, via: "online" | "offline"): boolean;
     /** Outgoing messages still awaiting delivery (peer was offline), oldest
      *  first — both queued text and queued file chips. The daemon drains this
      *  on a friend's reconnect. */

package/dist/daemon/message-store.js

@@ -74,6 +74,17 @@ export class MessageStore {
         this.scheduleSave();
         return true;
     }
+    /** Record how a text message travelled: "online" over a live session,
+     *  "offline" posted to the express relay for the friend to collect. */
+    setVia(peer, id, via) {
+        const arr = this.byPeer.get(peer);
+        const msg = arr?.find((m) => m.id === id);
+        if (!msg || msg.file)
+            return false;
+        msg.via = via;
+        this.scheduleSave();
+        return true;
+    }
     /** Outgoing messages still awaiting delivery (peer was offline), oldest
      *  first — both queued text and queued file chips. The daemon drains this
      *  on a friend's reconnect. */

package/dist/daemon/server.js

@@ -467,11 +467,42 @@ export class DaemonServer {
                     // sender in ~/.agentnet/messages.json). "queued" now means exactly
                     // one thing: nobody is sending this, the flush must.
                     const online = !!this.peerManager?.isFriendOnline(userid);
-                    const msg = this.messageStore?.append(userid, "out", text, Date.now(), online ? "sending" : "queued");
+                    const msg = this.messageStore?.append(userid, "out", text, Date.now(), "sending");
                     this.friendMeta?.ensure(userid);
                     this.ipcEvents.emit("event", { type: "chat", userid, dir: "out" });
-                    if (!msg || !online) {
-                        this.logger.info(`Queued text for ${userid.slice(0, 8)} (delivers on reconnect)`);
+                    if (!msg)
+                        return;
+                    // An OFFLINE friend used to get nothing at all: the message was
+                    // stored "queued" and waited for a live session, which for a friend
+                    // who is rarely connected — a browser tab, a phone in a pocket — can
+                    // be never. Meanwhile their client, on the same SDK, posted ITS
+                    // messages to the express store-and-forward relay and they arrived
+                    // here as offline mail. The asymmetry was observed on 2026-09-12: a
+                    // new web user's friend request and first message came through, the
+                    // reply sat queued, and — because the SDK takes the first offline
+                    // message from a "requested" friend as the proof of acceptance —
+                    // their tab never learned it had been accepted either.
+                    //
+                    // So an offline friend now gets the message posted to express, the
+                    // same way the SDK already does for friend requests. It is marked
+                    // sent · offline, not delivered: nothing confirms it until they
+                    // collect it. A live friend keeps the path below unchanged.
+                    if (!online) {
+                        void (async () => {
+                            try {
+                                const how = await this.peerManager.sendTextOffline(userid, text, `dl-${msg.id}`);
+                                this.messageStore?.setStatus(userid, msg.id, undefined);
+                                this.messageStore?.setVia(userid, msg.id, how === "offline" ? "offline" : "online");
+                                if (how === "acked")
+                                    this.friendMeta?.markConfirmed(userid);
+                                this.logger.info(`Text to ${userid.slice(0, 8)} ${how === "offline" ? "posted to offline mail (friend not connected)" : "delivered"}`);
+                            }
+                            catch (e) {
+                                this.logger.warn(`Offline text to ${userid.slice(0, 8)} failed, queued for reconnect: ${e.message}`);
+                                this.messageStore?.setStatus(userid, msg.id, "queued");
+                            }
+                            this.ipcEvents.emit("event", { type: "chat", userid, dir: "out" });
+                        })();
                         return;
                     }
                     // Deliver in the background; on failure hand it to the reconnect flush.

package/dist/dora/dora-integration.js

@@ -129,6 +129,11 @@ export class DoraIntegration {
         // crashed the daemon on startup.
         try {
             let record;
+            // True when the preferred IP was refused and config says we keep it
+            // anyway (dora.keepConfiguredIp). We then run unregistered on the
+            // configured address, still read the roster, and let the bootstrap
+            // retry keep asking for the preferred IP until its owner accepts it.
+            let keptConfiguredIp = false;
             try {
                 record = await this.tryRegister(myUserid, myAddress, this.opts.preferredIp);
             }
@@ -154,41 +159,63 @@ export class DoraIntegration {
                 const retryWithoutPreferredIp = /held by|in use|already taken|already in use|out of range/i.test(msg);
                 if (!retryWithoutPreferredIp)
                     throw err;
-                this.logger.warn(`Preferred IP ${this.opts.preferredIp} not available (${msg}) — requesting any free IP`);
-                record = await this.tryRegister(myUserid, myAddress);
+                if (this.opts.config.keepConfiguredIp && this.opts.preferredIp) {
+                    this.logger.warn(`Preferred IP ${this.opts.preferredIp} not accepted (${msg}) — keeping it (dora.keepConfiguredIp); ` +
+                        `running unregistered on it and retrying the registration in the background`);
+                    keptConfiguredIp = true;
+                }
+                else {
+                    this.logger.warn(`Preferred IP ${this.opts.preferredIp} not available (${msg}) — requesting any free IP`);
+                    record = await this.tryRegister(myUserid, myAddress);
+                }
             }
-            this.allocatedIp = record.virtualIp;
-            this.registered = true;
-            this.logger.info(`Registered with dora: ${record.name} -> ${record.virtualIp}`);
+            if (record) {
+                this.allocatedIp = record.virtualIp;
+                this.registered = true;
+                this.logger.info(`Registered with dora: ${record.name} -> ${record.virtualIp}`);
+            }
+            else {
+                this.allocatedIp = this.opts.preferredIp;
+            }
+            const selfIp = record?.virtualIp ?? this.opts.preferredIp ?? "";
+            const selfName = record?.name ?? this.opts.nodeName;
             // Add self to the in-memory IPAM so the local DNS server can
             // answer `<my-name>.<domain>` queries from this very host.
             // mergeRosterIntoIpam skips own entry (sensible — peers don't
             // need to "auto-friend themselves"), but the DNS resolver
             // looks at the same IPAM, so without this entry `dig snoopy.
             // decent` from snoopy itself NXDOMAINs.
-            this.opts.ipam.assignPeer({
-                name: record.name,
-                carrierId: myUserid,
-                virtualIp: record.virtualIp,
-                services: [],
-            });
-            // Pull the full roster. We don't fail the whole bootstrap if
-            // list() throws — we still have our own address allocated.
-            try {
-                const roster = await this.client.list();
-                this.mergeRosterIntoIpam(roster, myUserid);
+            if (selfIp) {
+                this.opts.ipam.assignPeer({
+                    name: selfName,
+                    carrierId: myUserid,
+                    virtualIp: selfIp,
+                    services: [],
+                });
             }
-            catch (err) {
-                this.logger.warn(`Initial roster fetch failed: ${err}`);
+            // Pull the full roster and start the periodic refresh — once. The
+            // bootstrap retry re-enters this method every 30s while we are
+            // unregistered (keepConfiguredIp), and must not stack refresh timers.
+            if (!this.refreshTimer) {
+                // We don't fail the whole bootstrap if list() throws — we still
+                // have our own address.
+                try {
+                    const roster = await this.client.list();
+                    this.mergeRosterIntoIpam(roster, myUserid);
+                }
+                catch (err) {
+                    this.logger.warn(`Initial roster fetch failed: ${err}`);
+                }
+                const interval = this.opts.config.refreshIntervalMs ?? 60_000;
+                this.refreshTimer = setInterval(() => {
+                    this.refreshRoster(myUserid).catch((err) => {
+                        this.logger.debug(`Roster refresh: ${err}`);
+                    });
+                }, interval);
             }
-            // Start periodic refresh.
-            const interval = this.opts.config.refreshIntervalMs ?? 60_000;
-            this.refreshTimer = setInterval(() => {
-                this.refreshRoster(myUserid).catch((err) => {
-                    this.logger.debug(`Roster refresh: ${err}`);
-                });
-            }, interval);
-            return this.allocatedIp;
+            if (keptConfiguredIp)
+                this.scheduleBootstrapRetry();
+            return this.allocatedIp ?? "";
         }
         catch (err) {
             if (err instanceof AllRegistriesUnavailableError) {

package/dist/types.d.ts

@@ -204,6 +204,24 @@ export interface DoraConfig {
      *    friended on every refresh; everything else is left alone.
      */
     autoFriend?: "none" | "all" | string[];
+    /**
+     * Never let a registry move this node off `network.ip`.
+     *
+     * By default, when the preferred IP is rejected (collision, or "out of
+     * range" because the registry that owns its band did not answer in time),
+     * the daemon registers for ANY free IP and rebuilds the TUN on it. That is
+     * right for a throwaway node and catastrophic for one whose address is
+     * pinned elsewhere — an exit node listed by IP in every app, a server in
+     * someone's /etc/hosts. 2026-09-07: a routine restart moved the tokyo exit
+     * from 10.86.68.90 to 10.86.64.16 and gojipower from 10.86.166.16 to
+     * 10.86.192.10 this way.
+     *
+     * With `keepConfiguredIp: true` the daemon keeps `network.ip`, still
+     * pulls the roster (so `.decent` names resolve), and keeps retrying the
+     * preferred registration in the background until the owning registry
+     * accepts it. Set it on every node whose IP other things depend on.
+     */
+    keepConfiguredIp?: boolean;
 }
 export interface DecentAgentNetConfig {
     node: NodeConfig;

package/dist/ui/desktop/app.js

@@ -1,4 +1,4 @@
-window.__DK_UI_VERSION="0.1.299";
+window.__DK_UI_VERSION="0.1.301";
 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/package.json

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