eas-cli 16.1.0 → 16.2.1

package/build/commands/update/index.js

@@ -5,6 +5,7 @@ const eas_build_job_1 = require("@expo/eas-build-job");
 const core_1 = require("@oclif/core");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
+const api_1 = require("../../api");
 const queries_1 = require("../../branch/queries");
 const graphql_1 = require("../../build/graphql");
 const repository_1 = require("../../build/utils/repository");
@@ -15,6 +16,7 @@ const pagination_1 = require("../../commandUtils/pagination");
 const fetch_1 = tslib_1.__importDefault(require("../../fetch"));
 const generated_1 = require("../../graphql/generated");
 const PublishMutation_1 = require("../../graphql/mutations/PublishMutation");
+const AppQuery_1 = require("../../graphql/queries/AppQuery");
 const log_1 = tslib_1.__importStar(require("../../log"));
 const ora_1 = require("../../ora");
 const platform_1 = require("../../platform");
@@ -374,74 +376,103 @@ class UpdatePublish extends EasCommand_1.default {
         }
         if (jsonFlag) {
             (0, json_1.printJsonOnlyOutput)((0, utils_1.getUpdateJsonInfosForUpdates)(newUpdates));
+            return;
         }
-        else {
-            if (new Set(newUpdates.map(update => update.group)).size > 1) {
-                log_1.default.addNewLineIfNone();
-                log_1.default.log('👉 Since multiple runtime versions are defined, multiple update groups have been published.');
+        if (new Set(newUpdates.map(update => update.group)).size > 1) {
+            log_1.default.addNewLineIfNone();
+            log_1.default.log('👉 Since multiple runtime versions are defined, multiple update groups have been published.');
+        }
+        log_1.default.addNewLineIfNone();
+        const runtimeToCompatibleBuilds = await Promise.all(runtimeToPlatformsAndFingerprintInfoAndFingerprintSourceMapping.map(obj => (0, publish_1.findCompatibleBuildsAsync)(graphqlClient, projectId, obj)));
+        for (const runtime of (0, uniqBy_1.default)(runtimeToPlatformsAndFingerprintInfoMapping, version => version.runtimeVersion)) {
+            const newUpdatesForRuntimeVersion = newUpdates.filter(update => update.runtimeVersion === runtime.runtimeVersion);
+            if (newUpdatesForRuntimeVersion.length === 0) {
+                throw new Error(`Publish response is missing updates with runtime ${runtime.runtimeVersion}.`);
             }
+            const platforms = newUpdatesForRuntimeVersion.map(update => update.platform);
+            const newAndroidUpdate = newUpdatesForRuntimeVersion.find(update => update.platform === 'android');
+            const newIosUpdate = newUpdatesForRuntimeVersion.find(update => update.platform === 'ios');
+            const updateGroupId = newUpdatesForRuntimeVersion[0].group;
+            const projectName = exp.slug;
+            const accountName = (await (0, projectUtils_1.getOwnerAccountForProjectIdAsync)(graphqlClient, projectId)).name;
+            const updateGroupUrl = (0, url_1.getUpdateGroupUrl)(accountName, projectName, updateGroupId);
+            const updateGroupLink = (0, log_1.link)(updateGroupUrl, { dim: false });
+            log_1.default.log((0, formatFields_1.default)([
+                { label: 'Branch', value: branchName },
+                { label: 'Runtime version', value: runtime.runtimeVersion },
+                { label: 'Platform', value: platforms.join(', ') },
+                { label: 'Update group ID', value: updateGroupId },
+                ...(newAndroidUpdate ? [{ label: 'Android update ID', value: newAndroidUpdate.id }] : []),
+                ...(newIosUpdate ? [{ label: 'iOS update ID', value: newIosUpdate.id }] : []),
+                ...(newAndroidUpdate?.rolloutControlUpdate
+                    ? [
+                        {
+                            label: 'Android Rollout',
+                            value: `${newAndroidUpdate.rolloutPercentage}% (Base update ID: ${newAndroidUpdate.rolloutControlUpdate.id})`,
+                        },
+                    ]
+                    : []),
+                ...(newIosUpdate?.rolloutControlUpdate
+                    ? [
+                        {
+                            label: 'iOS Rollout',
+                            value: `${newIosUpdate.rolloutPercentage}% (Base update ID: ${newIosUpdate.rolloutControlUpdate.id})`,
+                        },
+                    ]
+                    : []),
+                { label: 'Message', value: updateMessage ?? '' },
+                ...(gitCommitHash
+                    ? [
+                        {
+                            label: 'Commit',
+                            value: `${gitCommitHash}${isGitWorkingTreeDirty ? '*' : ''}`,
+                        },
+                    ]
+                    : []),
+                { label: 'EAS Dashboard', value: updateGroupLink },
+            ]));
             log_1.default.addNewLineIfNone();
-            for (const runtime of (0, uniqBy_1.default)(runtimeToPlatformsAndFingerprintInfoMapping, version => version.runtimeVersion)) {
-                const newUpdatesForRuntimeVersion = newUpdates.filter(update => update.runtimeVersion === runtime.runtimeVersion);
-                if (newUpdatesForRuntimeVersion.length === 0) {
-                    throw new Error(`Publish response is missing updates with runtime ${runtime.runtimeVersion}.`);
-                }
-                const platforms = newUpdatesForRuntimeVersion.map(update => update.platform);
-                const newAndroidUpdate = newUpdatesForRuntimeVersion.find(update => update.platform === 'android');
-                const newIosUpdate = newUpdatesForRuntimeVersion.find(update => update.platform === 'ios');
-                const updateGroupId = newUpdatesForRuntimeVersion[0].group;
-                const projectName = exp.slug;
-                const accountName = (await (0, projectUtils_1.getOwnerAccountForProjectIdAsync)(graphqlClient, projectId)).name;
-                const updateGroupUrl = (0, url_1.getUpdateGroupUrl)(accountName, projectName, updateGroupId);
-                const updateGroupLink = (0, log_1.link)(updateGroupUrl, { dim: false });
-                log_1.default.log((0, formatFields_1.default)([
-                    { label: 'Branch', value: branchName },
-                    { label: 'Runtime version', value: runtime.runtimeVersion },
-                    { label: 'Platform', value: platforms.join(', ') },
-                    { label: 'Update group ID', value: updateGroupId },
-                    ...(newAndroidUpdate
-                        ? [{ label: 'Android update ID', value: newAndroidUpdate.id }]
-                        : []),
-                    ...(newIosUpdate ? [{ label: 'iOS update ID', value: newIosUpdate.id }] : []),
-                    ...(newAndroidUpdate?.rolloutControlUpdate
-                        ? [
-                            {
-                                label: 'Android Rollout',
-                                value: `${newAndroidUpdate.rolloutPercentage}% (Base update ID: ${newAndroidUpdate.rolloutControlUpdate.id})`,
-                            },
-                        ]
-                        : []),
-                    ...(newIosUpdate?.rolloutControlUpdate
-                        ? [
-                            {
-                                label: 'iOS Rollout',
-                                value: `${newIosUpdate.rolloutPercentage}% (Base update ID: ${newIosUpdate.rolloutControlUpdate.id})`,
-                            },
-                        ]
-                        : []),
-                    { label: 'Message', value: updateMessage ?? '' },
-                    ...(gitCommitHash
-                        ? [
+            if ((0, publish_1.isUploadedAssetCountAboveWarningThreshold)(uploadedAssetCount, assetLimitPerUpdateGroup)) {
+                log_1.default.warn(`This update group contains ${uploadedAssetCount} assets and is nearing the server cap of ${assetLimitPerUpdateGroup}.\n` +
+                    `${(0, log_1.learnMore)('https://docs.expo.dev/eas-update/optimize-assets/', {
+                        learnMoreMessage: 'Consider optimizing your usage of assets',
+                        dim: false,
+                    })}.`);
+                log_1.default.addNewLineIfNone();
+            }
+            const fingerprintsWithoutCompatibleBuilds = runtimeToCompatibleBuilds.find(({ runtimeVersion }) => runtimeVersion === runtime.runtimeVersion)?.fingerprintInfoGroupWithCompatibleBuilds;
+            if (fingerprintsWithoutCompatibleBuilds) {
+                const missingBuilds = Object.entries(fingerprintsWithoutCompatibleBuilds).filter(([_platform, fingerprintInfo]) => !fingerprintInfo.build);
+                if (missingBuilds.length > 0) {
+                    const project = await AppQuery_1.AppQuery.byIdAsync(graphqlClient, projectId);
+                    log_1.default.warn('No compatible builds found for the following fingerprints:');
+                    for (const [platform, fingerprintInfo] of missingBuilds) {
+                        const fingerprintUrl = new URL(`/accounts/${project.ownerAccount.name}/projects/${project.slug}/fingerprints/${fingerprintInfo.fingerprintHash}`, (0, api_1.getExpoWebsiteBaseUrl)());
+                        log_1.default.warn((0, formatFields_1.default)([
                             {
-                                label: 'Commit',
-                                value: `${gitCommitHash}${isGitWorkingTreeDirty ? '*' : ''}`,
+                                label: `${this.prettyPlatform(platform)} fingerprint`,
+                                value: fingerprintInfo.fingerprintHash,
                             },
-                        ]
-                        : []),
-                    { label: 'EAS Dashboard', value: updateGroupLink },
-                ]));
-                log_1.default.addNewLineIfNone();
-                if ((0, publish_1.isUploadedAssetCountAboveWarningThreshold)(uploadedAssetCount, assetLimitPerUpdateGroup)) {
-                    log_1.default.warn(`This update group contains ${uploadedAssetCount} assets and is nearing the server cap of ${assetLimitPerUpdateGroup}.\n` +
-                        `${(0, log_1.learnMore)('https://docs.expo.dev/eas-update/optimize-assets/', {
-                            learnMoreMessage: 'Consider optimizing your usage of assets',
-                            dim: false,
-                        })}.`);
-                    log_1.default.addNewLineIfNone();
+                            { label: 'URL', value: fingerprintUrl.toString() },
+                        ], {
+                            labelFormat: label => `    ${chalk_1.default.dim(label)}:`,
+                        }));
+                        log_1.default.addNewLineIfNone();
+                    }
                 }
             }
         }
     }
+    prettyPlatform(updatePlatform) {
+        switch (updatePlatform) {
+            case 'android':
+                return 'Android';
+            case 'ios':
+                return 'iOS';
+            default:
+                return updatePlatform;
+        }
+    }
     sanitizeFlags(flags) {
         const nonInteractive = flags['non-interactive'] ?? false;
         const { auto, branch: branchName, channel: channelName, message: updateMessage } = flags;

package/build/commands/upload.d.ts

@@ -0,0 +1,18 @@
+import { Platform } from '@expo/eas-build-job';
+import EasCommand from '../commandUtils/EasCommand';
+export default class BuildUpload extends EasCommand {
+    static description: string;
+    static hidden: boolean;
+    static flags: {
+        'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        platform: import("@oclif/core/lib/interfaces").OptionFlag<Platform | undefined>;
+        'build-path': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        fingerprint: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+    };
+    static contextDefinition: {
+        loggedIn: import("../commandUtils/context/LoggedInContextField").default;
+        projectId: import("../commandUtils/context/ProjectIdContextField").ProjectIdContextField;
+    };
+    runAsync(): Promise<void>;
+    private selectPlatformAsync;
+}

package/build/commands/upload.js

@@ -0,0 +1,253 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const config_plugins_1 = require("@expo/config-plugins");
+const eas_build_job_1 = require("@expo/eas-build-job");
+const core_1 = require("@oclif/core");
+const fast_glob_1 = tslib_1.__importDefault(require("fast-glob"));
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const node_stream_zip_1 = tslib_1.__importDefault(require("node-stream-zip"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const tar_1 = tslib_1.__importDefault(require("tar"));
+const url_1 = require("../build/utils/url");
+const EasCommand_1 = tslib_1.__importDefault(require("../commandUtils/EasCommand"));
+const flags_1 = require("../commandUtils/flags");
+const generated_1 = require("../graphql/generated");
+const FingerprintMutation_1 = require("../graphql/mutations/FingerprintMutation");
+const LocalBuildMutation_1 = require("../graphql/mutations/LocalBuildMutation");
+const AppPlatform_1 = require("../graphql/types/AppPlatform");
+const log_1 = tslib_1.__importDefault(require("../log"));
+const prompts_1 = require("../prompts");
+const xcode = tslib_1.__importStar(require("../run/ios/xcode"));
+const uploads_1 = require("../uploads");
+const progress_1 = require("../utils/progress");
+class BuildUpload extends EasCommand_1.default {
+    static description = 'upload a local build and generate a sharable link';
+    static hidden = true;
+    static flags = {
+        platform: core_1.Flags.enum({
+            char: 'p',
+            options: [eas_build_job_1.Platform.IOS, eas_build_job_1.Platform.ANDROID],
+        }),
+        'build-path': core_1.Flags.string({
+            description: 'Path for the local build',
+        }),
+        fingerprint: core_1.Flags.string({
+            description: 'Fingerprint hash of the local build',
+        }),
+        ...flags_1.EASNonInteractiveFlag,
+    };
+    static contextDefinition = {
+        ...this.ContextOptions.ProjectId,
+        ...this.ContextOptions.LoggedIn,
+    };
+    async runAsync() {
+        const { flags } = await this.parse(BuildUpload);
+        const { 'build-path': buildPath, fingerprint: manualFingerprintHash } = flags;
+        const { projectId, loggedIn: { graphqlClient }, } = await this.getContextAsync(BuildUpload, {
+            nonInteractive: false,
+        });
+        const platform = await this.selectPlatformAsync(flags.platform);
+        const localBuildPath = await resolveLocalBuildPathAsync(platform, buildPath);
+        const { fingerprintHash: buildFingerprintHash, developmentClient, simulator, } = await extractAppMetadataAsync(localBuildPath, platform);
+        let fingerprint = manualFingerprintHash ?? buildFingerprintHash;
+        if (fingerprint) {
+            if (manualFingerprintHash &&
+                buildFingerprintHash &&
+                manualFingerprintHash !== buildFingerprintHash) {
+                const selectedAnswer = await (0, prompts_1.promptAsync)({
+                    name: 'fingerprint',
+                    message: `The provided fingerprint hash ${manualFingerprintHash} does not match the fingerprint hash of the build ${buildFingerprintHash}. Which fingerprint do you want to use?`,
+                    type: 'select',
+                    choices: [
+                        { title: manualFingerprintHash, value: manualFingerprintHash },
+                        { title: buildFingerprintHash, value: buildFingerprintHash },
+                    ],
+                });
+                fingerprint = String(selectedAnswer.fingerprint);
+            }
+            await FingerprintMutation_1.FingerprintMutation.createFingerprintAsync(graphqlClient, projectId, {
+                hash: fingerprint,
+            });
+        }
+        log_1.default.log('Uploading your app archive to EAS');
+        const bucketKey = await uploadAppArchiveAsync(graphqlClient, localBuildPath);
+        const build = await LocalBuildMutation_1.LocalBuildMutation.createLocalBuildAsync(graphqlClient, projectId, { platform: (0, AppPlatform_1.toAppPlatform)(platform), simulator }, { type: generated_1.LocalBuildArchiveSourceType.Gcs, bucketKey }, { distribution: generated_1.DistributionType.Internal, fingerprintHash: fingerprint, developmentClient });
+        log_1.default.withTick(`Here is a sharable link of your build: ${(0, url_1.getBuildLogsUrl)(build)}`);
+    }
+    async selectPlatformAsync(platform) {
+        if (platform) {
+            return platform;
+        }
+        const { resolvedPlatform } = await (0, prompts_1.promptAsync)({
+            type: 'select',
+            message: 'Select platform',
+            name: 'resolvedPlatform',
+            choices: [
+                { title: 'Android', value: eas_build_job_1.Platform.ANDROID },
+                { title: 'iOS', value: eas_build_job_1.Platform.IOS },
+            ],
+        });
+        return resolvedPlatform;
+    }
+}
+exports.default = BuildUpload;
+async function resolveLocalBuildPathAsync(platform, inputBuildPath) {
+    const rootDir = process.cwd();
+    let applicationArchivePatternOrPath = [];
+    if (inputBuildPath) {
+        applicationArchivePatternOrPath.push(inputBuildPath);
+    }
+    else if (platform === eas_build_job_1.Platform.ANDROID) {
+        applicationArchivePatternOrPath.push('android/app/build/outputs/**/*.{apk,aab}');
+    }
+    else {
+        const xcworkspacePath = await xcode.resolveXcodeProjectAsync(rootDir);
+        const schemes = config_plugins_1.IOSConfig.BuildScheme.getRunnableSchemesFromXcodeproj(rootDir);
+        if (xcworkspacePath && schemes.length > 0) {
+            for (const scheme of schemes) {
+                const buildSettings = await xcode.getXcodeBuildSettingsAsync(xcworkspacePath, scheme.name);
+                applicationArchivePatternOrPath = applicationArchivePatternOrPath.concat(buildSettings.map(({ buildSettings }) => `${buildSettings.BUILD_DIR}/**/*.app`));
+            }
+        }
+    }
+    let applicationArchives = await findArtifactsAsync({
+        rootDir,
+        patternOrPathArray: applicationArchivePatternOrPath,
+    });
+    if (applicationArchives.length === 0 && !inputBuildPath) {
+        log_1.default.warn(`No application archives found at ${applicationArchivePatternOrPath}.`);
+        const { path } = await (0, prompts_1.promptAsync)({
+            type: 'text',
+            name: 'path',
+            message: 'Provide a path to the application archive:',
+            validate: value => (value ? true : 'Path may not be empty.'),
+        });
+        applicationArchives = await findArtifactsAsync({
+            rootDir,
+            patternOrPathArray: [path],
+        });
+    }
+    if (applicationArchives.length === 1) {
+        return applicationArchives[0];
+    }
+    if (applicationArchives.length > 1) {
+        const { path } = await (0, prompts_1.promptAsync)({
+            type: 'select',
+            name: 'path',
+            message: 'Found multiple application archives. Select one:',
+            choices: applicationArchives.map(archivePath => {
+                return {
+                    title: archivePath,
+                    value: archivePath,
+                };
+            }),
+        });
+        return path;
+    }
+    throw new Error(`Found no application archives at ${inputBuildPath}.`);
+}
+async function findArtifactsAsync({ rootDir, patternOrPathArray, }) {
+    const files = [];
+    for (const patternOrPath of patternOrPathArray) {
+        if (path_1.default.isAbsolute(patternOrPath) && (await fs_extra_1.default.pathExists(patternOrPath))) {
+            files.push(patternOrPath);
+        }
+        else {
+            const filesFound = await (0, fast_glob_1.default)(patternOrPath, {
+                cwd: rootDir,
+                onlyFiles: false,
+            });
+            files.push(...filesFound);
+        }
+    }
+    return files.map(filePath => {
+        // User may provide an absolute path as input in which case
+        // fg will return an absolute path.
+        if (path_1.default.isAbsolute(filePath)) {
+            return filePath;
+        }
+        // User may also provide a relative path in which case
+        // fg will return a path relative to rootDir.
+        return path_1.default.join(rootDir, filePath);
+    });
+}
+async function uploadAppArchiveAsync(graphqlClient, path) {
+    const fileSize = (await fs_extra_1.default.stat(path)).size;
+    const bucketKey = await (0, uploads_1.uploadFileAtPathToGCSAsync)(graphqlClient, generated_1.UploadSessionType.EasShareGcsAppArchive, path, (0, progress_1.createProgressTracker)({
+        total: fileSize,
+        message: 'Uploading to EAS',
+        completedMessage: 'Uploaded to EAS',
+    }));
+    return bucketKey;
+}
+async function extractAppMetadataAsync(buildPath, platform) {
+    let developmentClient = false;
+    let fingerprintHash;
+    const simulator = platform === eas_build_job_1.Platform.IOS;
+    const basePath = platform === eas_build_job_1.Platform.ANDROID ? 'assets/' : buildPath;
+    const fingerprintFilePath = platform === eas_build_job_1.Platform.ANDROID ? 'fingerprint' : 'EXUpdates.bundle/fingerprint';
+    const devMenuBundlePath = platform === eas_build_job_1.Platform.ANDROID ? 'EXDevMenuApp.android.js' : 'EXDevMenu.bundle/';
+    const buildExtension = path_1.default.extname(buildPath);
+    if (['.apk', '.aab'].includes(buildExtension)) {
+        const zip = new node_stream_zip_1.default.async({ file: buildPath });
+        try {
+            developmentClient = Boolean(await zip.entry(path_1.default.join(basePath, devMenuBundlePath)));
+            if (await zip.entry(path_1.default.join(basePath, fingerprintFilePath))) {
+                fingerprintHash = (await zip.entryData(path_1.default.join(basePath, fingerprintFilePath))).toString('utf-8');
+            }
+        }
+        catch (err) {
+            log_1.default.error(`Error reading ${buildExtension}: ${err}`);
+        }
+        finally {
+            await zip.close();
+        }
+    }
+    else if (buildExtension === '.app') {
+        developmentClient = await fs_extra_1.default.exists(path_1.default.join(basePath, devMenuBundlePath));
+        if (await fs_extra_1.default.exists(path_1.default.join(basePath, fingerprintFilePath))) {
+            fingerprintHash = await fs_extra_1.default.readFile(path_1.default.join(basePath, fingerprintFilePath), 'utf8');
+        }
+    }
+    else {
+        // Use tar to list files in the archive
+        try {
+            let fingerprintHashPromise;
+            await tar_1.default.list({
+                file: buildPath,
+                // eslint-disable-next-line async-protect/async-suffix
+                onentry: entry => {
+                    if (entry.path.endsWith(devMenuBundlePath)) {
+                        developmentClient = true;
+                    }
+                    if (entry.path.endsWith(fingerprintFilePath)) {
+                        fingerprintHashPromise = new Promise(async (resolve, reject) => {
+                            try {
+                                let content = '';
+                                for await (const chunk of entry) {
+                                    content += chunk.toString('utf8');
+                                }
+                                resolve(content);
+                            }
+                            catch (error) {
+                                reject(error);
+                            }
+                        });
+                    }
+                },
+            });
+            if (fingerprintHashPromise !== undefined) {
+                fingerprintHash = await fingerprintHashPromise;
+            }
+        }
+        catch (err) {
+            log_1.default.error(`Error reading ${buildExtension}: ${err}`);
+        }
+    }
+    return {
+        developmentClient,
+        fingerprintHash,
+        simulator,
+    };
+}

package/build/credentials/ios/appstore/ensureTestFlightGroup.js

@@ -53,7 +53,7 @@ async function ensureInternalGroupAsync({ groups, app, }) {
             }, {
                 shouldRetry(error) {
                     if ((0, ensureAppExists_1.isAppleError)(error)) {
-                        spinner.text = `TestFlight not ready, retrying in 25 seconds...`;
+                        spinner.text = `TestFlight still preparing, retrying in 10 seconds...`;
                         return error.data.errors.some(error => error.code === 'ENTITY_ERROR.RELATIONSHIP.INVALID');
                     }
                     return false;
@@ -154,9 +154,10 @@ async function getTestFlightGroupUrlAsync(group) {
     }
     return null;
 }
-async function pollRetryAsync(fn, { shouldRetry, retries = 10, 
+async function pollRetryAsync(fn, { shouldRetry, retries = 15, 
 // 25 seconds was the minium interval I calculated when measuring against 5 second intervals.
-interval = 25000, } = {}) {
+// Switching to 10 seconds to account for days where Apple APIs are faster.
+interval = 10000, } = {}) {
     let lastError = null;
     for (let i = 0; i < retries; i++) {
         try {