hypercore 11.27.12 → 11.27.14

package/lib/replicator.js

@@ -526,7 +526,8 @@ class Peer {
       hotswaps: 0,
       invalidData: 0,
       invalidRequests: 0,
-      backoffs: 0
+      backoffs: 0,
+      notAvailableBackoffs: 0
     }
 
     this.receiverQueue = new ReceiverQueue()
@@ -1991,7 +1992,8 @@ module.exports = class Replicator {
       hotswaps: 0,
       invalidData: 0,
       invalidRequests: 0,
-      backoffs: 0
+      backoffs: 0,
+      notAvailableBackoffs: 0
     }
 
     this._attached = new Set()
@@ -2684,6 +2686,15 @@ module.exports = class Replicator {
   }
 
   _onnodata(peer, req, reason) {
+    if (reason === NOT_AVAILABLE) {
+      peer.stats.notAvailableBackoffs++
+      this.stats.notAvailableBackoffs++
+
+      if (peer.stats.notAvailableBackoffs >= MAX_BACKOFFS) {
+        peer.paused = true
+      }
+    }
+
     if (reason === INVALID_REQUEST) {
       peer.stats.backoffs++
       this.stats.backoffs++

package/lib/session-state.js

@@ -3,6 +3,7 @@ const b4a = require('b4a')
 const assert = require('nanoassert')
 const flat = require('flat-tree')
 const quickbit = require('quickbit-universal')
+const HypercoreStorage = require('hypercore-storage')
 
 const {
   INVALID_OPERATION,
@@ -249,6 +250,13 @@ class SessionState {
     return true
   }
 
+  _precommit(state) {
+    assert(
+      state.parent === this && state.storage.core.dataPointer === this.storage.core.dataPointer,
+      'Atomic state must flush to parent'
+    )
+  }
+
   async _commit() {
     await this.mutex.lock()
 
@@ -957,12 +965,21 @@ class SessionState {
     return { tree, flushed }
   }
 
+  static isParent(state, parent) {
+    // atomic batches have parent set
+    if (state.parent && state.parent === parent) return true
+
+    return HypercoreStorage.isParentStorage(state.storage, parent.storage)
+  }
+
   async commit(state, { signature, keyPair, length = state.length, treeLength = -1 } = {}) {
     assert(
       this.isDefault() || (this.parent && this.parent.isDefault()),
       'Can only commit into default state'
     )
 
+    assert(SessionState.isParent(state, this), 'Cannot commit across cores')
+
     if (this.core._repairMode) {
       throw ASSERTION('Cannot commit while repair mode is on')
     }
@@ -1180,6 +1197,7 @@ class SessionState {
 
       if (atom) {
         this.atomized = atom
+        atom.preflush(this._precommit.bind(this, state))
         atom.onflush(state._commit.bind(state))
       }
 

package/package.json

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