corestore 6.15.14 → 6.16.1

package/index.js

@@ -16,6 +16,7 @@ const PRIMARY_KEY_FILE_NAME = 'primary-key'
 const USERDATA_NAME_KEY = 'corestore/name'
 const USERDATA_NAMESPACE_KEY = 'corestore/namespace'
 const POOL_SIZE = 512 // how many open fds to aim for before cycling them
+const DEFAULT_MANIFEST = 0 // bump to 1 when this is more widely deployed
 
 module.exports = class Corestore extends ReadyResource {
   constructor (storage, opts = {}) {
@@ -28,6 +29,7 @@ module.exports = class Corestore extends ReadyResource {
     this.cache = !!opts.cache
     this.primaryKey = opts.primaryKey || null
     this.passive = !!opts.passive
+    this.manifestVersion = typeof opts.manifestVersion === 'number' ? opts.manifestVersion : (root ? root.manifestVersion : DEFAULT_MANIFEST)
 
     this._keyStorage = null
     this._bootstrap = opts._bootstrap || null
@@ -167,6 +169,18 @@ module.exports = class Corestore extends ReadyResource {
     if (this._bootstrap) await this._openNamespaceFromBootstrap()
   }
 
+  async _exists (discoveryKey) {
+    const id = b4a.toString(discoveryKey, 'hex')
+    const storageRoot = getStorageRoot(id)
+
+    const st = this.storage(storageRoot + '/oplog')
+
+    const exists = await new Promise((resolve) => st.stat((err, st) => resolve(!err && st.size > 0)))
+    await new Promise(resolve => st.close(resolve))
+
+    return exists
+  }
+
   async _generateKeys (opts) {
     if (opts._discoveryKey) {
       return {
@@ -206,14 +220,27 @@ module.exports = class Corestore extends ReadyResource {
     const publicKey = opts.publicKey || keyPair.publicKey
 
     if (opts.compat === false) {
-      const manifest = { signer: { publicKey } } // default manifest
-      const key = Hypercore.key(manifest)
+      let manifest = { version: this.manifestVersion, signers: [{ publicKey }] } // default manifest
+      let key = Hypercore.key(manifest)
+      let discoveryKey = crypto.discoveryKey(key)
+
+      if (!(await this._exists(discoveryKey)) && manifest.version !== 0) {
+        const manifestV0 = { version: 0, signers: [{ publicKey }] }
+        const keyV0 = Hypercore.key(manifestV0)
+        const discoveryKeyV0 = crypto.discoveryKey(keyV0)
+
+        if (await this._exists(discoveryKeyV0)) {
+          manifest = manifestV0
+          key = keyV0
+          discoveryKey = discoveryKeyV0
+        }
+      }
 
       return {
         manifest,
         keyPair,
         key,
-        discoveryKey: crypto.discoveryKey(key)
+        discoveryKey
       }
     }
 
@@ -275,7 +302,7 @@ module.exports = class Corestore extends ReadyResource {
 
     // No more async ticks allowed after this point -- necessary for caching
 
-    const storageRoot = [CORES_DIR, id.slice(0, 2), id.slice(2, 4), id].join('/')
+    const storageRoot = getStorageRoot(id)
     const core = new Hypercore(p => this.storage(storageRoot + '/' + p), {
       _preready: this._preready.bind(this),
       notDownloadingLinger: this._notDownloadingLinger,
@@ -544,3 +571,7 @@ async function forceClose (core) {
   await core.ready()
   return Promise.all(core.sessions.map(s => s.close()))
 }
+
+function getStorageRoot (id) {
+  return CORES_DIR + '/' + id.slice(0, 2) + '/' + id.slice(2, 4) + '/' + id
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "corestore",
-  "version": "6.15.14",
+  "version": "6.16.1",
   "description": "A Hypercore factory that simplifies managing collections of cores.",
   "main": "index.js",
   "scripts": {
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "b4a": "^1.6.4",
-    "hypercore": "^10.28.1",
+    "hypercore": "^10.32.3",
     "hypercore-crypto": "^3.4.0",
     "hypercore-id-encoding": "^1.2.0",
     "read-write-mutexify": "^2.1.0",