eas-cli 16.0.1 → 16.2.0

package/build/graphql/types/BackgroundJobReceipt.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BackgroundJobReceiptNode = void 0;
+const tslib_1 = require("tslib");
+const graphql_tag_1 = tslib_1.__importDefault(require("graphql-tag"));
+exports.BackgroundJobReceiptNode = (0, graphql_tag_1.default) `
+  fragment BackgroundJobReceiptData on BackgroundJobReceipt {
+    id
+    state
+    tries
+    willRetry
+    resultId
+    resultType
+    resultData
+    errorCode
+    errorMessage
+    createdAt
+    updatedAt
+  }
+`;

package/build/project/publish.d.ts

@@ -4,7 +4,7 @@ import { Env, FingerprintSource, Platform, Workflow } from '@expo/eas-build-job'
 import Joi from 'joi';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { PaginatedQueryOptions } from '../commandUtils/pagination';
-import { AppPlatform, PartialManifestAsset, UpdateRolloutInfoGroup } from '../graphql/generated';
+import { AppPlatform, BuildFragment, PartialManifestAsset, UpdateRolloutInfoGroup } from '../graphql/generated';
 import { RequestedPlatform } from '../platform';
 import { UpdateJsonInfo } from '../update/utils';
 import { Client } from '../vcs/vcs';
@@ -188,6 +188,22 @@ export declare function maybeCalculateFingerprintForRuntimeVersionInfoObjectsWit
     expoUpdatesRuntimeFingerprintSource: FingerprintSource | null;
     fingerprintInfoGroup: FingerprintInfoGroup;
 })[]>;
