hypercore 11.0.5 → 11.0.7

package/lib/core.js

@@ -649,8 +649,8 @@ module.exports = class Core {
     this.updateContiguousLength({ start, length, drop: true })
   }
 
-  async _onconflict (proof, from) {
-    await this.replicator.onconflict(from)
+  async _onconflict (proof) {
+    await this.replicator.onconflict()
 
     for (let i = this.monitors.length - 1; i >= 0; i--) {
       const s = this.monitors[i]

package/lib/replicator.js

@@ -1578,7 +1578,7 @@ module.exports = class Replicator {
   }
 
   // Called externally when a conflict has been detected and verified
-  async onconflict (from) {
+  async onconflict () {
     const all = []
     for (const peer of this.peers) {
       all.push(peer._onconflict())

package/lib/session-state.js

@@ -19,6 +19,10 @@ module.exports = class SessionState {
     this.name = name
     this.sessions = []
 
+    // small hack to close old storages as late as possible.
+    // TODO: add a read lock so we can avoid that
+    this.lingers = null
+
     this.parent = parent
     this.mutex = new Mutex()
 
@@ -135,6 +139,10 @@ module.exports = class SessionState {
     this.index = -1
     this.core.checkIfIdle()
 
+    if (this.lingers !== null) {
+      for (const storage of this.lingers) await storage.close()
+    }
+
     return closing
   }
 
@@ -225,11 +233,15 @@ module.exports = class SessionState {
     }
 
     if (src.dependencyLength > this.dependencyLength) {
+      this.dependencyLength = src.dependencyLength
       this.storage.updateDependencyLength(src.dependencyLength)
     }
 
     // handle migration
     if (src.core !== this.core) {
+      if (this.lingers === null) this.lingers = []
+      this.lingers.push(this.storage)
+
       this.prologue = src.prologue
       this.storage = await src.core.state.storage.resumeSession(this.name)
       this.tree = new MerkleTree(this.storage)
@@ -241,8 +253,6 @@ module.exports = class SessionState {
       }
 
       this._moveToCore(src.core)
-
-      await this.storage.close()
     }
 
     const truncated = (bitfield && bitfield.truncated !== -1)
@@ -800,7 +810,8 @@ module.exports = class SessionState {
       const treeLength = this.length
 
       if (!this.isSnapshot()) {
-        const oldStorage = this.storage
+        if (this.lingers === null) this.lingers = []
+        this.lingers.push(this.storage)
 
         const truncation = length < this.length ? await truncateAndFlush(this, length) : null
         const treeInfo = truncation ? truncation.tree : await state._getTreeHeadAt(this.length)
@@ -830,8 +841,6 @@ module.exports = class SessionState {
           if (dependency) this.storage.updateDependencyLength(this.dependencyLength)
           this.ontruncate(tree, tree.length, treeLength, flushed)
         }
-
-        await oldStorage.close()
       }
 
       if (!this.storage.atom) {

package/package.json

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