Merge pull request #851 from udarrr/main

checking downloaded local file with remote file by size/md5

Author: udarrr

lib/default-config.js

@@ -27,7 +27,7 @@ module.exports = () => {
       },
       chromiumedge: {
         version: 'latest',
-        fallbackVersion: '96.0.1054.34',
+        fallbackVersion: '117.0.2045.55',
         arch: process.arch,
         onlyDriverArgs: [],
         baseURL: 'https://msedgedriver.azureedge.net',

lib/install-utils.js

@@ -6,9 +6,9 @@ const yauzl = require('yauzl');
 const fs = require('fs');
 const zlib = require('zlib');
 const got = require('got');
-const merge = require('lodash.merge');
 const debug = require('debug')('selenium-standalone:install');
 const { logError } = require('./log-error');
+const md5 = require('md5');
 
 const installers = ['selenium', 'chrome', 'ie', 'firefox', 'edge', 'chromiumedge'];
 
@@ -79,30 +79,21 @@ async function setDriverFilePermissions(where) {
   }
 }
 
-async function isUpToDate(url, requestOpts, etag) {
-  if (!etag) {
+async function isUpToDate(url, file, pathToFile) {
+  if (!file) {
     return false;
   }
-
-  const options = merge({}, requestOpts, {
-    headers: {
-      'If-None-Match': etag,
-    },
-    timeout: 2500,
-  });
   try {
-    const response = await got(url, options);
-    return response.statusCode === 304;
-  } catch (err) {
-    if (err.response && err.response.statusCode === 304) {
+    const response = await got.head(url, {
+      timeout: 2500,
+    });
+    if (response.headers['content-length'] === `${fs.statSync(pathToFile).size}`) {
       return true;
     }
-    logError(
-      `Could not request headers from ${url}: ` +
-        (err.response ? err.response.statusCode : err.message) +
-        ', continue without checking for latest version.'
-    );
-    return true;
+    return response.headers.etag.includes(md5(file).toString());
+  } catch (err) {
+    logError(`Remote file size/hash in ${url} don't match with local file ${pathToFile}`);
+    return false;
   }
 }
 

lib/install.js

@@ -121,14 +121,16 @@ async function install(_opts) {
   }
 
   async function onlyInstallMissingFiles(opts) {
-    let etag;
+    let file;
     try {
-      etag = await readFile(`${opts.to}.etag`);
+      file = await readFile(opts.to);
     } catch (err) {
       // ENOENT means not found which is ok. But anything else re-raise
-      if (err.code != 'ENOENT') throw err;
+      if (err.code != 'ENOENT') {
+        throw err;
+      }
     }
-    const isLatest = await isUpToDate(opts.from, requestOpts, etag);
+    const isLatest = await isUpToDate(opts.from, file, opts.to);
 
     // File already exists. Prevent download/installation.
     if (isLatest) {

package-lock.json

@@ -50,6 +50,7 @@
     "is-port-reachable": "^3.0.0",
     "lodash.mapvalues": "^4.6.0",
     "lodash.merge": "^4.6.2",
+    "md5": "^2.3.0",
     "minimist": "^1.2.5",
     "mkdirp": "^2.1.3",
     "progress": "2.0.3",