removed request from dev dependencies, replaced with node-fetch (dat-…

…ecosystem#1198)

package.json

@@ -63,10 +63,10 @@
     "dependency-check": "^3.4.1",
     "hypercore": "^6.25.2",
     "mkdirp": "^0.5.4",
+    "node-fetch": "^2.6.1",
     "pkg": "^4.4.4",
     "random-access-memory": "^3.1.1",
     "recursive-readdir-sync": "^1.0.6",
-    "request": "^2.88.2",
     "standard": "^12.0.0",
     "tape": "^4.13.2",
     "tape-spawn": "^1.4.2",

test/helpers/index.js

@@ -6,13 +6,15 @@ var rimraf = require('rimraf')
 var encoding = require('dat-encoding')
 var recursiveReadSync = require('recursive-readdir-sync')
 var Dat = require('dat-node')
+var fetch = require('node-fetch')
 
 module.exports.matchLink = matchDatLink
 module.exports.isDir = isDir
 module.exports.testFolder = newTestFolder
 module.exports.datJson = datJson
 module.exports.shareFixtures = shareFixtures
 module.exports.fileList = fileList
+module.exports.fetchText = fetchText
 
 function shareFixtures (opts, cb) {
   if (typeof opts === 'function') return shareFixtures(null, opts)
@@ -75,3 +77,15 @@ function isDir (dir) {
     return false
   }
 }
+
+function fetchText (url) {
+  let resp = {}
+  return fetch(url).then(function (res) {
+    resp = res
+    return resp.text()
+  }).then(function (body) {
+    return { resp, body, error: null }
+  }).catch(function (error) {
+    return { error, resp: {}, body: null }
+  })
+}

test/http.js

@@ -1,8 +1,8 @@
 var path = require('path')
 var test = require('tape')
 var rimraf = require('rimraf')
-var request = require('request')
 var spawn = require('./helpers/spawn.js')
+var { fetchText } = require('./helpers')
 
 var dat = path.resolve(path.join(__dirname, '..', 'bin', 'cli.js'))
 var fixtures = path.join(__dirname, 'fixtures')
@@ -16,20 +16,19 @@ test('http - share with http', function (t) {
     var sharingHttp = output.indexOf('Serving files over http') > -1
     if (!sharingHttp) return false
 
-    request('http://localhost:8080', function (err, resp, body) {
-      t.error(err, 'no error')
-      t.ok(resp.statusCode === 200, 'okay status')
+    fetchText('http://localhost:8080').then(function ({ resp, body, error }) {
+      t.error(error, 'no error')
+      t.ok(resp.status === 200, 'okay status')
       t.ok(body)
 
-      request('http://localhost:8080/folder/nested/hello.txt', function (err, resp, body) {
-        t.error(err, 'no error')
-        t.ok(resp.statusCode === 200, 'okay status')
+      fetchText('http://localhost:8080/folder/nested/hello.txt').then(function ({ resp, body, error }) {
+        t.error(error, 'no error')
+        t.ok(resp.status === 200, 'okay status')
         t.same(body, 'code for science and society', 'body of file okay')
 
         st.kill()
       })
     })
-
     return true
   })
   st.stderr.empty()
@@ -45,20 +44,19 @@ test('http - share with http other port', function (t) {
     var sharingHttp = output.indexOf('Serving files over http') > -1
     if (!sharingHttp) return false
 
-    request('http://localhost:3333', function (err, resp, body) {
-      t.error(err, 'no error')
-      t.ok(resp.statusCode === 200, 'okay status')
+    fetchText('http://localhost:3333').then(function ({ resp, body, error }) {
+      t.error(error, 'no error')
+      t.ok(resp.status === 200, 'okay status')
       t.ok(body)
 
-      request('http://localhost:3333/folder/nested/hello.txt', function (err, resp, body) {
-        t.error(err, 'no error')
-        t.ok(resp.statusCode === 200, 'okay status')
+      fetchText('http://localhost:3333/folder/nested/hello.txt').then(function ({ resp, body, error }) {
+        t.error(error, 'no error')
+        t.ok(resp.status === 200, 'okay status')
         t.same(body, 'code for science and society', 'body of file okay')
 
         st.kill()
       })
     })
-
     return true
   })
   st.stderr.empty()