fix: update with iso-stream-http

Author: hugomrdias

package.json

@@ -7,9 +7,7 @@
   "browser": {
     "glob": false,
     "fs": false,
-    "stream": "readable-stream",
-    "http": "stream-http",
-    "./src/utils/request.js": "./src/utils/request-browser.js"
+    "stream": "readable-stream"
   },
   "scripts": {
     "test": "aegir test",
@@ -38,15 +36,16 @@
     "glob": "^7.1.3",
     "ipfs-block": "~0.8.0",
     "ipld-dag-cbor": "~0.13.1",
-    "ipld-dag-pb": "~0.15.0",
-    "is-ipfs": "~0.5.1",
+    "ipld-dag-pb": "~0.15.3",
+    "is-ipfs": "~0.6.0",
     "is-pull-stream": "0.0.0",
     "is-stream": "^1.1.0",
+    "iso-stream-http": "~0.1.1",
     "iso-url": "~0.4.6",
     "just-kebab-case": "^1.1.0",
     "just-map-keys": "^1.1.0",
     "lru-cache": "^5.1.1",
-    "multiaddr": "^6.0.5",
+    "multiaddr": "^6.0.6",
     "multibase": "~0.6.0",
     "multicodec": "~0.5.0",
     "multihashes": "~0.4.14",
@@ -61,10 +60,9 @@
     "pump": "^3.0.0",
     "qs": "^6.5.2",
     "readable-stream": "^3.1.1",
-    "stream-http": "hugomrdias/stream-http#develop",
     "stream-to-pull-stream": "^1.7.2",
     "tar-stream": "^2.0.1",
-    "through2": "^3.0.0"
+    "through2": "^3.0.1"
   },
   "engines": {
     "node": ">=10.0.0",
@@ -75,7 +73,7 @@
     "url": "https://github.com./ipfs/js-ipfs-http-client"
   },
   "devDependencies": {
-    "aegir": "^18.2.0",
+    "aegir": "^18.2.1",
     "browser-process-platform": "~0.1.1",
     "chai": "^4.2.0",
     "cross-env": "^5.2.0",
@@ -179,4 +177,4 @@
     "url": "https://github.com./ipfs/js-ipfs-http-client/issues"
   },
   "homepage": "https://github.com./ipfs/js-ipfs-http-client"
-}
+}

src/files-mfs/ls-readable-stream.js

@@ -3,7 +3,7 @@
 const {
   Transform,
   PassThrough
-} = require('stream')
+} = require('readable-stream')
 const pump = require('pump')
 const ndjson = require('ndjson')
 const isStream = require('is-stream')

src/files-regular/add-from-url.js

@@ -2,7 +2,7 @@
 
 const promisify = require('promisify-es6')
 const { URL } = require('iso-url')
-const request = require('../utils/request')
+const { getRequest } = require('iso-stream-http')
 const SendOneFile = require('../utils/send-one-file-multiple-results')
 const FileResultStreamConverter = require('../utils/file-result-stream-converter')
 
@@ -37,7 +37,7 @@ const validUrl = (url) => typeof url === 'string' && url.startsWith('http')
 const requestWithRedirect = (url, opts, sendOneFile, callback) => {
   const parsedUrl = new URL(url)
 
-  const req = request(parsedUrl.protocol)(url, (res) => {
+  const req = getRequest(parsedUrl, (res) => {
     if (res.statusCode >= 400) {
       return callback(new Error(`Failed to download with ${res.statusCode}`))
     }

src/utils/multipart.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const Transform = require('stream').Transform
+const Transform = require('readable-stream').Transform
 const isNode = require('detect-node')
 const isSource = require('is-pull-stream').isSource
 const toStream = require('pull-to-stream')

src/utils/request-browser.js

@@ -6,9 +6,9 @@ const isNode = require('detect-node')
 const ndjson = require('ndjson')
 const pump = require('pump')
 const once = require('once')
+const { getRequest } = require('iso-stream-http')
 const streamToValue = require('./stream-to-value')
 const streamToJsonValue = require('./stream-to-json-value')
-const request = require('./request')
 const log = require('debug')('ipfs-http-client:request')
 
 // -- Internal
@@ -171,7 +171,7 @@ function requestAPI (config, options, callback) {
     protocol: `${config.protocol}:`
   }
 
-  const req = request(config.protocol)(reqOptions, onRes(options.buffer, callback))
+  const req = getRequest(reqOptions, onRes(options.buffer, callback))
 
   req.on('error', (err) => {
     callback(err)

src/utils/request.js

@@ -23,7 +23,7 @@ describe('.get (specific go-ipfs features)', function () {
 
   const smallFile = {
     cid: 'Qma4hjFTnCasJ8PVp3mZbZK5g2vGDT4LByLJ7m8ciyRFZP',
-    data: fixture('js/test/fixtures/testfile.txt')
+    data: fixture('test/fixtures/testfile.txt')
   }
 
   let ipfsd