holepunch-hop 0.1.7 → 0.1.8

package/package.json

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

package/src/bees.js

@@ -36,7 +36,7 @@ class HyperBee extends EventEmitter {
 
   /**
    * setup hypercore protocol
-   * @method startHyperbee
+   * @method setupHyperbee
    *
   */
   setupHyperbee = async function () {
@@ -48,7 +48,7 @@ class HyperBee extends EventEmitter {
       valueEncoding: 'json' // same options as above
     })
     await this.dbPublicLibrary.ready()
-    beePubkeys.push({'pubilclibrary': b4a.toString(core.key, 'hex')})
+    beePubkeys.push({ store: 'pubilclibrary', pubkey: b4a.toString(core.key, 'hex')})
     // console.log(this.dbPublicLibrary._feed)
     // this.client.replicate(this.dbPublicLibrary.feed)
 
@@ -58,7 +58,7 @@ class HyperBee extends EventEmitter {
       valueEncoding: 'json' // same options as above
     })
     await this.dbPeerLibrary.ready()
-    beePubkeys.push({'peerlibrary': b4a.toString(core2.key, 'hex')})
+    beePubkeys.push({store:'peerlibrary', pubkey: b4a.toString(core2.key, 'hex')})
 
     const core6 = this.core.get({ name: 'peers' })
     this.dbPeers = new Hyperbee(core6, {
@@ -66,7 +66,7 @@ class HyperBee extends EventEmitter {
       valueEncoding: 'json' // same options as above
     })
     await this.dbPeers.ready()
-    beePubkeys.push({'peers': b4a.toString(core6.key, 'hex')})
+    beePubkeys.push({store:'peers', pubkey: b4a.toString(core6.key, 'hex')})
 
     const core3 = this.core.get({ name: 'bentospaces' })
     this.dbBentospaces = new Hyperbee(core3, {
@@ -74,7 +74,7 @@ class HyperBee extends EventEmitter {
       valueEncoding: 'json' // same options as above
     })
     await this.dbBentospaces.ready()
-    beePubkeys.push({'bentospaces': b4a.toString(core3.key, 'hex')})
+    beePubkeys.push({store:'bentospaces', pubkey: b4a.toString(core3.key, 'hex')})
 
     const core4 = this.core.get({ name: 'hopresults' })
     this.dbHOPresults = new Hyperbee(core4, {
@@ -83,7 +83,7 @@ class HyperBee extends EventEmitter {
     })
     await this.dbHOPresults.ready()
     // this.client.replicate(this.dbHOPresults.feed)
-    beePubkeys.push({'hopresults': b4a.toString(core4.key, 'hex')})
+    beePubkeys.push({store:'hopresults', pubkey: b4a.toString(core4.key, 'hex')})
 
     const core5 = this.core.get({ name: 'kbledger' })
     this.dbKBledger = new Hyperbee(core5, {
@@ -92,12 +92,13 @@ class HyperBee extends EventEmitter {
     })
     await this.dbKBledger.ready()
     // this.client.replicate(this.dbKBledger.feed)
-    beePubkeys.push({'kbledger': b4a.toString(core5.key, 'hex')})
+    beePubkeys.push({store:'kbledger', pubkey: b4a.toString(core5.key, 'hex')})
     console.log('hyperbees-live')
     this.emit('hbee-live')
     // return beePubkeys
     let startBeePubkey = {}
-    startBeePubkey.type = 'hyperbee-pubkeys'
+    startBeePubkey.type = 'account'
+    startBeePubkey.action = 'hyperbee-pubkeys'
     startBeePubkey.data = beePubkeys
     this.liveBees = startBeePubkey
     this.wsocket.send(JSON.stringify(startBeePubkey))

package/src/drive.js

@@ -63,7 +63,7 @@ class HypDrive extends EventEmitter {
    *
    */
   hyperdriveWritestream = async function (fileData) {
-    let localthis = this
+    /* let localthis = this
     const ws = this.drive.createWriteStream('/blob.txt')
 
     this.wsocketwrite('Hello, ')
@@ -73,7 +73,7 @@ class HypDrive extends EventEmitter {
     this.wsocketon('close', function () {
       const rs = localthis.drive.createReadStream('/blob.txt')
       rs.pipe(process.stdout) // prints Hello, world!
-    })
+    }) */
   }
 
   /**
@@ -133,6 +133,23 @@ class HypDrive extends EventEmitter {
     return confirmSave
   }
 
+  /**
+   * save csv data to hyperdrive file
+   * @method saveCSVfilecontent 
+   *
+  */
+  saveCSVfilecontent = async function (fData) {
+    // extract header info first
+    let headerInfo = this.fileUtility.webCSVparse(fData)
+    let hyperdrivePath = 'csv/' + fData.data[0].name
+    let confirmSave = await this.drive.put(hyperdrivePath, fData.data[0].content)
+    let saveStatus = {}
+    saveStatus.save = confirmSave
+    saveStatus.headerinfo = headerInfo
+    return saveStatus
+  }
+
+
   /**
    * save to hyperdrive file
    * @method hyperdriveFilesave 
@@ -191,6 +208,8 @@ class HypDrive extends EventEmitter {
    *
    */
   hyperdriveLocalfile = async function (path) {
+    console.log('hoelpuch--localfile')
+    console.log(path)
     // File reads to buffer and recreate file
     // const bufFromGet2 = await this.drive.get(path)
     const { value: entry } = await this.drive.entry(path)

package/src/fileParser.js

@@ -91,13 +91,25 @@ FileParser.prototype.localFileParse = async function (o, ws) {
 }
 
 /**
-* files from cloud
-* @method webFileParse
+* csv content files from web
+* @method webCSVparse
 *
 */
-FileParser.prototype.webFileParse = async function (o, ws) {
-  const localthis = this
-  let dataWeb = await axios.get(o.data.websource)
+FileParser.prototype.webCSVparse = function (fData) {
+  // match name row number
+  let lcounter = 0
+  let match = ''
+  fData.data[0].content.split(/\r?\n/).forEach(line =>  {
+    lcounter++
+    if (lcounter === (parseInt(fData.data[0].info.cnumber) +1 )) {
+    match = line
+    }
+  })
+
+  let headerInfo = this.extractCSVheaders(fData.data[0], match)
+  return headerInfo
+  /*
+  let dataWeb = await axios.get(content.websource)
     .catch(function (error) {
         // handle error
         console.log(error)
@@ -107,18 +119,19 @@ FileParser.prototype.webFileParse = async function (o, ws) {
   let match = []
   dataSource.split(/\r\n|\n/).forEach(line =>  {
     lcounter++
-    if (lcounter === (parseInt(o.data.info.cnumber) +1 )) {
+    if (lcounter === (parseInt(content.info.cnumber) +1 )) {
       match = line
     }
   })
+  */
   // create new file name hash of source url
-  const hashURL = crypto.createHash('sha256').update(o.data.websource).digest('hex')
-  const fileNewName = hashURL + '.csv'
+  // const hashURL = crypto.createHash('sha256').update(content.websource).digest('hex')
+  // const fileNewName = hashURL + '.csv'
   // localthis.linesLimit = lines.slice(0, 30)
-  let headerInfo = localthis.extractCSVheaders(o, match)
-  let newPathFile = localthis.saveOriginalProtocolWeb(o, dataSource, fileNewName)
-  const praser = await localthis.readFileStream(newPathFile, headerInfo)
-  this.convertJSON(o, ws, headerInfo, praser, 'web', fileNewName)
+  // let headerInfo = this.extractCSVheaders(content, match)
+  // let newPathFile = localthis.saveOriginalProtocolWeb(content, dataSource, fileNewName)
+  // const praser = await localthis.readFileStream(newPathFile, headerInfo)
+  // this.convertJSON(o, ws, headerInfo, praser, 'web', fileNewName)
 }
 
 /**
@@ -184,18 +197,18 @@ FileParser.prototype.extractJSONkeys = function (o) {
 * @method extractCSVheaders
 *
 */
-FileParser.prototype.extractCSVheaders = function (o, lineData) {
+FileParser.prototype.extractCSVheaders = function (data, lineData) {
   let delimiter = ''
-  if (o.data[0].info.delimiter === 'tab') {
+  if (data.info.delimiter === 'tab') {
     delimiter = "\t"
-  } else if (o.data[0].info.delimiter === ';') {
+  } else if (data.info.delimiter === ';') {
     delimiter = ";"
   } else {
     delimiter = ","
   }
   let splitWords = lineData.split(delimiter)
   const headerSet = splitWords
-  let dataline = parseInt(o.data[0].info.dataline)
+  let dataline = parseInt(data.info.dataline)
 
   let headerInfo = {}
   headerInfo.headerset = headerSet

package/src/index.js

@@ -34,7 +34,9 @@ class HolepunchWorker extends EventEmitter {
     this.core3 = {}
     this.discKeypeer = ''
     this.readcore = null
+    this.warmPeers = []
     this.startHolepunch()
+    this.networkListeners()
   }
 
   /**
@@ -48,7 +50,7 @@ class HolepunchWorker extends EventEmitter {
     goodbye(() => this.swarm.destroy())
     this.BeeData = new BeeWorker(this.store, this.swarm)
     this.DriveFiles = new DriveWorker(this.store, this.swarm)
-    this.Peers = new PeerWorker()
+    this.Peers = new PeerWorker(this.store, this.swarm)
   }
 
   /**
@@ -59,6 +61,7 @@ class HolepunchWorker extends EventEmitter {
   activateHypercores = async function () {
     await this.DriveFiles.setupHyperdrive()
     await this.BeeData.setupHyperbee()
+    this.Peers.networkKeys()
     this.emit('hcores-active')
   }
 
@@ -68,20 +71,78 @@ class HolepunchWorker extends EventEmitter {
    *
   */
   setWebsocket = function (ws) {
+    console.log('webcocket live HP')
     this.wsocket = ws
     this.BeeData.setWebsocket(ws)
     this.DriveFiles.setWebsocket(ws)
     this.activateHypercores()
   }
 
+
+  /**
+  * listen for outputs from workers
+  * @method networkListeners
+  *
+  */
+  networkListeners = function () {
+    this.Peers.on('peer-network', (data) => {
+      this.wsocket.send(JSON.stringify(data))
+    })
+    // peer connection active
+    this.Peers.on('peer-connect', (data) => {
+      this.Peers.writeTonetwork(data)
+    })
+    // data for beebee
+    this.Peers.on('beebee-data', (data) => {
+      this.emit('peer-topeer', data)
+    })
+    // new warm incoming peer
+    this.Peers.on('connect-warm', (data) => {
+      let peerId = {}
+      peerId.name = ''
+      peerId.publickkey = data
+      peerId.datastore = ''
+      this.warmPeers.push(peerId)
+    })
+  }
+
+  /**
+  * manage flow to network of peers and data
+  * @method networkPath
+  *
+  */
+  networkPath = function (message) {
+    if (message.action === 'share') {
+      if (message.task === 'peer-join') {
+        // has the peer joined already?
+        let peerMatch = false
+        for (let wpeer of this.warmPeers) {
+          if (wpeer.publickey = message.data.publickey) {
+            peerMatch = true
+          }
+        }
+        if (peerMatch === true) {
+          this.Peers.peerAlreadyJoin(message.data)
+          this.Peers.writeTonetwork(message.data.publickey)
+        } else {
+          this.warmPeers.push(message.data)
+          this.Peers.peerJoin(message.data)
+        }
+      } else if (message.task === 'peer-write') {
+        this.emit('peer-write', message.data)
+      } else if (message.task === 'topic') {
+        // this.Peers.peerTopic(message.data.topic)
+      }
+    }
+  }
+
   /**
    * corestore test example
    * @method testCorestore
    *
   */
   testCoreStore = async function () {
-
-        // A name is a purely-local, and maps to a key pair. It's not visible to readers.
+    // A name is a purely-local, and maps to a key pair. It's not visible to readers.
     // Since a name always corresponds to a key pair, these are all writable
     this.core1 = this.store.get({ name: 'core-1', valueEncoding: 'json' })
     this.core2 = this.store.get({ name: 'core-2' })

package/src/peers.js

@@ -2,8 +2,8 @@
 /**
 *  Manage Peers connections
 *
-* @class HypPeers
-* @package    HypPeers
+* @class NetworkPeers
+* @package    NetworkPeers
 * @copyright  Copyright (c) 2022 James Littlejohn
 * @license    http://www.gnu.org/licenses/old-licenses/gpl-3.0.html
 * @version    $Id$
@@ -14,15 +14,157 @@ import goodbye from 'graceful-goodbye'
 import b4a from 'b4a'
 
 
-class HypPeers extends EventEmitter {
+class NetworkPeers extends EventEmitter {
 
   constructor(core, swarm) {
     super()
+    console.log('peer manager')
     this.hello = 'hyperpeers'
     this.core = core
     this.swarm = swarm
     this.drive = {}
-    // this.setupHyerPeers()
+    this.peerHolder = {}
+    this.peerConnect = {}
+  }
+
+  /**
+   * public/piv key on DHT
+   * @method networkKeys
+   *
+  */
+  networkKeys = function () {
+    console.log('hyperswarm begin1')
+    let peerNxKeys = {}
+    peerNxKeys.publickey = this.swarm.keyPair.publicKey.toString('hex')
+    let networkMessage = {}
+    networkMessage.type = 'account'
+    networkMessage.action = 'network-keys'
+    networkMessage.data = peerNxKeys
+    this.emit('peer-network', networkMessage)
+    this.listenNetwork()
+    this.peerJoinClient()
+  }
+
+  /**
+   * connection listen
+   * @method listenNetwork
+   *
+  */
+  listenNetwork = function () {
+    console.log('listen network')
+    this.swarm.on('connection', (conn, info) => {
+      // listener to write message to peers or network partial or broadcast
+      console.log('swarm connection recieved')
+      let publicKeylive = info.publicKey.toString('hex')
+      this.emit('connect-warm', publicKeylive)
+      this.peerConnect[publicKeylive] = conn
+      this.emit('peer-connect', publicKeylive)
+      // process network message
+      conn.on('data', data =>
+        // console.log('recieve network message:', data.toString()),
+        // console.log(data.toString()),
+        // console.log('emit to be verified and acted upon appropriately'),
+        // assess data
+        this.assessData(publicKeylive, data)
+      )
+      //conn.end()
+    })
+  }
+
+  /**
+   * 
+   * @method assessData data and act
+   *
+  */
+  assessData = function (peer, data) {
+    console.log('assess---data receive peer-----------')
+    let dataShareIn = JSON.parse(data.toString())
+    if (dataShareIn.type === 'chart') {
+      console.log('start chart protocol from peer')
+      this.emit('beebee-data', dataShareIn)
+      // 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 === 'peer') {
+      console.log('message from peer on connect')
+      console.log(dataShareIn)
+    }
+  }
+
+  /**
+   * write message to network
+   * @method writeTonetwork
+   *
+  */
+  writeTonetwork = function (publickey) {
+    // check this peer has asked for chart data
+    let connectTrue = publickey in this.peerConnect
+    let chartTrue = publickey in this.peerHolder
+    if (connectTrue === true && chartTrue === true) {
+      let chartData = this.peerHolder[publickey]
+      let dataShare = {}
+      dataShare.hop = chartData.hop
+      dataShare.data = chartData.data
+      dataShare.type = 'chart'
+      this.peerConnect[publickey].write(JSON.stringify(dataShare))
+    } else {
+      console.log('non chart write')
+    }
+  }
+
+
+  /**
+   * join peer to peer private (server)
+   * @method peerJoin
+   *
+  */
+  peerJoin = function (peerContext) {
+    this.peerHolder[peerContext.publickey] = peerContext
+    const noisePublicKey = Buffer.from(peerContext.publickey, 'hex') //  must be 32 bytes
+    if (noisePublicKey.length === 32) {
+      const peerConnect = this.swarm.joinPeer(noisePublicKey, { server: true, client: false })
+    }
+  }
+
+  /**
+   * already joined but keep track context data
+   * @method peerAlreadyJoin
+   *
+  */
+  peerAlreadyJoin = function (peerContext) {
+    console.log('aleardy joined')
+    this.peerHolder[peerContext.publickey] = peerContext
+  }
+
+
+  /**
+   * join peer to peer private (client)
+   * @method peerJoinClient
+   *
+  */
+  peerJoinClient = function () {
+    this.swarm.listen() 
+  }
+
+  /**
+   * listen for topics as a client
+   * @method listenClient
+   *
+  */
+  listenClient = async function (topic) {
+    const noisePublicKey = Buffer.alloc(32).fill(topic) // A topic must be 32 bytes
+    const peerConnect = this.swarm.join(noisePublicKey, { server: false, client: true })
+    await peerConnect.flushed() // Waits for the topic to be fully announced on the DHT
+  }
+
+  /**
+   * 
+   * @method listen
+   *
+  */
+  listen = function () {
+    console.log('listen')
   }
 
   /**
@@ -52,4 +194,4 @@ class HypPeers extends EventEmitter {
 
 }
 
-export default HypPeers
+export default NetworkPeers