holepunch-hop 0.4.0 → 0.4.2

package/package.json

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

package/src/bees.js

@@ -21,6 +21,7 @@ class HyperBee extends EventEmitter {
     this.swarm = swarm
     this.liveBees = {}
     this.confirmPubLibList = {}
+    this.repPublicHolder = {}
   }
 
   /**
@@ -46,12 +47,13 @@ class HyperBee extends EventEmitter {
       valueEncoding: 'json' // same options as above
     })
     await this.dbPublicLibrary.ready()
-    beePubkeys.push({ store: 'publiclibrary', pubkey: b4a.toString(this.dbPublicLibrary.key, 'hex')})
+    beePubkeys.push({ store: 'publiclibrary', privacy: 'public', pubkey: b4a.toString(this.dbPublicLibrary.key, 'hex')})
     // allow other peer access to public library  (need to check for DDOS ie over asked)
     // join a topic for network 
     const discovery = this.swarm.join(this.dbPublicLibrary.discoveryKey)
     // Only display the key once the Hyperbee has been announced to the DHT
     discovery.flushed().then(() => {
+      console.log('public library open')
     })
 
     const core2 = this.store.get({ name: 'peerlibrary' })
@@ -60,7 +62,7 @@ class HyperBee extends EventEmitter {
       valueEncoding: 'json' // same options as above
     })
     await this.dbPeerLibrary.ready()
-    beePubkeys.push({store:'peerlibrary', pubkey: b4a.toString(core2.key, 'hex')})
+    beePubkeys.push({store:'peerlibrary', privacy: 'private', pubkey: b4a.toString(core2.key, 'hex')})
 
     const core6 = this.store.get({ name: 'peers' })
     this.dbPeers = new Hyperbee(core6, {
@@ -68,7 +70,7 @@ class HyperBee extends EventEmitter {
       valueEncoding: 'json' // same options as above
     })
     await this.dbPeers.ready()
-    beePubkeys.push({store:'peers', pubkey: b4a.toString(core6.key, 'hex')})
+    beePubkeys.push({store:'peers', privacy: 'private', pubkey: b4a.toString(core6.key, 'hex')})
 
     const core3 = this.store.get({ name: 'bentospaces' })
     this.dbBentospaces = new Hyperbee(core3, {
@@ -84,7 +86,7 @@ class HyperBee extends EventEmitter {
       valueEncoding: 'json' // same options as above
     })
     await this.dbBentochat.ready()
-    beePubkeys.push({store:'bentochat', pubkey: b4a.toString(core3.key, 'hex')})
+    beePubkeys.push({store:'bentochat', privacy: 'private', pubkey: b4a.toString(core3.key, 'hex')})
 
 
     const core4 = this.store.get({ name: 'hopresults' })
@@ -94,7 +96,7 @@ class HyperBee extends EventEmitter {
     })
     await this.dbHOPresults.ready()
     // this.client.replicate(this.dbHOPresults.feed)
-    beePubkeys.push({store:'hopresults', pubkey: b4a.toString(core4.key, 'hex')})
+    beePubkeys.push({store:'hopresults', privacy: 'private', pubkey: b4a.toString(core4.key, 'hex')})
 
     const core5 = this.store.get({ name: 'kbledger' })
     this.dbKBledger = new Hyperbee(core5, {
@@ -112,7 +114,7 @@ class HyperBee extends EventEmitter {
       valueEncoding: 'json' // same options as above
     })
     await this.dbBentocues.ready()
-    beePubkeys.push({store:'bentocues', pubkey: b4a.toString(core7.key, 'hex')})
+    beePubkeys.push({store:'bentocues', privacy: 'public', pubkey: b4a.toString(core7.key, 'hex')})
 
     const core13 = this.store.get({ name: 'bentomodels' })
     this.dbBentomodels = new Hyperbee(core13, {
@@ -120,7 +122,7 @@ class HyperBee extends EventEmitter {
       valueEncoding: 'json' // same options as above
     })
     await this.dbBentomodels.ready()
-    beePubkeys.push({store:'bentomodels', pubkey: b4a.toString(core7.key, 'hex')})
+    beePubkeys.push({store:'bentomodels', privacy: 'public', pubkey: b4a.toString(core7.key, 'hex')})
 
     const core8 = this.store.get({ name: 'bentodecisions' })
     this.dbBentodecisions = new Hyperbee(core8, {
@@ -137,7 +139,7 @@ class HyperBee extends EventEmitter {
       valueEncoding: 'json' // same options as above
     })
     await this.dbBentomarkers.ready()
-    beePubkeys.push({store:'bentomarkers', pubkey: b4a.toString(core9.key, 'hex')})
+    beePubkeys.push({store:'bentomarkers', privacy: 'private', pubkey: b4a.toString(core9.key, 'hex')})
 
 
     const core10 = this.store.get({ name: 'research' })
@@ -146,7 +148,7 @@ class HyperBee extends EventEmitter {
       valueEncoding: 'json' // same options as above
     })
     await this.dbBentoresearch.ready()
-    beePubkeys.push({store:'research', pubkey: b4a.toString(core10.key, 'hex')})
+    beePubkeys.push({store:'research', privacy: 'public', pubkey: b4a.toString(core10.key, 'hex')})
 
 
     const core11 = this.store.get({ name: 'bentoproducts' })
@@ -155,7 +157,7 @@ class HyperBee extends EventEmitter {
       valueEncoding: 'json' // same options as above
     })
     await this.dbBentoproducts.ready()
-    beePubkeys.push({store:'bentoproducts', pubkey: b4a.toString(core11.key, 'hex')})
+    beePubkeys.push({store:'bentoproducts', privacy: 'private', pubkey: b4a.toString(core11.key, 'hex')})
 
     const core12 = this.store.get({ name: 'bentomedia' })
     this.dbBentomedia = new Hyperbee(core12, {
@@ -163,25 +165,8 @@ class HyperBee extends EventEmitter {
       valueEncoding: 'json' // same options as above
     })
     await this.dbBentomedia.ready()
-    beePubkeys.push({store:'bentomedia', pubkey: b4a.toString(core12.key, 'hex')})
+    beePubkeys.push({store:'bentomedia', privacy: 'private', pubkey: b4a.toString(core12.key, 'hex')})
     
-    // temp delete agents
-    // this.deleteBentoModel({ id: '5e6e36c953b673fe7b2dd06dd773d43feea42a0d'})
-    // this.deleteBentoModel({ id: '8439ec4e6d6b89227145da877fffb697b1209d78'})
-    // this.deleteBentoModel({ id: 'ba5b7ba40a1dc5c37722c75d29353437e94f805c'})
-
-    /*this.deleteBentospace({ cueid: '296ce0efc66045c5842707d4652186e440f2fc21'})
-    this.deleteBentospace({ cueid: '7baf3109a5b2c5b64981b494984d1bb1fe72f3ba'})
-    this.deleteBentospace({ cueid: 'a820ec16b810603b3b1c6458f33d9f36bafdc533'})
-    this.deleteBentospace({ cueid: 'b96fa316c2f7eddf9b842da8c9ac2780f36abdff'})
-    this.deleteBentospace({ cueid: 'ddd7eb037439f97ead2d1e1be880e58d329ca54b'})
-    this.deleteBentospace({ cueid: 's-296ce0efc66045c5842707d4652186e440f2fc21'})
-    this.deleteBentospace({ cueid: 's-7baf3109a5b2c5b64981b494984d1bb1fe72f3ba'})
-    this.deleteBentospace({ cueid: 's-83dc025c2298b4673f62fbc436d2c1f8dc525fe8'})
-    this.deleteBentospace({ cueid: 's-b96fa316c2f7eddf9b842da8c9ac2780f36abdff'}) */
-
-
-
     this.emit('hbee-live')
     // return beePubkeys
     let startBeePubkey = {}
