Merge pull request #233 from XhmikosR/master-got

Switch to got.
bezoerb · Nov 6, 2019 · cb088a5 · cb088a5
2 parents 5a4704e + 03d3c86
commit cb088a5
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 349 deletions.
diff --git a/lib/resolver.js b/lib/resolver.js
@@ -4,7 +4,7 @@ const fs = require('fs');
 const path = require('path');
 const url = require('url');
 const util = require('util');
-const request = require('request');
+const got = require('got');
 const mime = require('mime');
 const debug = require('debug')('asset-resolver');
 const globby = require('globby');
@@ -54,7 +54,8 @@ function requestAsync(resource, opts = {}) {
   const settings = {
     followRedirect: true,
     encoding: null,
-    rejectUnauthorized: false
+    rejectUnauthorized: false,
+    retry: 0
   };
 
   if (opts.user && opts.pass) {
@@ -66,29 +67,28 @@ function requestAsync(resource, opts = {}) {
   return new Promise((resolve, reject) => {
     // Handle protocol-relative urls
     resource = url.resolve('http://te.st', resource); // eslint-disable-line node/no-deprecated-api
-    request(resource, settings, (err, resp, body) => {
-      let msg;
-      if (err) {
-        debug('Url failed:', err.message || err);
-        return reject(err);
-      }
-
-      if (resp.statusCode !== 200) {
-        msg = 'Wrong status code ' + resp.statusCode + ' for ' + resource;
-        debug(msg);
-        return reject(new Error(msg));
-      }
-
-      const {headers = {}} = resp;
-
-      const mimeType = headers['content-type'] || mime.getType(resource);
-
-      resolve({
-        contents: body,
-        path: resource,
-        mime: mimeType
+    got(resource, settings)
+      .then(response => {
+        if (response.statusCode !== 200) {
+          const msg = `Wrong status code ${response.statusCode} for ${resource}`;
+          debug(msg);
+          return reject(new Error(msg));
+        }
+
+        const {headers = {}} = response;
+
+        const mimeType = headers['content-type'] || mime.getType(resource);
+
+        resolve({
+          contents: response.body,
+          path: resource,
+          mime: mimeType
+        });
+      })
+      .catch(error => {
+        debug('Url failed:', error.message || error);
+        return reject(error);
       });
-    });
   });
 }