holepunch-hop 0.3.7 → 0.3.9

package/package.json

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

package/src/bees.js

@@ -78,6 +78,15 @@ class HyperBee extends EventEmitter {
     await this.dbBentospaces.ready()
     beePubkeys.push({store:'bentospaces', pubkey: b4a.toString(core3.key, 'hex')})
 
+    const core14 = this.store.get({ name: 'bentochat' })
+    this.dbBentochat = new Hyperbee(core14, {
+      keyEncoding: 'utf-8', // can be set to undefined (binary), utf-8, ascii or and abstract-encoding
+      valueEncoding: 'json' // same options as above
+    })
+    await this.dbBentochat.ready()
+    beePubkeys.push({store:'bentochat', pubkey: b4a.toString(core3.key, 'hex')})
+
+
     const core4 = this.store.get({ name: 'hopresults' })
     this.dbHOPresults = new Hyperbee(core4, {
       keyEncoding: 'utf-8', // can be set to undefined (binary), utf-8, ascii or and abstract-encoding
@@ -105,6 +114,13 @@ class HyperBee extends EventEmitter {
     await this.dbBentocues.ready()
     beePubkeys.push({store:'bentocues', pubkey: b4a.toString(core7.key, 'hex')})
 
+    const core13 = this.store.get({ name: 'bentomodels' })
+    this.dbBentomodels = new Hyperbee(core13, {
+      keyEncoding: 'utf-8', // can be set to undefined (binary), utf-8, ascii or and abstract-encoding
+      valueEncoding: 'json' // same options as above
+    })
+    await this.dbBentomodels.ready()
+    beePubkeys.push({store:'bentomodels', pubkey: b4a.toString(core7.key, 'hex')})
 
     const core8 = this.store.get({ name: 'bentodecisions' })
     this.dbBentodecisions = new Hyperbee(core8, {
@@ -149,6 +165,23 @@ class HyperBee extends EventEmitter {
     await this.dbBentomedia.ready()
     beePubkeys.push({store:'bentomedia', 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 = {}
@@ -211,13 +244,15 @@ class HyperBee extends EventEmitter {
     await this.dbHOPresults.put(refContract.hash, refContract.data)
   }
 
+  /** CHAT */
+
   /**
    * save chat history
    * @method saveBentochat
    *
   */
   saveBentochat = async function (chatHistory) {
-    await this.dbBentospaces.put(chatHistory.chat.chatid, chatHistory)
+    await this.dbBentochat.put(chatHistory.chat.chatid, chatHistory)
     let checkSave = await this.getBentochat(chatHistory.chat.chatid)
     return checkSave
   }
@@ -228,7 +263,7 @@ class HyperBee extends EventEmitter {
    *
   */
   deleteBentochat = async function (chat) {
-    await this.dbBentospaces.del(chat.chatid)
+    await this.dbBentochat.del(chat.chatid)
     let deleteInfo = {}
     deleteInfo.chatid = chat.chatid
     return deleteInfo
@@ -240,8 +275,7 @@ class HyperBee extends EventEmitter {
    *
   */
   getBentochat = async function (key) {
-    // let key = 'startbentospaces'
-    const nodeData = await this.dbBentospaces.get(key)
+    const nodeData = await this.dbBentochat.get(key)
     return nodeData
   }
 
@@ -251,7 +285,7 @@ class HyperBee extends EventEmitter {
    *
   */
   getBentochatHistory = async function (range) {
-    const chathistoryData = this.dbBentospaces.createReadStream() // { gt: 'a', lt: 'z' }) // anything >a and <z
+    const chathistoryData = this.dbBentochat.createReadStream() // { gt: 'a', lt: 'z' }) // anything >a and <z
     let chatData = []
     for await (const { key, value } of chathistoryData) {
       chatData.push({ key, value })
@@ -259,6 +293,8 @@ class HyperBee extends EventEmitter {
     return chatData
   }
 
+  /** SPACE */
+
   /**
    * save space menu
    * @method saveSpaceHistory
@@ -365,6 +401,52 @@ class HyperBee extends EventEmitter {
     return deleteInfo
   }
 
+  /** MODELS */
+  /**
+   * save model
+   * @method saveModel
+  */
+  saveModel = async function (modelInfo) {
+    await this.dbBentomodels.put(modelInfo.id, modelInfo.data)
+    let checkSave = await this.getModel(modelInfo.id)
+    return checkSave
+  }
+
+  /**
+   * get one cue by id
+   * @method getModel
+   *
+  */
+  getModel = async function (key) {
+    const nodeData = await this.dbBentomodels.get(key)
+    return nodeData
+  }
+
+  /**
+   * get all cuees
+   * @method getModelHistory
+   *
+  */
+  getModelHistory = async function (key) {
+    const modelHistory = await this.dbBentomodels.createReadStream()
+    let modelData = []
+    for await (const { key, value } of modelHistory) {
+      modelData.push({ key, value })
+    }
+    return modelData
+  }
+
+  /**
+   * delete nxp ref contract from peer library
+   * @method deleteBentomodel
+  */
+  deleteBentoModel = async function (model) {
+    const deleteStatus = await this.dbBentomodels.del(model.id)
+    let deleteInfo = {}
+    deleteInfo.id = model.id
+    return deleteInfo
+  }
+
  /** MEDIA */
   /**
    * save media
@@ -422,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
     }