@@ -874,6 +859,42 @@ 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.discoverykey, 'hex') })
+
+    // create a hyperbee instance using the hypercore instance
+    const beePlib = new Hyperbee(coreRep, {
+      keyEncoding: 'utf-8',
+      valueEncoding: 'utf-8'
+    })
+
+    // wait till the hypercore properties to be intialized
+    await coreRep.ready()
+
+    // logging the public key of the hypercore instance
+    // console.log('core key here is:', coreRep.key.toString('hex'))
+
+    // Attempt to connect to peers
+    this.swarm.join(coreRep.discoveryKey, { server: false, client: true })
+
+    await coreRep.update()
+
+    const nodeData = beePlib.createReadStream()
+    let resData = []
+    for await (const { key, value } of nodeData) {
+      resData.push({ key, value })
+    }
+    this.repPublicHolder[dataIn.discoverykey] = resData
+    // notify peer repliate complete, ask if want save
+    this.emit('publib-replicate-notification', { data: { text: 'public library replication complete', publib: dataIn.discoverykey }})
+  }
+
+  /**
+   * repicate the publiclibrary peer to peer
+   * @method replicateQueryPubliclibrary
+   *
+  */
+  replicateQueryPubliclibrary = 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.data.datastores, 'hex') })
 
@@ -958,6 +979,18 @@ class HyperBee extends EventEmitter {
     return repMessage */
   }
 
