hypercore 11.0.35 → 11.0.37

package/index.js

@@ -364,8 +364,10 @@ class Hypercore extends EventEmitter {
       if (state) state.unref() // ref'ed above in setup session
     }
 
-    if (this.state && checkout !== -1 && checkout < this.state.length) {
-      await this.state.truncate(checkout, this.fork)
+    if (this.state && checkout !== -1) {
+      if (!opts.name && !opts.atom) throw ASSERTION('Checkouts must be named or atomized')
+      if (checkout > this.state.length) throw ASSERTION('Invalid checkout ' + checkout + ' for ' + opts.name + ', length is ' + this.state.length)
+      if (checkout < this.state.length) await this.state.truncate(checkout, this.fork)
     }
 
     if (this.state === null) {

package/lib/session-state.js

@@ -114,16 +114,19 @@ module.exports = class SessionState {
     return this.treeFork === -1 ? this.core.header.tree.fork : this.treeFork
   }
 
-  async getFlushedTreeInfo (storage) {
+  async updateSnapshotStorage (storage) {
     if (!this.atomized || !this.atomized.flushing) return this.treeInfo()
     await this.atomized.flushed()
 
     let rx = storage.read()
     const headPromise = rx.getHead()
     const authPromise = rx.getAuth()
+    const depPromise = rx.getDependency()
 
     rx.tryFlush()
-    const [head, auth] = await Promise.all([headPromise, authPromise])
+    const [head, auth, dep] = await Promise.all([headPromise, authPromise, depPromise])
+
+    storage.setDependencyHead(dep)
 
     const fork = head ? head.fork : 0
     const length = head ? head.length : 0
@@ -188,7 +191,7 @@ module.exports = class SessionState {
 
   async snapshot () {
     const storage = this.storage.snapshot()
-    const treeInfo = await this.getFlushedTreeInfo(storage)
+    const treeInfo = await this.updateSnapshotStorage(storage)
 
     const s = new SessionState(
       this.core,
@@ -258,6 +261,14 @@ module.exports = class SessionState {
     try {
       const currLength = this.length
 
+      // load dependency into memory
+      const rx = this.storage.read()
+      const dependencyPromise = rx.getDependency()
+
+      rx.tryFlush()
+
+      const dependency = await dependencyPromise
+
       this.fork = src.fork
       this.length = src.length
       this.byteLength = src.byteLength
@@ -271,15 +282,7 @@ module.exports = class SessionState {
         signature: this.signature
       }
 
-      const rx = src.storage.read()
-      const dependencyPromise = rx.getDependency()
-
-      rx.tryFlush()
-
-      const dependency = await dependencyPromise
-      if (dependency && dependency.length > this.flushedLength()) {
-        this.storage.updateDependencyLength(dependency.length, false, true)
-      }
+      if (dependency) this.storage.setDependencyHead(dependency)
 
       const truncated = bitfield ? bitfield.truncated : -1
 
@@ -398,7 +401,7 @@ module.exports = class SessionState {
       this.roots = roots
       this.signature = tree.signature
 
-      if (dependency) this.storage.updateDependencyLength(dependency.length, true)
+      if (dependency) this.storage.setDependencyHead(dependency)
 
       this.ontruncate(tree, tree.length, batch.treeLength, flushed)
     } finally {
@@ -424,7 +427,7 @@ module.exports = class SessionState {
       this.roots = batch.roots
       this.signature = batch.signature
 
-      if (dependency) this.storage.updateDependencyLength(dependency.length, true)
+      if (dependency) this.storage.setDependencyHead(dependency)
 
       this.ontruncate(tree, batch.ancestors, batch.treeLength, flushed)
     } finally {
@@ -481,7 +484,7 @@ module.exports = class SessionState {
 
       const flushed = await this.flush()
 
-      if (dependency) this.storage.updateDependencyLength(dependency.length, true)
+      if (dependency) this.storage.setDependencyHead(dependency)
 
       // todo: atomic event handle
       if (this.isDefault() && flushed) {
@@ -658,7 +661,7 @@ module.exports = class SessionState {
       const truncating = sharedLength < origLength
 
       for (const node of roots) {
-        if (node === null) throw new INVALID_OPERATION('Invalid catchup length, tree nodes not available')
+        if (node === null) throw INVALID_OPERATION('Invalid catchup length, tree nodes not available')
       }
 
       const fork = truncating ? this.fork + 1 : this.fork
@@ -685,9 +688,7 @@ module.exports = class SessionState {
 
       const flushed = await this.flush()
 
-      // and prop a better way to do this tooo
-      this.storage.updateDependencyLength(sharedLength, true)
-      this.storage.updateDependencyLength(length, false)
+      this.storage.setDependencyHead(dep)
 
       this.fork = tree.fork
       this.roots = roots
@@ -846,7 +847,7 @@ module.exports = class SessionState {
 
         await state.flush(tx)
 
-        if (dependency) state.storage.updateDependencyLength(dependency.length, false)
+        if (dependency) state.storage.setDependencyHead(dependency)
       }
 
       const bitfield = { start: treeLength, length: length - treeLength, drop: false }
@@ -953,7 +954,7 @@ module.exports = class SessionState {
         if (truncation) {
           const { dependency } = truncation
 
-          if (dependency) this.storage.updateDependencyLength(dependency.length, true)
+          if (dependency) this.storage.setDependencyHead(dependency)
           truncated = { to: treeLength, fork }
         }
 

package/package.json

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