hypercore-storage 1.0.5 → 1.0.7

package/index.js

@@ -104,7 +104,7 @@ class HypercoreStorage {
   }
 
   snapshot () {
-    return new HypercoreStorage(this.store, this.db.snapshot(), this.core, this.view.snapshot(), this.atom)
+    return new HypercoreStorage(this.store, this.db.snapshot(), cloneCore(this.core), this.view.snapshot(), this.atom)
   }
 
   atomize (atom) {
@@ -212,13 +212,12 @@ class HypercoreStorage {
       version: this.core.version,
       corePointer: this.core.corePointer,
       dataPointer: this.core.dataPointer,
-      dependencies: this._addDependency({ dataPointer: this.core.dataPointer, length })
+      dependencies: this._addDependency(null)
     }
 
     const coreTx = new CoreTX(core, this.db, atom.view, [])
 
     if (length > 0) coreTx.setHead(head)
-    coreTx.setDependency(core.dependencies[core.dependencies.length - 1])
 
     await coreTx.flush()
 
@@ -231,7 +230,7 @@ class HypercoreStorage {
     for (let i = 0; i < this.core.dependencies.length; i++) {
       const d = this.core.dependencies[i]
 
-      if (d.length > dep.length) {
+      if (dep !== null && d.length > dep.length) {
         deps.push({ dataPointer: d.dataPointer, length: dep.length })
         return deps
       }
@@ -239,7 +238,7 @@ class HypercoreStorage {
       deps.push(d)
     }
 
-    deps.push(dep)
+    if (dep !== null) deps.push(dep)
     return deps
   }
 
@@ -705,3 +704,17 @@ function createColumnFamily (db) {
 
   return db.columnFamily(col)
 }
+
+function cloneCore (c) {
+  const copy = {
+    dataPointer: c.dataPointer,
+    corePointer: c.corePointer,
+    dependencies: []
+  }
+
+  for (const { dataPointer, length } of c.dependencies) {
+    copy.dependencies.push({ dataPointer, length })
+  }
+
+  return copy
+}

package/lib/block-dependency-stream.js

@@ -8,6 +8,7 @@ module.exports = class BlockStream extends Readable {
     this.core = core
     this.db = db
     this.updates = updates
+    this.start = start
     this.end = end
     this.reverse = reverse === true
 
@@ -23,26 +24,18 @@ module.exports = class BlockStream extends Readable {
   _update () {
     if (this._consumed > this.core.dependencies.length) return
 
-    const index = this.reverse ? this.core.dependencies.length - this._consumed : this._consumed
-    const offset = index === 0 ? 0 : this.core.dependencies[index - 1].length
+    const deps = this.core.dependencies
 
-    let end = 0
-    let ptr = 0
+    const index = findDependencyIndex(deps, this.end, this._consumed++, this.reverse)
 
-    if (this._consumed < this.core.dependencies.length) {
-      const dep = this.core.dependencies[this._consumed]
-      end = this.end === -1 ? dep.length : Math.min(this.end, dep.length)
-      ptr = dep.dataPointer
-    } else {
-      end = this.end === -1 ? Infinity : this.end
-      ptr = this.core.dataPointer
-    }
-
-    this._consumed++
+    const curr = deps[index]
+    const prev = deps[index - 1]
 
-    if (end === offset) return
+    const start = prev && prev.length > this.start ? prev.length : this.start
+    const end = curr && curr.length < this.end ? curr.length : this.end
+    const ptr = curr ? curr.dataPointer : this.core.dataPointer
 
-    this._makeStream(core.block(ptr, offset), core.block(ptr, end))
+    this._makeStream(core.block(ptr, start), core.block(ptr, end))
   }
 
   _predestroy () {
@@ -105,3 +98,13 @@ module.exports = class BlockStream extends Readable {
 }
 
 function noop () {}
+
+function findDependencyIndex (deps, end, offset, reverse) {
+  if (!reverse) return offset
+
+  for (let i = deps.length - offset; i > 0; i--) {
+    if (deps[i - 1].length <= end) return i
+  }
+
+  return 0
+}

package/lib/tx.js

@@ -16,6 +16,7 @@ const CORE_HINTS = schema.getEncoding('@core/hints')
 
 class CoreTX {
   constructor (core, db, view, changes) {
+    if (db.snapshotted) throw new Error('Cannot open core tx on snapshot')
     this.core = core
     this.db = db
     this.view = view

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore-storage",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "main": "index.js",
   "files": [
     "index.js",