@leofcoin/chain 1.10.6 → 1.10.7

package/exports/chain.js

@@ -1115,6 +1115,87 @@ class Jobber {
   }
 }
 
+const MAX_RESPONSE_DEPTH$1 = 3;
+const asLastBlockMessage = async (blockInput, claimedHash) => {
+  const block = new BlockMessage(blockInput);
+  const hash = await block.hash();
+  if (claimedHash && hash !== claimedHash) {
+    throw new Error(`lastBlock hash mismatch: expected ${claimedHash}, got ${hash}`);
+  }
+  return new LastBlockMessage({ hash, index: block.decoded.index });
+};
+const resolveLegacyHash = async (hash) => {
+  const blockData = await globalThis.peernet?.get?.(hash, "block");
+  if (!blockData) throw new Error(`unable to resolve lastBlock hash: ${hash}`);
+  return asLastBlockMessage(blockData, hash);
+};
+const resolveLastBlockMessage = async (result, depth = 0) => {
+  if (depth > MAX_RESPONSE_DEPTH$1) throw new Error("lastBlock response nesting exceeds limit");
+  if (result instanceof Uint8Array) {
+    let codec;
+    try {
+      codec = new Codec(result);
+    } catch {
+    }
+    if (codec) {
+      if (codec.name === "peernet-response") {
+        const ResponseMessage = globalThis.peernet?.protos?.["peernet-response"];
+        if (!ResponseMessage) throw new Error("peernet-response codec is not registered");
+        const wrapped = new ResponseMessage(result);
+        if (wrapped?.decoded?.response === void 0) throw new Error("peernet-response has no response payload");
+        return resolveLastBlockMessage(wrapped.decoded.response, depth + 1);
+      }
+      if (codec.name === "last-block-message") return new LastBlockMessage(result);
+      if (codec.name === "block-message") return asLastBlockMessage(result);
+    }
+    const candidate = new TextDecoder().decode(result);
+    if (candidate) return resolveLegacyHash(candidate);
+  }
+  if (typeof result === "string") return resolveLegacyHash(result);
+  if (result && typeof result === "object") {
+    const response = result.decoded?.response ?? result.response;
+    if (response !== void 0) return resolveLastBlockMessage(response, depth + 1);
+    if ("hash" in result && "index" in result) return new LastBlockMessage(result);
+    if ("previousHash" in result && "index" in result) return asLastBlockMessage(result);
+  }
+  throw new Error(`invalid lastBlock payload: ${typeof result}`);
+};
+
+const MAX_RESPONSE_DEPTH = 3;
+const decodeResponsePayload = async (result, depth = 0) => {
+  if (depth > MAX_RESPONSE_DEPTH) throw new Error("peernet response nesting exceeds limit");
+  if (result instanceof Uint8Array) {
+    let codec;
+    try {
+      codec = new Codec(result);
+    } catch {
+    }
+    if (codec?.name === "peernet-response") {
+      const ResponseMessage = globalThis.peernet?.protos?.["peernet-response"];
+      if (!ResponseMessage) throw new Error("peernet-response codec is not registered");
+      const wrapped = new ResponseMessage(result);
+      return decodeResponsePayload(wrapped.decoded.response, depth + 1);
+    }
+    try {
+      return JSON.parse(new TextDecoder().decode(result));
+    } catch {
+      return result;
+    }
+  }
+  if (result && typeof result === "object") {
+    const response = result.decoded?.response ?? result.response;
+    if (response !== void 0) return decodeResponsePayload(response, depth + 1);
+  }
+  if (typeof result === "string") {
+    try {
+      return JSON.parse(result);
+    } catch {
+      return result;
+    }
+  }
+  return result;
+};
+
 const debug$1 = createDebugger("leofcoin/state");
 class State extends Contract {
   constructor(config) {
@@ -1194,42 +1275,6 @@ 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;
   }
@@ -1674,21 +1719,9 @@ class State extends Contract {
         compatiblePeerCount += 1;
         const task = async () => {
           try {
-            let result = await peer.request(node.encoded);
+            const result = await peer.request(node.encoded);
             const resultType = result instanceof Uint8Array ? `bytes:${result.length}` : typeof result;
             debug$1(`lastBlock result type: ${resultType}`);
-            console.log({ result });
-            if (result instanceof Uint8Array) {
-              for (let i = 0; i < 3; i += 1) {
-                try {
-                  const wrapped = await new globalThis.peernet.protos["peernet-response"](result);
-                  if (wrapped?.decoded?.response === void 0) break;
-                  result = wrapped.decoded.response;
-                } catch {
-                  break;
-                }
-              }
-            }
             return { result, peer };
           } catch (error) {
             const peerId = peer?.peerId || peer?.id || peer?.address || "unknown";
@@ -1712,7 +1745,7 @@ class State extends Contract {
     console.log({ promises });
     promises = await Promise.all(
       promises.map(async (item) => ({
-        value: (await this.#resolveLastBlockMessage(item.value)).decoded,
+        value: (await resolveLastBlockMessage(item.value)).decoded,
         peer: item.peer
       }))
     );
@@ -1733,10 +1766,11 @@ class State extends Contract {
         });
         let node2 = await globalThis.peernet.prepareMessage(data2);
         try {
-          let message2 = await peer.request(node2.encoded);
-          message2 = await new globalThis.peernet.protos["peernet-response"](message2);
+          const message2 = await decodeResponsePayload(await peer.request(node2.encoded));
+          const blocks = message2?.blocks;
+          if (!Array.isArray(blocks)) throw new Error("knownBlocks response does not contain a blocks array");
           const MAX_WANTLIST_SIZE = 1e3;
-          const incoming = message2.decoded.response.blocks.filter((block) => !this.knownBlocks.includes(block));
+          const incoming = blocks.filter((block) => !this.knownBlocks.includes(block));
           const remaining = MAX_WANTLIST_SIZE - this.wantList.length;
           if (remaining > 0) this.wantList.push(...incoming.slice(0, remaining));
         } catch (error) {
@@ -1816,28 +1850,20 @@ class State extends Contract {
     this.#chainState = "loaded";
     return true;
   }
-  promiseRequests(promises) {
-    return new Promise(async (resolve, reject) => {
-      const timeout = setTimeout(() => {
-        resolve([{ index: 0, hash: "0x0" }]);
-        debug$1("sync timed out");
-      }, this.requestTimeout);
-      console.log({ promises });
-      promises = await Promise.allSettled(promises);
-      console.log({ promises });
-      promises = promises.filter(({ status }) => status === "fulfilled");
-      clearTimeout(timeout);
-      if (promises.length > 0) {
-        promises = promises.map(async ({ value }) => {
-          const node = await new globalThis.peernet.protos["peernet-response"](value.result);
-          return { value: node.decoded.response, peer: value.peer };
-        });
-        promises = await Promise.all(promises);
-        resolve(promises);
-      } else {
-        resolve([]);
-      }
-    });
+  async promiseRequests(promises) {
+    let timeout;
+    const settled = await Promise.race([
+      Promise.allSettled(promises),
+      new Promise((resolve) => {
+        timeout = setTimeout(() => resolve(null), this.requestTimeout);
+      })
+    ]);
+    clearTimeout(timeout);
+    if (settled === null) {
+      debug$1("sync timed out");
+      return [];
+    }
+    return settled.filter(({ status }) => status === "fulfilled").map(({ value }) => ({ value: value.result, peer: value.peer }));
   }
   get canSync() {
     if (this.#chainSyncing) return false;
@@ -2905,42 +2931,6 @@ 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)) {
@@ -3073,7 +3063,7 @@ class Chain extends VersionControl {
       if (lastBlockRaw === void 0 || lastBlockRaw === null) {
         throw new Error(`invalid lastBlock payload: ${typeof lastBlockRaw}`);
       }
-      const lastBlockMessage = await this.#resolveLastBlockMessage(lastBlockRaw);
+      const lastBlockMessage = await resolveLastBlockMessage(lastBlockRaw);
       console.log(lastBlockMessage);
       lastBlock = lastBlockMessage.decoded;
     } catch (error) {