Merge pull request #514 from Synthetixio/dev

promote dev to master

Author: drptbl

helpers.js

@@ -1,7 +1,7 @@
 const axios = require('axios');
-const fs = require('fs');
-const zip = require('cross-zip');
+const fs = require('fs').promises;
 const path = require('path');
+const download = require('download');
 const packageJson = require('./package.json');
 
 let networkName = 'mainnet';
@@ -47,51 +47,90 @@ module.exports = {
       return path.dirname(require.resolve(packageJson.name));
     }
   },
+  createDirIfNotExist: async path => {
+    try {
+      await fs.access(path);
+    } catch (e) {
+      if (e.code === 'ENOENT') {
+        await fs.mkdir(path);
+      } else {
+        throw new Error(
+          `[prepareMetamask] Unhandled error from fs.access() with following error:\n${e}`,
+        );
+      }
+    }
+  },
+  checkDirOrFileExist: async path => {
+    try {
+      await fs.access(path);
+      return true;
+    } catch (e) {
+      if (e.code === 'ENOENT') {
+        return false;
+      } else {
+        throw new Error(
+          `[checkDirOrFileExist] Unhandled error from fs.access() with following error:\n${e}`,
+        );
+      }
+    }
+  },
   getMetamaskReleases: async version => {
     let filename;
     let downloadUrl;
+    let tagName;
 
-    const response = await axios.get(
-      'https://api.github.com/repos/metamask/metamask-extension/releases',
-    );
-
-    if (version === 'latest' || !version) {
-      filename = response.data[0].assets[0].name;
-      downloadUrl = response.data[0].assets[0].browser_download_url;
-    } else if (version) {
-      filename = `metamask-chrome-${version}.zip`;
-      downloadUrl = `https://github.com/MetaMask/metamask-extension/releases/download/v${version}/metamask-chrome-${version}.zip`;
+    try {
+      const response = await axios.get(
+        'https://api.github.com/repos/metamask/metamask-extension/releases',
+      );
+      if (version === 'latest' || !version) {
+        filename = response.data[0].assets[0].name;
+        downloadUrl = response.data[0].assets[0].browser_download_url;
+        tagName = response.data[0].tag_name;
+      } else if (version) {
+        filename = `metamask-chrome-${version}.zip`;
+        downloadUrl = `https://github.com/MetaMask/metamask-extension/releases/download/v${version}/metamask-chrome-${version}.zip`;
+        tagName = `metamask-chrome-${version}`;
+      }
+      return {
+        filename,
+        downloadUrl,
+        tagName,
+      };
+    } catch (e) {
+      throw new Error(
+        `[getMetamaskReleases] Unable to fetch metamask releases from: ${downloadUrl} with following error:\n${e}`,
+      );
     }
-
-    return {
-      filename,
-      downloadUrl,
-    };
   },
   download: async (url, destination) => {
-    const writer = fs.createWriteStream(destination);
-    const result = await axios({
-      url,
-      method: 'GET',
-      responseType: 'stream',
-    });
-    await new Promise(resolve =>
-      result.data.pipe(writer).on('finish', resolve),
-    );
-  },
-  extract: async (file, destination) => {
-    await zip.unzip(file, destination);
+    try {
+      await download(url, destination, { extract: true });
+    } catch (e) {
+      throw new Error(
+        `[download] Unable to download metamask release from: ${url} to: ${destination} with following error:\n${e}`,
+      );
+    }
   },
   prepareMetamask: async version => {
     const release = await module.exports.getMetamaskReleases(version);
     const downloadsDirectory = path.resolve(__dirname, 'downloads');
-    if (!fs.existsSync(downloadsDirectory)) {
-      fs.mkdirSync(downloadsDirectory);
+    await module.exports.createDirIfNotExist(downloadsDirectory);
+    const metamaskDirectory = path.join(downloadsDirectory, release.tagName);
+    const metamaskDirectoryExists = await module.exports.checkDirOrFileExist(
+      metamaskDirectory,
+    );
+    const metamaskManifestFilePath = path.join(
+      downloadsDirectory,
+      release.tagName,
+      'manifest.json',
+    );
+    const metamaskManifestFileExists = await module.exports.checkDirOrFileExist(
+      metamaskManifestFilePath,
+    );
+    if (!metamaskDirectoryExists && !metamaskManifestFileExists) {
+      await module.exports.download(release.downloadUrl, metamaskDirectory);
     }
-    const downloadDestination = path.join(downloadsDirectory, release.filename);
-    await module.exports.download(release.downloadUrl, downloadDestination);
-    const metamaskDirectory = path.join(downloadsDirectory, 'metamask');
-    await module.exports.extract(downloadDestination, metamaskDirectory);
     return metamaskDirectory;
   },
 };

package.json

@@ -61,11 +61,11 @@
     "babel-plugin-transform-react-styled-components-qa": "^2.1.0",
     "bytes32": "^0.0.3",
     "commander": "^9.4.0",
-    "cross-zip": "^4.0.0",
     "cypress": "^10.8.0",
     "cypress-wait-until": "^1.7.2",
     "dotenv": "^16.0.2",
     "dotenv-parse-variables": "^2.0.0",
+    "download": "^8.0.0",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-config-standard": "^17.0.0",