electron-mksnapshot 7.0.0 → 9.0.2

package/.circleci/config.yml

@@ -40,7 +40,7 @@ jobs:
 
   install-test-osx:
     macos:
-        xcode: "9.0"
+        xcode: "11.1.0"
     steps:
       - checkout
 

package/README.md

@@ -41,3 +41,37 @@ ELECTRON_MIRROR="https://npm.taobao.org/mirrors/electron/"
 # Example of requested URL: http://localhost:8080/1.2.0/mksnapshot-v1.2.0-darwin-x64.zip
 ELECTRON_MIRROR="http://localhost:8080/"
 ```
+
+## Overriding the version downloaded
+
+The version downloaded can be overriden by setting the `ELECTRON_CUSTOM_VERSION` environment variable.
+
+```sh
+# Install mksnapshot for Electron v8.3.0
+ELECTRON_CUSTOM_VERSION=8.3.0 npm install
+```
+
+## Generating snapshots for ARM hardware
+
+If you need to generate snapshots for Linux on 32 bit ARM, Linux on ARM64, or Windows on ARM64 you will need to install a cross arch mksnapshot on an Intel x64 machine.  To do so, set the npm config `arch` to the proper arch and then run `npm install --save-dev electron-mksnapshot`.  For example:
+
+### Linux on ARM64
+From an Intel x64 Linux OS run:
+```sh
+npm config set arch arm64
+npm install --save-dev electron-mksnapshot
+```
+
+### Linux on 32 bit ARM 
+From an Intel x64 Linux OS run:
+```sh
+npm config set arch armv7l
+npm install --save-dev electron-mksnapshot
+```
+
+### Windows on ARM (64-bit)
+From an Intel x64 Windows OS run:
+```sh
+npm config set arch arm64
+npm install --save-dev electron-mksnapshot
+```

package/download-mksnapshot.js

@@ -1,38 +1,65 @@
-var fs = require('fs')
-var path = require('path')
-var electronDownload = require('electron-download')
-var extractZip = require('extract-zip')
-var versionToDownload = require('./package').version
+const fs = require('fs')
+const path = require('path')
+const { downloadArtifact } = require('@electron/get')
+const extractZip = require('extract-zip')
+const versionToDownload = require('./package').version
+let archToDownload = process.env.npm_config_arch
 
-function download (version, callback) {
-  electronDownload({
+if (process.arch.indexOf('arm') === 0) {
+  console.log(`WARNING: mksnapshot does not run on ${process.arch}. Download 
+  https://github.com/electron/electron/releases/download/v${versionToDownload}/mksnapshot-v${versionToDownload}-${process.platform}-${process.arch}-x64.zip
+  on a x64 ${process.platform} OS to generate ${archToDownload} snapshots.`)
+  process.exit(1)
+}
+
+if (archToDownload && archToDownload.indexOf('arm') === 0) {
+  if (process.platform !== 'darwin') {
+    archToDownload += '-x64'
+  } else {
+    console.log(`WARNING: mksnapshot for ${archToDownload} is not available on macOS. Download 
+    https://github.com/electron/electron/releases/download/v${versionToDownload}/mksnapshot-v${versionToDownload}-linux-${archToDownload}-x64.zip
+    on a x64 Linux OS to generate ${archToDownload} snapshots.`)
+    process.exit(1)
+  }
+}
+
+function download (version) {
+  return downloadArtifact({
     version: version,
-    mksnapshot: true,
+    artifactName: 'mksnapshot',
     platform: process.env.npm_config_platform,
-    arch: process.env.npm_config_arch,
-    strictSSL: process.env.npm_config_strict_ssl === 'true',
+    arch: archToDownload,
+    rejectUnauthorized: process.env.npm_config_strict_ssl === 'true',
     quiet: ['info', 'verbose', 'silly', 'http'].indexOf(process.env.npm_config_loglevel) === -1
-  }, callback)
+  })
 }
 
-function processDownload (err, zipPath) {
-  if (err != null) throw err
-  extractZip(zipPath, { dir: path.join(__dirname, 'bin') }, function (error) {
-    if (error != null) throw error
-    if (process.platform !== 'win32') {
-      fs.chmod(path.join(__dirname, 'bin', 'mksnapshot'), '755', function (error) {
-        if (error != null) throw error
-      })
+async function attemptDownload (version) {
+  try {
+    const targetFolder = path.join(__dirname, 'bin')
+    const zipPath = await download(version)
+    await extractZip(zipPath, { dir: targetFolder })
+    const platform = process.env.npm_config_platform || process.platform
+    if (platform !== 'win32') {
+      const mksnapshotPath = path.join(__dirname, 'bin', 'mksnapshot')
+      if (fs.existsSync(mksnapshotPath)) {
+        fs.chmod(mksnapshotPath, '755', function (error) {
+          if (error != null) throw error
+        })
+      }
     }
-  })
-}
+  } catch (err) {
+    // attempt to fall back to semver minor
+    const parts = version.split('.')
+    const baseVersion = `${parts[0]}.${parts[1]}.0`
 
-download(versionToDownload, function (err, zipPath) {
-  if (err) {
-    var versionSegments = versionToDownload.split('.')
-    var baseVersion = versionSegments[0] + '.' + versionSegments[1] + '.0'
-    download(baseVersion, processDownload)
-  } else {
-    processDownload(err, zipPath)
+    // don't recurse infinitely
+    if (baseVersion === version) {
+      throw err
+    } else {
+      await attemptDownload(baseVersion)
+    }
   }
-})
+}
+
+attemptDownload(versionToDownload)

package/mksnapshot.js

@@ -5,6 +5,11 @@ const { spawnSync } = require('child_process')
 const path = require('path')
 const temp = require('temp').track()
 const workingDir = temp.mkdirSync('mksnapshot-workdir')
+const crossArchDirs = [
+  'clang_x86_v8_arm',
+  'clang_x64_v8_arm64',
+  'win_clang_x64'
+]
 
 function getBinaryPath (binary, binaryPath) {
   if (process.platform === 'win32') {
@@ -38,11 +43,6 @@ if (outDirIdx > -1) {
 if (args.includes('--startup_blob')) {
   console.log('--startup_blob argument not supported. Use --output_dir to specify where to output snapshot_blob.bin')
   process.exit(1)
-} else {
-  mksnapshotArgs = mksnapshotArgs.concat(['--startup_blob', 'snapshot_blob.bin'])
-}
-if (!mksnapshotArgs.includes('--turbo_instruction_scheduling')) {
-  mksnapshotArgs.push('--turbo_instruction_scheduling')
 }
 
 const mksnapshotDir = path.join(__dirname, 'bin')
@@ -52,13 +52,48 @@ const mksnapshotDir = path.join(__dirname, 'bin')
 // directory.
 fs.copySync(mksnapshotDir, workingDir)
 
+const argsFile = path.join(mksnapshotDir, 'mksnapshot_args')
+let mksnapshotBinaryDir = workingDir
+if (fs.existsSync(argsFile)) {
+  // Use args from args file if it is provided as these match what is used to generate the original snapshot
+  const mksnapshotArgsFile = fs.readFileSync(argsFile, 'utf8')
+  const newlineRegEx = /(\r\n|\r|\n)/g
+  const mksnapshotArgsFromFile = mksnapshotArgsFile.split(newlineRegEx).filter((arg) => {
+    return (!arg.match(newlineRegEx) && arg !== '')
+  })
+  const mksnapshotBinaryPath = path.parse(mksnapshotArgsFromFile[0])
+  if (mksnapshotBinaryPath.dir) {
+    mksnapshotBinaryDir = path.join(workingDir, mksnapshotBinaryPath.dir)
+  }
+  mksnapshotArgs = mksnapshotArgs.concat(mksnapshotArgsFromFile.slice(1))
+} else {
+  mksnapshotArgs = mksnapshotArgs.concat(['--startup_blob', 'snapshot_blob.bin'])
+  if (!mksnapshotArgs.includes('--turbo_instruction_scheduling')) {
+    mksnapshotArgs.push('--turbo_instruction_scheduling')
+  }
+  if (!fs.existsSync(getBinaryPath('mksnapshot', mksnapshotBinaryDir))) {
+    const matchingDir = crossArchDirs.find((crossArchDir) => {
+      const candidatePath = path.join(mksnapshotBinaryDir, crossArchDir)
+      if (fs.existsSync(getBinaryPath('mksnapshot', candidatePath))) {
+        return true
+      }
+    })
+    if (matchingDir) {
+      mksnapshotBinaryDir = path.join(workingDir, matchingDir)
+    } else {
+      console.log('ERROR: Could not find mksnapshot')
+      process.exit(1)
+    }
+  }
+}
+
 const options = {
   cwd: workingDir,
   env: process.env,
   stdio: 'inherit'
 }
 
-const mksnapshotCommand = getBinaryPath('mksnapshot', workingDir)
+const mksnapshotCommand = getBinaryPath('mksnapshot', mksnapshotBinaryDir)
 const mksnapshotProcess = spawnSync(mksnapshotCommand, mksnapshotArgs, options)
 if (mksnapshotProcess.status !== 0) {
   let code = mksnapshotProcess.status
@@ -75,7 +110,7 @@ if (args.includes('--help')) {
 fs.copyFileSync(path.join(workingDir, 'snapshot_blob.bin'),
   path.join(outputDir, 'snapshot_blob.bin'))
 
-const v8ContextGenCommand = getBinaryPath('v8_context_snapshot_generator', workingDir)
+const v8ContextGenCommand = getBinaryPath('v8_context_snapshot_generator', mksnapshotBinaryDir)
 const v8ContextGenArgs = [
   `--output_file=${path.join(outputDir, 'v8_context_snapshot.bin')}`
 ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron-mksnapshot",
-  "version": "7.0.0",
+  "version": "9.0.2",
   "description": "Electron version of the mksnapshot binary",
   "repository": "https://github.com/electron/mksnapshot",
   "bin": {
@@ -12,13 +12,13 @@
   },
   "license": "MIT",
   "dependencies": {
-    "electron-download": "^4.1.0",
-    "extract-zip": "^1.6.5",
+    "@electron/get": "^1.12.2",
+    "extract-zip": "^2.0.0",
     "fs-extra": "^7.0.1",
     "temp": "^0.8.3"
   },
   "devDependencies": {
-    "mocha": "^5.2.0",
+    "mocha": "^7.1.2",
     "standard": "^14.3.1"
   },
   "standard": {