hypercore-storage 2.7.0 → 2.8.0

package/index.js

@@ -21,6 +21,7 @@ const {
   createBitfieldStream,
   createUserDataStream,
   createTreeNodeStream,
+  createMarkStream,
   createLocalStream
 } = require('./lib/streams.js')
 
@@ -32,9 +33,14 @@ class Atom {
     this.view = new View()
     this.flushedPromise = null
     this.flushing = false
+    this.preflushes = []
     this.flushes = []
   }
 
+  preflush(fn) {
+    this.preflushes.push(fn)
+  }
+
   onflush(fn) {
     this.flushes.push(fn)
   }
@@ -57,8 +63,10 @@ class Atom {
     this.flushing = true
 
     try {
+      const plen = this.preflushes.length
+      for (let i = 0; i < plen; i++) this.preflushes[i]()
+
       await View.flush(this.view.changes, this.db)
-      this.view.reset()
 
       const promises = []
       const len = this.flushes.length // in case of reentry
@@ -66,6 +74,7 @@ class Atom {
 
       await Promise.all(promises)
     } finally {
+      this.view.reset()
       this.flushing = false
       if (this.flushedPromise !== null) this._resolve()
     }
@@ -230,6 +239,10 @@ class HypercoreStorage {
     return createUserDataStream(this.core, this.db, this.view, opts)
   }
 
+  createMarkStream(opts) {
+    return createMarkStream(this.core, this.db, this.view, opts)
+  }
+
   createLocalStream(opts) {
     return createLocalStream(this.core, this.db, this.view, opts)
   }
@@ -450,6 +463,11 @@ class HypercoreStorage {
 
     return core
   }
+
+  static isParentStorage(storage, parent) {
+    const last = getLastDependency(storage)
+    return !!last && last.dataPointer === parent.core.dataPointer
+  }
 }
 
 class CorestoreStorage {
@@ -1103,6 +1121,10 @@ class CorestoreStorage {
       await this._exit()
     }
   }
+
+  static isParentStorage(storage, parent) {
+    return HypercoreStorage.isParentStorage(storage, parent)
+  }
 }
 
 module.exports = CorestoreStorage
@@ -1157,6 +1179,10 @@ function createColumnFamily(db, opts = {}) {
   return db.columnFamily(col)
 }
 
+function getLastDependency(storage) {
+  return storage.dependencies.length ? storage.dependencies[storage.dependencies.length - 1] : null
+}
+
 // TODO: remove in like 3-6 mo
 function tmpFixStorage(p) {
   // if CORESTORE file is written, new format

package/lib/keys.js

@@ -21,6 +21,7 @@ const DATA_TREE = 4
 const DATA_BITFIELD = 5
 const DATA_USER_DATA = 6
 const DATA_LOCAL = 7
+const DATA_MARK = 8
 
 const slab = { buffer: b4a.allocUnsafe(65536), start: 0, end: 0 }
 
@@ -224,6 +225,16 @@ core.userDataEnd = function (ptr) {
   return state.buffer.subarray(start, state.start)
 }
 
+core.mark = function (ptr, index) {
+  const state = alloc()
+  const start = state.start
+  UINT.encode(state, TL_DATA)
+  UINT.encode(state, ptr)
+  UINT.encode(state, DATA_MARK)
+  UINT.encode(state, index)
+  return state.buffer.subarray(start, state.start)
+}
+
 core.local = function (ptr, key) {
   if (key.byteLength > 2048) {
     throw new Error('local keys has an upper limit of 2048 bytes atm')
@@ -273,6 +284,14 @@ core.userDataKey = function (buffer) {
   return STRING.decode(state)
 }
 
+core.markKey = function (buffer) {
+  const state = { buffer, start: 0, end: buffer.byteLength }
+  UINT.decode(state) // ns
+  UINT.decode(state) // ptr
+  UINT.decode(state) // type
+  return UINT.decode(state)
+}
+
 core.localKey = function (buffer) {
   const state = { buffer, start: 0, end: buffer.byteLength }
   UINT.decode(state) // ns

package/lib/streams.js

@@ -15,6 +15,7 @@ module.exports = {
   createAliasStream,
   createDiscoveryKeyStream,
   createTreeNodeStream,
+  createMarkStream,
   createLocalStream
 }
 
@@ -117,6 +118,20 @@ function createUserDataStream(
   return ite
 }
 
+function createMarkStream(
+  ptr,
+  db,
+  view,
+  { gt = -1, gte = gt + 1, lte = -1, lt = lte === -1 ? -1 : lte + 1, reverse = false } = {}
+) {
+  const s = core.mark(ptr.dataPointer, gte)
+  const e = core.mark(ptr.dataPointer, lt === -1 ? Infinity : lt)
+  const ite = view.iterator(db, s, e, reverse)
+
+  ite._readableState.map = mapMark
+  return ite
+}
+
 function createLocalStream(
   ptr,
   db,
@@ -139,6 +154,11 @@ function mapBitfield(data) {
   return { index, page: data.value }
 }
 
+function mapMark(data) {
+  const index = core.markKey(data.key)
+  return { index, page: data.value }
+}
+
 function mapLocal(data) {
   const key = core.localKey(data.key)
   return { key, value: data.value }

package/lib/tx.js

@@ -108,6 +108,22 @@ class CoreTX {
     this.changes.push([core.userData(this.core.dataPointer, key), null, null])
   }
 
+  putMark(index, data) {
+    this.changes.push([core.mark(this.core.dataPointer, index), data, null])
+  }
+
+  deleteMark(index) {
+    this.changes.push([core.mark(this.core.dataPointer, index), null, null])
+  }
+
+  deleteMarkRange(start, end) {
+    this.changes.push([
+      core.mark(this.core.dataPointer, start),
+      null,
+      core.mark(this.core.dataPointer, end === -1 ? Infinity : end)
+    ])
+  }
+
   putLocal(key, value) {
     this.changes.push([core.local(this.core.dataPointer, key), value, null])
   }
@@ -213,6 +229,10 @@ class CoreRX {
     return this.view.get(this.read, core.userData(this.core.dataPointer, key))
   }
 
+  getMark(index) {
+    return this.view.get(this.read, core.mark(this.core.dataPointer, index))
+  }
+
   getLocal(key) {
     return this.view.get(this.read, core.local(this.core.dataPointer, key))
   }

package/package.json

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