corestore 7.0.15 → 7.0.17

package/index.js

@@ -4,6 +4,7 @@ const ReadyResource = require('ready-resource')
 const sodium = require('sodium-universal')
 const crypto = require('hypercore-crypto')
 const ID = require('hypercore-id-encoding')
+const { STORAGE_EMPTY } = require('hypercore-errors')
 
 const auditStore = require('./lib/audit.js')
 
@@ -119,6 +120,11 @@ class CoreTracker {
     return core
   }
 
+  opened (id) {
+    const core = this.map.get(id)
+    return !!(core && core.opened && !core.closing)
+  }
+
   get (id) {
     // we allow you do call this from the outside, so support normal buffers also
     if (b4a.isBuffer(id)) id = b4a.toString(id, 'hex')
@@ -352,7 +358,7 @@ class Corestore extends ReadyResource {
 
   async _attachMaybe (muxer, discoveryKey) {
     if (this.opened === false) await this.ready()
-    if (this.cores.get(toHex(discoveryKey)) === null && !(await this.storage.has(discoveryKey, { ifMigrated: true }))) return
+    if (!this.cores.opened(toHex(discoveryKey)) && !(await this.storage.has(discoveryKey, { ifMigrated: true }))) return
     if (this.closing) return
 
     const core = this._openCore(discoveryKey, { createIfMissing: false })
@@ -437,6 +443,11 @@ class Corestore extends ReadyResource {
       return this._makeSession(conf)
     }
 
+    if (opts.discoveryKey && !opts.key && !opts.manifest) {
+      conf.preload = this._preloadCheckIfExists(opts)
+      return this._makeSession(conf)
+    }
+
     // if not not we can sync create it, which just is easier for the
     // upstream user in terms of guarantees (key is there etc etc)
     const core = this._openCore(null, opts)
@@ -459,6 +470,12 @@ class Corestore extends ReadyResource {
     return createKeyPair(this.primaryKey, ns, name)
   }
 
+  async _preloadCheckIfExists (opts) {
+    const has = await this.storage.has(opts.discoveryKey)
+    if (!has) throw STORAGE_EMPTY('No Hypercore is stored here')
+    return this._preload(opts)
+  }
+
   async _preload (opts) {
     if (opts.preload) opts = { ...opts, ...(await opts.preload) }
     if (this.opened === false) await this.ready()
@@ -518,7 +535,7 @@ class Corestore extends ReadyResource {
     if (existing && !existing.closing) return existing
 
     const core = Hypercore.createCore(this.storage, {
-      preopen: existing ? existing.closing : null, // always wait for the prev one to close first in any case...
+      preopen: (existing && existing.opened) ? existing.closing : null, // always wait for the prev one to close first in any case...
       eagerUpgrade: true,
       notDownloadingLinger: opts.notDownloadingLinger,
       allowFork: opts.allowFork !== false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "corestore",
-  "version": "7.0.15",
+  "version": "7.0.17",
   "description": "A Hypercore factory that simplifies managing collections of cores.",
   "main": "index.js",
   "files": [
@@ -11,6 +11,7 @@
     "b4a": "^1.6.7",
     "hypercore": "^11.0.0",
     "hypercore-crypto": "^3.4.2",
+    "hypercore-errors": "^1.4.0",
     "hypercore-id-encoding": "^1.3.0",
     "ready-resource": "^1.1.1",
     "sodium-universal": "^4.0.1"