@gethashd/bytecave-browser 1.0.27 → 1.0.29

package/dist/{chunk-AETVOZYQ.js → chunk-CTI3NP4T.js}

@@ -5726,19 +5726,40 @@ var P2PProtocolClient = class {
         } catch (e) {
           console.warn("[ByteCave P2P] Could not get peer info from peerStore:", e);
         }
-        console.log("[ByteCave P2P] Step 2: Opening protocol stream on existing connection...");
+        console.log("[ByteCave P2P] Step 2: Checking if connection upgrade needed...");
         if (existingConns.length === 0) {
           throw new Error("No connection to peer - cannot open protocol stream");
         }
-        const connection = existingConns[0];
-        console.log("[ByteCave P2P] Using connection:", connection.remoteAddr.toString());
+        let connection = existingConns[0];
+        const isRelayCircuit = connection.remoteAddr.toString().includes("/p2p-circuit");
+        console.log("[ByteCave P2P] Connection type:", isRelayCircuit ? "relay circuit (limited)" : "direct");
+        console.log("[ByteCave P2P] Connection address:", connection.remoteAddr.toString());
+        if (isRelayCircuit) {
+          console.log("[ByteCave P2P] Waiting for DCUtR to upgrade relay circuit to direct WebRTC...");
+          const upgradeStart = Date.now();
+          const hasDirectConnection = await this.waitForDirectConnection(peerId, 5e3);
+          const upgradeDuration = Date.now() - upgradeStart;
+          if (!hasDirectConnection) {
+            console.error("[ByteCave P2P] DCUtR upgrade failed after", upgradeDuration, "ms");
+            throw new Error("Cannot use storage protocol - relay circuit upgrade to WebRTC failed");
+          }
+          console.log("[ByteCave P2P] DCUtR upgrade successful after", upgradeDuration, "ms");
+          const directConns = this.node.getConnections(peerIdObj);
+          const directConn = directConns.find((conn) => !conn.remoteAddr.toString().includes("/p2p-circuit"));
+          if (!directConn) {
+            throw new Error("DCUtR reported success but no direct connection found");
+          }
+          connection = directConn;
+          console.log("[ByteCave P2P] Using direct connection:", connection.remoteAddr.toString());
+        }
+        console.log("[ByteCave P2P] Step 3: Opening protocol stream...");
         const streamStart = Date.now();
         let stream;
         try {
           console.log("[ByteCave P2P] Calling connection.newStream with protocol /bytecave/store/1.0.0...");
           stream = await connection.newStream("/bytecave/store/1.0.0");
           const streamDuration = Date.now() - streamStart;
-          console.log("[ByteCave P2P] Step 3: Protocol stream opened in", streamDuration, "ms");
+          console.log("[ByteCave P2P] Step 4: Protocol stream opened in", streamDuration, "ms");
           console.log("[ByteCave P2P] Stream details:", {
             protocol: stream.protocol,
             direction: stream.direction,
@@ -6626,9 +6647,16 @@ Nonce: ${nonce}`;
       const peerInfo = this.knownPeers.get(peerId);
       const relayAddrs = peerInfo?.relayAddrs;
       if (relayAddrs && relayAddrs.length > 0 && this.node) {
-        console.log("[ByteCave] Dialing peer through relay:", peerId.slice(0, 12), relayAddrs[0]);
+        const webrtcRelayAddrs = relayAddrs.filter((addr) => addr.includes("/webrtc"));
+        const plainRelayAddrs = relayAddrs.filter((addr) => !addr.includes("/webrtc"));
+        const addrToUse = webrtcRelayAddrs.length > 0 ? webrtcRelayAddrs[0] : plainRelayAddrs[0];
+        console.log("[ByteCave] Dialing peer through relay:", peerId.slice(0, 12), {
+          webrtcAvailable: webrtcRelayAddrs.length,
+          plainAvailable: plainRelayAddrs.length,
+          using: addrToUse
+        });
         try {
-          const ma = multiaddr(relayAddrs[0]);
+          const ma = multiaddr(addrToUse);
           await this.node.dial(ma);
           console.log("[ByteCave] Successfully dialed peer through relay");
         } catch (dialError) {
@@ -6733,12 +6761,7 @@ Nonce: ${nonce}`;
       blobCount: announcement.blobCount,
       timestamp: announcement.timestamp,
       multiaddrs: announcement.multiaddrs,
-      relayAddrs: announcement.relayAddrs || existing?.relayAddrs,
-      // Store on-chain registration status
-      registeredOnChain: announcement.registeredOnChain || false,
-      onChainNodeId: announcement.onChainNodeId || existing?.onChainNodeId,
-      // Store relay flag
-      isRelay: announcement.isRelay || false
+      relayAddrs: announcement.relayAddrs || existing?.relayAddrs
     };
     this.knownPeers.set(announcement.peerId, peerInfo);
     this.emit("peerAnnounce", peerInfo);

package/dist/index.cjs

@@ -5794,19 +5794,40 @@ var P2PProtocolClient = class {
         } catch (e) {
           console.warn("[ByteCave P2P] Could not get peer info from peerStore:", e);
         }
-        console.log("[ByteCave P2P] Step 2: Opening protocol stream on existing connection...");
+        console.log("[ByteCave P2P] Step 2: Checking if connection upgrade needed...");
         if (existingConns.length === 0) {
           throw new Error("No connection to peer - cannot open protocol stream");
         }
-        const connection = existingConns[0];
-        console.log("[ByteCave P2P] Using connection:", connection.remoteAddr.toString());
+        let connection = existingConns[0];
+        const isRelayCircuit = connection.remoteAddr.toString().includes("/p2p-circuit");
+        console.log("[ByteCave P2P] Connection type:", isRelayCircuit ? "relay circuit (limited)" : "direct");
+        console.log("[ByteCave P2P] Connection address:", connection.remoteAddr.toString());
+        if (isRelayCircuit) {
+          console.log("[ByteCave P2P] Waiting for DCUtR to upgrade relay circuit to direct WebRTC...");
+          const upgradeStart = Date.now();
+          const hasDirectConnection = await this.waitForDirectConnection(peerId, 5e3);
+          const upgradeDuration = Date.now() - upgradeStart;
+          if (!hasDirectConnection) {
+            console.error("[ByteCave P2P] DCUtR upgrade failed after", upgradeDuration, "ms");
+            throw new Error("Cannot use storage protocol - relay circuit upgrade to WebRTC failed");
+          }
+          console.log("[ByteCave P2P] DCUtR upgrade successful after", upgradeDuration, "ms");
+          const directConns = this.node.getConnections(peerIdObj);
+          const directConn = directConns.find((conn) => !conn.remoteAddr.toString().includes("/p2p-circuit"));
+          if (!directConn) {
+            throw new Error("DCUtR reported success but no direct connection found");
+          }
+          connection = directConn;
+          console.log("[ByteCave P2P] Using direct connection:", connection.remoteAddr.toString());
+        }
+        console.log("[ByteCave P2P] Step 3: Opening protocol stream...");
         const streamStart = Date.now();
         let stream;
         try {
           console.log("[ByteCave P2P] Calling connection.newStream with protocol /bytecave/store/1.0.0...");
           stream = await connection.newStream("/bytecave/store/1.0.0");
           const streamDuration = Date.now() - streamStart;
-          console.log("[ByteCave P2P] Step 3: Protocol stream opened in", streamDuration, "ms");
+          console.log("[ByteCave P2P] Step 4: Protocol stream opened in", streamDuration, "ms");
           console.log("[ByteCave P2P] Stream details:", {
             protocol: stream.protocol,
             direction: stream.direction,
@@ -6679,9 +6700,16 @@ Nonce: ${nonce}`;
       const peerInfo = this.knownPeers.get(peerId);
       const relayAddrs = peerInfo?.relayAddrs;
       if (relayAddrs && relayAddrs.length > 0 && this.node) {
-        console.log("[ByteCave] Dialing peer through relay:", peerId.slice(0, 12), relayAddrs[0]);
+        const webrtcRelayAddrs = relayAddrs.filter((addr) => addr.includes("/webrtc"));
+        const plainRelayAddrs = relayAddrs.filter((addr) => !addr.includes("/webrtc"));
+        const addrToUse = webrtcRelayAddrs.length > 0 ? webrtcRelayAddrs[0] : plainRelayAddrs[0];
+        console.log("[ByteCave] Dialing peer through relay:", peerId.slice(0, 12), {
+          webrtcAvailable: webrtcRelayAddrs.length,
+          plainAvailable: plainRelayAddrs.length,
+          using: addrToUse
+        });
         try {
-          const ma = (0, import_multiaddr.multiaddr)(relayAddrs[0]);
+          const ma = (0, import_multiaddr.multiaddr)(addrToUse);
           await this.node.dial(ma);
           console.log("[ByteCave] Successfully dialed peer through relay");
         } catch (dialError) {
@@ -6786,12 +6814,7 @@ Nonce: ${nonce}`;
       blobCount: announcement.blobCount,
       timestamp: announcement.timestamp,
       multiaddrs: announcement.multiaddrs,
-      relayAddrs: announcement.relayAddrs || existing?.relayAddrs,
-      // Store on-chain registration status
-      registeredOnChain: announcement.registeredOnChain || false,
-      onChainNodeId: announcement.onChainNodeId || existing?.onChainNodeId,
-      // Store relay flag
-      isRelay: announcement.isRelay || false
+      relayAddrs: announcement.relayAddrs || existing?.relayAddrs
     };
     this.knownPeers.set(announcement.peerId, peerInfo);
     this.emit("peerAnnounce", peerInfo);

package/dist/index.js

@@ -13,7 +13,7 @@ import {
   useHashdImage,
   useHashdMedia,
   useHashdUrl
-} from "./chunk-AETVOZYQ.js";
+} from "./chunk-CTI3NP4T.js";
 import {
   clearHashdCache,
   createHashdUrl,

package/dist/react/index.cjs

@@ -6049,19 +6049,40 @@ var P2PProtocolClient = class {
         } catch (e) {
           console.warn("[ByteCave P2P] Could not get peer info from peerStore:", e);
         }
-        console.log("[ByteCave P2P] Step 2: Opening protocol stream on existing connection...");
+        console.log("[ByteCave P2P] Step 2: Checking if connection upgrade needed...");
         if (existingConns.length === 0) {
           throw new Error("No connection to peer - cannot open protocol stream");
         }
-        const connection = existingConns[0];
-        console.log("[ByteCave P2P] Using connection:", connection.remoteAddr.toString());
+        let connection = existingConns[0];
+        const isRelayCircuit = connection.remoteAddr.toString().includes("/p2p-circuit");
+        console.log("[ByteCave P2P] Connection type:", isRelayCircuit ? "relay circuit (limited)" : "direct");
+        console.log("[ByteCave P2P] Connection address:", connection.remoteAddr.toString());
+        if (isRelayCircuit) {
+          console.log("[ByteCave P2P] Waiting for DCUtR to upgrade relay circuit to direct WebRTC...");
+          const upgradeStart = Date.now();
+          const hasDirectConnection = await this.waitForDirectConnection(peerId, 5e3);
+          const upgradeDuration = Date.now() - upgradeStart;
+          if (!hasDirectConnection) {
+            console.error("[ByteCave P2P] DCUtR upgrade failed after", upgradeDuration, "ms");
+            throw new Error("Cannot use storage protocol - relay circuit upgrade to WebRTC failed");
+          }
+          console.log("[ByteCave P2P] DCUtR upgrade successful after", upgradeDuration, "ms");
+          const directConns = this.node.getConnections(peerIdObj);
+          const directConn = directConns.find((conn) => !conn.remoteAddr.toString().includes("/p2p-circuit"));
+          if (!directConn) {
+            throw new Error("DCUtR reported success but no direct connection found");
+          }
+          connection = directConn;
+          console.log("[ByteCave P2P] Using direct connection:", connection.remoteAddr.toString());
+        }
+        console.log("[ByteCave P2P] Step 3: Opening protocol stream...");
         const streamStart = Date.now();
         let stream;
         try {
           console.log("[ByteCave P2P] Calling connection.newStream with protocol /bytecave/store/1.0.0...");
           stream = await connection.newStream("/bytecave/store/1.0.0");
           const streamDuration = Date.now() - streamStart;
-          console.log("[ByteCave P2P] Step 3: Protocol stream opened in", streamDuration, "ms");
+          console.log("[ByteCave P2P] Step 4: Protocol stream opened in", streamDuration, "ms");
           console.log("[ByteCave P2P] Stream details:", {
             protocol: stream.protocol,
             direction: stream.direction,

package/dist/react/index.js

@@ -8,7 +8,7 @@ import {
   useHashdImage,
   useHashdMedia,
   useHashdUrl
-} from "../chunk-AETVOZYQ.js";
+} from "../chunk-CTI3NP4T.js";
 import "../chunk-EEZWRIUI.js";
 export {
   HashdAudio,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gethashd/bytecave-browser",
-  "version": "1.0.27",
+  "version": "1.0.29",
   "description": "ByteCave browser client for WebRTC P2P connections to storage nodes",
   "main": "dist/index.cjs",
   "module": "dist/index.js",

package/src/client.ts

@@ -750,10 +750,20 @@ Nonce: ${nonce}`;
       const relayAddrs = (peerInfo as any)?.relayAddrs;
       
       // If we have relay addresses, dial through relay first
+      // Prefer WebRTC circuit relay addresses for direct connections
       if (relayAddrs && relayAddrs.length > 0 && this.node) {
-        console.log('[ByteCave] Dialing peer through relay:', peerId.slice(0, 12), relayAddrs[0]);
+        const webrtcRelayAddrs = relayAddrs.filter((addr: string) => addr.includes('/webrtc'));
+        const plainRelayAddrs = relayAddrs.filter((addr: string) => !addr.includes('/webrtc'));
+        const addrToUse = webrtcRelayAddrs.length > 0 ? webrtcRelayAddrs[0] : plainRelayAddrs[0];
+        
+        console.log('[ByteCave] Dialing peer through relay:', peerId.slice(0, 12), {
+          webrtcAvailable: webrtcRelayAddrs.length,
+          plainAvailable: plainRelayAddrs.length,
+          using: addrToUse
+        });
+        
         try {
-          const ma = multiaddr(relayAddrs[0]);
+          const ma = multiaddr(addrToUse);
           await this.node.dial(ma as any);
           console.log('[ByteCave] Successfully dialed peer through relay');
         } catch (dialError) {
@@ -881,12 +891,7 @@ Nonce: ${nonce}`;
       blobCount: announcement.blobCount,
       timestamp: announcement.timestamp,
       multiaddrs: announcement.multiaddrs,
-      relayAddrs: announcement.relayAddrs || (existing as any)?.relayAddrs,
-      // Store on-chain registration status
-      registeredOnChain: announcement.registeredOnChain || false,
-      onChainNodeId: announcement.onChainNodeId || (existing as any)?.onChainNodeId,
-      // Store relay flag
-      isRelay: announcement.isRelay || false
+      relayAddrs: announcement.relayAddrs || (existing as any)?.relayAddrs
     };
 
     this.knownPeers.set(announcement.peerId, peerInfo);

package/src/p2p-protocols.ts

@@ -148,24 +148,51 @@ export class P2PProtocolClient {
           console.warn('[ByteCave P2P] Could not get peer info from peerStore:', e);
         }
         
-        // Step 2: Open protocol stream on existing connection (relay circuits require explicit stream creation)
-        console.log('[ByteCave P2P] Step 2: Opening protocol stream on existing connection...');
+        // Step 2: Wait for connection upgrade from limited relay circuit to full WebRTC
+        console.log('[ByteCave P2P] Step 2: Checking if connection upgrade needed...');
         
         if (existingConns.length === 0) {
           throw new Error('No connection to peer - cannot open protocol stream');
         }
         
-        const connection = existingConns[0]; // Use first available connection
-        console.log('[ByteCave P2P] Using connection:', connection.remoteAddr.toString());
+        let connection = existingConns[0];
+        const isRelayCircuit = connection.remoteAddr.toString().includes('/p2p-circuit');
+        console.log('[ByteCave P2P] Connection type:', isRelayCircuit ? 'relay circuit (limited)' : 'direct');
+        console.log('[ByteCave P2P] Connection address:', connection.remoteAddr.toString());
         
+        // If it's a relay circuit, wait for DCUtR to upgrade to direct WebRTC
+        if (isRelayCircuit) {
+          console.log('[ByteCave P2P] Waiting for DCUtR to upgrade relay circuit to direct WebRTC...');
+          const upgradeStart = Date.now();
+          const hasDirectConnection = await this.waitForDirectConnection(peerId, 5000);
+          const upgradeDuration = Date.now() - upgradeStart;
+          
+          if (!hasDirectConnection) {
+            console.error('[ByteCave P2P] DCUtR upgrade failed after', upgradeDuration, 'ms');
+            throw new Error('Cannot use storage protocol - relay circuit upgrade to WebRTC failed');
+          }
+          
+          console.log('[ByteCave P2P] DCUtR upgrade successful after', upgradeDuration, 'ms');
+          
+          // Get the new direct connection
+          const directConns = this.node!.getConnections(peerIdObj);
+          const directConn = directConns.find(conn => !conn.remoteAddr.toString().includes('/p2p-circuit'));
+          if (!directConn) {
+            throw new Error('DCUtR reported success but no direct connection found');
+          }
+          connection = directConn;
+          console.log('[ByteCave P2P] Using direct connection:', connection.remoteAddr.toString());
+        }
+        
+        // Step 3: Open protocol stream on the connection
+        console.log('[ByteCave P2P] Step 3: Opening protocol stream...');
         const streamStart = Date.now();
         let stream;
         try {
-          // Open a new stream on the existing connection with the protocol
           console.log('[ByteCave P2P] Calling connection.newStream with protocol /bytecave/store/1.0.0...');
           stream = await connection.newStream('/bytecave/store/1.0.0');
           const streamDuration = Date.now() - streamStart;
-          console.log('[ByteCave P2P] Step 3: Protocol stream opened in', streamDuration, 'ms');
+          console.log('[ByteCave P2P] Step 4: Protocol stream opened in', streamDuration, 'ms');
           console.log('[ByteCave P2P] Stream details:', {
             protocol: stream.protocol,
             direction: stream.direction,