cypress 9.2.0 → 9.2.1

package/lib/tasks/download.js

@@ -8,7 +8,7 @@ const is = require('check-more-types');
 
 const os = require('os');
 
-const url = require('url');
+const Url = require('url');
 
 const path = require('path');
 
@@ -36,6 +36,7 @@ const fs = require('../fs');
 const util = require('../util');
 
 const defaultBaseUrl = 'https://download.cypress.io/';
+const defaultMaxRedirects = 10;
 
 const getProxyForUrlWithNpmConfig = url => {
   return getProxyForUrl(url) || process.env.npm_config_https_proxy || process.env.npm_config_proxy || null;
@@ -76,7 +77,7 @@ const getCA = () => {
 };
 
 const prepend = urlPath => {
-  const endpoint = url.resolve(getBaseUrl(), urlPath);
+  const endpoint = Url.resolve(getBaseUrl(), urlPath);
   const platform = os.platform();
   return `${endpoint}?platform=${platform}&arch=${arch()}`;
 };
@@ -183,8 +184,18 @@ const downloadFromUrl = ({
   url,
   downloadDestination,
   progress,
-  ca
+  ca,
+  version,
+  redirectTTL = defaultMaxRedirects
 }) => {
+  if (redirectTTL <= 0) {
+    return Promise.reject(new Error(stripIndent`
+          Failed downloading the Cypress binary.
+          There were too many redirects. The default allowance is ${defaultMaxRedirects}.
+          Maybe you got stuck in a redirect loop?
+        `));
+  }
+
   return new Promise((resolve, reject) => {
     const proxy = getProxyForUrlWithNpmConfig(url);
     debug('Downloading package', {
@@ -192,35 +203,24 @@ const downloadFromUrl = ({
       proxy,
       downloadDestination
     });
-    let redirectVersion;
-    const reqOptions = {
-      url,
-      proxy,
-
-      followRedirect(response) {
-        const version = response.headers['x-version'];
-        debug('redirect version:', version);
-
-        if (version) {
-          // set the version in options if we have one.
-          // this insulates us from potential redirect
-          // problems where version would be set to undefined.
-          redirectVersion = version;
-        } // yes redirect
-
-
-        return true;
-      }
-
-    };
 
     if (ca) {
       debug('using custom CA details from npm config');
-      reqOptions.agentOptions = {
-        ca
-      };
     }
 
+    const reqOptions = {
+      uri: url,
+      ...(proxy ? {
+        proxy
+      } : {}),
+      ...(ca ? {
+        agentOptions: {
+          ca
+        }
+      } : {}),
+      method: 'GET',
+      followRedirect: false
+    };
     const req = request(reqOptions); // closure
 
     let started = null;
@@ -248,18 +248,46 @@ const downloadFromUrl = ({
       // response headers
 
 
-      started = new Date(); // if our status code does not start with 200
-
-      if (!/^2/.test(response.statusCode)) {
+      started = new Date();
+
+      if (/^3/.test(response.statusCode)) {
+        const redirectVersion = response.headers['x-version'];
+        const redirectUrl = response.headers.location;
+        debug('redirect version:', redirectVersion);
+        debug('redirect url:', redirectUrl);
+        downloadFromUrl({
+          url: redirectUrl,
+          progress,
+          ca,
+          downloadDestination,
+          version: redirectVersion,
+          redirectTTL: redirectTTL - 1
+        }).then(resolve).catch(reject); // if our status code does not start with 200
+      } else if (!/^2/.test(response.statusCode)) {
         debug('response code %d', response.statusCode);
         const err = new Error(stripIndent`
           Failed downloading the Cypress binary.
           Response code: ${response.statusCode}
           Response message: ${response.statusMessage}
         `);
-        reject(err);
+        reject(err); // status codes here are all 2xx
+      } else {
+        // We only enable this pipe connection when we know we've got a successful return
+        // and handle the completion with verify and resolve
+        // there was a possible race condition between end of request and close of writeStream
+        // that is made ordered with this Promise.all
+        Promise.all([new Promise(r => {
+          return response.pipe(fs.createWriteStream(downloadDestination).on('close', r));
+        }), new Promise(r => response.on('end', r))]).then(() => {
+          debug('downloading finished');
+          verifyDownloadedFile(downloadDestination, expectedSize, expectedChecksum).then(() => debug('verified')).then(() => resolve(version)).catch(reject);
+        });
       }
-    }).on('error', reject).on('progress', state => {
+    }).on('error', e => {
+      if (e.code === 'ECONNRESET') return; // sometimes proxies give ECONNRESET but we don't care
+
+      reject(e);
+    }).on('progress', state => {
       // total time we've elapsed
       // starting on our first progress notification
       const elapsed = new Date() - started; // request-progress sends a value between 0 and 1
@@ -268,12 +296,6 @@ const downloadFromUrl = ({
       const eta = util.calculateEta(percentage, elapsed); // send up our percent and seconds remaining
 
       progress.onProgress(percentage, util.secsRemaining(eta));
-    }) // save this download here
-    .pipe(fs.createWriteStream(downloadDestination)).on('finish', () => {
-      debug('downloading finished');
-      verifyDownloadedFile(downloadDestination, expectedSize, expectedChecksum).then(() => {
-        return resolve(redirectVersion);
-      }, reject);
     });
   });
 };
@@ -288,7 +310,8 @@ const start = opts => {
   let {
     version,
     downloadDestination,
-    progress
+    progress,
+    redirectTTL
   } = opts;
 
   if (!downloadDestination) {
@@ -316,7 +339,11 @@ const start = opts => {
       url,
       downloadDestination,
       progress,
-      ca
+      ca,
+      version,
+      ...(redirectTTL ? {
+        redirectTTL
+      } : {})
     });
   }).catch(err => {
     return prettyDownloadErr(err, version);

package/lib/tasks/verify.js

@@ -37,7 +37,7 @@ const xvfb = require('../exec/xvfb');
 
 const state = require('./state');
 
-const VERIFY_TEST_RUNNER_TIMEOUT_MS = process.env.CYPRESS_VERIFY_TIMEOUT || 30000;
+const VERIFY_TEST_RUNNER_TIMEOUT_MS = +process.env.CYPRESS_VERIFY_TIMEOUT || 30000;
 
 const checkExecutable = binaryDir => {
   const executable = state.getPathToExecutable(binaryDir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cypress",
-  "version": "9.2.0",
+  "version": "9.2.1",
   "main": "index.js",
   "scripts": {
     "postinstall": "node index.js --exec install",
@@ -19,7 +19,7 @@
     "chalk": "^4.1.0",
     "check-more-types": "^2.24.0",
     "cli-cursor": "^3.1.0",
-    "cli-table3": "~0.6.0",
+    "cli-table3": "~0.6.1",
     "commander": "^5.1.0",
     "common-tags": "^1.8.0",
     "dayjs": "^1.10.4",