hypercore-storage 2.6.1 → 2.7.1

package/index.js

@@ -32,9 +32,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 +62,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 +73,7 @@ class Atom {
 
       await Promise.all(promises)
     } finally {
+      this.view.reset()
       this.flushing = false
       if (this.flushedPromise !== null) this._resolve()
     }
@@ -242,7 +250,7 @@ class HypercoreStorage {
     const existingSessions = await existingSessionsPromise
 
     const sessions = existingSessions || []
-    const session = getBatch(sessions, name, false)
+    const session = getSession(sessions, name, false)
 
     if (session === null) return null
 
@@ -288,7 +296,7 @@ class HypercoreStorage {
     }
 
     const sessions = existingSessions || []
-    const session = getBatch(sessions, name, true)
+    const session = getSession(sessions, name, true)
     const fresh = session.dataPointer === -1
 
     if (fresh) {
@@ -374,6 +382,29 @@ class HypercoreStorage {
     return deps
   }
 
+  async deleteSessions() {
+    const rx = this.read()
+    const existingSessionsPromise = rx.getSessions()
+    rx.tryFlush()
+
+    const existingSessions = await existingSessionsPromise
+
+    // Remove batches
+    const coreTx = this.write()
+    coreTx.setSessions([]) // Clear sessions record
+    await coreTx.flush()
+
+    const tx = this.db.write({ autoDestroy: true })
+
+    for (const { dataPointer } of existingSessions) {
+      const start = core.data(dataPointer)
+      const end = core.data(dataPointer + 1)
+      tx.tryDeleteRange(start, end)
+    }
+
+    await tx.flush()
+  }
+
   read() {
     return new CoreRX(this.core, this.db, this.view)
   }
@@ -427,6 +458,11 @@ class HypercoreStorage {
 
     return core
   }
+
+  static isParentStorage(storage, parent) {
+    const last = getLastDependency(storage)
+    return !!last && last.dataPointer === parent.core.dataPointer
+  }
 }
 
 class CorestoreStorage {
@@ -1080,6 +1116,10 @@ class CorestoreStorage {
       await this._exit()
     }
   }
+
+  static isParentStorage(storage, parent) {
+    return HypercoreStorage.isParentStorage(storage, parent)
+  }
 }
 
 module.exports = CorestoreStorage
@@ -1096,7 +1136,7 @@ function initStoreHead() {
   }
 }
 
-function getBatch(sessions, name, alloc) {
+function getSession(sessions, name, alloc) {
   for (let i = 0; i < sessions.length; i++) {
     if (sessions[i].name === name) return sessions[i]
   }
@@ -1134,6 +1174,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/package.json

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