+  
+  /**
+   * look up holder and save data to public library datastore
+   * @method saveRepliatePubLibary
+   *
+  */
+  saveRepliatePubLibary = async function (data) {
+    // add board nxp
+    let updatePubLib = this.repPublicHolder[data.discoverykey]
+    await this.updatePublicLibrary(updatePubLib)
+    this.repPublicHolder[data.discoverykey] = []
+  }
 
   /**
    * peer confirmed add to public library

package/src/drive.js

@@ -56,9 +56,10 @@ class HypDrive extends EventEmitter {
     await this.drive.ready()
 
     let startDrivePubkey = {}
-    startDrivePubkey.type = 'hyperdrive-pubkey'
+    startDrivePubkey.type = 'account'
+    startDrivePubkey.action = 'drive-pubkey'
     startDrivePubkey.data =  b4a.toString(this.drive.key, 'hex')
-    // this.wsocket.send(JSON.stringify(startDrivePubkey))
+    this.wsocket.send(JSON.stringify(startDrivePubkey))
   }
 
 
@@ -102,7 +103,6 @@ class HypDrive extends EventEmitter {
     // file input management
     // protocol to save original file
     let newPathFile = await this.hyperdriveFilesave(fileData.data[0].type, fileData.data[0].name, fileData.data[0].content)
-
     // extract out the headers name for columns
     let headerSet = this.fileUtility.extractCSVHeaderInfo(fileData)
     //  csv to JSON convertion HOP protocol standard
@@ -164,7 +164,6 @@ class HypDrive extends EventEmitter {
     return fileResponse
   }
 
-
   /**
    * blind sqlite lookup of data (maybe restricture no. of rows of data iniitally)
    * @method blindDataSqlite 
@@ -175,7 +174,6 @@ class HypDrive extends EventEmitter {
      return parseData
   }
 
-
   /**
    * save to hyperdrive file
    * @method hyperdriveFilesave 
@@ -213,7 +211,6 @@ class HypDrive extends EventEmitter {
     return hyperdrivePath
   }
 
-
   /**
    * save a stream of file ie. large file
    * @method hyperdriveStreamSave 
@@ -370,7 +367,6 @@ class HypDrive extends EventEmitter {
     return summarySQLinfo
   }
 
-
   /**
   *  ask for device tables and info.
   * @method SQLiteDeviceSetup
@@ -425,7 +421,6 @@ class HypDrive extends EventEmitter {
 
   }
 
-
 	/**
 	* try to match to known time formats
 	* @method testDataExtact

package/src/index.js

@@ -55,10 +55,10 @@ class HolepunchWorker extends EventEmitter {
 
     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)
+      // console.log('update-------')
+      // console.log(this.swarm.connecting)
+      // console.log(this.swarm.connections.size)
+      // console.log(this.swarm.peers.size)
     })
     
 
@@ -146,22 +146,26 @@ class HolepunchWorker extends EventEmitter {
       // check if bentoboxN1 included?
       if (data.data.data.content.bbn1.publicN1contracts.length > 0) {
         for (let n1Cont of data.data.data.content.bbn1.publicN1contracts) {
-          this.BeeData.replicatePubliclibrary({ data: n1Cont })
+          this.BeeData.replicateQueryPubliclibrary({ data: n1Cont })
         }
       }
     })
     // public library notification
     this.Peers.on('publiclibrarynotification', (data) => {
-      this.BeeData.replicatePubliclibrary(data)
+      this.BeeData.replicateQueryPubliclibrary(data)
     })
     // beebee notifications public
     this.BeeData.on('publibbeebee-notification', (data) => {
       this.emit('beebee-publib-notification', data)
     })
+    // public library replicate
+    this.BeeData.on('publib-replicate-notification', (data) => {
+      this.emit('replicate-publib-notification', data)
+    })
     // new warm incoming peer
     this.Peers.on('connect-warm-first', (data) => {
       // check re establishing peer to peer of first time connection?
-      let peerInfoName = 'not-matched' //this.Peers.peerHolder[data]
+      let peerInfoName = 'not-matched' //  could be mis match or blind/ cold peer accessing public library
       // check role and match codename
       if (data.roletaken === 'server') {
         // not unique info to match on yet.
@@ -282,17 +286,22 @@ class HolepunchWorker extends EventEmitter {
           let peerActionData = this.Peers.peerHolder[message.data.publickey]
           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()
+    } else if (message.action === 'replicate-library') {
+      // let reEstablishShort = this.Peers.checkConnectivityStatus(message, this.warmPeers, 'invite-replicate')
+      if (message.task === 'public-library-replicate') {
+        // write message to peer with open public library
+        this.BeeData.replicatePubliclibrary(message.data)
+      }
+    } else if (message.action === 'save-replicate-library') {
+      // look up holder and save to public library please
+      this.BeeData.saveRepliatePubLibary(message.data)
     }
   }
 
@@ -446,10 +455,6 @@ class HolepunchWorker extends EventEmitter {
    *
   */
   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))

