Merge remote-tracking branch 'remotes/origin/refactor/use-exporter-w-cid-instances' into add-http-dag-api

Author: achingbrain

package.json

@@ -108,11 +108,12 @@
     "ipfs-block-service": "~0.15.1",
     "ipfs-http-client": "^29.0.0",
     "ipfs-http-response": "~0.2.1",
-    "ipfs-mfs": "~0.9.1",
+    "ipfs-mfs": "github:ipfs/js-ipfs-mfs#refactor/use-exporter-w-cid-instances",
     "ipfs-multipart": "~0.1.0",
     "ipfs-repo": "~0.26.1",
     "ipfs-unixfs": "~0.1.16",
-    "ipfs-unixfs-engine": "~0.35.3",
+    "ipfs-unixfs-exporter": "~0.36.0",
+    "ipfs-unixfs-importer": "~0.38.4",
     "ipld": "~0.21.1",
     "ipld-bitcoin": "~0.1.8",
     "ipld-dag-pb": "~0.15.0",

src/core/components/files-regular/add-pull-stream.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { importer } = require('ipfs-unixfs-engine')
+const importer = require('ipfs-unixfs-importer')
 const pull = require('pull-stream')
 const toPull = require('stream-to-pull-stream')
 const waterfall = require('async/waterfall')

src/core/components/files-regular/cat-pull-stream.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { exporter } = require('ipfs-unixfs-engine')
+const exporter = require('ipfs-unixfs-exporter')
 const pull = require('pull-stream')
 const deferred = require('pull-defer')
 const { normalizePath } = require('./utils')

src/core/components/files-regular/get-pull-stream.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { exporter } = require('ipfs-unixfs-engine')
+const exporter = require('ipfs-unixfs-exporter')
 const pull = require('pull-stream')
 const errCode = require('err-code')
 const { normalizePath } = require('./utils')
@@ -21,6 +21,13 @@ module.exports = function (self) {
       self._preload(pathComponents[0])
     }
 
-    return exporter(ipfsPath, self._ipld, options)
+    return pull(
+      exporter(ipfsPath, self._ipld, options),
+      pull.map(file => {
+        file.hash = file.cid.toString()
+        delete file.cid
+        return file
+      })
+    )
   }
 }

src/core/components/files-regular/ls-pull-stream.js

@@ -1,8 +1,7 @@
 'use strict'
 
-const { exporter } = require('ipfs-unixfs-engine')
+const exporter = require('ipfs-unixfs-exporter')
 const pull = require('pull-stream')
-const CID = require('cids')
 const { normalizePath } = require('./utils')
 
 module.exports = function (self) {
@@ -26,7 +25,8 @@ module.exports = function (self) {
         recursive ? node.depth >= pathDepth : node.depth === pathDepth
       ),
       pull.map(node => {
-        node.hash = new CID(node.hash).toBaseEncodedString()
+        node.hash = node.cid.toString()
+        delete node.cid
         delete node.content
         return node
       })

src/http/api/resources/file.js

@@ -1,8 +1,7 @@
 'use strict'
 
 const isIpfs = require('is-ipfs')
-const unixfsEngine = require('ipfs-unixfs-engine')
-const exporter = unixfsEngine.exporter
+const exporter = require('ipfs-unixfs-exporter')
 const pull = require('pull-stream')
 const toB58String = require('multihashes').toB58String
 const Boom = require('boom')
@@ -82,7 +81,7 @@ exports.ls = {
     const links = []
     files.forEach((file) => {
       if (file.depth === rootDepth) {
-        const id = toB58String(file.hash)
+        const id = file.cid.toString()
         res.Arguments[path] = id
         res.Objects[id] = toFileObject(file)
         res.Objects[id].Links = file.type === 'file' ? null : links