corestore 6.11.0 → 6.13.0

package/index.js

@@ -27,6 +27,7 @@ module.exports = class Corestore extends ReadyResource {
     this.cores = root ? root.cores : new Map()
     this.cache = !!opts.cache
     this.primaryKey = opts.primaryKey || null
+    this.passive = !!opts.passive
 
     this._keyStorage = null
     this._bootstrap = opts._bootstrap || null
@@ -168,7 +169,6 @@ module.exports = class Corestore extends ReadyResource {
     if (opts._discoveryKey) {
       return {
         keyPair: null,
-        auth: null,
         discoveryKey: opts._discoveryKey
       }
     }
@@ -178,18 +178,16 @@ module.exports = class Corestore extends ReadyResource {
           publicKey: opts.publicKey,
           secretKey: opts.secretKey
         },
-        sign: opts.sign,
-        auth: opts.auth,
         discoveryKey: crypto.discoveryKey(opts.publicKey)
       }
     }
-    const { publicKey, auth } = await this.createKeyPair(opts.name)
+    const { publicKey, secretKey } = await this.createKeyPair(opts.name)
+
     return {
       keyPair: {
         publicKey,
-        secretKey: null
+        secretKey
       },
-      auth,
       discoveryKey: crypto.discoveryKey(publicKey)
     }
   }
@@ -207,13 +205,9 @@ module.exports = class Corestore extends ReadyResource {
     if (!name) return
 
     const namespace = this._getPrereadyUserData(core, USERDATA_NAMESPACE_KEY)
-    const { publicKey, auth } = await this.createKeyPair(b4a.toString(name), namespace)
-    if (!b4a.equals(publicKey, core.key)) throw new Error('Stored core key does not match the provided name')
+    const keyPair = await this.createKeyPair(b4a.toString(name), namespace)
 
-    // TODO: Should Hypercore expose a helper for this, or should preready return keypair/auth?
-    core.auth = auth
-    core.key = publicKey
-    core.writable = true
+    core.setKeyPair(keyPair)
   }
 
   _getLock (id) {
@@ -292,13 +286,7 @@ module.exports = class Corestore extends ReadyResource {
 
     const keyPair = {
       publicKey: b4a.allocUnsafe(sodium.crypto_sign_PUBLICKEYBYTES),
-      secretKey: b4a.alloc(sodium.crypto_sign_SECRETKEYBYTES),
-      auth: {
-        sign: (msg) => sign(keyPair, msg),
-        verify: (signable, signature) => {
-          return crypto.verify(signable, signature, keyPair.publicKey)
-        }
-      }
+      secretKey: b4a.alloc(sodium.crypto_sign_SECRETKEYBYTES)
     }
 
     const seed = deriveSeed(this.primaryKey, namespace, name)
@@ -363,15 +351,24 @@ module.exports = class Corestore extends ReadyResource {
     const isExternal = isStream(isInitiator) || !!(opts && opts.stream)
     const stream = Hypercore.createProtocolStream(isInitiator, {
       ...opts,
-      ondiscoverykey: discoveryKey => {
+      ondiscoverykey: async discoveryKey => {
         const core = this.get({ _discoveryKey: discoveryKey })
-        return core.ready().catch(safetyCatch)
+
+        try {
+          await core.ready()
+        } catch {
+          return
+        }
+
+        if (this.passive && !core.closing) core.replicate(stream, { session: true })
       }
     })
 
-    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.
-      core.replicate(stream, { session: true })
+    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.
+        core.replicate(stream, { session: true })
+      }
     }
 
     const streamRecord = { stream, isExternal }
@@ -444,11 +441,6 @@ module.exports = class Corestore extends ReadyResource {
   }
 }
 
-function sign (keyPair, message) {
-  if (!keyPair.secretKey) throw new Error('Invalid key pair')
-  return crypto.sign(message, keyPair.secretKey)
-}
-
 function validateGetOptions (opts) {
   const key = (b4a.isBuffer(opts) || typeof opts === 'string') ? hypercoreId.decode(opts) : null
   if (key) return { key, publicKey: key }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "corestore",
-  "version": "6.11.0",
+  "version": "6.13.0",
   "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.18.2",
+    "hypercore": "^10.21.0",
     "hypercore-crypto": "^3.4.0",
     "hypercore-id-encoding": "^1.2.0",
     "read-write-mutexify": "^2.1.0",