package/src/peers.js

@@ -230,7 +230,6 @@ class NetworkPeers extends EventEmitter {
 
       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) {
@@ -257,8 +256,8 @@ class NetworkPeers extends EventEmitter {
    *
   */
   updateListen = function (data) {
-    console.log('update listen')
-    console.log(data)
+    // console.log('update listen')
+    // console.log(data)
   }
 
   /**
@@ -282,6 +281,8 @@ class NetworkPeers extends EventEmitter {
         } else if (dataShareIn.type === 'private-cue-space') {
           this.emit('cuespace-notification', { publickey: peerMatch, data: dataShareIn })
         } else if (dataShareIn.type === 'public-library') {
+          console.log('public rep reque arrivee')
+          console.log(dataShareIn)
           this.emit('publiclibrarynotification', { publickey: peerMatch, data: dataShareIn })
         } else if (dataShareIn.type === 'peer') {
         } else if (dataShareIn.type === 'peer-codename-inform') {
@@ -453,7 +454,12 @@ class NetworkPeers extends EventEmitter {
         originalKey = savePeer.key
       }
     }
-    return originalKey
+    // check if first time peer connect
+    if (originalKey.length === 0) {
+      return currPubKey
+    } else {
+      return originalKey
+    }
   }
 
   /**
@@ -622,7 +628,7 @@ class NetworkPeers extends EventEmitter {
       } else if (peerTopeerState.type === 'peer-write') {
         this.Peers.writeTonetwork(peerTopeerState)
       } else if (peerTopeerState.type === 'public-library') {
-        this.Peers.writeToPublicLibrary(data)
+        this.Peers.writeToPublicLibrary(livePubkey, peerTopeerState)
       }
     }
   }
@@ -764,7 +770,6 @@ class NetworkPeers extends EventEmitter {
    *
   */
   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) {
@@ -783,7 +788,6 @@ 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