holepunch-hop 0.3.8 → 0.3.9

package/package.json

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

package/src/bees.js

@@ -504,7 +504,6 @@ class HyperBee extends EventEmitter {
   savePeer = async function (peerInfo) {
     await this.dbPeers.put(peerInfo.publickey, peerInfo)
     let checkSave = await this.getPeer(peerInfo.publickey)
-    console.log('save peer over---------')
     return checkSave
   }
 

package/src/index.js

@@ -319,21 +319,6 @@ class HolepunchWorker extends EventEmitter {
       // what type of data being shared?
       // check for data along with new peer?
       this.Peers.routeDataPath(data, peerDataExist)
-      /*
-      if (peerDataExist.data !== undefined) {
-        if (peerDataExist.data.type === 'private-chart') {
-          this.Peers.writeTonetworkData(data, peerDataExist.data)
-        } else if (peerDataExist.data.type === 'private-cue-space') {
-          this.Peers.writeToCueSpace(this.Peers.peerHolder[peerFirstID].publickey)
-        } else if (peerDataExist.data.type === 'public-n1-experiment') {
-          this.Peers.writeTonetworkData(data, peerDataExist.data)
-        } else if (peerDataExist.data.type === 'public-library') {
-          this.Peers.writeToPublicLibrary(data)
-        } else if (peerDataExist.data.type === 'text-message') {
-          // simpole text message
-          this.Peers.writeTonetwork(data)
-        }
-      } */
     }
   }
 

package/src/peers.js

@@ -82,8 +82,8 @@ class NetworkPeers extends EventEmitter {
     for (let sPeer of this.peerNetwork) {
       // sPeer.value.key = publicKeylive
       if (sPeer.value.settopic === true) {
-        // client role
-        this.topicConnect(sPeer.value.topic)
+        // client role  need to pass on peerUniqueID
+        this.topicConnect(sPeer.key, sPeer.value.topic)
       } else {
         // server role
         this.topicListen(sPeer.value.topic, sPeer.key)
@@ -100,8 +100,6 @@ class NetworkPeers extends EventEmitter {
     this.peerEstContext[pubKey] = established
   }
 
-  
-
   /**
    * connection listen
    * @method listenNetwork
@@ -493,13 +491,29 @@ class NetworkPeers extends EventEmitter {
         let discovery = this.swarm.status(noisePublicKey)
         let discoverTopic = discovery.topic.toString('hex')
         if (discoverTopic === topicH.topic) {
+          // do the peerid match?
           discovery.swarm.connections.forEach((value, key) => {
             checkDiscoveryTopic.server = value.publicKey.toString('hex')
             checkDiscoveryTopic.client = value.remotePublicKey.toString('hex')
             checkDiscoveryTopic.topic = discoverTopic
           })
+          if (checkDiscoveryTopic.client === topicH.peerKey) {
+            return checkDiscoveryTopic
+          } else {
+            if (checkDiscoveryTopic.topic === topicH.topic) {
+              return checkDiscoveryTopic
+            } else {
+              checkDiscoveryTopic.topic = ''
+            }
+        }
+        } else {
+          
         }
       }
+    } else {
+      checkDiscoveryTopic.server = '' 
+      checkDiscoveryTopic.client = ''
+      checkDiscoveryTopic.topic = ''
     }
     return checkDiscoveryTopic
   }
@@ -665,13 +679,13 @@ class NetworkPeers extends EventEmitter {
    * @method topicConnect
    *
   */
-  topicConnect = async function (topic) {
+  topicConnect = async function (peerID, topic) {
     // const noisePublicKey = Buffer.alloc(32).fill(topic) // A topic must be 32 bytes
     const noisePublicKey = Buffer.from(topic, 'hex') //  must be 32 bytes
     if (noisePublicKey.length === 32) {
       let topicKeylive = noisePublicKey.toString('hex')
       this.topicHolder[topic] = { role: 'server', livePubkey: this.swarm.keyPair.publicKey.toString('hex'), topic: topic, key: topicKeylive, timestamp: '' }
-      this.sendTopicHolder.push({ livePubkey: this.swarm.keyPair.publicKey.toString('hex'), topic: topic })
+      this.sendTopicHolder.push({ livePubkey: this.swarm.keyPair.publicKey.toString('hex'), peerKey: peerID, topic: topic })
       const peerConnect = this.swarm.join(noisePublicKey, { server: true, client: false })
       await peerConnect.flushed() // Waits for the topic to be fully announced on the DHT
     }