feat: register downloaded dist in Fiddle

.gitignore

@@ -1,4 +1,5 @@
 .nyc_output/
+artifacts
 configs
 coverage
 node_modules

README.md

@@ -482,7 +482,7 @@ git cherry-pick --continue
 git push
 
 # create pull request
-e pr --backport 1234
+e pr open --backport 1234
 ```
 
 ## Common Usage

package.json

@@ -28,6 +28,7 @@
     "command-exists": "^1.2.8",
     "commander": "^9.0.0",
     "debug": "^4.3.1",
+    "extract-zip": "^2.0.1",
     "inquirer": "^8.2.4",
     "node-gyp": "^10.0.1",
     "open": "^6.4.0",

src/download.js

@@ -1,29 +1,9 @@
 const fs = require('fs');
 const stream = require('stream');
 const { pipeline } = require('stream/promises');
-const ProgressBar = require('progress');
 
 const { fatal } = require('./utils/logging');
-
-const MB_BYTES = 1024 * 1024;
-
-const progressStream = function (total, tokens) {
-  var pt = new stream.PassThrough();
-
-  pt.on('pipe', function (stream) {
-    const bar = new ProgressBar(tokens, { total: Math.round(total) });
-
-    pt.on('data', function (chunk) {
-      const elapsed = new Date() - bar.start;
-      const rate = bar.curr / (elapsed / 1000);
-      bar.tick(chunk.length, {
-        mbRate: (rate / MB_BYTES).toFixed(2),
-      });
-    });
-  });
-
-  return pt;
-};
+const { progressStream } = require('./utils/download');
 
 const write = fs.createWriteStream(process.argv[3]);
 

src/e

@@ -169,7 +169,7 @@ program
   .command('backport [pr]', 'Assists with manual backport processes')
   .command('show <subcommand>', 'Show info about the current build config')
   .command('test [specRunnerArgs...]', `Run Electron's spec runner`)
-  .command('pr [options]', 'Open a GitHub URL where you can PR your changes')
+  .command('pr [subcommand]', 'Work with PRs to electron/electron')
   .command('patches <target>', 'Refresh the patches in $root/src/electron/patches/$target')
   .command('open <sha1|PR#>', 'Open a GitHub URL for the given commit hash / pull # / issue #')
   .command('auto-update', 'Check for build-tools updates or enable/disable automatic updates')

src/e-pr.js

@@ -1,15 +1,27 @@
 #!/usr/bin/env node
 
 const childProcess = require('child_process');
+const fs = require('fs');
+const os = require('os');
 const path = require('path');
+const { Readable } = require('stream');
+const { pipeline } = require('stream/promises');
+
+const extractZip = require('extract-zip');
 const querystring = require('querystring');
 const semver = require('semver');
-
 const open = require('open');
 const program = require('commander');
+const { Octokit } = require('@octokit/rest');
+const inquirer = require('inquirer');
 
+const { progressStream } = require('./utils/download');
+const { getGitHubAuthToken } = require('./utils/github-auth');
 const { current } = require('./evm-config');
 const { color, fatal } = require('./utils/logging');
