hypercore 11.27.7 → 11.27.9

package/index.js

@@ -376,12 +376,16 @@ class Hypercore extends EventEmitter {
     const state = this.state
 
     if (opts.atom) {
+      await parentState.mutex.lock()
       this.state = await parentState.createSession(null, false, opts.atom)
+      parentState.mutex.unlock()
       if (state) state.unref()
     } else if (opts.name) {
       // todo: need to make named sessions safe before ready
       // atm we always copy the state in passCapabilities
+      await parentState.mutex.lock()
       this.state = await parentState.createSession(opts.name, !!opts.overwrite, null)
+      parentState.mutex.unlock()
       if (state) state.unref() // ref'ed above in setup session
     }
 

package/lib/core.js

@@ -44,7 +44,6 @@ module.exports = class Core {
     this.bitfield = null
     this.verifier = null
     this.truncating = 0
-    this.updating = false
     this.skipBitfield = null
     this.globalCache = opts.globalCache || null
     this.autoClose = opts.autoClose !== false

package/lib/session-state.js

@@ -123,7 +123,7 @@ class SessionState {
     return this.core.header.tree.fork
   }
 
-  async updateSnapshotStorage(storage) {
+  async _updateSnapshotStorage(storage) {
     if (!this.atomized || !this.atomized.flushing) return this.treeInfo()
     await this.atomized.flushed()
 
@@ -206,12 +206,16 @@ class SessionState {
   }
 
   async snapshot() {
-    const storage = this.storage.snapshot()
-    const treeInfo = await this.updateSnapshotStorage(storage)
+    try {
+      await this.mutex.lock()
 
-    const s = new SessionState(this.core, null, storage, treeInfo, this.name)
+      const storage = this.storage.snapshot()
+      const treeInfo = await this._updateSnapshotStorage(storage)
 
-    return s
+      return new SessionState(this.core, null, storage, treeInfo, this.name)
+    } finally {
+      this._unlock()
+    }
   }
 
   updateDependency(tx, length) {
@@ -251,10 +255,6 @@ class SessionState {
     return true
   }
 
-  _precommit() {
-    this.commiting = true
-  }
-
   async _commit() {
     await this.mutex.lock()
 
@@ -264,7 +264,6 @@ class SessionState {
       this.lastTruncation = null
       await this.parent._oncommit(this, bitfield)
     } finally {
-      this.commiting = false
       this.mutex.unlock()
     }
   }
@@ -311,8 +310,7 @@ class SessionState {
 
       if (this.core.hintsChanged && this.isDefault()) await this.core.flushHints()
     } finally {
-      this.mutex.unlock()
-      this.core.checkIfIdle()
+      this._unlock()
     }
   }
 
@@ -346,7 +344,6 @@ class SessionState {
       }
 
       const tx = this.createWriteBatch()
-      this.updating = true
 
       if (bitfield) {
         tx.putBlock(bitfield.start, value)
@@ -384,9 +381,7 @@ class SessionState {
 
       if (this.core.hintsChanged && this.isDefault()) await this.core.flushHints()
     } finally {
-      this._clearActiveBatch()
-      this.updating = false
-      this.mutex.unlock()
+      this._unlock()
     }
 
     return true
@@ -849,7 +844,7 @@ class SessionState {
 
       if (this.core.hintsChanged && this.isDefault()) await this.core.flushHints()
     } finally {
-      this.mutex.unlock()
+      this._unlock()
     }
   }
 
@@ -1027,15 +1022,8 @@ class SessionState {
         byteLength: this.byteLength
       }
     } finally {
-      this.updating = false
-      this.mutex.unlock()
-
-      if (srcLocked) {
-        state.mutex.unlock()
-        state._clearActiveBatch()
-      }
-
-      this.core.checkIfIdle()
+      if (srcLocked) state._unlock()
+      this._unlock()
     }
   }
 
@@ -1144,7 +1132,7 @@ class SessionState {
 
       this._moveToCore(core.core, truncated, appended)
     } finally {
-      this.mutex.unlock()
+      this._unlock()
     }
   }
 

package/package.json

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