hypercore 11.30.2 → 11.32.0

package/index.js

@@ -270,6 +270,11 @@ class Hypercore extends EventEmitter {
     this.encryption = encryption
   }
 
+  async setGroup(topic) {
+    if (!this.opened) await this.opening
+    return this.core.setGroup(topic)
+  }
+
   setKeyPair(keyPair) {
     this.keyPair = keyPair
   }
@@ -1363,6 +1368,7 @@ function initOnce(session, storage, key, opts) {
     keyPair: opts.keyPair,
     legacy: opts.legacy,
     manifest: opts.manifest,
+    group: opts.group,
     globalCache: opts.globalCache || null // session is a temp option, not to be relied on unless you know what you are doing (no semver guarantees)
   })
 }

package/lib/core.js

@@ -48,6 +48,7 @@ module.exports = class Core {
     this.globalCache = opts.globalCache || null
     this.autoClose = opts.autoClose !== false
     this.onidle = noop
+    this.ongroupupdate = noop
 
     this.state = null
     this.opened = false
@@ -214,8 +215,10 @@ module.exports = class Core {
           fork: 0,
           length: 0,
           rootHash: null,
-          signature: null
+          signature: null,
+          timestamp: 0
         },
+        group: null,
         hints: {
           reorgs: [],
           contiguousLength: 0,
@@ -296,6 +299,19 @@ module.exports = class Core {
       this.replicator.setPushOnly(true)
     }
 
+    if (opts.group) {
+      if (!header.group) header.group = await this.db.createGroup(opts.group)
+      else if (!b4a.equals(header.group.key, opts.group)) {
+        throw STORAGE_CONFLICT(
+          'Core is already register to group: ' + b4a.toString(header.group.key, 'hex')
+        )
+      }
+
+      const tx = storage.write()
+      tx.setGroup(header.group)
+      await tx.flush()
+    }
+
     if (overwrite) {
       const tx = storage.write()
       tx.deleteTreeNodeRange(0, -1)
@@ -354,6 +370,24 @@ module.exports = class Core {
     }
   }
 
+  async setGroup(group) {
+    await this.state.mutex.lock()
+    try {
+      if (!this.header.group) this.header.group = await this.db.createGroup(group)
+      else if (!b4a.equals(this.header.group.key, group)) {
+        throw STORAGE_CONFLICT(
+          'Core is already register to group: ' + b4a.toString(this.header.group.key, 'hex')
+        )
+      }
+
+      const tx = this.storage.write()
+      tx.setGroup(this.header.group)
+      await tx.flush()
+    } finally {
+      this.state.mutex.unlock()
+    }
+  }
+
   async setManifest(manifest) {
     await this.state.mutex.lock()
 
@@ -965,7 +999,8 @@ function getDefaultTree() {
     fork: 0,
     length: 0,
     rootHash: null,
-    signature: null
+    signature: null,
+    timestamp: 0
   }
 }
 
@@ -978,6 +1013,7 @@ function parseHeader(info) {
     external: null,
     keyPair: info.keyPair,
     tree: info.head || getDefaultTree(),
+    group: info.group,
     hints: {
       reorgs: [],
       contiguousLength: info.hints ? info.hints.contiguousLength : 0,
@@ -1005,13 +1041,15 @@ async function getCoreInfo(storage) {
   const auth = r.getAuth()
   const head = r.getHead()
   const hints = r.getHints()
+  const group = r.getGroup()
 
   r.tryFlush()
 
-  const [authInfo, headInfo, hintsInfo] = await Promise.all([auth, head, hints])
+  const [authInfo, headInfo, hintsInfo, groupInfo] = await Promise.all([auth, head, hints, group])
   return {
     ...authInfo,
     head: headInfo,
-    hints: hintsInfo
+    hints: hintsInfo,
+    group: groupInfo
   }
 }

package/lib/replicator.js

@@ -2460,7 +2460,12 @@ module.exports = class Replicator {
     }
 
     this._onpeerupdate(false, peer)
-    if (inflight) this.updateAll()
+    if (inflight) {
+      this.updateAll()
+    } else {
+      this._checkUpgradeIfAvailable()
+      this._maybeResolveIfAvailableRanges()
+    }
   }
 
   _queueBlock(b) {

package/lib/session-state.js

@@ -219,6 +219,14 @@ class SessionState {
     return dependency
   }
 
+  updateGroupIndex(tx, tree) {
+    const { pointer } = this.core.header.group
+
+    tx.deleteGroupUpdate(pointer, this.core.header.tree.timestamp)
+    tx.putGroupUpdate(pointer, tree.timestamp, this.core.header.key)
+    this.core.ongroupupdate(this.core.header.group.key)
+  }
+
   _clearActiveBatch() {
     this._activeTx = null
   }
@@ -294,7 +302,14 @@ class SessionState {
         fork: this.fork,
         length: this.length,
         rootHash: this.hash(),
-        signature: this.signature
+        signature: this.signature,
+        timestamp: Date.now()
+      }
+
+      if (this.isDefault() && this.core.header.group) {
+        const tx = await this.createWriteBatch()
+        this.updateGroupIndex(tx, tree)
+        await tx.flush()
       }
 
       if (dependency) this.storage.setDependencyHead(dependency)
@@ -364,10 +379,17 @@ class SessionState {
         fork: batch.fork,
         length: batch.length,
         rootHash: batch.hash(),
-        signature: batch.signature
+        signature: batch.signature,
+        timestamp: Date.now()
       }
 
-      if (batch.upgraded) tx.setHead(head)
+      if (batch.upgraded) {
+        tx.setHead(head)
+
+        if (this.core.header.group) {
+          this.updateGroupIndex(tx, head)
+        }
+      }
 
       const flushed = await this.flush()
 
@@ -487,7 +509,12 @@ class SessionState {
       fork: batch.fork,
       length: batch.length,
       rootHash: batch.hash(),
-      signature: batch.signature
+      signature: batch.signature,
+      timestamp: Date.now()
+    }
+
+    if (this.isDefault() && this.core.header.group) {
+      this.updateGroupIndex(storage, tree)
     }
 
     storage.setHead(tree)
@@ -663,7 +690,8 @@ class SessionState {
         fork: batch.fork,
         length: batch.length,
         rootHash: batch.hash(),
-        signature: batch.signature
+        signature: batch.signature,
+        timestamp: Date.now()
       }
 
       tx.setHead(tree)
@@ -676,6 +704,10 @@ class SessionState {
             remoteContiguousLength: this.core.header.hints.remoteContiguousLength
           })
         }
+
+        if (this.core.header.group) {
+          this.updateGroupIndex(tx, tree)
+        }
       }
 
       for (let i = 0; i < values.length; i++) {
@@ -829,9 +861,11 @@ class SessionState {
         fork,
         length,
         rootHash: crypto.tree(roots),
-        signature: null
+        signature: null,
+        timestamp: Date.now()
       }
 
+      // never default state so do not update group index
       tx.setHead(tree)
 
       // prop a better way to do this
@@ -957,7 +991,12 @@ class SessionState {
       fork,
       length,
       rootHash: crypto.tree(roots),
-      signature
+      signature,
+      timestamp: Date.now()
+    }
+
+    if (this.isDefault() && this.core.header.group) {
+      this.updateGroupIndex(tx, tree)
     }
 
     const upgraded = treeLength < this.length || this.length < length || tree.fork !== this.fork

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore",
-  "version": "11.30.2",
+  "version": "11.32.0",
   "description": "Hypercore is a secure, distributed append-only log",
   "main": "index.js",
   "scripts": {
@@ -54,7 +54,7 @@
     "hypercore-crypto": "^3.2.1",
     "hypercore-errors": "^1.5.0",
     "hypercore-id-encoding": "^1.2.0",
-    "hypercore-storage": "^2.8.0",
+    "hypercore-storage": "^3.0.0",
     "is-options": "^1.0.1",
     "nanoassert": "^2.0.0",
     "protomux": "^3.5.0",