Add "addUrl" API.

Author: hackergrrl

package.json

@@ -13,6 +13,7 @@
     "flatmap": "0.0.3",
     "glob": "^7.0.3",
     "ipfs-merkle-dag": "^0.6.0",
+    "isstream": "^0.1.2",
     "multiaddr": "^2.0.0",
     "multipart-stream": "^2.0.1",
     "ndjson": "^1.4.3",

src/add-to-dagnode-transform.js

@@ -0,0 +1,12 @@
+const async = require('async')
+const getDagNode = require('./get-dagnode')
+
+// transform { Hash: '...' } objects into DAGNodes async
+module.exports = function (err, res, send, done) {
+  if (err) return done(err)
+  async.map(res, function map (entry, next) {
+    getDagNode(send, entry.Hash, next)
+  }, function (err, res) {
+    done(err, res)
+  })
+}

src/api/add-url.js

@@ -0,0 +1,27 @@
+'use strict'
+
+const Wreck = require('wreck')
+const async = require('async')
+const DAGNode = require('ipfs-merkle-dag').DAGNode
+const addToDagNodesTransform = require('../add-to-dagnode-transform')
+
+module.exports = (send) => {
+  return function add (url, opts, cb) {
+    if (typeof (opts) === 'function' && cb === undefined) {
+      cb = opts
+      opts = {}
+    }
+
+    if (typeof url !== 'string' || !url.startsWith('http')) {
+      return cb(new Error('"url" param must be an http(s) url'))
+    }
+
+    var sendWithTransform = send.withTransform(addToDagNodesTransform)
+
+    Wreck.request('GET', url, null, (err, res) => {
+      if (err) return cb(err)
+
+      sendWithTransform('add', null, opts, res, cb)
+    })
+  }
+}

src/api/add.js

@@ -1,8 +1,8 @@
 'use strict'
 
+const isStream = require('isstream')
 const Wreck = require('wreck')
-const async = require('async')
-const DAGNode = require('ipfs-merkle-dag').DAGNode
+const addToDagNodesTransform = require('../add-to-dagnode-transform')
 
 module.exports = (send) => {
   return function add (files, opts, cb) {
@@ -11,33 +11,16 @@ module.exports = (send) => {
       opts = {}
     }
 
-    send = send.withTransform(transform)
+    var good = Buffer.isBuffer(files) ||
+               isStream.isReadable(files) ||
+               Array.isArray(files)
 
-    if (typeof files === 'string' && files.startsWith('http')) {
-      return Wreck.request('GET', files, null, (err, res) => {
-        if (err) return cb(err)
-
-        send('add', null, opts, res, cb)
-      })
+    if (!good) {
+      return cb(new Error('"files" must be a buffer, readable stream, or array of objects'))
     }
 
-    return send('add', null, opts, files, cb)
-
-    // transform returned objects into DAGNodes
-    function transform (err, res, done) {
-      if (err) return done(err)
+    var sendWithTransform = send.withTransform(addToDagNodesTransform)
 
-      async.map(res,
-        function map (entry, fin) {
-          send('object/get', entry.Hash, null, null, function (err, result) {
-            if (err) return done(err)
-            const node = new DAGNode(result.Data, result.Links)
-            fin(err, node)
-          })
-        },
-        function complete (err, results) {
-          if (done) return done(err, results)
-        })
-    }
+    return sendWithTransform('add', null, opts, files, cb)
   }
 }

src/get-dagnode.js

@@ -0,0 +1,9 @@
+const DAGNode = require('ipfs-merkle-dag').DAGNode
+
+module.exports = function (send, hash, cb) {
+  send('object/get', hash, null, null, function (err, result) {
+    if (err) return cb(err)
+    const node = new DAGNode(result.Data, result.Links)
+    cb(err, node)
+  })
+}

src/load-commands.js

@@ -3,6 +3,7 @@
 function requireCommands () {
   return {
     add: require('./api/add'),
+    addUrl: require('./api/add-url'),
     bitswap: require('./api/bitswap'),
     block: require('./api/block'),
     cat: require('./api/cat'),

src/request-api.js

@@ -143,7 +143,7 @@ exports = module.exports = function getRequestAPI (config) {
       if (p instanceof Promise) {
         return p.then((res) => {
           return new Promise(function (resolve, reject) {
-            transform(null, res, function (err, res) {
+            transform(null, res, send, function (err, res) {
               if (err) reject(err)
               else resolve(res)
             })
@@ -156,7 +156,7 @@ exports = module.exports = function getRequestAPI (config) {
       function wrap (done) {
         if (done) {
           return function (err, res) {
-            transform(err, res, done)
+            transform(err, res, send, done)
           }
         }
       }

test/api/add.spec.js

@@ -167,7 +167,7 @@ describe('.add', () => {
 
   it('add url', (done) => {
     const url = 'https://raw.githubusercontent.com/ipfs/js-ipfs-api/2a9cc63d7427353f2145af6b1a768a69e67c0588/README.md'
-    apiClients.a.add(url, (err, res) => {
+    apiClients.a.addUrl(url, (err, res) => {
       expect(err).to.not.exist
 
       const added = res[0] != null ? res[0] : res