corestore 7.0.13 → 7.0.15

package/index.js

@@ -1,7 +1,6 @@
 const b4a = require('b4a')
 const Hypercore = require('hypercore')
 const ReadyResource = require('ready-resource')
-const EventEmitter = require('events')
 const sodium = require('sodium-universal')
 const crypto = require('hypercore-crypto')
 const ID = require('hypercore-id-encoding')
@@ -77,11 +76,14 @@ class SessionTracker {
   }
 }
 
-class CoreTracker extends EventEmitter {
+class CoreTracker {
   constructor () {
-    super()
     this.map = new Map()
     this.watching = []
+
+    this._gcing = new Set()
+    this._gcInterval = null
+    this._gcCycleBound = this._gcCycle.bind(this)
   }
 
   get size () {
@@ -100,15 +102,33 @@ class CoreTracker extends EventEmitter {
     store.watchIndex = -1
   }
 
+  resume (id) {
+    const core = this.map.get(id)
+
+    if (!core) return null
+
+    // signal back that we have a closing one stored
+    if (core.closing) return core
+
+    if (core.gc) {
+      this._gcing.delete(core)
+      if (this._gcing.size === 0) this._stopGC()
+      core.gc = 0
+    }
+
+    return core
+  }
+
   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')
-    return this.map.get(id) || null
+    const core = this.map.get(id)
+    if (!core || core.closing) return null
+    return core
   }
 
   set (id, core) {
     this.map.set(id, core)
-    this.emit('add', core) // TODO: will be removed
     if (this.watching.length > 0) this._emit(core)
   }
 
@@ -119,13 +139,53 @@ class CoreTracker extends EventEmitter {
     }
   }
 
-  delete (id, core) {
-    this.map.delete(id)
-    this.emit('remove', core) // TODO: will be removed
+  _gc (core) {
+    const id = toHex(core.discoveryKey)
+    if (this.map.get(id) === core) this.map.delete(id)
+  }
+
+  _gcCycle () {
+    for (const core of this._gcing) {
+      if (++core.gc < 4) continue
+      const gc = this._gc.bind(this, core)
+      core.close().then(gc, gc)
+      this._gcing.delete(core)
+    }
+
+    if (this._gcing.size === 0) this._stopGC()
   }
 
-  [Symbol.iterator] () {
-    return this.map.values()
+  gc (core) {
+    core.gc = 1 // first strike
+    this._gcing.add(core)
+    if (this._gcing.size === 1) this._startGC()
+  }
+
+  _stopGC () {
+    clearInterval(this._gcInterval)
+    this._gcInterval = null
+  }
+
+  _startGC () {
+    if (this._gcInterval) return
+    this._gcInterval = setInterval(this._gcCycleBound, 2000)
+  }
+
+  close () {
+    this._stopGC()
+    this._gcing.clear()
+
+    const all = []
+    for (const core of this.map.values()) all.push(core.close())
+    this.map.clear()
+
+    return Promise.all(all)
+  }
+
+  * [Symbol.iterator] () {
+    for (const core of this.map.values()) {
+      if (!core.closing) yield core
+    }
   }
 }
 
@@ -286,17 +346,16 @@ class Corestore extends ReadyResource {
 
     await Promise.all(closing)
 
-    const cores = []
-    for (const core of this.cores) cores.push(core.close())
-    await Promise.all(cores)
+    await this.cores.close()
     await this.storage.close()
   }
 
   async _attachMaybe (muxer, discoveryKey) {
     if (this.opened === false) await this.ready()
-    if (this.cores.get(toHex(discoveryKey)) === null && !(await this.storage.has(discoveryKey))) return
+    if (this.cores.get(toHex(discoveryKey)) === null && !(await this.storage.has(discoveryKey, { ifMigrated: true }))) return
+    if (this.closing) return
 
-    const core = this._getCore(discoveryKey, { createIfMissing: false })
+    const core = this._openCore(discoveryKey, { createIfMissing: false })
 
     if (!core) return
     if (!core.opened) await core.ready()
@@ -304,6 +363,8 @@ class Corestore extends ReadyResource {
     if (!core.replicator.attached(muxer)) {
       core.replicator.attachTo(muxer)
     }
+
+    core.checkIfIdle()
   }
 
   replicate (isInitiator, opts) {
@@ -378,11 +439,12 @@ class Corestore extends ReadyResource {
 
     // 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._getCore(null, opts)
+    const core = this._openCore(null, opts)
 
     conf.core = core
     conf.sessions = this.sessions.get(core.id)
     conf.ongc = this._ongcBound
+
     return this._makeSession(conf)
   }
 
@@ -404,7 +466,7 @@ class Corestore extends ReadyResource {
     const discoveryKey = opts.name ? await this.storage.getAlias({ name: opts.name, namespace: this.ns }) : null
     this._maybeClosed()
 
-    const core = this._getCore(discoveryKey, opts)
+    const core = this._openCore(discoveryKey, opts)
 
     return {
       core,
@@ -448,18 +510,15 @@ class Corestore extends ReadyResource {
     return result
   }
 
-  _hasCore (discoveryKey) {
-    return this.cores.get(toHex(discoveryKey)) !== null
-  }
-
-  _getCore (discoveryKey, opts) {
+  _openCore (discoveryKey, opts) {
     const auth = this._auth(discoveryKey, opts)
 
     const id = toHex(auth.discoveryKey)
-    const existing = this.cores.get(id)
-    if (existing) return existing
+    const existing = this.cores.resume(id)
+    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...
       eagerUpgrade: true,
       notDownloadingLinger: opts.notDownloadingLinger,
       allowFork: opts.allowFork !== false,
@@ -478,8 +537,7 @@ class Corestore extends ReadyResource {
     })
 
     core.onidle = () => {
-      core.destroy()
-      this.cores.delete(id, core)
+      this.cores.gc(core)
     }
 
     core.replicator.ondownloading = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "corestore",
-  "version": "7.0.13",
+  "version": "7.0.15",
   "description": "A Hypercore factory that simplifies managing collections of cores.",
   "main": "index.js",
   "files": [
@@ -9,7 +9,6 @@
   ],
   "dependencies": {
     "b4a": "^1.6.7",
-    "bare-events": "^2.5.0",
     "hypercore": "^11.0.0",
     "hypercore-crypto": "^3.4.2",
     "hypercore-id-encoding": "^1.3.0",
@@ -25,12 +24,6 @@
   "scripts": {
     "test": "standard && brittle test/*.js"
   },
-  "imports": {
-    "events": {
-      "bare": "bare-events",
-      "default": "events"
-    }
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/holepunchto/corestore2.git"