holepunch-hop 0.4.5 → 0.4.8

package/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "vitest.disableWorkspaceWarning": true
+}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "holepunch-hop",
-  "version": "0.4.5",
+  "version": "0.4.8",
   "description": "data interface to HOP",
   "main": "src/index.js",
   "type": "module",
   "scripts": {
     "start": "node src/index.js",
-    "test": "mocha test/*.*"
+    "test": "vitest run"
   },
   "repository": {
     "type": "git",
@@ -28,6 +28,7 @@
     "atob": "^2.1.2",
     "axios": "^1.2.2",
     "b4a": "^1.6.1",
+    "chrono-node": "^2.7.5",
     "corestore": "^6.4.0",
     "csv-parser": "^3.0.0",
     "debounceify": "^1.0.0",
@@ -38,11 +39,16 @@
     "hyperswarm": "^4.3.5",
     "localdrive": "github:holepunchto/localdrive",
     "luxon": "^3.4.4",
-    "chrono-node": "^2.7.5",
     "sqlite3": "^5.1.7"
   },
   "devDependencies": {
-    "assert": "^2.0.0",
-    "mocha": "^10.0.0"
+    "object-hash": "^3.0.0",
+    "vitest": "^3.1.1",
+    "brittle": "^3.1.0",
+    "protocol-buffers": "^4.2.0",
+    "standard": "^17.0.0",
+    "sub-encoder": "^1.0.6",
+    "tree-to-string": "^1.1.1",
+    "ws": "^8.11.0"
   }
 }

package/src/index.js

@@ -16,15 +16,16 @@ import goodbye from 'graceful-goodbye'
 import b4a from 'b4a'
 
 // import { Node } from 'hyperbee/lib/messages.js'
-import BeeWorker from './bees.js'
-import DriveWorker from './drive.js'
-import PeerWorker from './peers.js'
+import BeeWorker from './storage/bees.js'
+import DriveWorker from './storage/drive.js'
+import PeerWorker from './network/peers.js'
 
 class HolepunchWorker extends EventEmitter {
 
-  constructor() {
+  constructor(storeName) {
     super()
     this.hello = 'holepunch'
+    this.peerStore = ''
     this.store = {}
     this.swarm = {}
     this.BeeData = {}
@@ -37,17 +38,31 @@ class HolepunchWorker extends EventEmitter {
     this.warmPeers = [] // ikeep track of live incoming sharing
     this.codenameUpdates = []
     this.topicExhange = []
+    this.setStorename(storeName)
     this.startHolepunch()
     this.networkListeners()
   }
 
+  /**
+   * set store name
+   * @method setStorename
+   *
+  */
+  setStorename = function (storeName) {
+    if (storeName === undefined || storeName?.length === 0) {
+      this.peerStore = '.hop-storage'
+    } else {
+      this.peerStore = '.' + storeName
+    }
+  }
+
   /**
    * setup holepunch protocol
    * @method startHolepunch
    *
   */
   startHolepunch = async function () {
-    this.store = new Corestore(os.homedir() + '/.hop-storage')
+    this.store = new Corestore(os.homedir() + '/' + this.peerStore)
     this.swarm = new Hyperswarm()
     // make replication possible
     this.swarm.on('connection', conn => this.store.replicate(conn))
@@ -58,7 +73,7 @@ class HolepunchWorker extends EventEmitter {
       // console.log('update-------')
       // console.log(this.swarm.connecting)
       // console.log(this.swarm.connections.size)
-      // console.log(this.swarm.peers.size)
+      //console.log(this.swarm.peers)
     })
     
 
@@ -96,8 +111,8 @@ class HolepunchWorker extends EventEmitter {
    * @method startStores
    *
   */
-  startStores = function (ws) {
-    this.activateHypercores()
+  startStores = async function () {
+    await this.activateHypercores()
   }
 
   /**
@@ -111,7 +126,7 @@ class HolepunchWorker extends EventEmitter {
     })
     // peer connection active for first time 
     this.Peers.on('peer-connect', (data) => {
-     //this.warmPeerPrepare(data)
+     // this.warmPeerPrepare(data)
     })
     // share connection failed
     this.Peers.on('peer-share-fail', (data) => {
@@ -126,6 +141,18 @@ class HolepunchWorker extends EventEmitter {
       data.prime = false
       this.emit('peer-topic-update', data)    
     })
+    // reconnect topic peer id
+    this.Peers.on('peer-reconnect-topic-id', (peerIn, data) => {
+      // update status to live
+      this.Peers.updatePeerStatus(data.topic, peerIn)
+      // match current key to peerid
+      let peerMatch = this.Peers.matchPeerTopic(data.topic)
+      let codeNameInform = {}
+      codeNameInform.type = 'peer-codename-inform'
+      codeNameInform.action = 'set'
+      codeNameInform.data = { inviteCode: '' , publickey: peerMatch.key }
+      this.emit('invite-live-peer', codeNameInform)
+    })
     // peer reconnection topic ie. able to reconnect again
     this.Peers.on('topic-formed-save', (data) => {
       // put data into holder await for codename  matching over
@@ -133,6 +160,8 @@ class HolepunchWorker extends EventEmitter {
     })
     // codename matching
     this.Peers.on('peer-codename-match', (data) => {
+      // check if first time?
+      this.Peers.matchInviteFirst(data)
       // put in holding and then complete once save first complete
       this.codenameUpdates.push(data)
     })
@@ -170,6 +199,7 @@ class HolepunchWorker extends EventEmitter {
       if (data.roletaken === 'server') {
         // not unique info to match on yet.
       } else {
+        // client path --->
         let peerRole = this.Peers.matchCodename(data.publickey)
         if (peerRole.name.length > 0) {
           // receiving peer
@@ -289,7 +319,12 @@ class HolepunchWorker extends EventEmitter {
       } 
     } else if (message.action === 'retry') {
       let peerDefaults = this.Peers.peerMatchTopic(message.data.key)
-      this.Peers.discoveryMatch(message.data.key)
+      // this.Peers.discoveryMatch(message.data.key)
+      if (message.data.value.settopic === true) {
+        this.Peers.topicConnect(message.data.key, message.data.value.topic)
+      } else {
+        this.Peers.topicListen(message.data.value.topic, message.data.key)
+      }
     } else if (message.action === 'peer-closed') {
       this.flushConnections()
       await this.swarm.destroy()