Replace request with got.

bezoerb · Nov 6, 2019 · cf34969 · cf34969
1 parent 1f169fe
commit cf34969
Show file tree

Hide file tree

Showing 3 changed files with 238 additions and 380 deletions.
diff --git a/lib/resolver.js b/lib/resolver.js
@@ -2,7 +2,7 @@
 const path = require('path');
 const url = require('url');
 const fs = require('fs');
-const request = require('request');
+const got = require('got');
 const mime = require('mime');
 const Bluebird = require('bluebird');
 const debug = require('debug')('asset-resolver');
@@ -55,7 +55,8 @@ function requestAsync(resource, opts = {}) {
 	const settings = {
 		followRedirect: true,
 		encoding: null,
-		rejectUnauthorized: false
+		rejectUnauthorized: false,
+		retry: 0
 	};
 
 	if (opts.user && opts.pass) {
@@ -67,28 +68,27 @@ function requestAsync(resource, opts = {}) {
 	return new Bluebird((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 mimeType =
-				result(resp, 'headers.content-type') || mime.getType(resource);
+		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));
+				}
 
-			resolve({
-				contents: body,
-				path: resource,
-				mime: mimeType
+				const mimeType =
+					result(response, '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);
 			});
-		});
 	});
 }