@leofcoin/chain 1.9.15 → 1.9.17

package/exports/browser/chain.js

@@ -6302,36 +6302,6 @@ class Chain extends VersionControl {
     console.log("init");
     await super.init();
     console.log("super init done");
-    const peernetAny = globalThis.peernet;
-    if (typeof peernetAny.removePeer === "function" && !peernetAny.__chainRemovePeerGuardInstalled) {
-      const originalRemovePeer = peernetAny.removePeer.bind(peernetAny);
-      peernetAny.removePeer = async (peer) => {
-        if (!peer || typeof peer !== "object") {
-          debug("removePeer called with invalid peer (ignored)");
-          return;
-        }
-        const peerId = peer?.id || peer?.peerId;
-        if (!peerId || typeof peerId !== "string") {
-          debug("removePeer called with peer missing id (ignored)");
-          return;
-        }
-        const trackedPeers = Object.values(peernetAny.connections || {});
-        const isStillTracked = trackedPeers.some((trackedPeer) => {
-          const trackedId = trackedPeer?.id || trackedPeer?.peerId;
-          return trackedPeer === peer || trackedId === peerId;
-        });
-        if (!isStillTracked) {
-          debug(`removePeer called for unknown peer ${peerId} (ignored)`);
-          return;
-        }
-        try {
-          return await originalRemovePeer(peer);
-        } catch (error) {
-          debug("removePeer failed (ignored):", error?.message ?? error);
-        }
-      };
-      peernetAny.__chainRemovePeerGuardInstalled = true;
-    }
     this.#connectionMonitor.start(this.version);
     await globalThis.peernet.addRequestHandler("bw-request-message", () => {
       const bw = globalThis.peernet.client?.bw || { up: 0, down: 0 };
@@ -6395,10 +6365,41 @@ class Chain extends VersionControl {
     try {
       let response = await peer.request(node.encoded);
       response = await new globalThis.peernet.protos["peernet-response"](response);
-      if (!(response.decoded.response instanceof Uint8Array)) {
-        console.warn(`Deprecated: ${response.decoded.response} is not an Uint8Array`);
-      }
-      return response.decoded.response;
+      const normalizeResponse = async (payload) => {
+        if (payload && typeof payload === "object" && "response" in payload) {
+          return normalizeResponse(payload.response);
+        }
+        if (payload instanceof Uint8Array || typeof Buffer !== "undefined" && Buffer.isBuffer(payload)) {
+          let bytes = payload;
+          for (let i = 0; i < 3; i++) {
+            try {
+              const nested = await new globalThis.peernet.protos["peernet-response"](bytes);
+              payload = nested?.decoded?.response;
+              if (!(payload instanceof Uint8Array)) break;
+              bytes = payload;
+            } catch {
+              break;
+            }
+          }
+          if (payload instanceof Uint8Array) {
+            try {
+              return JSON.parse(new TextDecoder().decode(payload));
+            } catch {
+              return payload;
+            }
+          }
+          return payload;
+        }
+        if (typeof payload === "string") {
+          try {
+            return JSON.parse(payload);
+          } catch {
+            return payload;
+          }
+        }
+        return payload;
+      };
+      return await normalizeResponse(response.decoded.response);
     } catch (error) {
       const peerId = peer?.peerId || peer?.id || peer?.address || "unknown";
       debug(`peernet request failed: ${request} -> ${peerId}:`, error?.message ?? error);
@@ -6483,16 +6484,6 @@ class Chain extends VersionControl {
       debug(`peer not found: ${peerId}`);
       return;
     }
-    const peerAny = peer;
-    if (typeof peerAny.on === "function" && !peerAny.__chainErrorListenerInstalled) {
-      peerAny.on("error", async (error) => {
-        const reason = error?.message ?? String(error);
-        const peerName = peerAny?.peerId || peerAny?.id || peerAny?.address || peerId || "unknown";
-        debug(`peer error: ${peerName}:`, reason);
-        await this.#recordPeerFailure(peerId, `peer error: ${reason}`);
-      });
-      peerAny.__chainErrorListenerInstalled = true;
-    }
     if (!peer.version) {
       try {
         let versionResponse = await this.#makeRequest(peer, "version");

package/exports/chain.js

@@ -2525,36 +2525,6 @@ class Chain extends VersionControl {
     console.log("init");
     await super.init();
     console.log("super init done");
-    const peernetAny = globalThis.peernet;
-    if (typeof peernetAny.removePeer === "function" && !peernetAny.__chainRemovePeerGuardInstalled) {
-      const originalRemovePeer = peernetAny.removePeer.bind(peernetAny);
-      peernetAny.removePeer = async (peer) => {
-        if (!peer || typeof peer !== "object") {
-          debug("removePeer called with invalid peer (ignored)");
-          return;
-        }
-        const peerId = peer?.id || peer?.peerId;
-        if (!peerId || typeof peerId !== "string") {
-          debug("removePeer called with peer missing id (ignored)");
-          return;
-        }
-        const trackedPeers = Object.values(peernetAny.connections || {});
-        const isStillTracked = trackedPeers.some((trackedPeer) => {
-          const trackedId = trackedPeer?.id || trackedPeer?.peerId;
-          return trackedPeer === peer || trackedId === peerId;
-        });
-        if (!isStillTracked) {
-          debug(`removePeer called for unknown peer ${peerId} (ignored)`);
-          return;
-        }
-        try {
-          return await originalRemovePeer(peer);
-        } catch (error) {
-          debug("removePeer failed (ignored):", error?.message ?? error);
-        }
-      };
-      peernetAny.__chainRemovePeerGuardInstalled = true;
-    }
     this.#connectionMonitor.start(this.version);
     await globalThis.peernet.addRequestHandler("bw-request-message", () => {
       const bw = globalThis.peernet.client?.bw || { up: 0, down: 0 };
@@ -2618,10 +2588,41 @@ class Chain extends VersionControl {
     try {
       let response = await peer.request(node.encoded);
       response = await new globalThis.peernet.protos["peernet-response"](response);
-      if (!(response.decoded.response instanceof Uint8Array)) {
-        console.warn(`Deprecated: ${response.decoded.response} is not an Uint8Array`);
-      }
-      return response.decoded.response;
+      const normalizeResponse = async (payload) => {
+        if (payload && typeof payload === "object" && "response" in payload) {
+          return normalizeResponse(payload.response);
+        }
+        if (payload instanceof Uint8Array || typeof Buffer !== "undefined" && Buffer.isBuffer(payload)) {
+          let bytes = payload;
+          for (let i = 0; i < 3; i++) {
+            try {
+              const nested = await new globalThis.peernet.protos["peernet-response"](bytes);
+              payload = nested?.decoded?.response;
+              if (!(payload instanceof Uint8Array)) break;
+              bytes = payload;
+            } catch {
+              break;
+            }
+          }
+          if (payload instanceof Uint8Array) {
+            try {
+              return JSON.parse(new TextDecoder().decode(payload));
+            } catch {
+              return payload;
+            }
+          }
+          return payload;
+        }
+        if (typeof payload === "string") {
+          try {
+            return JSON.parse(payload);
+          } catch {
+            return payload;
+          }
+        }
+        return payload;
+      };
+      return await normalizeResponse(response.decoded.response);
     } catch (error) {
       const peerId = peer?.peerId || peer?.id || peer?.address || "unknown";
       debug(`peernet request failed: ${request} -> ${peerId}:`, error?.message ?? error);
@@ -2706,16 +2707,6 @@ class Chain extends VersionControl {
       debug(`peer not found: ${peerId}`);
       return;
     }
-    const peerAny = peer;
-    if (typeof peerAny.on === "function" && !peerAny.__chainErrorListenerInstalled) {
-      peerAny.on("error", async (error) => {
-        const reason = error?.message ?? String(error);
-        const peerName = peerAny?.peerId || peerAny?.id || peerAny?.address || peerId || "unknown";
-        debug(`peer error: ${peerName}:`, reason);
-        await this.#recordPeerFailure(peerId, `peer error: ${reason}`);
-      });
-      peerAny.__chainErrorListenerInstalled = true;
-    }
     if (!peer.version) {
       try {
         let versionResponse = await this.#makeRequest(peer, "version");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.9.15",
+  "version": "1.9.17",
   "description": "Official javascript implementation",
   "private": false,
   "exports": {