corestore 7.9.1 → 7.10.0

package/index.js

@@ -8,6 +8,7 @@ const { isAndroid } = require('which-runtime')
 const { STORAGE_EMPTY, ASSERTION } = require('hypercore-errors')
 
 const auditStore = require('./lib/audit.js')
+const GroupNotifyHandle = require('./lib/notify.js')
 
 const [NS] = crypto.namespace('corestore', 1)
 const DEFAULT_NAMESPACE = b4a.alloc(32) // This is meant to be 32 0-bytes
@@ -204,6 +205,7 @@ class FindingPeers {
   constructor() {
     this.count = 0
     this.pending = []
+    this.destroyed = false
   }
 
   add(core) {
@@ -212,7 +214,7 @@ class FindingPeers {
   }
 
   inc(sessions) {
-    if (++this.count !== 1) return
+    if (this.destroyed || ++this.count !== 1) return
 
     for (const core of sessions) {
       this.pending.push(core.findingPeers())
@@ -220,7 +222,12 @@ class FindingPeers {
   }
 
   dec(sessions) {
-    if (--this.count !== 0) return
+    if (this.destroyed || --this.count !== 0) return
+    while (this.pending.length > 0) this.pending.pop()()
+  }
+
+  destroy() {
+    this.destroyed = true
     while (this.pending.length > 0) this.pending.pop()()
   }
 }
@@ -253,8 +260,10 @@ class Corestore extends ReadyResource {
     this.watchers = null
     this.watchIndex = -1
 
+    this._groupNotifiers = new Map() // group notifications
     this._findingPeers = null // here for legacy
     this._ongcBound = this._ongc.bind(this)
+    this._onGroupActiveBound = this._onGroupActive.bind(this)
 
     if (opts.primaryKey && !this.root && !opts.unsafe) {
       throw ASSERTION(
@@ -262,8 +271,6 @@ class Corestore extends ReadyResource {
       )
     }
 
-    if (this.root) this.corestores.add(this)
-
     this.ready().catch(noop)
   }
 
@@ -287,12 +294,50 @@ class Corestore extends ReadyResource {
     }
   }
 
+  _onGroupActive(topic) {
+    this.emit('group-active', topic)
+
+    const topicHex = b4a.toString(topic, 'hex')
+    const handles = this._groupNotifiers.get(topicHex)
+    if (!handles) return
+    for (const handle of handles) handle.emit('update')
+  }
+
+  notifyGroup(topic) {
+    const topicHex = b4a.toString(topic, 'hex')
+    let handles = this._groupNotifiers.get(topicHex)
+
+    if (!handles) {
+      handles = []
+      this._groupNotifiers.set(topicHex, handles)
+    }
+
+    const handle = new GroupNotifyHandle(this, topic)
+    const length = handles.push(handle)
+    handle.index = length - 1
+
+    return handle
+  }
+
+  _removeGroupNotify(handle) {
+    if (handle.index === -1) return
+
+    const topicHex = b4a.toString(handle._topic, 'hex')
+    const handles = this._groupNotifiers.get(topicHex)
+    if (!handles) return
+
+    const popped = handles.pop()
+    if (popped !== handle) handles[(popped.index = handle.index)] = popped
+    if (handles.length === 0) this._groupNotifiers.delete(topicHex)
+    handle.index = -1
+  }
+
   findingPeers() {
     if (this._findingPeers === null) this._findingPeers = new FindingPeers()
     this._findingPeers.inc(this.sessions)
     let done = false
     return () => {
-      if (done) return
+      if (done || !this._findingPeers) return
       done = true
       this._findingPeers.dec(this.sessions)
     }
@@ -352,6 +397,7 @@ class Corestore extends ReadyResource {
 
   async _open() {
     if (this.root !== null) {
+      this.corestores.add(this)
       if (this.root.opened === false) await this.root.ready()
       this.primaryKey = this.root.primaryKey
       return
@@ -374,10 +420,19 @@ class Corestore extends ReadyResource {
     const hanging = [...this.sessions]
     for (const sess of hanging) closing.push(sess.close())
 
-    if (this.watchers !== null) this.cores.unwatch(this)
+    if (this.watchers !== null) {
+      this.cores.unwatch(this)
+      this.watchers = null
+    }
+
+    if (this._findingPeers !== null) {
+      this._findingPeers.destroy()
+      this._findingPeers = null
+    }
 
     if (this.root !== null) {
       await Promise.all(closing)
+      this.corestores.delete(this)
       return
     }
 
@@ -554,6 +609,7 @@ class Corestore extends ReadyResource {
 
   _makeSession(conf) {
     const session = new Hypercore(null, null, conf)
+
     if (this._findingPeers !== null) this._findingPeers.add(session)
     return session
   }
@@ -596,7 +652,8 @@ class Corestore extends ReadyResource {
       keyPair: null,
       key: null,
       discoveryKey,
-      manifest: null
+      manifest: null,
+      group: null
     }
 
     if (opts.name) {
@@ -614,6 +671,10 @@ class Corestore extends ReadyResource {
       }
     }
 
+    if (opts.group) {
+      result.group = opts.group
+    }
+
     if (opts.key) result.key = ID.decode(opts.key)
     else if (result.manifest) result.key = Hypercore.key(result.manifest)
 
@@ -630,7 +691,7 @@ class Corestore extends ReadyResource {
     const auth = this._auth(discoveryKey, opts)
 
     const id = toHex(auth.discoveryKey)
-    const existing = this.cores.resume(id)
+    const existing = this.cores.resume(id, auth.group)
     if (existing && !existing.closing) return existing
 
     const core = Hypercore.createCore(this.storage, {
@@ -649,6 +710,7 @@ class Corestore extends ReadyResource {
       keyPair: auth.keyPair,
       legacy: opts.legacy,
       manifest: auth.manifest,
+      group: auth.group,
       globalCache: opts.globalCache || this.globalCache || null,
       alias: opts.name ? { name: opts.name, namespace: this.ns } : null
     })
@@ -657,6 +719,8 @@ class Corestore extends ReadyResource {
       this.cores.gc(core)
     }
 
+    core.ongroupupdate = this._onGroupActiveBound
+
     core.replicator.ondownloading = () => {
       if (this.active) this.streamTracker.attachAll(core)
     }

package/lib/notify.js

@@ -0,0 +1,27 @@
+const { EventEmitter } = require('events')
+const { Readable } = require('streamx')
+
+class GroupNotifyHandle extends EventEmitter {
+  constructor(store, topic) {
+    super()
+    this._store = store
+    this._topic = topic
+    this.index = -1
+  }
+
+  updates(opts) {
+    return Readable.deferred(async () => {
+      const groupId = await this._store.storage.getGroup(this._topic).catch(noop)
+      if (groupId === null) return null
+      return this._store.storage.createGroupUpdateStream(groupId, opts)
+    })
+  }
+
+  destroy() {
+    this._store._removeGroupNotify(this)
+  }
+}
+
+module.exports = GroupNotifyHandle
+
+function noop() {}

package/package.json

@@ -1,20 +1,28 @@
 {
   "name": "corestore",
-  "version": "7.9.1",
+  "version": "7.10.0",
   "description": "A Hypercore factory that simplifies managing collections of cores.",
   "main": "index.js",
   "files": [
     "index.js",
     "lib/*"
   ],
+  "imports": {
+    "events": {
+      "bare": "bare-events",
+      "default": "events"
+    }
+  },
   "dependencies": {
     "b4a": "^1.6.7",
-    "hypercore": "^11.19.0",
+    "bare-events": "^2.8.3",
+    "hypercore": "^11.32.0",
     "hypercore-crypto": "^3.4.2",
     "hypercore-errors": "^1.4.0",
     "hypercore-id-encoding": "^1.3.0",
     "ready-resource": "^1.1.1",
     "sodium-universal": "^5.0.1",
+    "streamx": "^2.26.0",
     "which-runtime": "^1.2.1"
   },
   "devDependencies": {
@@ -22,15 +30,14 @@
     "lunte": "^1.3.0",
     "prettier": "^3.6.2",
     "prettier-config-holepunch": "^2.0.0",
-    "rache": "^1.0.0",
-    "test-tmp": "^1.3.0"
+    "rache": "^1.0.0"
   },
   "scripts": {
     "format": "prettier --write .",
     "test": "npm run test:node && npm run test:bare",
-    "test:bare": "brittle-bare --coverage test/*.js",
+    "test:bare": "brittle-bare --coverage test/all.js",
     "lint": "prettier --check . && lunte",
-    "test:node": "brittle-node --coverage test/*.js"
+    "test:node": "brittle-node --coverage test/all.js"
   },
   "repository": {
     "type": "git",