chore: move mfs and multipart files into core (#2811)

BREAKING CHANGE:

When the path passed to `ipfs.files.stat(path)` was a hamt sharded dir, the resovled
value returned by js-ipfs previously had a `type` property of with a value of
`'hamt-sharded-directory'`.  To bring it in line with go-ipfs this value is now
`'directory'`.

Author: achingbrain

Diff for: package.json

@@ -15,8 +15,7 @@
   ],
   "main": "src/index.js",
   "browser": {
-    "./src/add/form-data.js": "./src/add/form-data.browser.js",
-    "./src/lib/buffer-to-form-data.js": "./src/lib/buffer-to-form-data.browser.js",
+    "./src/lib/to-stream.js": "./src/lib/to-stream.browser.js",
     "ipfs-utils/src/files/glob-source": false
   },
   "repository": {
@@ -53,19 +52,21 @@
     "ipld-raw": "^4.0.1",
     "iso-url": "^0.4.6",
     "it-tar": "^1.2.1",
+    "it-to-buffer": "^1.0.0",
     "it-to-stream": "^0.1.1",
     "merge-options": "^2.0.0",
     "multiaddr": "^7.2.1",
     "multiaddr-to-uri": "^5.1.0",
     "multibase": "^0.6.0",
     "multicodec": "^1.0.0",
     "multihashes": "^0.4.14",
+    "nanoid": "^2.1.11",
     "node-fetch": "^2.6.0",
     "parse-duration": "^0.1.2",
     "stream-to-it": "^0.2.0"
   },
   "devDependencies": {
-    "aegir": "^21.3.0",
+    "aegir": "21.3.0",
     "browser-process-platform": "^0.1.1",
     "cross-env": "^7.0.0",
     "go-ipfs-dep": "0.4.23-3",

Diff for: src/add/index.js renamed to src/add.js

@@ -1,29 +1,27 @@
 'use strict'
 
 const CID = require('cids')
-const merge = require('merge-options')
-const { toFormData } = require('./form-data')
-const toCamel = require('../lib/object-to-camel')
-const configure = require('../lib/configure')
+const toCamel = require('./lib/object-to-camel')
+const configure = require('./lib/configure')
+const multipartRequest = require('./lib/multipart-request')
+const toUrlSearchParams = require('./lib/to-url-search-params')
 
 module.exports = configure((api) => {
   return async function * add (input, options = {}) {
     const progressFn = options.progress
-    options = merge(
-      options,
-      {
-        'stream-channels': true,
-        progress: Boolean(progressFn),
-        hash: options.hashAlg // TODO fix this either is hash or hashAlg
-      }
-    )
 
     const res = await api.ndjson('add', {
       method: 'POST',
-      searchParams: options,
-      body: await toFormData(input),
+      searchParams: toUrlSearchParams(null, {
+        ...options,
+        'stream-channels': true,
+        progress: Boolean(progressFn)
+      }),
       timeout: options.timeout,
-      signal: options.signal
+      signal: options.signal,
+      ...(
+        await multipartRequest(input)
+      )
     })
 
     for await (let file of res) {

Diff for: src/add/form-data.browser.js

@@ -3,7 +3,7 @@
 const Block = require('ipfs-block')
 const CID = require('cids')
 const multihash = require('multihashes')
-const toFormData = require('../lib/buffer-to-form-data')
+const multipartRequest = require('../lib/multipart-request')
 const configure = require('../lib/configure')
 
 module.exports = configure(api => {
@@ -37,7 +37,9 @@ module.exports = configure(api => {
         timeout: options.timeout,
         signal: options.signal,
         searchParams: options,
-        body: toFormData(data)
+        ...(
+          await multipartRequest(data)
+        )
       })
       res = await response.json()
     } catch (err) {

Diff for: src/add/form-data.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { Buffer } = require('buffer')
-const toFormData = require('../lib/buffer-to-form-data')
+const multipartRequest = require('../lib/multipart-request')
 const configure = require('../lib/configure')
 
 module.exports = configure(api => {
@@ -10,7 +10,9 @@ module.exports = configure(api => {
       timeout: options.timeout,
       signal: options.signal,
       searchParams: options,
-      body: toFormData(Buffer.from(JSON.stringify(config)))
+      ...(
+        await multipartRequest(Buffer.from(JSON.stringify(config)))
+      )
     })
 
     return res.text()

Diff for: src/block/put.js

@@ -3,8 +3,8 @@
 const dagCBOR = require('ipld-dag-cbor')
 const CID = require('cids')
 const multihash = require('multihashes')
-const toFormData = require('../lib/buffer-to-form-data')
 const configure = require('../lib/configure')
+const multipartRequest = require('../lib/multipart-request')
 
 module.exports = configure(api => {
   return async (dagNode, options = {}) => {
@@ -51,7 +51,9 @@ module.exports = configure(api => {
       timeout: options.timeout,
       signal: options.signal,
       searchParams,
-      body: toFormData(serialized)
+      ...(
+        await multipartRequest(serialized)
+      )
     })
     const data = await rsp.json()
 

Diff for: src/config/replace.js

@@ -1,21 +1,16 @@
 'use strict'
 
-const modeToString = require('../lib/mode-to-string')
 const configure = require('../lib/configure')
+const toUrlSearchParams = require('../lib/to-url-search-params')
 
 module.exports = configure(api => {
   return async function chmod (path, mode, options = {}) {
-    options.arg = path
-    options.mode = modeToString(mode)
-    options.hash = options.hashAlg
-    options.hashAlg = null
-
     const res = await api.post('files/chmod', {
       timeout: options.timeout,
       signal: options.signal,
-      searchParams: options
+      searchParams: toUrlSearchParams(path, { ...options, mode })
     })
 
-    return res.text()
+    await res.text()
   }
 })

Diff for: src/dag/put.js

@@ -3,20 +3,21 @@
 const CID = require('cids')
 const { findSources } = require('./utils')
 const configure = require('../lib/configure')
+const toUrlSearchParams = require('../lib/to-url-search-params')
 
 module.exports = configure(api => {
   return async (...args) => {
     const { sources, options } = findSources(args)
 
-    const searchParams = new URLSearchParams(options)
-    sources.forEach(src => searchParams.append('arg', CID.isCID(src) ? `/ipfs/${src}` : src))
-    if (options.hashAlg) searchParams.set('hash', options.hashAlg)
-
     const res = await api.post('files/cp', {
       timeout: options.timeout,
       signal: options.signal,
-      searchParams
+      searchParams: toUrlSearchParams(
+        sources.map(src => CID.isCID(src) ? `/ipfs/${src}` : src),
+        options
+      )
     })
-    return res.text()
+
+    await res.text()
   }
 })

Diff for: src/files/chmod.js

@@ -3,13 +3,13 @@
 module.exports = config => ({
   chmod: require('./chmod')(config),
   cp: require('./cp')(config),
-  mkdir: require('./mkdir')(config),
   flush: require('./flush')(config),
-  stat: require('./stat')(config),
-  rm: require('./rm')(config),
   ls: require('./ls')(config),
+  mkdir: require('./mkdir')(config),
+  mv: require('./mv')(config),
   read: require('./read')(config),
+  rm: require('./rm')(config),
+  stat: require('./stat')(config),
   touch: require('./touch')(config),
-  write: require('./write')(config),
-  mv: require('./mv')(config)
+  write: require('./write')(config)
 })

Diff for: src/files/cp.js

@@ -3,6 +3,7 @@
 const CID = require('cids')
 const toCamelWithMetadata = require('../lib/object-to-camel-with-metadata')
 const configure = require('../lib/configure')
+const toUrlSearchParams = require('../lib/to-url-search-params')
 
 module.exports = configure(api => {
   return async function * ls (path, options = {}) {
@@ -11,19 +12,22 @@ module.exports = configure(api => {
       path = '/'
     }
 
-    const searchParams = new URLSearchParams(options)
-    searchParams.set('arg', CID.isCID(path) ? `/ipfs/${path}` : path)
-    // TODO the args below are not in the go-ipfs or interface core
-    searchParams.set('stream', options.stream == null ? true : options.stream)
-    searchParams.set('long', options.long == null ? true : options.long)
-    // TODO: remove after go-ipfs 0.5 is released
-    searchParams.set('l', options.long == null ? true : options.long)
-
     const res = await api.ndjson('files/ls', {
       method: 'POST',
       timeout: options.timeout,
       signal: options.signal,
-      searchParams
+      searchParams: toUrlSearchParams(
+        CID.isCID(path) ? `/ipfs/${path}` : path, {
+          ...options,
+
+          // TODO the args below are not in the go-ipfs or interface core
+          stream: options.stream == null ? true : options.stream,
+          long: options.long == null ? true : options.long,
+
+          // TODO: remove after go-ipfs 0.5 is released
+          l: options.long == null ? true : options.long
+        }
+      )
     })
 
     for await (const result of res) {