holepunch-hop 0.3.8 → 0.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "holepunch-hop",
-  "version": "0.3.8",
+  "version": "0.4.0",
   "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
   }
 
@@ -876,7 +875,7 @@ class HyperBee extends EventEmitter {
   */
   replicatePubliclibrary = async function (dataIn) {
     // create or get the hypercore using the public key supplied as command-line argument
-    const coreRep = this.store.get({ key: b4a.from(dataIn.data.datastores, 'hex') })
+    const coreRep = this.store.get({ key: b4a.from(dataIn.data.data.datastores, 'hex') })
 
     // create a hyperbee instance using the hypercore instance
     const beePlib = new Hyperbee(coreRep, {
@@ -896,7 +895,7 @@ class HyperBee extends EventEmitter {
     await coreRep.update()
 
     // if provided with specific boarnxp key then just get the contract, extract module contracts and get those contracts and then inform the peer and save to their public library
-    const boardNXPcontract = await beePlib.get(dataIn.data.boardID)
+    const boardNXPcontract = await beePlib.get(dataIn.data.data.boardID)
     let unString = JSON.parse(boardNXPcontract.value)
     let moduleContracts = []
     for (let mod of unString.modules) {
@@ -935,8 +934,8 @@ class HyperBee extends EventEmitter {
       holderConfirm.boardNXP = [boardNXPcontract]
       holderConfirm.modules = moduleContracts
       holderConfirm.refcontracts = referenceContracts
-      this.confirmPubLibList[dataIn.data.datastores] = holderConfirm
-      this.emit('publibbeebee-notification', dataIn.data)
+      this.confirmPubLibList[dataIn.data.data.datastores] = holderConfirm
+      this.emit('publibbeebee-notification', dataIn)
     }
     // or
     // now ask for whole of public library

package/src/index.js

@@ -52,6 +52,16 @@ class HolepunchWorker extends EventEmitter {
     // make replication possible
     this.swarm.on('connection', conn => this.store.replicate(conn))
     goodbye(() => this.swarm.destroy())
+
+    this.swarm.on('update', () => {
+      // this.Peers.updateListen(data)
+      console.log('update-------')
+      console.log(this.swarm.connecting)
+      console.log(this.swarm.connections.size)
+      console.log(this.swarm.peers.size)
+    })
+    
+
     this.BeeData = new BeeWorker(this.store, this.swarm)
     this.DriveFiles = new DriveWorker(this.store, this.swarm)
     this.Peers = new PeerWorker(this.store, this.swarm)
@@ -134,8 +144,8 @@ class HolepunchWorker extends EventEmitter {
     this.Peers.on('cuespace-notification', (data) => {
       this.emit('peer-cuespace', data)
       // check if bentoboxN1 included?
-      if (data.data.content.bbn1.publicN1contracts.length > 0) {
-        for (let n1Cont of data.data.content.bbn1.publicN1contracts) {
+      if (data.data.data.content.bbn1.publicN1contracts.length > 0) {
+        for (let n1Cont of data.data.data.content.bbn1.publicN1contracts) {
           this.BeeData.replicatePubliclibrary({ data: n1Cont })
         }
       }
@@ -181,6 +191,9 @@ class HolepunchWorker extends EventEmitter {
       peerLive.publickey = data
       this.emit('peer-live-notify', peerLive)
     })
+    this.Peers.on('peer-disconnect', (data) => {
+      this.emit('peer-disconnect-notify', data)
+    })
     // drive listener
     this.DriveFiles.on('largefile-save', (data) => {
       this.emit('drive-save-large', data)
@@ -192,7 +205,7 @@ class HolepunchWorker extends EventEmitter {
   * @method networkPath
   *
   */
-  networkPath = function (message) {
+  networkPath = async function (message) {
     if (message.action === 'share') {
       // check if joined now?
       let reEstablishShort = this.Peers.checkConnectivityStatus(message, this.warmPeers, 'invite-gen')
@@ -270,6 +283,16 @@ class HolepunchWorker extends EventEmitter {
           this.Peers.routeDataPath(reEstablishShort.peer.value.livePeerkey, peerActionData.data)
         }
       }
+    } else if (message.action === 'retry') {
+      console.log('retry')
+      let peerDefaults = this.Peers.peerMatchTopic(message.data.key)
+      this.Peers.discoveryMatch(message.data.key)
+    } else if (message.action === 'peer-closed') {
+      console.log('distroy swarm connections')
+      console.log(message)
+      this.flushConnections()
+      await this.swarm.destroy()
+      // this.flushConnections()
     }
   }
 
@@ -319,21 +342,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)
-        }
-      } */
     }
   }
 
@@ -432,6 +440,21 @@ class HolepunchWorker extends EventEmitter {
     this.readcore = lastBlock
   }
 
+  /**
+   * refresh connection i.e. which peers are live
+   * @method flushConnections
+   *
+  */
+  flushConnections = async function () {
+    console.log('flush connections')
+    console.log(this.swarm.connections.size)
+    console.log(this.swarm.connecting)
+    console.log(this.swarm.peers.size)
+    await this.swarm.flush()
+    await Promise.all(Array.from(this.swarm.connections).map(e => e.flush()))
+    await new Promise(resolve => setImmediate(resolve))
+  }
+
 }
 
 export default HolepunchWorker

package/src/peers.js

@@ -27,6 +27,7 @@ class NetworkPeers extends EventEmitter {
     this.topicHolder = {}
     this.sendTopicHolder = []
     this.peersRole = []
+    this.discoveryList = []
   }
 
   /**
@@ -82,8 +83,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 +101,6 @@ class NetworkPeers extends EventEmitter {
     this.peerEstContext[pubKey] = established
   }
 
-  
-
   /**
    * connection listen
    * @method listenNetwork
@@ -228,11 +227,41 @@ class NetworkPeers extends EventEmitter {
         // assess data
         this.assessData(publicKeylive, data)
       )
-      //conn.end()
+
+      conn.on('error', data => {
+        let connectLivekeys = Object.keys(this.peerConnect)
+        // console.log(this.peerNetwork)
+        for (let peer of this.peerNetwork) {
+          for (let pconn of connectLivekeys) {
+            if (peer.value.livePeerkey === pconn) {
+              // check if connect is close?
+              let keysNoise = Object.keys(this.peerConnect[pconn]['noiseStream']['_writableState']['stream']['_writableState']['stream']['_writableState']['stream']['_writableState']['stream']['rawStream']['_closed'])
+              // console.log(this.peerConnect[pconn]['noiseStream']['_writableState']['stream']['_writableState']['stream']['_writableState']['stream']['_writableState']['stream']['rawStream']['_closed'])
+              let closeStatus = this.peerConnect[pconn]['noiseStream']['_writableState']['stream']['_writableState']['stream']['_writableState']['stream']['_writableState']['stream']['rawStream']['_closed']
+              if (closeStatus === true) {
+                // remove peer & inform beebee
+                this.emit('peer-disconnect', { publickey: peer.key })
+              }
+            }
+          }
+        }
+      })
+
+      // conn.end()
     })
   }
 
-    /**
+  /**
+   * 
+   * @method updateListen
+   *
+  */
+  updateListen = function (data) {
+    console.log('update listen')
+    console.log(data)
+  }
+
+  /**
    * 
    * @method assessData data and act
    *
@@ -241,16 +270,19 @@ class NetworkPeers extends EventEmitter {
     if (Buffer.isBuffer(data)) {
       try {
         let dataShareIn = JSON.parse(data.toString())
+        // match current public key to base id of peer
+        let peerMatch = this.peerMatchbase(peer)
         if (dataShareIn.type === 'private-chart') {
-          this.emit('beebee-data', dataShareIn)
+          this.emit('beebee-data', { publickey: peerMatch, data: dataShareIn })
+          // two types of chart share above html answer sharing and below from a full bentoboxN1 experiment TODO
           // need to look at NXP,  modules and within for reference contracts.
           // Need to replicate public library for contracts (repliate hyberbee)
           // Need to ask for data source e.g. file (replicate hyberdrive)
           // Lastly put together SafeFlowECS query to produce chart
         } else if (dataShareIn.type === 'private-cue-space') {
-          this.emit('cuespace-notification', dataShareIn)
+          this.emit('cuespace-notification', { publickey: peerMatch, data: dataShareIn })
         } else if (dataShareIn.type === 'public-library') {
-          this.emit('publiclibrarynotification', dataShareIn)
+          this.emit('publiclibrarynotification', { publickey: peerMatch, data: dataShareIn })
         } else if (dataShareIn.type === 'peer') {
         } else if (dataShareIn.type === 'peer-codename-inform') {
           // all peer to match publicke to codename then update save and infom beebee
@@ -374,6 +406,56 @@ class NetworkPeers extends EventEmitter {
     return roleMatch
   }
 
+  /**
+  *  match peer key to settings
+  *  @method peerMatchTopic
+  * 
+  */
+  peerMatchTopic = function (pubKey) {
+    // first match live pubkey to topic and then use topic to get original
+    let peerSettings = {}
+    for (let savePeer of this.peerNetwork) {
+      if (savePeer.key === pubKey) {
+        peerSettings = savePeer
+      }
+    }
+    return peerSettings
+  }
+
+  /**
+  *  match discovery peer reconnect
+  *  @method discoveryMatch
+  * 
+  */
+  discoveryMatch = function (pubKey) {
+    // first match live pubkey to topic and then use topic to get original
+    let discoverySettings = {}
+    for (let savePeer of this.discoveryList) {
+      if (savePeer.peerKey === pubKey) {
+        discoverySettings = savePeer.discovery
+      }
+    }
+    // now refresh
+    discoverySettings.refresh()
+    return true
+  }
+
+  /**
+  *  match current publickey to peer id i.e. estbalshed on first connect and maps to 'peername' in UX
+  *  @method peerMatchbase
+  * 
+  */
+  peerMatchbase = function (currPubKey) {
+    // first match live pubkey to topic and then use topic to get original
+    let originalKey = ''
+    for (let savePeer of this.peerNetwork) {
+      if (savePeer.value.livePeerkey === currPubKey) {
+        originalKey = savePeer.key
+      }
+    }
+    return originalKey
+  }
+
   /**
   *  split invte code string
   *  @method inviteDecoded
@@ -493,13 +575,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,14 +763,16 @@ class NetworkPeers extends EventEmitter {
    * @method topicConnect
    *
   */
-  topicConnect = async function (topic) {
+  topicConnect = async function (peerID, topic) {
+    console.log('topic connect')
     // 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 })
+      this.discoveryList.push({ peerKey: peerID, topic: topic, discovery: peerConnect })
       await peerConnect.flushed() // Waits for the topic to be fully announced on the DHT
     }
    }
@@ -683,6 +783,7 @@ class NetworkPeers extends EventEmitter {
    *
   */
   topicListen = async function (topic, peerKey) {
+    console.log('topic listen')
     // const noisePublicKey = Buffer.alloc(32).fill(topic) // A topic must be 32 bytes
     // let topicKeylive = noisePublicKey.toString('hex')
     const noisePublicKey = Buffer.from(topic, 'hex') //  must be 32 bytes
@@ -690,7 +791,8 @@ class NetworkPeers extends EventEmitter {
       let topicKeylive = noisePublicKey.toString('hex')
       this.topicHolder[topic] = { role: 'client', topic: topic, key: topicKeylive, peerKey: peerKey, timestamp: '' }
       const peerConnect = this.swarm.join(noisePublicKey, { server: false, client: true })
-      await peerConnect.flushed() // Waits for the topic to be fully announced on the DHT
+      this.discoveryList.push({ peerKey: peerKey, topic: topic, discovery: peerConnect })
+      await this.swarm.flush() // Waits for the topic to be fully announced on the DHT
     } else {
       console.log('key lenght issue')
     }