hypercore-storage 1.1.4 → 1.1.6

package/index.js

@@ -86,29 +86,42 @@ class HypercoreStorage {
   }
 
   // TODO: this might have to be async if the dependents have changed, but prop ok for now
-  updateDependencyLength (length) {
+  updateDependencyLength (length, truncated) {
     const deps = this.core.dependencies
 
-    for (let i = deps.length - 1; i >= 0; i--) {
-      if (deps[i].length > length) continue
+    const i = this.findDependencyIndex(length, truncated)
+    if (i === -1) throw new Error('Dependency not found')
 
-      this.core = {
-        corePointer: this.core.corePointer,
-        dataPointer: this.core.dataPointer,
-        dependencies: deps.slice(0, i + 1)
+    this.core = {
+      corePointer: this.core.corePointer,
+      dataPointer: this.core.dataPointer,
+      dependencies: deps.slice(0, i + 1)
+    }
+
+    if (this.core.dependencies[i].length !== length) {
+      this.core.dependencies[i] = {
+        dataPointer: deps[i].dataPointer,
+        length
       }
+    }
+  }
 
-      if (this.core.dependencies[i].length !== length) {
-        this.core.dependencies[i] = {
-          dataPointer: deps[i].dataPointer,
-          length
-        }
+  findDependencyIndex (length, truncated) {
+    const deps = this.core.dependencies
+
+    if (truncated) {
+      for (let i = 0; i < deps.length; i++) {
+        if (deps[i].length >= length) return i
       }
 
-      return
+      return -1
+    }
+
+    for (let i = deps.length - 1; i >= 0; i--) {
+      if (deps[i].length <= length) return i
     }
 
-    throw new Error('Dependency not found')
+    return -1
   }
 
   get snapshotted () {

package/lib/close-error-stream.js

@@ -0,0 +1,14 @@
+const { Readable } = require('streamx')
+
+// used for returned a stream that just errors (during read during teardown)
+
+module.exports = class CloseErrorStream extends Readable {
+  constructor (err) {
+    super()
+    this.error = err
+  }
+
+  _open (cb) {
+    cb(this.error)
+  }
+}

package/lib/view.js

@@ -1,4 +1,5 @@
 const { Readable, getStreamError } = require('streamx')
+const CloseErrorStream = require('./close-error-stream.js')
 const b4a = require('b4a')
 
 class OverlayStream extends Readable {
@@ -212,6 +213,8 @@ class View {
   }
 
   iterator (db, start, end, reverse) {
+    if (dbClosing(db)) return new CloseErrorStream(new Error('RocksDB session is closed'))
+
     const stream = db.iterator({ gte: start, lt: end, reverse })
     if (this.changes === null) return stream
 
@@ -344,3 +347,8 @@ function reverseArray (list) {
   for (let i = 0; i < list.length; i++) r[r.length - 1 - i] = list[i]
   return r
 }
+
+// TODO: expose from rocks instead
+function dbClosing (db) {
+  return db._state.closing || db._index === -1
+}

package/package.json

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