hypercore-storage 0.0.25 → 0.0.27

package/index.js

@@ -358,7 +358,7 @@ module.exports = class CoreStorage {
     return new HypercoreStorage(this, discoveryKey, core, data, null)
   }
 
-  async create ({ key, manifest, keyPair, encryptionKey, discoveryKey }) {
+  async create ({ key, manifest, keyPair, encryptionKey, discoveryKey, userData }) {
     await this.mutex.write.lock()
 
     try {
@@ -390,7 +390,7 @@ module.exports = class CoreStorage {
       const batch = new WriteBatch(storage, write)
 
       initialiseCoreInfo(batch, { key, manifest, keyPair, encryptionKey })
-      initialiseCoreData(batch)
+      initialiseCoreData(batch, { userData })
 
       await batch.flush()
       return storage
@@ -745,6 +745,11 @@ function initialiseCoreInfo (db, { key, manifest, keyPair, encryptionKey }) {
   if (encryptionKey) db.setEncryptionKey(encryptionKey)
 }
 
-function initialiseCoreData (db) {
+function initialiseCoreData (db, { userData } = {}) {
   db.setDataInfo({ version: 0 })
+  if (userData) {
+    for (const { key, value } of userData) {
+      db.setUserData(key, value)
+    }
+  }
 }

package/lib/memory-overlay.js

@@ -1,7 +1,98 @@
 const { ASSERTION } = require('hypercore-errors')
+const { Readable, isEnded, getStreamError } = require('streamx')
 
 const TipList = require('./tip-list')
 
+class OverlayStream extends Readable {
+  constructor (tip, storage, createStream, opts = {}) {
+    super()
+
+    this.tip = tip
+    this.storage = storage
+    this.opts = opts
+
+    this._reverse = !!opts.reverse
+    this._active = null
+    this._position = this._reverse ? tip.length() - 1 : tip.offset
+
+    this._createStream = createStream
+    this._pendingDestroy = null
+
+    if (!opts.reverse) {
+      this._active = createStream(storage, opts)
+      this._active.on('close', this._onclose.bind(this))
+      this._active.on('data', this._ondata.bind(this))
+    }
+  }
+
+  _predestroy () {
+    if (this._active) this._active.destroy()
+  }
+
+  _read (cb) {
+    if (this._active === null) {
+      if (this._yield()) return cb(null)
+    }
+
+    if (this._active) {
+      this._active.resume()
+    }
+
+    cb(null)
+  }
+
+  _yield () {
+    while (this._memoryRemaining()) {
+      const { valid, value } = this.tip.get(this._position)
+      const index = this._nextIndex()
+
+      if (!valid) continue
+      if (!this.push({ index, page: value })) break
+    }
+
+    return this._onmemorydrain()
+  }
+
+  _nextIndex () {
+    if (this._reverse) return this._position--
+    return this._position++
+  }
+
+  _memoryRemaining () {
+    if (this._reverse) return this._position >= this.tip.offset
+    return this._position < this.tip.length()
+  }
+
+  _onmemorydrain () {
+    if (!this._reverse) {
+      this.push(null)
+      return true
+    }
+
+    this._active = this._createStream(this.storage, this.opts)
+    this._active.on('close', this._onclose.bind(this))
+    this._active.on('data', this._ondata.bind(this))
+
+    return false
+  }
+
+  _ondata (data) {
+    if (!this.push(data)) this._active.pause()
+  }
+
+  _onclose () {
+    if (!isEnded(this._active)) {
+      const error = getStreamError(this._active)
+      this.destroy(error)
+      return
+    }
+
+    if (this._reverse) return this.push(null)
+
+    this._yield()
+  }
+}
+
 class MemoryOverlay {
   constructor (storage) {
     this.storage = storage
@@ -24,7 +115,7 @@ class MemoryOverlay {
   }
 
   snapshot () {
-    todo()
+    return new MemoryOverlay(this.storage.snapshot())
   }
 
   get dependencies () {
@@ -56,8 +147,8 @@ class MemoryOverlay {
     todo()
   }
 
-  createBitfieldPageStream () {
-    todo()
+  createBitfieldPageStream (opts) {
+    return new OverlayStream(this.bitfields, this.storage, createBitfieldPageStream, opts)
   }
 
   async peekLastTreeNode () {
@@ -266,6 +357,10 @@ class MemoryOverlayWriteBatch {
   }
 }
 
+function createBitfieldPageStream (storage, opts) {
+  return storage.createBitfieldPageStream(opts)
+}
+
 function mergeMap (a, b) {
   if (a === null) return b
   for (const [key, value] of b) a.set(key, value)

package/package.json

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