+const { openExternal } = require('./utils/open-external');
+
+const d = require('debug')('build-tools:pr');
 
 // Adapted from https://github.com/electron/clerk
 function findNoteInPRBody(body) {
@@ -134,27 +146,23 @@ function pullRequestSource(source) {
 }
 
 program
+  .command('open', null, { isDefault: true })
   .description('Open a GitHub URL where you can PR your changes')
-  .option(
-    '-s, --source <source_branch>',
-    'Where the changes are coming from',
-    guessPRSource(current()),
-  )
-  .option(
-    '-t, --target <target_branch>',
-    'Where the changes are going to',
-    guessPRTarget(current()),
-  )
+  .option('-s, --source [source_branch]', 'Where the changes are coming from')
+  .option('-t, --target [target_branch]', 'Where the changes are going to')
   .option('-b, --backport <pull_request>', 'Pull request being backported')
   .action(async (options) => {
-    if (!options.source) {
+    const source = options.source || guessPRSource(current());
+    const target = options.target || guessPRTarget(current());
+
+    if (!source) {
       fatal(`'source' is required to create a PR`);
-    } else if (!options.target) {
+    } else if (!target) {
       fatal(`'target' is required to create a PR`);
     }
 
     const repoBaseUrl = 'https://github.com/electron/electron';
-    const comparePath = `${options.target}...${pullRequestSource(options.source)}`;
+    const comparePath = `${target}...${pullRequestSource(source)}`;
     const queryParams = { expand: 1 };
 
     if (!options.backport) {
@@ -188,5 +196,257 @@ program
     }
 
     return open(`${repoBaseUrl}/compare/${comparePath}?${querystring.stringify(queryParams)}`);
-  })
-  .parse(process.argv);
+  });
+
+program
+  .command('download-dist <pull_request_number>')
+  .description('Download a pull request dist')
+  .option(
+    '--platform [platform]',
+    'Platform to download dist for. Defaults to current platform.',
+    process.platform,
+  )
+  .option(
+    '--arch [arch]',
+    'Architecture to download dist for. Defaults to current arch.',
+    process.arch,
+  )
+  .option(
+    '-o, --output <output_directory>',
+    'Specify the output directory for downloaded artifacts. ' +
+      'Defaults to ~/.electron_build_tools/artifacts/pr_{number}_{platform}_{arch}',
+  )
+  .option(
+    '-s, --skip-confirmation',
+    'Skip the confirmation prompt before downloading the dist.',
+    !!process.env.CI,
+  )
+  .option('--fiddle', 'Registers build as a local version in Electron Fiddle.')
+  .action(async (pullRequestNumber, options) => {
+    if (!pullRequestNumber) {
+      fatal(`Pull request number is required to download a PR`);
+    }
+
+    d('checking auth...');
+    const auth = await getGitHubAuthToken(['repo']);
+    const octokit = new Octokit({ auth });
+
+    d('fetching pr info...');
+    let pullRequest;
+    try {
+      const { data } = await octokit.pulls.get({
+        owner: 'electron',
+        repo: 'electron',
+        pull_number: pullRequestNumber,
+      });
+      pullRequest = data;
+    } catch (error) {
+      console.error(`Failed to get pull request: ${error}`);
+      return;
+    }
+
+    if (!options.skipConfirmation) {
+      const isElectronRepo = pullRequest.head.repo.full_name !== 'electron/electron';
+      const { proceed } = await inquirer.prompt([
+        {
+          type: 'confirm',
+          name: 'proceed',
+          message: `You are about to download artifacts from:
+
+“${pullRequest.title} (#${pullRequest.number})” by ${pullRequest.user.login}
+${pullRequest.head.repo.html_url}${isElectronRepo ? ' (fork)' : ''}
+
+Proceed?`,
+        },
+      ]);
+
+      if (!proceed) return;
+    }
+
+    d('fetching workflow runs...');
+    let workflowRuns;
+    try {
+      const { data } = await octokit.actions.listWorkflowRunsForRepo({
+        owner: 'electron',
+        repo: 'electron',
+        branch: pullRequest.head.ref,
+        name: 'Build',
+        event: 'pull_request',
+        status: 'completed',
+        per_page: 10,
+        sort: 'created',
+        direction: 'desc',
+      });
+      workflowRuns = data.workflow_runs;
+    } catch (error) {
+      console.error(`Failed to list workflow runs: ${error}`);
+      return;
+    }
+
+    const latestBuildWorkflowRun = workflowRuns.find((run) => run.name === 'Build');
+    if (!latestBuildWorkflowRun) {
+      fatal(`No 'Build' workflow runs found for pull request #${pullRequestNumber}`);
+    }
+
+    d('fetching artifacts...');
+    let artifacts;
+    try {
+      const { data } = await octokit.actions.listWorkflowRunArtifacts({
+        owner: 'electron',
+        repo: 'electron',
+        run_id: latestBuildWorkflowRun.id,
+      });
+      artifacts = data.artifacts;
+    } catch (error) {
+      console.error(`Failed to list artifacts: ${error}`);
+      return;
+    }
+
+    const artifactName = `generated_artifacts_${options.platform}_${options.arch}`;
+    const artifact = artifacts.find((artifact) => artifact.name === artifactName);
+    if (!artifact) {
+      console.error(`Failed to find artifact: ${artifactName}`);
+      return;
+    }
+
+    let outputDir;
+
+    if (options.output) {
+      outputDir = path.resolve(options.output);
+
+      if (!(await fs.promises.stat(outputDir).catch(() => false))) {
+        fatal(`The output directory '${options.output}' does not exist`);
+      }
+    } else {
+      const artifactsDir = path.resolve(__dirname, '..', 'artifacts');
+      const defaultDir = path.resolve(
+        artifactsDir,
+        `pr_${pullRequest.number}_${options.platform}_${options.arch}`,
+      );
+
+      // Clean up the directory if it exists
+      try {
+        await fs.promises.rm(defaultDir, { recursive: true, force: true });
+      } catch (error) {
+        if (error.code !== 'ENOENT') {
+          throw error;
+        }
+      }
+
+      // Create the directory
+      await fs.promises.mkdir(defaultDir, { recursive: true });
+
+      outputDir = defaultDir;
+    }
+
+    console.log(
+      `Downloading artifact '${artifactName}' from pull request #${pullRequestNumber}...`,
+    );
+
+    // Download the artifact to a temporary directory
+    const tempDir = path.join(os.tmpdir(), 'electron-tmp');
+    await fs.promises.mkdir(tempDir);
+
+    const { url } = await octokit.actions.downloadArtifact.endpoint({
+      owner: 'electron',
+      repo: 'electron',
+      artifact_id: artifact.id,
+      archive_format: 'zip',
+    });
+
+    const response = await fetch(url, {
+      headers: {
+        Authorization: `Bearer ${auth}`,
+      },
+    });
+
+    if (!response.ok) {
+      fatal(`Could not find artifact: ${url} got ${response.status}`);
+    }
+
+    const total = parseInt(response.headers.get('content-length'), 10);
+    const artifactDownloadStream = Readable.fromWeb(response.body);
+
+    try {
+      const artifactZipPath = path.join(tempDir, `${artifactName}.zip`);
+      const artifactFileStream = fs.createWriteStream(artifactZipPath);
+      await pipeline(
+        artifactDownloadStream,
+        // Show download progress
+        ...(process.env.CI ? [] : [progressStream(total, '[:bar] :mbRateMB/s :percent :etas')]),
+        artifactFileStream,
+      );
+
+      // Extract artifact zip
+      d('unzipping artifact to %s', tempDir);
+      await extractZip(artifactZipPath, { dir: tempDir });
+
+      // Check if dist.zip exists within the extracted artifact
+      const distZipPath = path.join(tempDir, 'dist.zip');
+      if (!(await fs.promises.stat(distZipPath).catch(() => false))) {
+        throw new Error(`dist.zip not found in build artifact.`);
+      }
+
+      // Extract dist.zip
+      // NOTE: 'extract-zip' is used as it correctly extracts symlinks.
+      d('unzipping dist.zip to %s', outputDir);
+      await extractZip(distZipPath, { dir: outputDir });
+
+      const platformExecutables = {
+        win32: 'electron.exe',
+        darwin: 'Electron.app/',
+        linux: 'electron',
+      };
+
+      const executableName = platformExecutables[options.platform];
+      if (!executableName) {
+        throw new Error(`Unable to find executable for platform '${options.platform}'`);
+      }
+
+      const executablePath = path.join(outputDir, executableName);
+      if (!(await fs.promises.stat(executablePath).catch(() => false))) {
+        throw new Error(`${executableName} not found within dist.zip.`);
+      }
+
+      // Cleanup temporary files
+      await fs.promises.rm(tempDir, { recursive: true });
+
+      console.log(`${color.success} Downloaded to ${outputDir}`);
+    } catch (error) {
+      // Cleanup temporary files
+      try {
+        await fs.promises.rm(tempDir, { recursive: true });
+      } catch {
+        // ignore
+      }
+
+      fatal(error);
+    }
+
+    if (options.fiddle) {
+      const version = (await fs.promises.readFile(path.join(outputDir, 'version'))).toString(
+        'utf8',
+      );
+      if (!semver.valid(version)) {
+        fatal(`Downloaded build contains invalid version: ${version}`);
+      }
+
+      // Replace prerelease version to avoid colliding with real versions in the
+      // version picker.
+      // 35.0.0-nightly.20241114 => 35.0.0-dist.c6164aa
+      const shortCommitHash = latestBuildWorkflowRun.head_sha.substring(0, 7);
+      const parsedVersion = semver.parse(version);
+      parsedVersion.prerelease = ['dist', shortCommitHash];
+      const localVersion = parsedVersion.format();
+
+      const fiddleUrl = new URL('electron-fiddle://register-local-version/');
+      fiddleUrl.searchParams.append('name', pullRequest.title);
+      fiddleUrl.searchParams.append('version', localVersion);
+      fiddleUrl.searchParams.append('path', outputDir);
+      openExternal(fiddleUrl.href);
+
+      console.log(`${color.success} Registered local version ${localVersion} in Electron Fiddle`);
+    }
+  });
+
+program.parse(process.argv);