hypercore 11.31.0 → 11.33.0

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

package/lib/replicator.js

@@ -233,13 +233,12 @@ class RangeBatchRequest extends Attachable {
 }
 
 class RangeRequest extends Attachable {
-  constructor(replicator, ranges, start, end, linear, ifAvailable, blocks) {
+  constructor(replicator, ranges, start, end, linear, blocks) {
     super(replicator)
 
     this.start = start
     this.end = end
     this.linear = linear
-    this.ifAvailable = ifAvailable
     this.blocks = blocks
     this.ranges = ranges
     this.batches = []
@@ -2230,14 +2229,7 @@ module.exports = class Replicator {
 
   addRange(
     session,
-    {
-      start = 0,
-      end = -1,
-      length = toLength(start, end),
-      blocks = null,
-      linear = false,
-      ifAvailable = false
-    } = {}
+    { start = 0, end = -1, length = toLength(start, end), blocks = null, linear = false } = {}
   ) {
     if (blocks !== null) {
       // if using blocks, start, end just acts as frames around the blocks array
@@ -2251,7 +2243,6 @@ module.exports = class Replicator {
       start,
       length === -1 ? -1 : start + length,
       linear,
-      ifAvailable,
       blocks
     )
 
@@ -2460,7 +2451,11 @@ module.exports = class Replicator {
     }
 
     this._onpeerupdate(false, peer)
-    if (inflight) this.updateAll()
+    if (inflight) {
+      this.updateAll()
+    } else {
+      this._checkUpgradeIfAvailable()
+    }
   }
 
   _queueBlock(b) {
@@ -2653,23 +2648,6 @@ module.exports = class Replicator {
     if (this._inflight.idle || updateAll) this.updateAll()
   }
 
-  _maybeResolveIfAvailableRanges() {
-    if (this._ifAvailable > 0 || !this._inflight.idle || !this._ranges.length) return
-
-    for (let i = 0; i < this.peers.length; i++) {
-      if (this.peers[i].dataProcessing > 0) return
-    }
-
-    for (let i = 0; i < this._ranges.length; i++) {
-      const r = this._ranges[i]
-
-      if (r.ifAvailable) {
-        this._resolveRangeRequest(r)
-        i--
-      }
-    }
-  }
-
   _clearRequest(peer, req) {
     if (req.block !== null) {
       this._clearInflightBlock(this._blocks, req)
@@ -3020,7 +2998,6 @@ module.exports = class Replicator {
     }
 
     this._checkUpgradeIfAvailable()
-    this._maybeResolveIfAvailableRanges()
   }
 
   updateAll() {
@@ -3048,7 +3025,6 @@ module.exports = class Replicator {
     }
 
     this._checkUpgradeIfAvailable()
-    this._maybeResolveIfAvailableRanges()
   }
 
   onpeerdestroy() {

package/lib/session-state.js

@@ -224,6 +224,11 @@ 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
+    })
   }
 
   _clearActiveBatch() {
@@ -306,8 +311,6 @@ class SessionState {
       }
 
       if (this.isDefault() && this.core.header.group) {
-        const { pointer } = this.core.header.group
-
         const tx = await this.createWriteBatch()
         this.updateGroupIndex(tx, tree)
         await tx.flush()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore",
-  "version": "11.31.0",
+  "version": "11.33.0",
   "description": "Hypercore is a secure, distributed append-only log",
   "main": "index.js",
   "scripts": {