@expo/build-tools 18.0.6 → 18.1.0

package/dist/steps/functions/uploadToAsc.d.ts

@@ -1,2 +1,5 @@
 import { BuildFunction } from '@expo/steps';
 export declare function createUploadToAscBuildFunction(): BuildFunction;
+export declare function isClosedVersionTrainError(messages: {
+    code: string;
+}[]): boolean;

package/dist/steps/functions/uploadToAsc.js

@@ -37,6 +37,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createUploadToAscBuildFunction = createUploadToAscBuildFunction;
+exports.isClosedVersionTrainError = isClosedVersionTrainError;
+const errors_1 = require("@expo/eas-build-job/dist/errors");
 const steps_1 = require("@expo/steps");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const jose = __importStar(require("jose"));
@@ -45,6 +47,7 @@ const node_path_1 = __importDefault(require("node:path"));
 const promises_1 = require("node:timers/promises");
 const zod_1 = require("zod");
 const AscApiClient_1 = require("../utils/ios/AscApiClient");
+const AscApiUtils_1 = require("../utils/ios/AscApiUtils");
 function createUploadToAscBuildFunction() {
     return new steps_1.BuildFunction({
         namespace: 'eas',
@@ -128,26 +131,14 @@ function createUploadToAscBuildFunction() {
                 .sign(privateKey);
             const client = new AscApiClient_1.AscApiClient({ token, logger: stepsCtx.logger });
             stepsCtx.logger.info('Reading App information...');
-            const appResponse = await client.getAsync('/v1/apps/:id', { 'fields[apps]': ['bundleId', 'name'] }, { id: appleAppIdentifier });
+            const appResponse = await AscApiUtils_1.AscApiUtils.getAppInfoAsync({ client, appleAppIdentifier });
             stepsCtx.logger.info(`Uploading Build to "${appResponse.data.attributes.name}" (${appResponse.data.attributes.bundleId})...`);
             stepsCtx.logger.info('Creating Build Upload...');
-            const buildUploadResponse = await client.postAsync('/v1/buildUploads', {
-                data: {
-                    type: 'buildUploads',
-                    attributes: {
-                        platform: 'IOS',
-                        cfBundleShortVersionString: bundleShortVersion,
-                        cfBundleVersion: bundleVersion,
-                    },
-                    relationships: {
-                        app: {
-                            data: {
-                                type: 'apps',
-                                id: appleAppIdentifier,
-                            },
-                        },
-                    },
-                },
+            const buildUploadResponse = await AscApiUtils_1.AscApiUtils.createBuildUploadAsync({
+                client,
+                appleAppIdentifier,
+                bundleShortVersion,
+                bundleVersion,
             });
             const buildUploadId = buildUploadResponse.data.id;
             const buildUploadUrl = `https://appstoreconnect.apple.com/apps/${appleAppIdentifier}/testflight/ios/${buildUploadId}`;
@@ -223,10 +214,18 @@ function createUploadToAscBuildFunction() {
             }
             stepsCtx.logger.info('Checking build upload status...');
             const waitingForBuildStartedAt = Date.now();
+            const waitingLogIntervalMs = 10 * 1000;
+            let lastWaitLogTime = 0;
+            let lastWaitLogState = null;
             while (Date.now() - waitingForBuildStartedAt < 30 * 60 * 1000 /* 30 minutes */) {
                 const { data: { attributes: { state }, }, } = await client.getAsync(`/v1/buildUploads/:id`, { 'fields[buildUploads]': ['state', 'build'], include: ['build'] }, { id: buildUploadId });
                 if (state.state === 'AWAITING_UPLOAD' || state.state === 'PROCESSING') {
-                    stepsCtx.logger.info(`Waiting for build upload to complete... (status = ${state.state})`);
+                    const now = Date.now();
+                    if (lastWaitLogState !== state.state || now - lastWaitLogTime >= waitingLogIntervalMs) {
+                        stepsCtx.logger.info(`Waiting for build upload to complete... (status = ${state.state})`);
+                        lastWaitLogTime = now;
+                        lastWaitLogState = state.state;
+                    }
                     await (0, promises_1.setTimeout)(2000);
                     continue;
                 }
@@ -242,6 +241,10 @@ function createUploadToAscBuildFunction() {
                     stepsCtx.logger.error(`Errors:\n${itemizeMessages(errors)}\n`);
                 }
                 if (state.state === 'FAILED') {
+                    if (isClosedVersionTrainError(errors)) {
+                        throw new errors_1.UserFacingError('EAS_UPLOAD_TO_ASC_CLOSED_VERSION_TRAIN', `Build upload was rejected by App Store Connect because the ${bundleShortVersion} version train is closed. ` +
+                            'Bump the iOS app version (CFBundleShortVersionString, e.g. expo.version) to a higher version and submit again.');
+                    }
                     throw new Error(`Build upload (ID: ${buildUploadId}) failed.`);
                 }
                 else if (state.state === 'COMPLETE') {
@@ -255,6 +258,9 @@ function createUploadToAscBuildFunction() {
 function itemizeMessages(messages) {
     return `- ${messages.map(m => `${m.description} (${m.code})`).join('\n- ')}`;
 }
+function isClosedVersionTrainError(messages) {
+    return (messages.length > 0 && messages.every(message => ['90062', '90186'].includes(message.code)));
+}
 async function uploadChunksAsync({ uploadOperations, ipaPath, logger, }) {
     const fd = await fs_extra_1.default.open(ipaPath, 'r');
     try {

package/dist/steps/utils/ios/AscApiClient.d.ts

@@ -1,6 +1,36 @@
 import { bunyan } from '@expo/logger';
 import { z } from 'zod';
+declare const AscErrorResponseSchema: z.ZodObject<{
+    errors: z.ZodArray<z.ZodObject<{
+        id: z.ZodOptional<z.ZodString>;
+        status: z.ZodOptional<z.ZodString>;
+        code: z.ZodOptional<z.ZodString>;
+        title: z.ZodOptional<z.ZodString>;
+        detail: z.ZodOptional<z.ZodString>;
+        source: z.ZodOptional<z.ZodUnknown>;
+    }, z.core.$strip>>;
+}, z.core.$strip>;
 declare const GetApi: {
+    '/v1/apps': {
+        path: z.ZodObject<{}, z.core.$strip>;
+        request: z.ZodObject<{
+            'fields[apps]': z.ZodArray<z.ZodEnum<{
+                name: "name";
+                bundleId: "bundleId";
+            }>>;
+            limit: z.ZodOptional<z.ZodNumber>;
+        }, z.core.$strip>;
+        response: z.ZodObject<{
+            data: z.ZodArray<z.ZodObject<{
+                type: z.ZodLiteral<"apps">;
+                id: z.ZodString;
+                attributes: z.ZodObject<{
+                    bundleId: z.ZodString;
+                    name: z.ZodString;
+                }, z.core.$strip>;
+            }, z.core.$strip>>;
+        }, z.core.$strip>;
+    };
     '/v1/apps/:id': {
         path: z.ZodObject<{
             id: z.ZodString;
@@ -222,6 +252,12 @@ declare const PatchApi: {
         }, z.core.$strip>;
     };
 };
+export type AscApiClientGetApi = {
+    [Path in keyof typeof GetApi]: {
+        request: z.input<(typeof GetApi)[Path]['request']>;
+        response: z.output<(typeof GetApi)[Path]['response']>;
+    };
+};
 export type AscApiClientPostApi = {
     [Path in keyof typeof PostApi]: {
         request: z.input<(typeof PostApi)[Path]['request']>;
@@ -234,6 +270,13 @@ export type AscApiClientPatchApi = {
         response: z.output<(typeof PatchApi)[Path]['response']>;
     };
 };
+export declare class AscApiRequestError extends Error {
+    readonly status: number;
+    readonly responseJson: z.output<typeof AscErrorResponseSchema>;
+    constructor(message: string, status: number, responseJson: z.output<typeof AscErrorResponseSchema>, options?: {
+        cause?: unknown;
+    });
+}
 export declare class AscApiClient {
     private readonly baseUrl;
     private readonly token;

package/dist/steps/utils/ios/AscApiClient.js

@@ -3,11 +3,42 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AscApiClient = void 0;
+exports.AscApiClient = exports.AscApiRequestError = void 0;
 const results_1 = require("@expo/results");
 const node_fetch_1 = __importDefault(require("node-fetch"));
 const zod_1 = require("zod");
+const AscErrorResponseSchema = zod_1.z.object({
+    errors: zod_1.z
+        .array(zod_1.z.object({
+        id: zod_1.z.string().optional(),
+        status: zod_1.z.string().optional(),
+        code: zod_1.z.string().optional(),
+        title: zod_1.z.string().optional(),
+        detail: zod_1.z.string().optional(),
+        source: zod_1.z.unknown().optional(),
+    }))
+        .min(1),
+});
 const GetApi = {
+    '/v1/apps': {
+        path: zod_1.z.object({}),
+        request: zod_1.z.object({
+            'fields[apps]': zod_1.z.array(zod_1.z.enum(['bundleId', 'name'])).refine(opts => {
+                return opts.includes('bundleId') && opts.includes('name');
+            }),
+            limit: zod_1.z.number().int().min(1).max(200).optional(),
+        }),
+        response: zod_1.z.object({
+            data: zod_1.z.array(zod_1.z.object({
+                type: zod_1.z.literal('apps'),
+                id: zod_1.z.string(),
+                attributes: zod_1.z.object({
+                    bundleId: zod_1.z.string(),
+                    name: zod_1.z.string(),
+                }),
+            })),
+        }),
+    },
     '/v1/apps/:id': {
         path: zod_1.z.object({
             id: zod_1.z.string(),
@@ -212,6 +243,16 @@ const PatchApi = {
         }),
     },
 };
+class AscApiRequestError extends Error {
+    status;
+    responseJson;
+    constructor(message, status, responseJson, options) {
+        super(message, { cause: options?.cause });
+        this.status = status;
+        this.responseJson = responseJson;
+    }
+}
+exports.AscApiRequestError = AscApiRequestError;
 class AscApiClient {
     baseUrl = 'https://api.appstoreconnect.apple.com';
     token;
@@ -283,11 +324,20 @@ class AscApiClient {
         });
         if (!response.ok) {
             const text = await response.text();
+            const parsedAscErrorResponse = await (0, results_1.asyncResult)((async () => AscErrorResponseSchema.parse(JSON.parse(text)))());
+            if (parsedAscErrorResponse.ok) {
+                throw new AscApiRequestError(`Unexpected response (${response.status}) from App Store Connect: ${text}`, response.status, parsedAscErrorResponse.value, { cause: response });
+            }
             throw new Error(`Unexpected response (${response.status}) from App Store Connect: ${text}`, {
                 cause: response,
             });
         }
-        const json = await response.json();
+        const text = await response.text();
+        const parsedJson = await (0, results_1.asyncResult)((async () => JSON.parse(text))());
+        if (!parsedJson.ok) {
+            throw new Error(`Malformed JSON response from App Store Connect (${response.status}): ${text}`);
+        }
+        const json = parsedJson.value;
         this.logger?.debug(`Response from App Store Connect: ${JSON.stringify(json, null, 2)}`);
         const parsedResponse = await (0, results_1.asyncResult)((async () => responseSchema.parse(json))());
         if (!parsedResponse.ok) {

package/dist/steps/utils/ios/AscApiUtils.d.ts

@@ -0,0 +1,13 @@
+import { AscApiClient, AscApiClientGetApi, AscApiClientPostApi } from './AscApiClient';
+export declare namespace AscApiUtils {
+    function getAppInfoAsync({ client, appleAppIdentifier, }: {
+        client: Pick<AscApiClient, 'getAsync'>;
+        appleAppIdentifier: string;
+    }): Promise<AscApiClientGetApi['/v1/apps/:id']['response']>;
+    function createBuildUploadAsync({ client, appleAppIdentifier, bundleShortVersion, bundleVersion, }: {
+        client: Pick<AscApiClient, 'postAsync'>;
+        appleAppIdentifier: string;
+        bundleShortVersion: string;
+        bundleVersion: string;
+    }): Promise<AscApiClientPostApi['/v1/buildUploads']['response']>;
+}

package/dist/steps/utils/ios/AscApiUtils.js

@@ -0,0 +1,90 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AscApiUtils = void 0;
+const errors_1 = require("@expo/eas-build-job/dist/errors");
+const AscApiClient_1 = require("./AscApiClient");
+var AscApiUtils;
+(function (AscApiUtils) {
+    async function getAppInfoAsync({ client, appleAppIdentifier, }) {
+        try {
+            return await client.getAsync('/v1/apps/:id', { 'fields[apps]': ['bundleId', 'name'] }, { id: appleAppIdentifier });
+        }
+        catch (error) {
+            const notFoundErrors = error instanceof AscApiClient_1.AscApiRequestError && error.status === 404
+                ? error.responseJson.errors
+                : [];
+            const isAppNotFoundError = notFoundErrors.length > 0 && notFoundErrors.every(item => item.code === 'NOT_FOUND');
+            if (!isAppNotFoundError) {
+                throw error;
+            }
+            let visibleAppsSummary = null;
+            try {
+                visibleAppsSummary = await getVisibleAppsSummaryAsync(client);
+            }
+            catch {
+                // Don't hide the original NOT_FOUND error with a secondary lookup failure.
+                throw error;
+            }
+            throw new errors_1.UserFacingError('EAS_UPLOAD_TO_ASC_APP_NOT_FOUND', `App Store Connect app for application identifier ${appleAppIdentifier} was not found. ` +
+                'Verify the configured application identifier and that the App Store Connect API key has access to the application in the correct App Store Connect account.' +
+                (visibleAppsSummary
+                    ? `\n\nExample applications visible to this API key:\n${visibleAppsSummary}`
+                    : ''), {
+                cause: error,
+                docsUrl: 'https://expo.fyi/asc-app-id',
+            });
+        }
+    }
+    AscApiUtils.getAppInfoAsync = getAppInfoAsync;
+    async function createBuildUploadAsync({ client, appleAppIdentifier, bundleShortVersion, bundleVersion, }) {
+        try {
+            return await client.postAsync('/v1/buildUploads', {
+                data: {
+                    type: 'buildUploads',
+                    attributes: {
+                        platform: 'IOS',
+                        cfBundleShortVersionString: bundleShortVersion,
+                        cfBundleVersion: bundleVersion,
+                    },
+                    relationships: {
+                        app: {
+                            data: {
+                                type: 'apps',
+                                id: appleAppIdentifier,
+                            },
+                        },
+                    },
+                },
+            });
+        }
+        catch (error) {
+            const errors = error instanceof AscApiClient_1.AscApiRequestError && error.status === 409
+                ? error.responseJson.errors
+                : [];
+            const isDuplicateVersionError = errors.length > 0 &&
+                errors.every(item => item.code === 'ENTITY_ERROR.ATTRIBUTE.INVALID.DUPLICATE');
+            if (isDuplicateVersionError) {
+                throw new errors_1.UserFacingError('EAS_UPLOAD_TO_ASC_VERSION_DUPLICATE', `Increment Build Number: Build number ${bundleVersion} for app version ${bundleShortVersion} has already been used. ` +
+                    'App Store Connect requires unique build numbers within each app version (version train). ' +
+                    'Increment it by setting ios.buildNumber in app.json, or set "autoIncrement": true in eas.json (recommended). Then rebuild and resubmit.', {
+                    cause: error,
+                    docsUrl: 'https://docs.expo.dev/build-reference/app-versions/',
+                });
+            }
+            throw error;
+        }
+    }
+    AscApiUtils.createBuildUploadAsync = createBuildUploadAsync;
+})(AscApiUtils || (exports.AscApiUtils = AscApiUtils = {}));
+async function getVisibleAppsSummaryAsync(client) {
+    const appsResponse = await client.getAsync('/v1/apps', {
+        'fields[apps]': ['bundleId', 'name'],
+        limit: 10,
+    });
+    if (appsResponse.data.length === 0) {
+        return '  (none)';
+    }
+    return appsResponse.data
+        .map(app => `- ${app.attributes.name} (${app.attributes.bundleId}) (ID: ${app.id})`)
+        .join('\n');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/build-tools",
-  "version": "18.0.6",
+  "version": "18.1.0",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "license": "BUSL-1.1",
   "author": "Expo <support@expo.io>",
@@ -97,5 +97,5 @@
     "typescript": "^5.5.4",
     "uuid": "^9.0.1"
   },
-  "gitHead": "df8ebc8f84809e52032661f9f08768650440e5c0"
+  "gitHead": "61b601de883b5c65d87163d8477b8a9250bc2de9"
 }