improved handling of protocol-relative asset urls [#288]

addyosmani · Apr 1, 2018 · ffcfb8a · ffcfb8a
1 parent 261eeda
commit ffcfb8a
Show file tree

Hide file tree

Showing 4 changed files with 667 additions and 245 deletions.
diff --git a/lib/file-helper.js b/lib/file-helper.js
@@ -5,7 +5,7 @@ const path = require('path');
 const fs = require('fs-extra');
 const _ = require('lodash');
 const Bluebird = require('bluebird');
-const request = require('request');
+const got = require('got');
 const debug = require('debug')('critical:file');
 const mime = require('mime-types');
 const slash = require('slash');
@@ -117,28 +117,37 @@ function temp(resp) {
 /**
  * Get external resource
  * @param {string} uri
+ * @param {boolean} secure
  * @returns {Promise}
  */
-function requestAsync(uri) {
-    return new Bluebird((resolve, reject) => {
-        // Handle protocol-relative urls
-        uri = url.resolve('http://te.st', uri);
-        request({url: uri, strictSSL: false}, (err, resp) => {
-            if (err) {
-                return reject(err);
-            }
-            if (resp.statusCode === 403 || resp.statusCode === 404) {
-                console.log('Ignoring', uri, '(' + resp.statusCode + ')');
-                resp.body = '';
-                return resolve(resp);
-            }
-
-            if (resp.statusCode >= 200 && resp.statusCode < 300) {
-                resolve(resp);
-            }
+function requestAsync(uri, secure = true) {
+    let check = Promise.resolve();
 
-            return reject(new Error('Wrong status code ' + resp.statusCode + ' for ' + uri));
+    if (/^\/\//.test(uri)) {
+        uri = url.resolve(`http${secure ? 's' : ''}://te.st`, uri);
+        check = got(uri, {method: 'HEAD'}).then(res => {
+            debug(`HEADERS for ${uri}: `, JSON.stringify(res.headers));
         });
+    }
+
+    return check.then(() => got(uri).then(res => {
+        if (res.statusCode === 403 || res.statusCode === 404) {
+            console.log('Ignoring', uri, '(' + res.statusCode + ')');
+            res.body = '';
+            return res;
+        }
+
+        if (res.statusCode >= 200 && res.statusCode < 300) {
+            return res;
+        }
+
+        return Promise.reject(new Error('Wrong status code ' + res.statusCode + ' for ' + uri));
+    })).catch(err => {
+        if (secure) {
+            return requestAsync(uri, false);
+        }
+
+        return Promise.resolve(err);
     });
 }
 
@@ -174,13 +183,13 @@ function isVinyl(file) {
  * @param {string} filePath
  * @returns {Promise}
  */
-function assertLocal(filePath) {
+function assertLocal(filePath, secure) {
     if (!isExternal(filePath)) {
         return new Bluebird(resolve => {
             resolve(filePath);
         });
     }
-    return requestAsync(filePath)
+    return requestAsync(filePath, secure)
         .then(response => temp(response));
 }