hypercore 11.33.4 → 11.34.0

package/lib/replicator.js

@@ -1019,7 +1019,7 @@ class Peer {
       }
 
       let req = null
-      const batch = this.core.storage.read()
+      const batch = this.core.storage.read(this.core.state.fork)
       try {
         req = await this._getProof(batch, msg, true)
       } catch (err) {
@@ -1051,7 +1051,7 @@ class Peer {
     }
 
     try {
-      const batch = this.core.storage.read()
+      const batch = this.core.storage.read(this.core.state.fork)
 
       // TODO: could still be answerable if (index, fork) is an ancestor of the current fork
       const req =

package/lib/session-state.js

@@ -46,6 +46,7 @@ class SessionState {
       ? Math.min(this.length, this.core.state.length)
       : -1
     this.lastTruncation = null
+    this.groupUpdated = false
 
     this.active = 0
 
@@ -224,11 +225,8 @@ class SessionState {
 
     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, {
-      key: this.core.key,
-      length: tree.length,
-      fork: tree.fork
-    })
+
+    this.groupUpdated = true
   }
 
   _clearActiveBatch() {
@@ -248,6 +246,16 @@ class SessionState {
     this.core.checkIfIdle()
   }
 
+  _flushHooks() {
+    if (!this.groupUpdated) return
+    this.groupUpdated = false
+    this.core.ongroupupdate(this.core.header.group.key, {
+      key: this.core.key,
+      length: this.length,
+      fork: this.fork
+    })
+  }
+
   async flush() {
     const tx = this._activeTx
     this._activeTx = null
@@ -311,9 +319,10 @@ class SessionState {
       }
 
       if (this.isDefault() && this.core.header.group) {
-        const tx = await this.createWriteBatch()
+        const tx = this.createWriteBatch()
         this.updateGroupIndex(tx, tree)
-        await tx.flush()
+        await this.flush()
+        this._flushHooks()
       }
 
       if (dependency) this.storage.setDependencyHead(dependency)
@@ -751,6 +760,8 @@ class SessionState {
     for (let i = this.sessions.length - 1; i >= 0; i--) {
       this.sessions[i].emit('append')
     }
+
+    this._flushHooks()
   }
 
   ontruncate(tree, to, from, flushed) {
@@ -774,6 +785,8 @@ class SessionState {
     for (let i = this.sessions.length - 1; i >= 0; i--) {
       this.sessions[i].emit('truncate', to, tree.fork)
     }
+
+    this._flushHooks()
   }
 
   _updateBitfield(bitfield, flushed) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore",
-  "version": "11.33.4",
+  "version": "11.34.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": "^3.0.0",
+    "hypercore-storage": "^3.2.0",
     "is-options": "^1.0.1",
     "nanoassert": "^2.0.0",
     "protomux": "^3.5.0",