Fix dat download-as-zip

Author: pfrazee

dat/protocol.js

@@ -4,7 +4,7 @@ const parseRange = require('range-parser')
 const once = require('once')
 const debug = require('../lib/debug-logger').debugLogger('dat-serve')
 const intoStream = require('into-stream')
-const toZipStream = require('hyperdrive-to-zip-stream')
+const {toZipStream} = require('../lib/zip')
 const slugify = require('slugify')
 
 const datDns = require('./dns')
@@ -173,7 +173,7 @@ exports.electronHandler = async function (request, respond) {
       })
     } else {
       // serve the zip
-      var zs = toZipStream(archive, filepath)
+      var zs = toZipStream(checkoutFS, filepath)
       zs.on('error', err => console.log('Error while producing .zip file', err))
       return respond({
         statusCode: 200,

lib/zip.js

@@ -0,0 +1,42 @@
+const {join} = require('path')
+const yazl = require('yazl')
+
+exports.toZipStream = function (archive, dirpath) {
+  var zipfile = new yazl.ZipFile()
+
+  // create listing stream
+  dirpath = dirpath || '/'
+  archive.pda.readdir(dirpath, {recursive: true}).then(async (paths) => {
+    for (let path of paths) {
+      let readPath = join(dirpath, path)
+
+      // files only
+      try {
+        let entry = await archive.pda.stat(readPath)
+        if (!entry.isFile()) {
+          continue
+        }
+      } catch (e) {
+        // ignore, file must have been removed
+        continue
+      }
+
+      // pipe each entry into the zip
+      console.log('go go go', readPath, path)
+      zipfile.addBuffer(await archive.pda.readFile(readPath, 'binary'), path)
+      // NOTE
+      // for some reason using archive.createReadStream() to feed into the zipfile addReadStream() was not working with multiple files
+      // no idea why, maybe a sign of a bug in the dat-daemon's zip rpc
+      // -prf
+    }
+    zipfile.end()
+  }).catch(onerror)
+
+  // on error, push to the output stream
+  function onerror (e) {
+    console.error('Error while producing zip stream', e)
+    zipfile.outputStream.emit('error', e)
+  }
+
+  return zipfile.outputStream
+}

package-lock.json

@@ -47,7 +47,6 @@
     "hypercore-protocol": "^6.9.0",
     "hyperdrive": "^9.14.0",
     "hyperdrive-network-speed": "^2.1.0",
-    "hyperdrive-to-zip-stream": "^2.1.1",
     "identify-filetype": "^1.0.0",
     "into-stream": "^3.1.0",
     "lodash.debounce": "^4.0.8",
@@ -81,7 +80,8 @@
     "supports-sparse-files": "^1.0.2",
     "textextensions": "^2.4.0",
     "through2": "^2.0.5",
-    "utp-native": "^2.1.3"
+    "utp-native": "^2.1.3",
+    "yazl": "^2.5.1"
   },
   "devDependencies": {
     "eslint": "^4.19.1",