Skip to content

Commit

Permalink
Switch to got.
Browse files Browse the repository at this point in the history
  • Loading branch information
XhmikosR committed Nov 4, 2019
1 parent b195773 commit 9b773f9
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 349 deletions.
48 changes: 24 additions & 24 deletions lib/resolver.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const path = require('path');
const url = require('url');
const fs = require('fs-extra');
const request = require('request');
const got = require('got');
const mime = require('mime');
const Bluebird = require('bluebird');
const debug = require('debug')('asset-resolver');
Expand Down Expand Up @@ -53,7 +53,8 @@ function requestAsync(resource, opts = {}) {
const settings = {
followRedirect: true,
encoding: null,
rejectUnauthorized: false
retry: 0
// todo handle unauthorized
};

if (opts.user && opts.pass) {
Expand All @@ -65,29 +66,28 @@ 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 {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);
});
});
});
}

Expand Down
Loading

0 comments on commit 9b773f9

Please sign in to comment.