corestore 7.9.0 → 7.9.2

package/index.js

@@ -204,6 +204,7 @@ class FindingPeers {
   constructor() {
     this.count = 0
     this.pending = []
+    this.destroyed = false
   }
 
   add(core) {
@@ -212,7 +213,7 @@ class FindingPeers {
   }
 
   inc(sessions) {
-    if (++this.count !== 1) return
+    if (this.destroyed || ++this.count !== 1) return
 
     for (const core of sessions) {
       this.pending.push(core.findingPeers())
@@ -220,7 +221,12 @@ class FindingPeers {
   }
 
   dec(sessions) {
-    if (--this.count !== 0) return
+    if (this.destroyed || --this.count !== 0) return
+    while (this.pending.length > 0) this.pending.pop()()
+  }
+
+  destroy() {
+    this.destroyed = true
     while (this.pending.length > 0) this.pending.pop()()
   }
 }
@@ -262,8 +268,6 @@ class Corestore extends ReadyResource {
       )
     }
 
-    if (this.root) this.corestores.add(this)
-
     this.ready().catch(noop)
   }
 
@@ -292,7 +296,7 @@ class Corestore extends ReadyResource {
     this._findingPeers.inc(this.sessions)
     let done = false
     return () => {
-      if (done) return
+      if (done || !this._findingPeers) return
       done = true
       this._findingPeers.dec(this.sessions)
     }
@@ -352,6 +356,7 @@ class Corestore extends ReadyResource {
 
   async _open() {
     if (this.root !== null) {
+      this.corestores.add(this)
       if (this.root.opened === false) await this.root.ready()
       this.primaryKey = this.root.primaryKey
       return
@@ -374,10 +379,19 @@ class Corestore extends ReadyResource {
     const hanging = [...this.sessions]
     for (const sess of hanging) closing.push(sess.close())
 
-    if (this.watchers !== null) this.cores.unwatch(this)
+    if (this.watchers !== null) {
+      this.cores.unwatch(this)
+      this.watchers = null
+    }
+
+    if (this._findingPeers !== null) {
+      this._findingPeers.destroy()
+      this._findingPeers = null
+    }
 
     if (this.root !== null) {
       await Promise.all(closing)
+      this.corestores.delete(this)
       return
     }
 
@@ -584,6 +598,7 @@ class Corestore extends ReadyResource {
       core,
       sessions: this.sessions.get(core.id),
       ongc: this._ongcBound,
+      manifest: opts.manifest || null,
       encryption: opts.encryption || null,
       encryptionKey: opts.encryptionKey || null, // back compat, should remove
       isBlockKey: !!opts.isBlockKey // back compat, should remove

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "corestore",
-  "version": "7.9.0",
+  "version": "7.9.2",
   "description": "A Hypercore factory that simplifies managing collections of cores.",
   "main": "index.js",
   "files": [