@leofcoin/chain 1.9.22 → 1.9.25

package/exports/browser/{browser-FVp_QbaL-C-GWIuv6.js → browser-DEjI2nFg-CL-zDjzl.js}

@@ -1,4 +1,4 @@
-import { g as getDefaultExportFromCjs } from './node-browser-Dc4HZiX0.js';
+import { g as getDefaultExportFromCjs } from './node-browser-Cdgaf6tz.js';
 import 'crypto';
 import './constants-COpvMqFX.js';
 

package/exports/browser/{browser-8BFql6K9-BMXXABIY.js → browser-tK3uOLQV-CtcRBohi.js}

@@ -1,4 +1,4 @@
-import { g as getDefaultExportFromCjs } from './node-browser-Dc4HZiX0.js';
+import { g as getDefaultExportFromCjs } from './node-browser-Cdgaf6tz.js';
 import 'crypto';
 import './constants-COpvMqFX.js';
 

package/exports/browser/chain.js

@@ -2473,6 +2473,11 @@ function requireRange () {
 
 	const isX = id => !id || id.toLowerCase() === 'x' || id === '*';
 
+	const invalidXRangeOrder = (M, m, p) => (
+	  (isX(M) && !isX(m)) ||
+	  (isX(m) && p && !isX(p))
+	);
+
 	// ~, ~> --> * (any, kinda silly)
 	// ~2, ~2.x, ~2.x.x, ~>2, ~>2.x ~>2.x.x --> >=2.0.0 <3.0.0-0
 	// ~2.0, ~2.0.x, ~>2.0, ~>2.0.x --> >=2.0.0 <2.1.0-0
@@ -2490,6 +2495,10 @@ function requireRange () {
 
 	const replaceTilde = (comp, options) => {
 	  const r = options.loose ? re[t.TILDELOOSE] : re[t.TILDE];
+	  // if we're including prereleases in the match, then the lower bound is
+	  // -0, the lowest possible prerelease value, just like x-ranges and carets.
+	  // this keeps `~1.2` equivalent to the `1.2.x` x-range it's documented as.
+	  const z = options.includePrerelease ? '-0' : '';
 	  return comp.replace(r, (_, M, m, p, pr) => {
 	    debug('tilde', comp, _, M, m, p, pr);
 	    let ret;
@@ -2497,10 +2506,10 @@ function requireRange () {
 	    if (isX(M)) {
 	      ret = '';
 	    } else if (isX(m)) {
-	      ret = `>=${M}.0.0 <${+M + 1}.0.0-0`;
+	      ret = `>=${M}.0.0${z} <${+M + 1}.0.0-0`;
 	    } else if (isX(p)) {
 	      // ~1.2 == >=1.2.0 <1.3.0-0
-	      ret = `>=${M}.${m}.0 <${M}.${+m + 1}.0-0`;
+	      ret = `>=${M}.${m}.0${z} <${M}.${+m + 1}.0-0`;
 	    } else if (pr) {
 	      debug('replaceTilde pr', pr);
 	      ret = `>=${M}.${m}.${p}-${pr
@@ -2569,10 +2578,10 @@ function requireRange () {
 	      if (M === '0') {
 	        if (m === '0') {
 	          ret = `>=${M}.${m}.${p
-	          }${z} <${M}.${m}.${+p + 1}-0`;
+	          } <${M}.${m}.${+p + 1}-0`;
 	        } else {
 	          ret = `>=${M}.${m}.${p
-	          }${z} <${M}.${+m + 1}.0-0`;
+	          } <${M}.${+m + 1}.0-0`;
 	        }
 	      } else {
 	        ret = `>=${M}.${m}.${p
@@ -2598,6 +2607,10 @@ function requireRange () {
 	  const r = options.loose ? re[t.XRANGELOOSE] : re[t.XRANGE];
 	  return comp.replace(r, (ret, gtlt, M, m, p, pr) => {
 	    debug('xRange', comp, ret, gtlt, M, m, p, pr);
+	    if (invalidXRangeOrder(M, m, p)) {
+	      return comp
+	    }
+
 	    const xM = isX(M);
 	    const xm = xM || isX(m);
 	    const xp = xm || isX(p);
@@ -4947,6 +4960,42 @@ class State extends Contract {
   get resolving() {
     return this.#resolving;
   }
+  async #resolveLastBlockMessage(result) {
+    if (result instanceof Uint8Array) {
+      try {
+        let payload = result;
+        for (let i = 0; i < 3; i += 1) {
+          try {
+            const wrapped = await new globalThis.peernet.protos["peernet-response"](payload);
+            if (wrapped?.decoded?.response === void 0) break;
+            payload = wrapped.decoded.response;
+          } catch {
+            break;
+          }
+        }
+        if (payload !== result) return this.#resolveLastBlockMessage(payload);
+        return new LastBlockMessage(result);
+      } catch {
+        const candidate = new TextDecoder().decode(result);
+        if (candidate) {
+          const blockData = await globalThis.peernet.get(candidate, "block");
+          if (blockData) return new BlockMessage(blockData);
+        }
+      }
+    }
+    if (typeof result === "string") {
+      const blockData = await globalThis.peernet.get(result, "block");
+      if (blockData) return new BlockMessage(blockData);
+    }
+    if (result && typeof result === "object") {
+      const response = result.decoded?.response ?? result.response;
+      if (response !== void 0) return this.#resolveLastBlockMessage(response);
+      if ("hash" in result && "index" in result) {
+        return new LastBlockMessage(result);
+      }
+    }
+    throw new Error(`invalid lastBlock payload: ${typeof result}`);
+  }
   get contracts() {
     return this.#machine.contracts;
   }
@@ -5386,7 +5435,7 @@ class State extends Contract {
                 }
               }
             }
-            return { result: new LastBlockMessage(result), peer };
+            return { result, peer };
           } catch (error) {
             const peerId = peer?.peerId || peer?.id || peer?.address || "unknown";
             debug$1(`lastBlock request failed: ${peerId}:`, error?.message ?? error);
@@ -5407,6 +5456,12 @@ class State extends Contract {
       throw new ResolveError("latestBlock: no responses from compatible peers");
     }
     console.log({ promises });
+    promises = await Promise.all(
+      promises.map(async (item) => ({
+        value: (await this.#resolveLastBlockMessage(item.value)).decoded,
+        peer: item.peer
+      }))
+    );
     let latest = { index: 0, hash: "0x0", previousHash: "0x0" };
     promises = promises.sort((a, b) => b.index - a.index);
     if (promises.length > 0) latest = promises[0].value;
@@ -6453,6 +6508,42 @@ class Chain extends VersionControl {
       throw error;
     }
   }
+  async #resolveLastBlockMessage(result) {
+    if (result instanceof Uint8Array) {
+      try {
+        let payload = result;
+        for (let i = 0; i < 3; i += 1) {
+          try {
+            const wrapped = await new globalThis.peernet.protos["peernet-response"](payload);
+            if (wrapped?.decoded?.response === void 0) break;
+            payload = wrapped.decoded.response;
+          } catch {
+            break;
+          }
+        }
+        if (payload !== result) return this.#resolveLastBlockMessage(payload);
+        return new LastBlockMessage(result);
+      } catch {
+        const candidate = new TextDecoder().decode(result);
+        if (candidate) {
+          const blockData = await globalThis.peernet.get(candidate, "block");
+          if (blockData) return new BlockMessage(blockData);
+        }
+      }
+    }
+    if (typeof result === "string") {
+      const blockData = await globalThis.peernet.get(result, "block");
+      if (blockData) return new BlockMessage(blockData);
+    }
+    if (result && typeof result === "object") {
+      const response = result.decoded?.response ?? result.response;
+      if (response !== void 0) return this.#resolveLastBlockMessage(response);
+      if ("hash" in result && "index" in result) {
+        return new LastBlockMessage(result);
+      }
+    }
+    throw new Error(`invalid lastBlock payload: ${typeof result}`);
+  }
   async #decodeKnownBlocksResponse(response) {
     if (!response) return null;
     if (Array.isArray(response)) {
@@ -6578,11 +6669,12 @@ class Chain extends VersionControl {
       console.log(await this.lastBlock);
       const lastBlockRaw = await this.#makeRequest(peer, "lastBlock");
       console.log("raw last block response:", lastBlockRaw);
-      if (lastBlockRaw === void 0 || lastBlockRaw === null || typeof lastBlockRaw !== "object" && !(lastBlockRaw instanceof Uint8Array)) {
+      if (lastBlockRaw === void 0 || lastBlockRaw === null) {
         throw new Error(`invalid lastBlock payload: ${typeof lastBlockRaw}`);
       }
-      console.log(new LastBlockMessage(lastBlockRaw));
-      lastBlock = new LastBlockMessage(lastBlockRaw).decoded;
+      const lastBlockMessage = await this.#resolveLastBlockMessage(lastBlockRaw);
+      console.log(lastBlockMessage);
+      lastBlock = lastBlockMessage.decoded;
     } catch (error) {
       const peerName = peer?.peerId || peer?.id || peer?.address || peerId || "unknown";
       debug(`lastBlock request failed: ${peerName}:`, error?.message ?? error);

package/exports/browser/{client-lPe0SUWx-DwxXCP5p.js → client-Ba1cHcxF-B4lH2-fQ.js}

@@ -1,4 +1,4 @@
-import { i as inflate_1, c as createDebugger, d as deflate_1, L as LittlePubSub } from './node-browser-Dc4HZiX0.js';
+import { i as inflate_1, c as createDebugger, d as deflate_1, L as LittlePubSub } from './node-browser-Cdgaf6tz.js';
 import 'crypto';
 import './constants-COpvMqFX.js';
 
@@ -231,7 +231,7 @@ class SocketRequestClient {
             const init = async () => {
                 // @ts-ignore
                 if (!globalThis.WebSocket && !this.#experimentalWebsocket)
-                    globalThis.WebSocket = (await import('./browser-8BFql6K9-BMXXABIY.js').then(function (n) { return n.b; })).default.w3cwebsocket;
+                    globalThis.WebSocket = (await import('./browser-tK3uOLQV-CtcRBohi.js').then(function (n) { return n.b; })).default.w3cwebsocket;
                 const client = new WebSocket(this.#url, this.#protocol);
                 if (this.#experimentalWebsocket) {
                     client.addEventListener('error', this.onerror);
@@ -1302,7 +1302,7 @@ class Client {
         }
     }
     async #loadNodeWebrtcImplementation() {
-        const koushWrtcModule = await import('./browser-FVp_QbaL-C-GWIuv6.js').then(function (n) { return n.b; });
+        const koushWrtcModule = await import('./browser-DEjI2nFg-CL-zDjzl.js').then(function (n) { return n.b; });
         const koushWrtc = koushWrtcModule.default;
         if (!isWrtcImplementation(koushWrtc)) {
             throw new Error('@koush/wrtc does not match required wrtc contract');
@@ -1853,14 +1853,15 @@ class Client {
         return peer;
     };
     #peerJoined = async ({ peerId, version, transport }, star) => {
-        // check if peer rejoined before the previous connection closed
-        if (this.#connections[peerId]) {
-            this.#connections[peerId].destroy();
-            delete this.#connections[peerId];
-        }
         if (this.peerId === peerId)
             return;
-        this.#startPeerTransportAttempt(peerId, star, version, true, transport);
+        // Stars can announce the same peer more than once while its transport is
+        // still negotiating. Keep that connection/attempt alive; destroying it
+        // here makes simultaneous joins continually reset each other.
+        // Both sides receive the discovery event. Elect exactly one offerer so
+        // simultaneous joins do not create competing channels/SDP negotiations.
+        const initiator = String(this.peerId) < String(peerId);
+        this.#startPeerTransportAttempt(peerId, star, version, initiator, transport);
         debug(`peer ${peerId} joined`);
     };
     #inComingSignal = async ({ from, signal, channelName, version }, star) => {
@@ -1926,12 +1927,16 @@ class Client {
         });
     };
     #peerClose = (peer) => {
+        // A failed transport can finish closing after fallback has already placed a
+        // replacement in the connection map. Never let that stale close delete or
+        // advance the replacement's active attempt.
+        if (this.#connections[peer.peerId] !== peer) {
+            debug(`ignored stale close for ${peer.peerId}`);
+            return;
+        }
         const wasConnected = peer.connected;
         this.#peerTransportKinds.delete(peer.peerId);
-        if (this.#connections[peer.peerId]) {
-            peer.destroy();
-            delete this.#connections[peer.peerId];
-        }
+        delete this.#connections[peer.peerId];
         if (!wasConnected && this.#peerTransportAttempts.has(peer.peerId)) {
             this.#advanceTransportAttempt(peer.peerId);
         }

package/exports/browser/{index-D6qd-AUn-cJS9xh8w.js → index-DIhxISkU-Bdapw5qM.js}

@@ -1,4 +1,4 @@
-import { M as MultiWallet, e as encrypt, b as base58$1 } from './node-browser-Dc4HZiX0.js';
+import { M as MultiWallet, e as encrypt, b as base58$1 } from './node-browser-Cdgaf6tz.js';
 import 'crypto';
 import './constants-COpvMqFX.js';
 

package/exports/browser/{messages-BfDvXW-x-BaHit_or.js → messages-BX59GgBQ-DVjVrJBf.js}

@@ -1,4 +1,4 @@
-import { F as FormatInterface } from './node-browser-Dc4HZiX0.js';
+import { F as FormatInterface } from './node-browser-Cdgaf6tz.js';
 import 'crypto';
 import './constants-COpvMqFX.js';