hypercore-storage 1.0.0 → 1.0.2

package/index.js

@@ -47,12 +47,12 @@ class Atom {
 }
 
 class HypercoreStorage {
-  constructor (store, db, core, view, atomic) {
+  constructor (store, db, core, view, atom) {
     this.store = store
     this.db = db
     this.core = core
     this.view = view
-    this.atomic = atomic
+    this.atom = atom
 
     this.view.readStart()
   }
@@ -95,15 +95,15 @@ class HypercoreStorage {
   }
 
   snapshot () {
-    return new HypercoreStorage(this.store, this.db.snapshot(), this.core, this.view.snapshot(), this.atomic)
+    return new HypercoreStorage(this.store, this.db.snapshot(), this.core, this.view.snapshot(), this.atom)
   }
 
   atomize (atom) {
-    return new HypercoreStorage(this.store, this.db.session(), this.core, atom.view, true)
+    return new HypercoreStorage(this.store, this.db.session(), this.core, atom.view, atom)
   }
 
-  atom () {
-    return this.store.atom()
+  createAtom () {
+    return this.store.createAtom()
   }
 
   createBlockStream (opts) {
@@ -149,11 +149,11 @@ class HypercoreStorage {
     const dependency = await dependencyPromise
     if (dependency) core.dependencies = this._addDependency(dependency)
 
-    return new HypercoreStorage(this.store, this.db.session(), core, this.atomic ? this.view : new View(), this.atomic)
+    return new HypercoreStorage(this.store, this.db.session(), core, this.atom ? this.view : new View(), this.atom)
   }
 
-  async createSession (name, head, atom) {
-    const rx = this.read(atom)
+  async createSession (name, head) {
+    const rx = this.read()
 
     const existingSessionsPromise = rx.getSessions()
     const existingHeadPromise = rx.getHead()
@@ -174,7 +174,7 @@ class HypercoreStorage {
       session.dataPointer = await this.store._allocData()
     }
 
-    const tx = this.write(atom)
+    const tx = this.write()
 
     tx.setSessions(sessions)
 
@@ -193,7 +193,7 @@ class HypercoreStorage {
 
     await tx.flush()
 
-    return new HypercoreStorage(this.store, this.db.session(), core, atom ? atom.view : this.atomic ? this.view : new View(), !!atom || this.atomic)
+    return new HypercoreStorage(this.store, this.db.session(), core, this.atom ? this.view : new View(), this.atom)
   }
 
   async createAtomicSession (atom, head) {
@@ -233,12 +233,12 @@ class HypercoreStorage {
     return deps
   }
 
-  read (atom) {
-    return new CoreRX(this.core, this.db, atom ? atom.view : this.view)
+  read () {
+    return new CoreRX(this.core, this.db, this.view)
   }
 
-  write (atom) {
-    return new CoreTX(this.core, this.db, atom ? atom.view : this.atomic ? this.view : null, [])
+  write () {
+    return new CoreTX(this.core, this.db, this.atom ? this.view : null, [])
   }
 
   close () {
@@ -429,7 +429,7 @@ class CorestoreStorage {
     return head === null ? initStoreHead() : head
   }
 
-  atom () {
+  createAtom () {
     return new Atom(this.db)
   }
 
@@ -585,7 +585,7 @@ class CorestoreStorage {
       dataPointer = dependency.dataPointer
     }
 
-    const result = new HypercoreStorage(this, this.db.session(), core, EMPTY, false)
+    const result = new HypercoreStorage(this, this.db.session(), core, EMPTY, null)
 
     if (result.core.version === 0) await this._migrateCore(result, discoveryKey, create)
     return result
@@ -635,7 +635,7 @@ class CorestoreStorage {
 
     tx.apply()
 
-    return new HypercoreStorage(this, this.db.session(), ptr, EMPTY, false)
+    return new HypercoreStorage(this, this.db.session(), ptr, EMPTY, null)
   }
 
   async create (data) {

package/lib/view.js

@@ -2,14 +2,14 @@ const { Readable, getStreamError } = require('streamx')
 const b4a = require('b4a')
 
 class OverlayStream extends Readable {
-  constructor (stream, start, end, reverse, changes, ranges) {
+  constructor (stream, start, end, reverse, changes, cleared) {
     super()
 
     this.start = start
     this.end = end
     this.reverse = reverse
     this.changes = changes
-    this.ranges = ranges
+    this.cleared = cleared
     this.change = 0
     this.range = 0
 
@@ -73,17 +73,17 @@ class OverlayStream extends Readable {
   _push (entry) {
     const key = entry.key
 
-    while (this.range < this.ranges.length) {
-      const r = this.ranges[this.range]
+    while (this.range < this.cleared.length) {
+      const c = this.cleared[this.range]
 
       // we moved past the range
-      if (this.reverse ? b4a.compare(key, r[0]) < 0 : b4a.compare(r[2], key) <= 0) {
+      if (this.reverse ? b4a.compare(key, c[0]) < 0 : b4a.compare(c[2], key) <= 0) {
         this.range++
         continue
       }
 
       // we didnt move past and are in, drop
-      if (b4a.compare(r[0], key) <= 0 && b4a.compare(key, r[2]) < 0) {
+      if (b4a.compare(c[0], key) <= 0 && b4a.compare(key, c[2]) < 0) {
         return true
       }
 
@@ -124,7 +124,7 @@ class Overlay {
   constructor () {
     this.indexed = 0
     this.changes = null
-    this.ranges = null
+    this.cleared = null
     this.reverse = false
   }
 
@@ -132,16 +132,16 @@ class Overlay {
     if (view.indexed === this.indexed) return
 
     const changes = view.map === null ? [] : [...view.map.values()]
-    const ranges = view.ranges === null ? [] : view.ranges.slice(0)
+    const cleared = view.cleared === null ? [] : view.cleared.slice(0)
 
     const cmp = reverse ? cmpChangeReverse : cmpChange
 
     changes.sort(cmp)
-    ranges.sort(cmp)
+    cleared.sort(cmp)
 
     this.indexed = view.indexed
     this.changes = changes
-    this.ranges = ranges
+    this.cleared = cleared
     this.reverse = reverse
   }
 
@@ -152,7 +152,7 @@ class Overlay {
       end,
       reverse,
       this.reverse === reverse ? this.changes : reverseArray(this.changes),
-      this.reverse === reverse ? this.ranges : reverseArray(this.ranges)
+      this.reverse === reverse ? this.cleared : reverseArray(this.cleared)
     )
   }
 }
@@ -162,7 +162,7 @@ class View {
     this.map = null
     this.indexed = 0
     this.changes = null
-    this.ranges = null
+    this.cleared = null
     this.overlay = null
     this.snap = null
     this.readers = 0
@@ -176,7 +176,7 @@ class View {
     snap.map = this.map
     snap.indexed = this.indexed
     snap.changes = this.changes
-    snap.ranges = this.ranges
+    snap.cleared = this.cleared
 
     if (this._frozen()) return snap
 
@@ -208,7 +208,7 @@ class View {
 
   reset () {
     this.indexed = 0
-    this.snap = this.map = this.changes = this.ranges = null
+    this.snap = this.map = this.changes = this.cleared = null
   }
 
   iterator (db, start, end, reverse) {
@@ -225,10 +225,29 @@ class View {
   _indexAndGet (read, key) {
     this._index()
     const change = this.map.get(b4a.toString(key, 'hex'))
-    if (change === undefined) return read.get(key)
+
+    if (change === undefined) {
+      return this.cleared === null
+        ? read.get(key)
+        : this._readAndMaybeDrop(read, key)
+    }
+
     return Promise.resolve(change[1])
   }
 
+  async _readAndMaybeDrop (read, key) {
+    const value = await read.get(key)
+    if (value === null) return null
+
+    for (let i = 0; i < this.cleared.length; i++) {
+      const c = this.cleared[i]
+      // check if in range
+      if (b4a.compare(c[0], key) <= 0 && b4a.compare(key, c[2]) < 0) return null
+    }
+
+    return value
+  }
+
   _attached () {
     return this.snap !== null && this.changes === this.snap.changes
   }
@@ -242,7 +261,7 @@ class View {
     if (this._attached()) {
       this.snap._index()
       this.map = this.snap.map
-      this.ranges = this.snap.ranges
+      this.cleared = this.snap.cleared
       this.indexed = this.snap.indexed
       return
     }
@@ -266,8 +285,8 @@ class View {
       if (s <= key && key < e) this.map.set(key, [c[0], null, null])
     }
 
-    if (this.ranges === null) this.ranges = []
-    this.ranges.push(range)
+    if (this.cleared === null) this.cleared = []
+    this.cleared.push(range)
   }
 
   apply (changes) {
@@ -275,7 +294,7 @@ class View {
 
     if (this.readers !== 0 && this.changes !== null) {
       this.changes = this.changes.slice(0)
-      this.ranges = this.ranges === null ? null : this.ranges.slice(0)
+      this.cleared = this.cleared === null ? null : this.cleared.slice(0)
       this.map = this.map === null ? null : new Map([...this.map])
     }
 

package/package.json

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