@decentnetwork/peer 0.1.7 → 0.1.9

package/dist/peer.js

@@ -1915,6 +1915,27 @@ export class Peer {
             .sort((a, b) => this.#nodeScore(`${b.host}:${b.port}`) - this.#nodeScore(`${a.host}:${a.port}`))
             .slice(0, MAX_SELF_ANNOUNCE_TARGETS);
         const zeroPing = new Uint8Array(32);
+        // Fresh ephemeral keypair for THIS announce sweep. Matches toxcore
+        // onion_client.c::do_announce which uses Onion_Client.temp_*_key
+        // — a per-client ephemeral pair regenerated on each round — as the
+        // announce sender, NOT the real identity key.
+        //
+        // The bug we just hit: before this fix, runSelfAnnounce used
+        // this.#keyPair (real identity) as both senderPublicKey AND
+        // searchPublicKey. Bootstrap nodes reject `isStored=2` when
+        // sender == search because the protocol's slot-allocation assumes
+        // the announcing party can be revoked by knowing the secret of
+        // the sender pubkey; if that's our long-lived identity, every
+        // bootstrap conservatively refuses. Observed in the wild as
+        // selfAnnounceStoredOn=0 across 9 bootstrap nodes on both a
+        // public-IP VPS and a NAT'd Mac — identical zero, not an
+        // environmental issue.
+        //
+        // searchPublicKey stays as our real identity (so peers querying
+        // for our pubkey find this slot). dataPublicKey also stays as
+        // #announceDataKey.publicKey (so peers can encrypt onion-data
+        // requests to us). Only the sender envelope rotates.
+        const announceSender = createEphemeralKeyPair();
         const candidates = [];
         for (const node of targets) {
             if (!node.pk)
@@ -1936,9 +1957,17 @@ export class Peer {
         // stabilize self-announce in ~10s on a healthy network. Old serial
         // walk took (per-node-timeout × N targets × 2 steps) ≈ 16 × 5s × 2
         // = 160s worst case before a single isStored=2 response.
+        // Reset counter at start so dhtHealth can distinguish "never ran" (-1)
+        // from "ran but stored on 0 nodes" (0). The latter means our UDP
+        // path is reaching bootstrap nodes but they're refusing to store
+        // us — that's a wire-level problem (auth, network) we want to see.
+        this.#lastSelfAnnounceStoredCount = 0;
         for (let i = 0; i < candidates.length; i += SELF_ANNOUNCE_BATCH_SIZE) {
             if (Date.now() >= deadlineMs) {
                 this.#debugLog("self announce stopped at deadline");
+                // Even on early return, the count is live: storedNodes is what
+                // we got so far.
+                this.#lastSelfAnnounceStoredCount = storedNodes.length;
                 return storedNodes;
             }
             const wave = candidates.slice(i, i + SELF_ANNOUNCE_BATCH_SIZE);
@@ -1946,8 +1975,8 @@ export class Peer {
             const step1Settled = await Promise.allSettled(wave.map((c) => this.#sendAnnounceAndWait({
                 node: c.node,
                 nodePublicKey: c.nodePk,
-                senderPublicKey: this.#keyPair.publicKey,
-                senderSecretKey: this.#keyPair.secretKey,
+                senderPublicKey: announceSender.publicKey,
+                senderSecretKey: announceSender.secretKey,
                 pingId: zeroPing,
                 searchPublicKey: this.#keyPair.publicKey,
                 dataPublicKey: this.#announceDataKey.publicKey,
@@ -1970,8 +1999,12 @@ export class Peer {
             const step2Settled = await Promise.allSettled(step1Hits.map(({ c, resp1 }) => this.#sendAnnounceAndWait({
                 node: c.node,
                 nodePublicKey: c.nodePk,
-                senderPublicKey: this.#keyPair.publicKey,
-                senderSecretKey: this.#keyPair.secretKey,
+                // Step2 MUST be re-encrypted to the bootstrap by the SAME
+                // ephemeral sender that step1 used — bootstrap matches the
+                // ping_id against the sender envelope of the request that
+                // issued it. Use the same announceSender as step1.
+                senderPublicKey: announceSender.publicKey,
+                senderSecretKey: announceSender.secretKey,
                 pingId: resp1.pingOrDataPublicKey,
                 searchPublicKey: this.#keyPair.publicKey,
                 dataPublicKey: this.#announceDataKey.publicKey,
@@ -1989,6 +2022,9 @@ export class Peer {
                 }
                 if (final.isStored === 2) {
                     storedNodes.push(c.node);
+                    // Keep dhtHealth.selfAnnounceStoredOn live within the loop,
+                    // not just at the end, so we see growth in real time.
+                    this.#lastSelfAnnounceStoredCount = storedNodes.length;
                 }
                 const discovered = parsePackedNodes(final.nodes);
                 if (discovered.length > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decentnetwork/peer",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "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",