@decentnetwork/peer 0.1.26 → 0.1.28

package/dist/peer.js

@@ -551,7 +551,25 @@ export class Peer {
             if (this.#selfAnnouncePromise) {
                 await this.#selfAnnouncePromise.catch(() => { });
             }
-            await this.#announceSelfBestEffort(false, Date.now() + 4000);
+            // An onion friend-request only has a return path once OUR OWN announce
+            // has actually STORED on the DHT. The old code fired a single 4s
+            // best-effort announce and pushed on regardless — so a request sent
+            // before the announce propagated (right after join, DHT not yet settled)
+            // had nowhere for the reply to come back and silently failed. That, not
+            // Carrier, is why client→exit friend-requests never landed. Match the C
+            // SDK: keep announcing until at least one node stores us (up to ~8s)
+            // before sending. If it genuinely never stores, we fall through to the
+            // express fallback below — but normally it stores within a couple of
+            // seconds and the plain onion friend-request just works.
+            const announceDeadline = Date.now() + 8000;
+            while (this.#lastSelfAnnounceStoredCount === 0 &&
+                Date.now() < announceDeadline) {
+                await this.#announceSelfBestEffort(true, Math.min(Date.now() + 3000, announceDeadline));
+                if (this.#lastSelfAnnounceStoredCount > 0)
+                    break;
+                await sleep(500);
+            }
+            this.#debugLog(`friend-request: announce stored on ${this.#lastSelfAnnounceStoredCount} node(s) before send`);
             const appPayload = encodeFriendRequestPacket({
                 name: PEER_NICKNAME,
                 descr: PEER_STATUS_MESSAGE || "decent peer",
@@ -611,20 +629,33 @@ export class Peer {
                     errors.push(`${route.node.host}:${route.node.port} ${error.message}`);
                 }
             }
-            if (sent === 0) {
+            // Record locally so the connection loop keeps retrying, then ALWAYS
+            // queue via express — even when every onion send failed. Onion delivery
+            // is unreliable (broken DHT onion-announce), and the old code threw on
+            // `sent === 0` BEFORE this express fallback ran, so a friend-request to
+            // a peer with stale-but-dead onion routes was silently dropped: the node
+            // "sent" it, nothing reached the relay, the recipient never friended
+            // back, and the session could never bridge. That stranded 2nd/3rd exits.
+            this.#recordOutgoingFriendRequest(friendId, pubkey, friendAddress.nospam, hello);
+            let expressOk = false;
+            if (this.#express?.hasNodes()) {
+                try {
+                    await this.#express.sendOfflineFriendRequest(pubkey, appPayload);
+                    expressOk = true;
+                }
+                catch (error) {
+                    this.#debugLog(`offline friend request dispatch failed: ${error.message}`);
+                }
+            }
+            // Only a true failure if BOTH transports got nothing out.
+            if (sent === 0 && !expressOk) {
                 throw new Error(`friend request dispatch failed: ${errors.join("; ")}`);
             }
             this.#lastFriendRequestDispatch = {
-                transport: "onion",
+                transport: sent > 0 ? "onion" : "express",
                 routes: routes.length,
                 targets: sent
             };
-            this.#recordOutgoingFriendRequest(friendId, pubkey, friendAddress.nospam, hello);
-            if (this.#express?.hasNodes()) {
-                void this.#express.sendOfflineFriendRequest(pubkey, appPayload).catch((error) => {
-                    this.#debugLog(`offline friend request dispatch failed: ${error.message}`);
-                });
-            }
         }
         finally {
             resumeSelfAnnounce();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decentnetwork/peer",
-  "version": "0.1.26",
+  "version": "0.1.28",
   "description": "Pure TypeScript port of Elastos Carrier (toxcore-derived) P2P messaging. DHT, onion routing, TCP relay, FlatBuffers app payloads, Express offline relay. Wire-compatible with iOS Beagle and the Carrier C SDK.",
   "type": "module",
   "main": "./dist/index.js",