holepunch-hop 0.3.5 → 0.3.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "holepunch-hop",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "description": "data interface to HOP",
   "main": "src/index.js",
   "type": "module",

package/src/bees.js

@@ -350,7 +350,7 @@ class HyperBee extends EventEmitter {
     let cuesData = []
     for await (const { key, value } of cuesHistory) {
       cuesData.push({ key, value })
-    }    
+    }
     return cuesData
   }
 
@@ -541,7 +541,7 @@ class HyperBee extends EventEmitter {
     let cuesData = []
     for await (const { key, value } of cuesHistory) {
       cuesData.push({ key, value })
-    }    
+    }
     return cuesData
   }
 

package/src/index.js

@@ -249,13 +249,26 @@ class HolepunchWorker extends EventEmitter {
         // from peer generating the invite
         this.Peers.setRole({ pubkey: message.data.publickey, codename: message.data.codename, name: message.data.name })
       } else if (message.task === 'cue-space') {
-        this.Peers.peerAlreadyJoinSetData(message.data)
-        let peerActionData = this.Peers.peerHolder[message.data.publickey]
-        this.Peers.routeDataPath(reEstablishShort.peer.value.livePeerkey, peerActionData.data)
+          // first time or turning
+        if (Object.keys(reEstablishShort.peer).length === 0) {
+          this.Peers.peerAlreadyJoinSetData(message.data)
+          let peerActionData = this.Peers.peerHolder[message.data.publickey]
+          this.Peers.routeDataPath(message.data.publickey, peerActionData.data)
+        } else {
+          this.Peers.peerAlreadyJoinSetData(message.data)
+          let peerActionData = this.Peers.peerHolder[message.data.publickey]
+          this.Peers.routeDataPath(reEstablishShort.peer.value.livePeerkey, peerActionData.data)
+        }
       } else if (message.task === 'public-n1-experiment') {
-        this.Peers.peerAlreadyJoinSetData(message.data)
-        let peerActionData = this.Peers.peerHolder[message.data.publickey]
-        this.Peers.routeDataPath(reEstablishShort.peer.value.livePeerkey, peerActionData.data)
+        if (Object.keys(reEstablishShort.peer).length === 0) {
+          this.Peers.peerAlreadyJoinSetData(message.data)
+          let peerActionData = this.Peers.peerHolder[message.data.publickey]
+          this.Peers.routeDataPath(message.data.publickey, peerActionData.data)
+        } else {
+          this.Peers.peerAlreadyJoinSetData(message.data)
+          let peerActionData = this.Peers.peerHolder[message.data.publickey]
+          this.Peers.routeDataPath(reEstablishShort.peer.value.livePeerkey, peerActionData.data)
+        }
       }
     }
   }
@@ -421,4 +434,4 @@ class HolepunchWorker extends EventEmitter {
 
 }
 
-export default HolepunchWorker
+export default HolepunchWorker

package/src/peers.js

@@ -78,7 +78,9 @@ class NetworkPeers extends EventEmitter {
    *
   */
   setupConnectionBegin = function (peerNetwork) {
-    for (let sPeer of peerNetwork) {
+    this.peerNetwork = peerNetwork
+    for (let sPeer of this.peerNetwork) {
+      // sPeer.value.key = publicKeylive
       if (sPeer.value.settopic === true) {
         // client role
         this.topicConnect(sPeer.value.topic)
@@ -107,8 +109,6 @@ class NetworkPeers extends EventEmitter {
   */
   listenNetwork = function  () {
     this.swarm.on('connection', (conn, info) => {
-      // console.log('peerinfo FIRST------------')
-      // console.log(info)
       // save peer connection instance for ongoing communication
       // listen for replication  NEED UPTATED LOGIC
       this.store.replicate(conn)
@@ -176,10 +176,11 @@ class NetworkPeers extends EventEmitter {
 
         if (serverStatus === true) {
           // set to live
+          // update livePeerkey to true?? 
           let originalKey = ''
           for (let savePeer of this.peerNetwork) {
             if (savePeer.value.topic === topicServer.topic) {
-              originalKey = savePeer.value.publickey    
+              originalKey = savePeer.value.publickey  
             }
           }
           // need original connection public key
@@ -379,14 +380,19 @@ class NetworkPeers extends EventEmitter {
   * 
   */
   inviteDecoded = function (invite) {
-    let splitInvite = invite.publickey.split('-')
-    if (splitInvite.length === 1) {
-      splitInvite = []
+    const [prefix, hexString] = invite.publickey.split(':')
+    let splitInvite = []
+    if (prefix === 'hop') {
+      const next32Bytes = hexString.slice(0, 64)
+      const remainder = hexString.slice(64)
       splitInvite.push('hop')
-      splitInvite.push(invite.publickey)
-      splitInvite.push(invite.codename)
+      splitInvite.push(next32Bytes)
+      splitInvite.push(remainder)
     } else {
       // first time split fine
+      splitInvite.push('hop')
+      splitInvite.push(invite.publickey)
+      splitInvite.push(invite.codename)
     }
     return splitInvite
   }