[export] Fix bug where streams would be reused across invocations (#1146

)

packages/@sanity/export/src/export.js

@@ -14,6 +14,7 @@ const getDocumentsStream = require('./getDocumentsStream')
 const filterSystemDocuments = require('./filterSystemDocuments')
 const filterDocumentTypes = require('./filterDocumentTypes')
 const filterDrafts = require('./filterDrafts')
+const logFirstChunk = require('./logFirstChunk')
 
 const noop = () => null
 
@@ -83,15 +84,19 @@ function exportDataset(opts) {
     }
 
     const inputStream = await getDocumentsStream(options.client, options.dataset)
+    debug('Got HTTP %d', inputStream.statusCode)
+    debug('Response headers: %o', inputStream.headers)
+
     const jsonStream = miss.pipeline(
       inputStream,
+      logFirstChunk(),
       split(JSON.parse),
-      rejectOnApiError,
-      filterSystemDocuments,
+      rejectOnApiError(),
+      filterSystemDocuments(),
       assetStreamHandler,
       filterDocumentTypes(options.types),
-      options.drafts ? miss.through.obj() : filterDrafts,
-      stringifyStream,
+      options.drafts ? miss.through.obj() : filterDrafts(),
+      stringifyStream(),
       miss.through(reportDocumentCount)
     )
 

packages/@sanity/export/src/filterDrafts.js

@@ -2,10 +2,11 @@ const miss = require('mississippi')
 
 const isDraft = doc => doc && doc._id && doc._id.indexOf('drafts.') === 0
 
-module.exports = miss.through.obj((doc, enc, callback) => {
-  if (isDraft(doc)) {
-    return callback()
-  }
+module.exports = () =>
+  miss.through.obj((doc, enc, callback) => {
+    if (isDraft(doc)) {
+      return callback()
+    }
 
-  return callback(null, doc)
-})
+    return callback(null, doc)
+  })

packages/@sanity/export/src/filterSystemDocuments.js

@@ -3,11 +3,12 @@ const debug = require('./debug')
 
 const isSystemDocument = doc => doc && doc._id && doc._id.indexOf('_.') === 0
 
-module.exports = miss.through.obj((doc, enc, callback) => {
-  if (isSystemDocument(doc)) {
-    debug('%s is a system document, skipping', doc && doc._id)
-    return callback()
-  }
+module.exports = () =>
+  miss.through.obj((doc, enc, callback) => {
+    if (isSystemDocument(doc)) {
+      debug('%s is a system document, skipping', doc && doc._id)
+      return callback()
+    }
 
-  return callback(null, doc)
-})
+    return callback(null, doc)
+  })

packages/@sanity/export/src/logFirstChunk.js

@@ -0,0 +1,15 @@
+const miss = require('mississippi')
+const debug = require('./debug')
+
+module.exports = () => {
+  let firstChunk = true
+  return miss.through((chunk, enc, callback) => {
+    if (firstChunk) {
+      const string = chunk.toString('utf8').split('\n')[0]
+      debug('First chunk received: %s', string.slice(0, 300))
+      firstChunk = false
+    }
+
+    callback(null, chunk)
+  })
+}

packages/@sanity/export/src/rejectOnApiError.js

@@ -1,10 +1,11 @@
 const miss = require('mississippi')
 
-module.exports = miss.through.obj((doc, enc, callback) => {
-  if (doc.error && doc.statusCode) {
-    callback(new Error([doc.statusCode, doc.error].join(': ')))
-    return
-  }
+module.exports = () =>
+  miss.through.obj((doc, enc, callback) => {
+    if (doc.error && doc.statusCode) {
+      callback(new Error([doc.statusCode, doc.error].join(': ')))
+      return
+    }
 
-  callback(null, doc)
-})
+    callback(null, doc)
+  })

packages/@sanity/export/src/stringifyStream.js

@@ -1,5 +1,4 @@
 const miss = require('mississippi')
 
-module.exports = miss.through.obj((doc, enc, callback) =>
-  callback(null, `${JSON.stringify(doc)}\n`)
-)
+module.exports = () =>
+  miss.through.obj((doc, enc, callback) => callback(null, `${JSON.stringify(doc)}\n`))