Cleanly handle closing of active scan feed

sciencefair-land · Jun 25, 2017 · 9f38e3f · 9f38e3f
1 parent c853c99
commit 9f38e3f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/app/client/lib/datasource.js b/app/client/lib/datasource.js
@@ -117,8 +117,7 @@ function Datasource (key, opts) {
   self.connectmeta = cb => {
     self.metadata = hyperdrive(storage(self.jsondir), self.key, {
       latest: true,
-      sparse: false,
-      live: false
+      sparse: true,
     })
 
     self.metadata.once('ready', () => {

diff --git a/app/client/models/collection.js b/app/client/models/collection.js
@@ -35,7 +35,10 @@ module.exports = (state, bus) => {
     const tags = {}
     let count = 0
 
-    if (activescan) activescan.destroy()
+    if (activescan) {
+      activescan.destroy()
+      activescan = null
+    }
 
     let scanstream = activescan = state.collection.docstore.createReadStream().on(
       'data', data => {
@@ -50,7 +53,12 @@ module.exports = (state, bus) => {
 
     eos(scanstream, err => {
       if (err) {
-        throw err
+        if (err.message == 'premature close') {
+          // activescan was destroyed
+          return
+        } else {
+          throw err
+        }
       } else {
         state.collectioncount = count
         bus.emit('tags:replace', tags)