fix(files.get): add dirs on the browser

Author: daviddias

package.json

@@ -35,6 +35,7 @@
     "gulp": "^3.9.1",
     "interface-ipfs-core": "^0.5.0",
     "ipfsd-ctl": "^0.14.0",
+    "passthrough-counter": "^1.0.0",
     "pre-commit": "^1.1.3",
     "stream-equal": "^0.1.8",
     "stream-http": "^2.3.1",

src/add-to-dagnode-transform.js

@@ -8,7 +8,9 @@ module.exports = function (err, res, send, done) {
   if (err) {
     return done(err)
   }
+
   async.map(res, function map (entry, next) {
+    console.log('RECEIVED', entry.Name)
     getDagNode(send, entry.Hash, function (err, node) {
       if (err) {
         return next(err)

src/api/add-files.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const isNode = require('detect-node')
 const addToDagNodesTransform = require('../add-to-dagnode-transform')
 
 module.exports = (send) => {
@@ -9,6 +10,10 @@ module.exports = (send) => {
       opts = {}
     }
 
+    if (!isNode) {
+      return cb(new Error('Recursive uploads are not supported in the browser'))
+    }
+
     if (typeof (path) !== 'string') {
       return cb(new Error('"path" must be a string'))
     }

src/get-files-stream.js

@@ -122,6 +122,7 @@ function getFilesStream (files, opts) {
       content: file
     }
   }).forEach((file) => {
+    console.log('SENDING (MULTIPART)', file.path, file.dir)
     mp.addPart({
       headers: headers(file),
       body: file.content

src/request-api.js

@@ -4,20 +4,29 @@ const Wreck = require('wreck')
 const Qs = require('qs')
 const ndjson = require('ndjson')
 const getFilesStream = require('./get-files-stream')
+const Counter = require('passthrough-counter')
 
 const isNode = require('detect-node')
 
 // -- Internal
 
 function parseChunkedJson (res, cb) {
   const parsed = []
+  const c = new Counter()
   res
+    .pipe(c)
     .pipe(ndjson.parse())
-    .on('data', parsed.push.bind(parsed))
-    .on('end', () => cb(null, parsed))
+    .on('data', (obj) => {
+      parsed.push(obj)
+    })
+    .on('end', () => {
+      console.log('Parsed total of:', parsed.length)
+      console.log('Total byte size was:', c.length)
+      cb(null, parsed)
+    })
 }
 
-function onRes (buffer, cb) {
+function onRes (buffer, cb, uri) {
   return (err, res) => {
     if (err) {
       return cb(err)
@@ -27,6 +36,10 @@ function onRes (buffer, cb) {
     const chunkedObjects = Boolean(res.headers['x-chunked-output'])
     const isJson = res.headers['content-type'] && res.headers['content-type'].indexOf('application/json') === 0
 
+    if (uri.indexOf('add') !== -1) {
+      console.log('HEADERS (stream, chunked, json)', stream, chunkedObjects, isJson)
+    }
+
     if (res.statusCode >= 400 || !res.statusCode) {
       const error = new Error(`Server responded with ${res.statusCode}`)
 
@@ -42,10 +55,14 @@ function onRes (buffer, cb) {
       })
     }
 
-    if (stream && !buffer) return cb(null, res)
+    if (stream && !buffer) {
+      return cb(null, res)
+    }
 
     if (chunkedObjects) {
-      if (isJson) return parseChunkedJson(res, cb)
+      if (isJson) {
+        return parseChunkedJson(res, cb)
+      }
 
       return Wreck.read(res, null, cb)
     }
@@ -56,6 +73,11 @@ function onRes (buffer, cb) {
 
 function requestAPI (config, path, args, qs, files, buffer, cb) {
   qs = qs || {}
+
+  if (Array.isArray(files)) {
+    qs.recursive = true
+  }
+
   if (Array.isArray(path)) path = path.join('/')
   if (args && !Array.isArray(args)) args = [args]
   if (args) qs.arg = args
@@ -67,10 +89,6 @@ function requestAPI (config, path, args, qs, files, buffer, cb) {
     delete qs.r
   }
 
-  if (!isNode && qs.recursive && path === 'add') {
-    return cb(new Error('Recursive uploads are not supported in the browser'))
-  }
-
   qs['stream-channels'] = true
 
   let stream
@@ -104,7 +122,7 @@ function requestAPI (config, path, args, qs, files, buffer, cb) {
     opts.payload = stream
   }
 
-  return Wreck.request(opts.method, opts.uri, opts, onRes(buffer, cb))
+  return Wreck.request(opts.method, opts.uri, opts, onRes(buffer, cb, opts.uri))
 }
 
 // -- Interface
@@ -128,9 +146,9 @@ exports = module.exports = function getRequestAPI (config) {
     return requestAPI(config, path, args, qs, files, buffer, cb)
   }
 
-  // Wraps the 'send' function such that an asynchronous transform may be
-  // applied to its result before passing it on to either its callback or
-  // promise.
+  // Wraps the 'send' function such that an asynchronous
+  // transform may be applied to its result before
+  // passing it on to either its callback or promise.
   send.withTransform = function (transform) {
     return function (path, args, qs, files, buffer, cb) {
       if (typeof buffer === 'function') {