corestore 6.15.3 → 6.15.5

package/index.js

@@ -294,9 +294,16 @@ module.exports = class Corestore extends ReadyResource {
       if (core.closing) return // extra safety here as ready is a tick after open
       if (hasKeyPair) core.setKeyPair(keyPair)
       this._emitCore('core-open', core)
-      for (const { stream } of this._replicationStreams) {
-        core.replicate(stream, { session: true })
+
+      const ondownloading = () => {
+        for (const { stream } of this._replicationStreams) {
+          core.replicate(stream, { session: true })
+        }
       }
+      // when the replicator says we are downloading, answer the call
+      core.replicator.ondownloading = ondownloading
+      // trigger once if the condition is already true
+      if (core.replicator.downloading) ondownloading()
     }, () => {
       this.cores.delete(id)
     })
@@ -343,6 +350,7 @@ module.exports = class Corestore extends ReadyResource {
       ...opts,
       name: null,
       preload: async () => {
+        if (opts.preload) opts = { ...opts, ...(await opts.preload()) }
         if (!this.opened) await this.ready()
 
         const keys = await this._generateKeys(opts)
@@ -382,7 +390,7 @@ module.exports = class Corestore extends ReadyResource {
     const stream = Hypercore.createProtocolStream(isInitiator, {
       ...opts,
       ondiscoverykey: async discoveryKey => {
-        const core = this.get({ _discoveryKey: discoveryKey })
+        const core = this.get({ _discoveryKey: discoveryKey, active: false })
 
         try {
           await core.ready()
@@ -390,14 +398,16 @@ module.exports = class Corestore extends ReadyResource {
           return
         }
 
-        if (this.passive && !core.closing) core.replicate(stream, { session: true })
+        // remote is asking for the core so we HAVE to answer even if not downloading
+        if (!core.closing) core.replicate(stream, { session: true })
         await core.close()
       }
     })
 
     if (!this.passive) {
       for (const core of this.cores.values()) {
-        if (!core.opened || core.closing) continue // If the core is not opened, it will be replicated in preload.
+        // If the core is not opened, it will be replicated in preload.
+        if (!core.opened || core.closing || !core.replicator.downloading) continue
         core.replicate(stream, { session: true })
       }
     }
@@ -488,7 +498,7 @@ function validateGetOptions (opts) {
   if (opts.name && opts.secretKey) throw new Error('Cannot provide both a name and a secret key')
   if (opts.publicKey && !b4a.isBuffer(opts.publicKey)) throw new Error('publicKey option must be a Buffer or Uint8Array')
   if (opts.secretKey && !b4a.isBuffer(opts.secretKey)) throw new Error('secretKey option must be a Buffer or Uint8Array')
-  if (!opts._discoveryKey && (!opts.name && !opts.publicKey && !opts.manifest && !opts.key)) throw new Error('Must provide either a name or a publicKey')
+  if (!opts._discoveryKey && (!opts.name && !opts.publicKey && !opts.manifest && !opts.key && !opts.preload)) throw new Error('Must provide either a name or a publicKey')
   return opts
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "corestore",
-  "version": "6.15.3",
+  "version": "6.15.5",
   "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.24.10",
+    "hypercore": "^10.25.0",
     "hypercore-crypto": "^3.4.0",
     "hypercore-id-encoding": "^1.2.0",
     "read-write-mutexify": "^2.1.0",