+export declare function findCompatibleBuildsAsync(graphqlClient: ExpoGraphqlClient, appId: string, runtimeToPlatformsAndFingerprintInfoMapping: {
+    runtimeVersion: string;
+    platforms: UpdatePublishPlatform[];
+    fingerprintInfoGroup: FingerprintInfoGroup;
+}): Promise<{
+    runtimeVersion: string;
+    platforms: UpdatePublishPlatform[];
+    fingerprintInfoGroupWithCompatibleBuilds: {
+        android?: (FingerprintInfo & {
+            build?: BuildFragment;
+        }) | undefined;
+        ios?: (FingerprintInfo & {
+            build?: BuildFragment;
+        }) | undefined;
+    };
+}>;
 export declare const platformDisplayNames: Record<UpdatePublishPlatform, string>;
 export declare const updatePublishPlatformToAppPlatform: Record<UpdatePublishPlatform, AppPlatform>;
 export declare function getRuntimeToUpdateRolloutInfoGroupMappingAsync(graphqlClient: ExpoGraphqlClient, { appId, branchName, rolloutPercentage, runtimeToPlatformsAndFingerprintInfoMapping, }: {

package/build/project/publish.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRuntimeToUpdateRolloutInfoGroupMappingAsync = exports.updatePublishPlatformToAppPlatform = exports.platformDisplayNames = exports.maybeCalculateFingerprintForRuntimeVersionInfoObjectsWithoutExpoUpdatesAsync = exports.getRuntimeToPlatformsAndFingerprintInfoMappingFromRuntimeVersionInfoObjects = exports.getRuntimeVersionInfoObjectsAsync = exports.defaultPublishPlatforms = exports.getUpdateMessageForCommandAsync = exports.getBranchNameForCommandAsync = exports.isUploadedAssetCountAboveWarningThreshold = exports.uploadAssetsAsync = exports.filterOutAssetsThatAlreadyExistAsync = exports.collectAssetsAsync = exports.getOriginalPathFromAssetMap = exports.getAssetHashFromPath = exports.loadAssetMapAsync = exports.filterCollectedAssetsByRequestedPlatforms = exports.generateEasMetadataAsync = exports.loadMetadata = exports.resolveInputDirectoryAsync = exports.buildBundlesAsync = exports.buildUnsortedUpdateInfoGroupAsync = exports.convertAssetToUpdateInfoGroupFormatAsync = exports.getStorageKeyForAssetAsync = exports.getStorageKey = exports.getBase64URLEncoding = exports.guessContentTypeFromExtension = exports.MetadataJoi = void 0;
+exports.getRuntimeToUpdateRolloutInfoGroupMappingAsync = exports.updatePublishPlatformToAppPlatform = exports.platformDisplayNames = exports.findCompatibleBuildsAsync = exports.maybeCalculateFingerprintForRuntimeVersionInfoObjectsWithoutExpoUpdatesAsync = exports.getRuntimeToPlatformsAndFingerprintInfoMappingFromRuntimeVersionInfoObjects = exports.getRuntimeVersionInfoObjectsAsync = exports.defaultPublishPlatforms = exports.getUpdateMessageForCommandAsync = exports.getBranchNameForCommandAsync = exports.isUploadedAssetCountAboveWarningThreshold = exports.uploadAssetsAsync = exports.filterOutAssetsThatAlreadyExistAsync = exports.collectAssetsAsync = exports.getOriginalPathFromAssetMap = exports.getAssetHashFromPath = exports.loadAssetMapAsync = exports.filterCollectedAssetsByRequestedPlatforms = exports.generateEasMetadataAsync = exports.loadMetadata = exports.resolveInputDirectoryAsync = exports.buildBundlesAsync = exports.buildUnsortedUpdateInfoGroupAsync = exports.convertAssetToUpdateInfoGroupFormatAsync = exports.getStorageKeyForAssetAsync = exports.getStorageKey = exports.getBase64URLEncoding = exports.guessContentTypeFromExtension = exports.MetadataJoi = void 0;
 const tslib_1 = require("tslib");
 const config_plugins_1 = require("@expo/config-plugins");
 const eas_build_job_1 = require("@expo/eas-build-job");
@@ -19,6 +19,7 @@ const projectUtils_1 = require("./projectUtils");
 const resolveRuntimeVersionAsync_1 = require("./resolveRuntimeVersionAsync");
 const queries_1 = require("../branch/queries");
 const utils_1 = require("../branch/utils");
+const builds_1 = require("../commandUtils/builds");
 const cli_1 = require("../fingerprint/cli");
 const generated_1 = require("../graphql/generated");
 const PublishMutation_1 = require("../graphql/mutations/PublishMutation");
@@ -601,6 +602,26 @@ async function maybeCalculateFingerprintForRuntimeVersionInfoObjectsWithoutExpoU
     return [...runtimesWithComputedFingerprint, ...runtimesWithPreviouslyComputedFingerprints];
 }
 exports.maybeCalculateFingerprintForRuntimeVersionInfoObjectsWithoutExpoUpdatesAsync = maybeCalculateFingerprintForRuntimeVersionInfoObjectsWithoutExpoUpdatesAsync;
+async function findCompatibleBuildsAsync(graphqlClient, appId, runtimeToPlatformsAndFingerprintInfoMapping) {
+    const { fingerprintInfoGroup } = runtimeToPlatformsAndFingerprintInfoMapping;
+    const entriesPromises = Object.entries(fingerprintInfoGroup).map(async ([platform, fingerprintInfo]) => {
+        const build = (await (0, builds_1.fetchBuildsAsync)({
+            graphqlClient,
+            projectId: appId,
+            filters: {
+                fingerprintHash: fingerprintInfo.fingerprintHash,
+            },
+        }))[0];
+        return [platform, { ...fingerprintInfo, build }];
+    });
+    const entries = await Promise.all(entriesPromises);
+    const fingerprintInfoGroupWithCompatibleBuilds = Object.fromEntries(entries);
+    return {
+        ...runtimeToPlatformsAndFingerprintInfoMapping,
+        fingerprintInfoGroupWithCompatibleBuilds,
+    };
+}
+exports.findCompatibleBuildsAsync = findCompatibleBuildsAsync;
 exports.platformDisplayNames = {
     android: 'Android',
     ios: 'iOS',

package/build/utils/pollForBackgroundJobReceiptAsync.d.ts

@@ -0,0 +1,29 @@
+import { CombinedError } from '@urql/core';
+import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
+import { BackgroundJobReceiptDataFragment } from '../graphql/generated';
+export declare enum BackgroundJobReceiptPollErrorType {
+    NULL_RECEIPT = 0,
+    JOB_FAILED_NO_WILL_RETRY = 1,
+    TIMEOUT = 2
+}
+export type BackgroundJobReceiptPollErrorData = {
+    errorType: BackgroundJobReceiptPollErrorType.NULL_RECEIPT;
+} | {
+    errorType: BackgroundJobReceiptPollErrorType.JOB_FAILED_NO_WILL_RETRY;
+    receiptErrorMessage: string | undefined | null;
+} | {
+    errorType: BackgroundJobReceiptPollErrorType.TIMEOUT;
+};
+export declare class BackgroundJobReceiptPollError extends Error {
+    readonly errorData: BackgroundJobReceiptPollErrorData;
+    constructor(errorData: BackgroundJobReceiptPollErrorData);
+    static createErrorMessage(errorData: BackgroundJobReceiptPollErrorData): string;
+}
+export type BackgroundJobPollErrorCondition = (error: CombinedError) => {
+    errorIndicatesSuccess: boolean;
+};
+export declare function pollForBackgroundJobReceiptAsync(graphqlClient: ExpoGraphqlClient, backgroundJobReceipt: BackgroundJobReceiptDataFragment): Promise<BackgroundJobReceiptDataFragment>;
+export declare function pollForBackgroundJobReceiptAsync(graphqlClient: ExpoGraphqlClient, backgroundJobReceipt: BackgroundJobReceiptDataFragment, options?: {
+    onBackgroundJobReceiptPollError?: BackgroundJobPollErrorCondition;
+    pollInterval?: number;
+}): Promise<BackgroundJobReceiptDataFragment | null>;

package/build/utils/pollForBackgroundJobReceiptAsync.js

@@ -0,0 +1,92 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pollForBackgroundJobReceiptAsync = exports.BackgroundJobReceiptPollError = exports.BackgroundJobReceiptPollErrorType = void 0;
+const core_1 = require("@urql/core");
+const set_interval_async_1 = require("set-interval-async");
+const generated_1 = require("../graphql/generated");
+const BackgroundJobReceiptQuery_1 = require("../graphql/queries/BackgroundJobReceiptQuery");
+var BackgroundJobReceiptPollErrorType;
+(function (BackgroundJobReceiptPollErrorType) {
+    BackgroundJobReceiptPollErrorType[BackgroundJobReceiptPollErrorType["NULL_RECEIPT"] = 0] = "NULL_RECEIPT";
+    BackgroundJobReceiptPollErrorType[BackgroundJobReceiptPollErrorType["JOB_FAILED_NO_WILL_RETRY"] = 1] = "JOB_FAILED_NO_WILL_RETRY";
+    BackgroundJobReceiptPollErrorType[BackgroundJobReceiptPollErrorType["TIMEOUT"] = 2] = "TIMEOUT";
+})(BackgroundJobReceiptPollErrorType || (exports.BackgroundJobReceiptPollErrorType = BackgroundJobReceiptPollErrorType = {}));
+class BackgroundJobReceiptPollError extends Error {
+    errorData;
+    constructor(errorData) {
+        super(BackgroundJobReceiptPollError.createErrorMessage(errorData));
+        this.errorData = errorData;
+    }
+    static createErrorMessage(errorData) {
+        switch (errorData.errorType) {
+            case BackgroundJobReceiptPollErrorType.NULL_RECEIPT:
+                return 'Background job receipt was null.';
+            case BackgroundJobReceiptPollErrorType.JOB_FAILED_NO_WILL_RETRY:
+                return `Background job failed with error: ${errorData.receiptErrorMessage}`;
+            case BackgroundJobReceiptPollErrorType.TIMEOUT:
+                return 'Background job timed out.';
+        }
+    }
+}
+exports.BackgroundJobReceiptPollError = BackgroundJobReceiptPollError;
+async function fetchBackgroundJobReceiptAsync(graphqlClient, receiptId) {
+    try {
+        return [await BackgroundJobReceiptQuery_1.BackgroundJobReceiptQuery.byIdAsync(graphqlClient, receiptId), null];
+    }
+    catch (error) {
+        if (error instanceof core_1.CombinedError) {
+            return [null, error];
+        }
+        throw error;
+    }
+}
+async function pollForBackgroundJobReceiptAsync(graphqlClient, backgroundJobReceipt, options) {
+    return await new Promise((resolve, reject) => {
+        let numChecks = 0;
+        const intervalHandle = (0, set_interval_async_1.setIntervalAsync)(async function pollForDeletionFinishedAsync() {
+            function failBackgroundDeletion(error) {
+                void (0, set_interval_async_1.clearIntervalAsync)(intervalHandle);
+                reject(error);
+            }
+            const [receipt, error] = await fetchBackgroundJobReceiptAsync(graphqlClient, backgroundJobReceipt.id);
+            if (!receipt) {
+                if (error instanceof core_1.CombinedError) {
+                    const errorResult = options?.onBackgroundJobReceiptPollError?.(error);
+                    if (errorResult?.errorIndicatesSuccess) {
+                        void (0, set_interval_async_1.clearIntervalAsync)(intervalHandle);
+                        resolve(null);
+                        return;
+                    }
+                }
+                failBackgroundDeletion(new BackgroundJobReceiptPollError({
+                    errorType: BackgroundJobReceiptPollErrorType.NULL_RECEIPT,
+                }));
+                return;
+            }
+            // job failed and will not retry
+            if (receipt.state === generated_1.BackgroundJobState.Failure && !receipt.willRetry) {
+                failBackgroundDeletion(new BackgroundJobReceiptPollError({
+                    errorType: BackgroundJobReceiptPollErrorType.JOB_FAILED_NO_WILL_RETRY,
+                    receiptErrorMessage: receipt.errorMessage,
+                }));
+                return;
+            }
+            // all else fails, stop polling after 90 checks. This should only happen if there's an
+            // issue with receipts not setting `willRetry` to false when they fail within a reasonable
+            // amount of time.
+            if (numChecks > 90) {
+                failBackgroundDeletion(new BackgroundJobReceiptPollError({
+                    errorType: BackgroundJobReceiptPollErrorType.TIMEOUT,
+                }));
+                return;
+            }
+            if (receipt.state === generated_1.BackgroundJobState.Success) {
+                void (0, set_interval_async_1.clearIntervalAsync)(intervalHandle);
+                resolve(receipt);
+                return;
+            }
+            numChecks++;
+        }, options?.pollInterval ?? 1000);
+    });
+}
+exports.pollForBackgroundJobReceiptAsync = pollForBackgroundJobReceiptAsync;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "16.0.1",
+  "version": "16.2.0",
   "commands": {
     "analytics": {
       "id": "analytics",
@@ -2781,6 +2781,7 @@
         "$ eas fingerprint:compare <FINGERPRINT-HASH> \t # Compare fingerprint against local directory",
         "$ eas fingerprint:compare <FINGERPRINT-HASH-1> <FINGERPRINT-HASH-2> \t # Compare provided fingerprints",
         "$ eas fingerprint:compare --build-id <BUILD-ID> \t # Compare fingerprint from build against local directory",
+        "$ eas fingerprint:compare --build-id <BUILD-ID> --environment production \t # Compare fingerprint from build against local directory with the \"production\" environment",
         "$ eas fingerprint:compare --build-id <BUILD-ID-1> --build-id <BUILD-ID-2>\t # Compare fingerprint from a build against another build",
         "$ eas fingerprint:compare --build-id <BUILD-ID> --update-id <UPDATE-ID>\t # Compare fingerprint from build against fingerprint from update",
         "$ eas fingerprint:compare <FINGERPRINT-HASH> --update-id <UPDATE-ID> \t # Compare fingerprint from update against provided fingerprint"
@@ -2810,6 +2811,18 @@
           "description": "Open the fingerprint comparison in the browser",
           "allowNo": false
         },
+        "environment": {
+          "name": "environment",
+          "type": "option",
+          "description": "If generating a fingerprint from the local directory, use the specified environment.",
+          "helpValue": "(development|preview|production)",
+          "multiple": false,
+          "options": [
+            "development",
+            "preview",
+            "production"
+          ]
+        },
         "json": {
           "name": "json",
           "type": "boolean",
@@ -2842,7 +2855,8 @@
         "projectId": {},
         "loggedIn": {},
         "privateProjectConfig": {},
-        "vcsClient": {}
+        "vcsClient": {},
+        "getServerSideEnvironmentVariablesAsync": {}
       }
     },
     "fingerprint:generate": {
@@ -2852,11 +2866,12 @@
       "pluginName": "eas-cli",
       "pluginAlias": "eas-cli",
       "pluginType": "core",
-      "hidden": true,
       "aliases": [],
       "examples": [
-        "$ eas fingerprint:generate",
-        "$ eas fingerprint:generate --json --non-interactive -p android"
+        "$ eas fingerprint:generate  \t # Generate fingerprint in interactive mode",
+        "$ eas fingerprint:generate --build-profile preview  \t # Generate a fingerprint using the \"preview\" build profile",
+        "$ eas fingerprint:generate --environment preview  \t # Generate a fingerprint using the \"preview\" environment",
+        "$ eas fingerprint:generate --json --non-interactive --platform android  \t # Output fingerprint json to stdout"
       ],
       "flags": {
         "platform": {
@@ -2870,6 +2885,31 @@
             "ios"
           ]
         },
+        "environment": {
+          "name": "environment",
+          "type": "option",
+          "description": "Environment variable's environment",
+          "helpValue": "(development|preview|production)",
+          "multiple": false,
+          "options": [
+            "development",
+            "preview",
+            "production"
+          ],
+          "exclusive": [
+            "build-profile"
+          ]
+        },
+        "build-profile": {
+          "name": "build-profile",
+          "type": "option",
+          "char": "e",
+          "description": "Name of the build profile from eas.json.",
+          "multiple": false,
+          "exclusive": [
+            "environment"
+          ]
+        },
         "json": {
           "name": "json",
           "type": "boolean",
@@ -2891,7 +2931,10 @@
         "projectId": {},
         "loggedIn": {},
         "privateProjectConfig": {},
-        "vcsClient": {}
+        "vcsClient": {},
+        "getServerSideEnvironmentVariablesAsync": {},
+        "getDynamicPublicProjectConfigAsync": {},
+        "getDynamicPrivateProjectConfigAsync": {}
       }
     },
     "metadata:lint": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "16.0.1",
+  "version": "16.2.0",
   "author": "Expo <support@expo.dev>",
   "bin": {
     "eas": "./bin/run"
@@ -12,8 +12,8 @@
     "@expo/code-signing-certificates": "0.0.5",
     "@expo/config": "10.0.6",
     "@expo/config-plugins": "9.0.12",
-    "@expo/eas-build-job": "1.0.170",
-    "@expo/eas-json": "16.0.0",
+    "@expo/eas-build-job": "1.0.173",
+    "@expo/eas-json": "16.1.0",
     "@expo/env": "^1.0.0",
     "@expo/json-file": "8.3.3",
     "@expo/logger": "1.0.117",
@@ -28,7 +28,7 @@
     "@expo/results": "1.0.0",
     "@expo/rudder-sdk-node": "1.1.1",
     "@expo/spawn-async": "1.7.2",
-    "@expo/steps": "1.0.170",
+    "@expo/steps": "1.0.173",
     "@expo/timeago.js": "1.0.0",
     "@oclif/core": "^1.26.2",
     "@oclif/plugin-autocomplete": "^2.3.10",
@@ -78,6 +78,7 @@
     "qrcode-terminal": "0.12.0",
     "resolve-from": "5.0.0",
     "semver": "7.5.4",
+    "set-interval-async": "3.0.3",
     "slash": "3.0.0",
     "tar": "6.2.1",
     "tar-stream": "3.1.7",
@@ -237,5 +238,5 @@
     "node": "20.11.0",
     "yarn": "1.22.21"
   },
-  "gitHead": "6bb3dd94f754dd08f66eab81af76c76a4f007da7"
+  "gitHead": "439d45d6e1f60be1e215627fdad91dba5c5d74a4"
 }