hypercore-storage 1.1.5 → 1.2.0

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/migrations/0/messages.js

@@ -180,7 +180,7 @@ const manifest = exports.manifest = {
     c.uint.encode(state, m.version)
     if (m.version === 0) return manifestv0.encode(state, m)
 
-    c.uint.encode(state, (m.allowPatch ? 1 : 0) | (m.prologue ? 2 : 0))
+    c.uint.encode(state, (m.allowPatch ? 1 : 0) | (m.prologue ? 2 : 0) | (m.unencrypted ? 4 : 0))
     hashes.encode(state, m.hash)
 
     c.uint.encode(state, m.quorum)
@@ -196,6 +196,7 @@ const manifest = exports.manifest = {
     const hash = hashes.decode(state)
     const quorum = c.uint.decode(state)
     const signers = signerArray.decode(state)
+    const unencrypted = (flags & 4) !== 0
 
     return {
       version: 1,
@@ -203,7 +204,8 @@ const manifest = exports.manifest = {
       allowPatch: (flags & 1) !== 0,
       quorum,
       signers,
-      prologue: (flags & 2) === 0 ? null : prologue.decode(state)
+      prologue: (flags & 2) === 0 ? null : prologue.decode(state),
+      unencrypted
     }
   }
 }

package/package.json

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

package/spec/hyperschema/index.js

@@ -250,7 +250,7 @@ const encoding9_4 = c.array(encoding7)
 const encoding9 = {
   preencode (state, m) {
     c.uint.preencode(state, m.version)
-    state.end++ // max flag is 2 so always one byte
+    state.end++ // max flag is 4 so always one byte
     encoding4.preencode(state, m.hash)
     c.uint.preencode(state, m.quorum)
     encoding9_4.preencode(state, m.signers)
@@ -260,7 +260,8 @@ const encoding9 = {
   encode (state, m) {
     const flags =
       (m.allowPatch ? 1 : 0) |
-      (m.prologue ? 2 : 0)
+      (m.prologue ? 2 : 0) |
+      (m.unencrypted ? 4 : 0)
 
     c.uint.encode(state, m.version)
     c.uint.encode(state, flags)
@@ -280,7 +281,8 @@ const encoding9 = {
       quorum: c.uint.decode(state),
       allowPatch: (flags & 1) !== 0,
       signers: encoding9_4.decode(state),
-      prologue: (flags & 2) !== 0 ? encoding8.decode(state) : null
+      prologue: (flags & 2) !== 0 ? encoding8.decode(state) : null,
+      unencrypted: (flags & 4) !== 0
     }
   }
 }