corestore 6.12.0 → 6.14.0

package/index.js

@@ -169,7 +169,6 @@ module.exports = class Corestore extends ReadyResource {
     if (opts._discoveryKey) {
       return {
         keyPair: null,
-        auth: null,
         discoveryKey: opts._discoveryKey
       }
     }
@@ -179,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)
     }
   }
@@ -208,13 +205,8 @@ 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')
-
-    // TODO: Should Hypercore expose a helper for this, or should preready return keypair/auth?
-    core.auth = auth
-    core.key = publicKey
-    core.writable = true
+    const keyPair = await this.createKeyPair(b4a.toString(name), namespace)
+    core.setKeyPair(keyPair)
   }
 
   _getLock (id) {
@@ -293,13 +285,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)
@@ -343,18 +329,26 @@ module.exports = class Corestore extends ReadyResource {
       this._findingPeers.push(core.findingPeers())
     }
 
+    const updateReplication = () => {
+      if (core.replicator !== null) {
+        // if the only session left is the internal session + replication sessions, tell the replicator so it can gc
+        core.replicator.setDownloading(core.replicator.sessions + 1 !== core.sessions.length)
+      }
+    }
+
     const gc = () => {
       // technically better to also clear _findingPeers if we added it,
       // but the lifecycle for those are pretty short so prob not worth the complexity
       // as _decFindingPeers clear them all.
       this._sessions.delete(core)
+      updateReplication()
 
       if (!rw) return
       rw.write.unlock()
-      if (rw.write.waiting === 0) this._locks.delete(id)
+      if (!rw.write.locked) this._locks.delete(id)
     }
 
-    core.ready().catch(gc)
+    core.ready().then(updateReplication, gc)
     core.once('close', gc)
 
     return core
@@ -374,6 +368,7 @@ module.exports = class Corestore extends ReadyResource {
         }
 
         if (this.passive && !core.closing) core.replicate(stream, { session: true })
+        await core.close()
       }
     })
 
@@ -454,11 +449,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.12.0",
+  "version": "6.14.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.22.2",
     "hypercore-crypto": "^3.4.0",
     "hypercore-id-encoding": "^1.2.0",
     "read-write-mutexify": "^2.1.0",