hypercore-storage 1.8.6 → 1.9.0

package/index.js

@@ -1,6 +1,9 @@
 const RocksDB = require('rocksdb-native')
 const rrp = require('resolve-reject-promise')
 const ScopeLock = require('scope-lock')
+const DeviceFile = require('device-file')
+const path = require('path')
+const fs = require('fs')
 const View = require('./lib/view.js')
 
 const VERSION = 1
@@ -346,10 +349,19 @@ class HypercoreStorage {
 }
 
 class CorestoreStorage {
-  constructor (db, opts) {
-    this.path = typeof db === 'string' ? db : db.path
-    this.rocks = typeof db === 'string' ? new RocksDB(db, opts) : db
+  constructor (db, opts = {}) {
+    const storage = typeof db === 'string' ? db : null
+
+    this.bootstrap = storage !== null
+    this.path = storage !== null ? storage : path.join(db.path, '..')
+    this.readOnly = !!opts.readOnly
+
+    // tmp sync fix for simplicty since not super deployed yet
+    if (this.bootstrap && !this.readOnly) tmpFixStorage(this.path)
+
+    this.rocks = storage === null ? db : new RocksDB(path.join(this.path, 'db'), opts)
     this.db = createColumnFamily(this.rocks, opts)
+    this.id = opts.id || null
     this.view = null
     this.enters = 0
     this.lock = new ScopeLock()
@@ -426,6 +438,14 @@ class CorestoreStorage {
     try {
       if (this.version === VERSION) return
 
+      if (this.bootstrap && this.readOnly) {
+        const corestoreFile = path.join(this.path, 'CORESTORE')
+
+        if (!(await DeviceFile.resume(corestoreFile, { id: this.id }))) {
+          await DeviceFile.create(corestoreFile, { id: this.id })
+        }
+      }
+
       const rx = new CorestoreRX(this.db, view)
       const headPromise = rx.getHead()
 
@@ -557,6 +577,10 @@ class CorestoreStorage {
     return new Atom(this.db)
   }
 
+  async flush () {
+    await this.rocks.flush()
+  }
+
   async close () {
     if (this.db.closed) return
     await this._flush()
@@ -678,7 +702,7 @@ class CorestoreStorage {
     const core = await promise
 
     if (core === null) return false
-    if (core.version !== VERSION && !ifMigrated) return false
+    if (core.version !== VERSION && ifMigrated) return false
 
     return true
   }
@@ -850,3 +874,24 @@ function createColumnFamily (db, opts = {}) {
 
   return db.columnFamily(col)
 }
+
+// TODO: remove in like 3-6 mo
+function tmpFixStorage (p) {
+  let files = []
+
+  try {
+    files = fs.readdirSync(p)
+  } catch {}
+
+  const notRocks = new Set(['CORESTORE', 'primary-key', 'cores', 'app-preferences', 'cache', 'preferences.json', 'db'])
+
+  for (const f of files) {
+    if (notRocks.has(f)) continue
+
+    try {
+      fs.mkdirSync(path.join(p, 'db'))
+    } catch {}
+
+    fs.renameSync(path.join(p, f), path.join(p, 'db', f))
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore-storage",
-  "version": "1.8.6",
+  "version": "1.9.0",
   "main": "index.js",
   "files": [
     "index.js",
@@ -31,6 +31,7 @@
     "bare-fs": "^4.0.1",
     "bare-path": "^3.0.0",
     "compact-encoding": "^2.16.0",
+    "device-file": "^1.2.2",
     "flat-tree": "^1.12.1",
     "hypercore-crypto": "^3.4.2",
     "hyperschema": "^1.7.0",