eas-cli 2.7.1 → 2.8.0

package/build/submit/ios/IosSubmitter.d.ts

@@ -1,6 +1,6 @@
 import { Platform } from '@expo/eas-build-job';
 import { IosSubmissionConfigInput, SubmissionFragment } from '../../graphql/generated';
-import { Archive, ArchiveSource } from '../ArchiveSource';
+import { ArchiveSource, ResolvedArchiveSource } from '../ArchiveSource';
 import BaseSubmitter, { SubmissionInput } from '../BaseSubmitter';
 import { SubmissionContext } from '../context';
 import { AppSpecificPasswordCredentials, AppSpecificPasswordSource } from './AppSpecificPasswordSource';
@@ -14,7 +14,7 @@ export interface IosSubmissionOptions extends Pick<IosSubmissionConfigInput, 'ap
     credentialsServiceSource?: CredentialsServiceSource;
 }
 interface ResolvedSourceOptions {
-    archive: Archive;
+    archive: ResolvedArchiveSource;
     credentials: {
         appSpecificPassword?: AppSpecificPasswordCredentials;
         ascApiKeyResult?: AscApiKeyResult;
@@ -23,7 +23,7 @@ interface ResolvedSourceOptions {
 export default class IosSubmitter extends BaseSubmitter<Platform.IOS, ResolvedSourceOptions, IosSubmissionOptions> {
     constructor(ctx: SubmissionContext<Platform.IOS>, options: IosSubmissionOptions);
     createSubmissionInputAsync(resolvedSourceOptions: ResolvedSourceOptions): Promise<SubmissionInput<Platform.IOS>>;
-    protected createPlatformSubmissionAsync({ projectId, submissionConfig, buildId, }: SubmissionInput<Platform.IOS>): Promise<SubmissionFragment>;
+    protected createPlatformSubmissionAsync({ projectId, submissionConfig, buildId, archiveSource, }: SubmissionInput<Platform.IOS>): Promise<SubmissionFragment>;
     private formatSubmissionConfig;
     private formatAppSpecificPassword;
     private formatAscApiKeyResult;

package/build/submit/ios/IosSubmitter.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+const eas_build_job_1 = require("@expo/eas-build-job");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const AnalyticsManager_1 = require("../../analytics/AnalyticsManager");
 const SubmissionMutation_1 = require("../../graphql/mutations/SubmissionMutation");
@@ -15,7 +16,12 @@ class IosSubmitter extends BaseSubmitter_1.default {
     constructor(ctx, options) {
         const sourceOptionsResolver = {
             // eslint-disable-next-line async-protect/async-suffix
-            archive: async () => await (0, ArchiveSource_1.getArchiveAsync)(ctx.graphqlClient, this.options.archiveSource),
+            archive: async () => await (0, ArchiveSource_1.getArchiveAsync)({
+                graphqlClient: ctx.graphqlClient,
+                platform: eas_build_job_1.Platform.IOS,
+                projectId: ctx.projectId,
+                nonInteractive: ctx.nonInteractive,
+            }, this.options.archiveSource),
             // eslint-disable-next-line async-protect/async-suffix
             credentials: async () => {
                 const maybeAppSpecificPassword = this.options.appSpecificPasswordSource
@@ -49,29 +55,28 @@ class IosSubmitter extends BaseSubmitter_1.default {
         super(ctx, options, sourceOptionsResolver, sourceOptionsAnalytics);
     }
     async createSubmissionInputAsync(resolvedSourceOptions) {
-        var _a;
         const submissionConfig = this.formatSubmissionConfig(this.options, resolvedSourceOptions);
         (0, summary_1.printSummary)(this.prepareSummaryData(this.options, resolvedSourceOptions), SummaryHumanReadableKeys);
         return {
             projectId: this.options.projectId,
             submissionConfig,
-            buildId: (_a = resolvedSourceOptions.archive.build) === null || _a === void 0 ? void 0 : _a.id,
+            ...this.formatArchive(resolvedSourceOptions.archive),
         };
     }
-    async createPlatformSubmissionAsync({ projectId, submissionConfig, buildId, }) {
+    async createPlatformSubmissionAsync({ projectId, submissionConfig, buildId, archiveSource, }) {
         return await SubmissionMutation_1.SubmissionMutation.createIosSubmissionAsync(this.ctx.graphqlClient, {
             appId: projectId,
             config: submissionConfig,
             submittedBuildId: buildId,
+            archiveSource,
         });
     }
-    formatSubmissionConfig(options, { archive, credentials }) {
+    formatSubmissionConfig(options, { credentials }) {
         const { appSpecificPassword, ascApiKeyResult } = credentials;
         const { appleIdUsername, ascAppIdentifier } = options;
         return {
             ascAppIdentifier,
             appleIdUsername,
-            archiveUrl: archive.url,
             ...(appSpecificPassword ? this.formatAppSpecificPassword(appSpecificPassword) : null),
             ...((ascApiKeyResult === null || ascApiKeyResult === void 0 ? void 0 : ascApiKeyResult.result) ? this.formatAscApiKeyResult(ascApiKeyResult.result) : null),
         };

package/build/submit/utils/files.js

@@ -18,11 +18,11 @@ async function isExistingFileAsync(filePath) {
 exports.isExistingFileAsync = isExistingFileAsync;
 async function uploadAppArchiveAsync(graphqlClient, path) {
     const fileSize = (await fs_extra_1.default.stat(path)).size;
-    const { url } = await (0, uploads_1.uploadFileAtPathToS3Async)(graphqlClient, generated_1.UploadSessionType.EasSubmitAppArchive, path, (0, progress_1.createProgressTracker)({
+    const bucketKey = await (0, uploads_1.uploadFileAtPathToGCSAsync)(graphqlClient, generated_1.UploadSessionType.EasSubmitGcsAppArchive, path, (0, progress_1.createProgressTracker)({
         total: fileSize,
         message: 'Uploading to EAS Submit',
         completedMessage: 'Uploaded to EAS Submit',
     }));
-    return url;
+    return bucketKey;
 }
 exports.uploadAppArchiveAsync = uploadAppArchiveAsync;

package/build/submit/utils/summary.d.ts

@@ -1,8 +1,8 @@
-import { Archive } from '../ArchiveSource';
+import { ResolvedArchiveSource } from '../ArchiveSource';
 export interface ArchiveSourceSummaryFields {
     archiveUrl?: string;
     archivePath?: string;
     formattedBuild?: string;
 }
-export declare function formatArchiveSourceSummary({ source, build }: Archive): ArchiveSourceSummaryFields;
+export declare function formatArchiveSourceSummary(archive: ResolvedArchiveSource): ArchiveSourceSummaryFields;
 export declare function printSummary<T extends object>(summary: T, keyMap: Record<keyof T, string>): void;

package/build/submit/utils/summary.js

@@ -32,18 +32,17 @@ function formatSubmissionBuildSummary(build) {
             labelFormat: label => `    ${chalk_1.default.dim(label)}:`,
         }));
 }
-function formatArchiveSourceSummary({ source, build }) {
+function formatArchiveSourceSummary(archive) {
     const summarySlice = {};
-    switch (source.sourceType) {
-        case ArchiveSource_1.ArchiveSourceType.path:
-            summarySlice.archivePath = source.path;
+    switch (archive.sourceType) {
+        case ArchiveSource_1.ArchiveSourceType.gcs:
+            summarySlice.archivePath = archive.localSource.path;
             break;
         case ArchiveSource_1.ArchiveSourceType.url:
-            summarySlice.archiveUrl = source.url;
+            summarySlice.archiveUrl = archive.url;
             break;
-        case ArchiveSource_1.ArchiveSourceType.buildId:
-        case ArchiveSource_1.ArchiveSourceType.latest:
-            summarySlice.formattedBuild = formatSubmissionBuildSummary(build);
+        case ArchiveSource_1.ArchiveSourceType.build:
+            summarySlice.formattedBuild = formatSubmissionBuildSummary(archive.build);
             break;
     }
     return summarySlice;

package/build/uploads.d.ts

@@ -1,16 +1,10 @@
 import { Response } from 'node-fetch';
 import { ExpoGraphqlClient } from './commandUtils/context/contextUtils/createGraphqlClient';
 import { UploadSessionType } from './graphql/generated';
-import { PresignedPost } from './graphql/mutations/UploadSessionMutation';
 import { ProgressHandler } from './utils/progress';
-export declare function uploadFileAtPathToS3Async(graphqlClient: ExpoGraphqlClient, type: UploadSessionType, path: string, handleProgressEvent: ProgressHandler): Promise<{
+export interface PresignedPost {
     url: string;
-    bucketKey: string;
-}>;
+    fields: Record<string, string>;
+}
+export declare function uploadFileAtPathToGCSAsync(graphqlClient: ExpoGraphqlClient, type: UploadSessionType, path: string, handleProgressEvent: ProgressHandler): Promise<string>;
 export declare function uploadWithPresignedPostWithRetryAsync(file: string, presignedPost: PresignedPost): Promise<Response>;
-/**
- * S3 returns broken URLs, sth like:
- * https://submission-service-archives.s3.amazonaws.com/production%2Fdc98ca84-1473-4cb3-ae81-8c7b291cb27e%2F4424aa95-b985-4e2f-8755-9507b1037c1c
- * This function replaces %2F with /.
- */
-export declare function fixS3Url(archiveUrl: string): string;

package/build/uploads.js

@@ -1,24 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fixS3Url = exports.uploadWithPresignedPostWithRetryAsync = exports.uploadFileAtPathToS3Async = void 0;
+exports.uploadWithPresignedPostWithRetryAsync = exports.uploadFileAtPathToGCSAsync = void 0;
 const tslib_1 = require("tslib");
-const assert_1 = tslib_1.__importDefault(require("assert"));
 const form_data_1 = tslib_1.__importDefault(require("form-data"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
-const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
 const promise_retry_1 = tslib_1.__importDefault(require("promise-retry"));
-const url_1 = require("url");
 const fetch_1 = tslib_1.__importDefault(require("./fetch"));
 const UploadSessionMutation_1 = require("./graphql/mutations/UploadSessionMutation");
-async function uploadFileAtPathToS3Async(graphqlClient, type, path, handleProgressEvent) {
-    const presignedPost = await UploadSessionMutation_1.UploadSessionMutation.createUploadSessionAsync(graphqlClient, type);
-    (0, assert_1.default)(presignedPost.fields.key, 'key is not specified in in presigned post');
-    const response = await uploadWithPresignedPostWithProgressAsync(path, presignedPost, handleProgressEvent);
-    const location = (0, nullthrows_1.default)(response.headers.get('location'), `location does not exist in response headers (make sure you're uploading to AWS S3)`);
-    const url = fixS3Url(location);
-    return { url, bucketKey: presignedPost.fields.key };
+async function uploadFileAtPathToGCSAsync(graphqlClient, type, path, handleProgressEvent) {
+    const signedUrl = await UploadSessionMutation_1.UploadSessionMutation.createUploadSessionAsync(graphqlClient, type);
+    await uploadWithSignedUrlWithProgressAsync(path, signedUrl, handleProgressEvent);
+    return signedUrl.bucketKey;
 }
-exports.uploadFileAtPathToS3Async = uploadFileAtPathToS3Async;
+exports.uploadFileAtPathToGCSAsync = uploadFileAtPathToGCSAsync;
 async function uploadWithPresignedPostWithRetryAsync(file, presignedPost) {
     return await (0, promise_retry_1.default)(async (retry) => {
         // retry fetch errors (usually connection or DNS errors)
@@ -48,7 +42,7 @@ async function uploadWithPresignedPostWithRetryAsync(file, presignedPost) {
     });
 }
 exports.uploadWithPresignedPostWithRetryAsync = uploadWithPresignedPostWithRetryAsync;
-async function createPresignedPostFormDataAsync(file, presignedPost) {
+async function uploadWithPresignedPostAsync(file, presignedPost) {
     const fileStat = await fs_extra_1.default.stat(file);
     const fileSize = fileStat.size;
     const form = new form_data_1.default();
@@ -56,10 +50,6 @@ async function createPresignedPostFormDataAsync(file, presignedPost) {
         form.append(fieldKey, fieldValue);
     }
     form.append('file', fs_extra_1.default.createReadStream(file), { knownLength: fileSize });
-    return { form, fileSize };
-}
-async function uploadWithPresignedPostAsync(file, presignedPost) {
-    const { form } = await createPresignedPostFormDataAsync(file, presignedPost);
     const formHeaders = form.getHeaders();
     return await (0, fetch_1.default)(presignedPost.url, {
         method: 'POST',
@@ -69,18 +59,19 @@ async function uploadWithPresignedPostAsync(file, presignedPost) {
         },
     });
 }
-async function uploadWithPresignedPostWithProgressAsync(file, presignedPost, handleProgressEvent) {
-    const { form, fileSize } = await createPresignedPostFormDataAsync(file, presignedPost);
-    const formHeaders = form.getHeaders();
-    const uploadPromise = (0, fetch_1.default)(presignedPost.url, {
-        method: 'POST',
-        body: form,
+async function uploadWithSignedUrlWithProgressAsync(file, signedUrl, handleProgressEvent) {
+    const fileStat = await fs_extra_1.default.stat(file);
+    const fileSize = fileStat.size;
+    const readStream = fs_extra_1.default.createReadStream(file);
+    const uploadPromise = (0, fetch_1.default)(signedUrl.url, {
+        method: 'PUT',
+        body: readStream,
         headers: {
-            ...formHeaders,
+            ...signedUrl.headers,
         },
     });
     let currentSize = 0;
-    form.addListener('data', (chunk) => {
+    readStream.addListener('data', (chunk) => {
         currentSize += Buffer.byteLength(chunk);
         handleProgressEvent({
             progress: {
@@ -100,14 +91,3 @@ async function uploadWithPresignedPostWithProgressAsync(file, presignedPost, han
         throw error;
     }
 }
-/**
- * S3 returns broken URLs, sth like:
- * https://submission-service-archives.s3.amazonaws.com/production%2Fdc98ca84-1473-4cb3-ae81-8c7b291cb27e%2F4424aa95-b985-4e2f-8755-9507b1037c1c
- * This function replaces %2F with /.
- */
-function fixS3Url(archiveUrl) {
-    const parsed = new url_1.URL(archiveUrl);
-    parsed.pathname = decodeURIComponent(parsed.pathname);
-    return parsed.toString();
-}
-exports.fixS3Url = fixS3Url;

package/build/utils/download.d.ts

@@ -1,2 +1,3 @@
-export declare function downloadAndExtractAppAsync(url: string, applicationExtension: string): Promise<string>;
-export declare function extractAppFromLocalArchiveAsync(appArchivePath: string, applicationExtension: string): Promise<string>;
+import { AppPlatform } from '../graphql/generated';
+export declare function downloadAndMaybeExtractAppAsync(url: string, platform: AppPlatform): Promise<string>;
+export declare function extractAppFromLocalArchiveAsync(appArchivePath: string, platform: AppPlatform): Promise<string>;

package/build/utils/download.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractAppFromLocalArchiveAsync = exports.downloadAndExtractAppAsync = void 0;
+exports.extractAppFromLocalArchiveAsync = exports.downloadAndMaybeExtractAppAsync = void 0;
 const tslib_1 = require("tslib");
 const spawn_async_1 = tslib_1.__importDefault(require("@expo/spawn-async"));
-const cli_progress_1 = tslib_1.__importDefault(require("cli-progress"));
 const fast_glob_1 = tslib_1.__importDefault(require("fast-glob"));
 const fs_1 = tslib_1.__importDefault(require("fs"));
 const path_1 = tslib_1.__importDefault(require("path"));
@@ -12,11 +11,15 @@ const tar_1 = require("tar");
 const util_1 = require("util");
 const uuid_1 = require("uuid");
 const fetch_1 = tslib_1.__importDefault(require("../fetch"));
+const generated_1 = require("../graphql/generated");
 const log_1 = tslib_1.__importDefault(require("../log"));
+const files_1 = require("./files");
 const paths_1 = require("./paths");
+const progress_1 = require("./progress");
 const pipeline = (0, util_1.promisify)(stream_1.Stream.pipeline);
+let didProgressBarFinish = false;
 function wrapFetchWithProgress() {
-    return async (url, init, onProgressCallback) => {
+    return async (url, init, progressHandler) => {
         const response = await (0, fetch_1.default)(url, init);
         if (response.ok) {
             const totalDownloadSize = response.headers.get('Content-Length');
@@ -31,7 +34,15 @@ function wrapFetchWithProgress() {
                     length += chunkLength;
                 }
                 const progress = length / total;
-                onProgressCallback(progress, total, length);
+                if (!didProgressBarFinish) {
+                    progressHandler({
+                        progress: { total, percent: progress, transferred: length },
+                        isComplete: total === length,
+                    });
+                    if (total === length) {
+                        didProgressBarFinish = true;
+                    }
+                }
             };
             response.body.on('data', chunk => {
                 onProgress(chunk.length);
@@ -43,46 +54,42 @@ function wrapFetchWithProgress() {
         return response;
     };
 }
-async function downloadFileWithProgressBarAsync(url, outputPath, infoMessage) {
+async function downloadFileWithProgressTrackerAsync(url, outputPath, progressTrackerMessage, progressTrackerCompletedMessage) {
     log_1.default.newLine();
-    log_1.default.log(infoMessage ? infoMessage : `Downloading file from ${url}...`);
-    const downloadProgressBar = new cli_progress_1.default.SingleBar({ format: '|{bar}|' }, cli_progress_1.default.Presets.rect);
-    let downloadProgressBarStarted = false;
     const response = await wrapFetchWithProgress()(url, {
         timeout: 1000 * 60 * 5, // 5 minutes
-    }, (_progress, total, loaded) => {
-        if (!downloadProgressBarStarted) {
-            downloadProgressBar.start(total, loaded);
-            downloadProgressBarStarted = true;
-        }
-        else if (loaded < total) {
-            downloadProgressBar.update(loaded);
-        }
-        else {
-            downloadProgressBar.stop();
-        }
-    });
+    }, (0, progress_1.createProgressTracker)({
+        message: progressTrackerMessage,
+        completedMessage: progressTrackerCompletedMessage,
+    }));
     if (!response.ok) {
         throw new Error(`Failed to download file from ${url}`);
     }
     await pipeline(response.body, fs_1.default.createWriteStream(outputPath));
 }
-async function downloadAndExtractAppAsync(url, applicationExtension) {
+async function downloadAndMaybeExtractAppAsync(url, platform) {
     const outputDir = path_1.default.join((0, paths_1.getTmpDirectory)(), (0, uuid_1.v4)());
     await fs_1.default.promises.mkdir(outputDir, { recursive: true });
-    const tmpArchivePathDir = path_1.default.join((0, paths_1.getTmpDirectory)(), (0, uuid_1.v4)());
-    await fs_1.default.promises.mkdir(tmpArchivePathDir, { recursive: true });
-    const tmpArchivePath = path_1.default.join(tmpArchivePathDir, `${(0, uuid_1.v4)()}.tar.gz`);
-    await downloadFileWithProgressBarAsync(url, tmpArchivePath, 'Downloading app archive...');
-    await tarExtractAsync(tmpArchivePath, outputDir);
-    return await getAppPathAsync(outputDir, applicationExtension);
+    if (url.endsWith('apk')) {
+        const apkFilePath = path_1.default.join(outputDir, `${(0, uuid_1.v4)()}.apk`);
+        await downloadFileWithProgressTrackerAsync(url, apkFilePath, (ratio, total) => `Downloading app (${(0, files_1.formatBytes)(total * ratio)} / ${(0, files_1.formatBytes)(total)})`, 'Successfully downloaded app');
+        return apkFilePath;
+    }
+    else {
+        const tmpArchivePathDir = path_1.default.join((0, paths_1.getTmpDirectory)(), (0, uuid_1.v4)());
+        await fs_1.default.promises.mkdir(tmpArchivePathDir, { recursive: true });
+        const tmpArchivePath = path_1.default.join(tmpArchivePathDir, `${(0, uuid_1.v4)()}.tar.gz`);
+        await downloadFileWithProgressTrackerAsync(url, tmpArchivePath, (ratio, total) => `Downloading app archive (${(0, files_1.formatBytes)(total * ratio)} / ${(0, files_1.formatBytes)(total)})`, 'Successfully downloaded app archive');
+        await tarExtractAsync(tmpArchivePath, outputDir);
+        return await getAppPathAsync(outputDir, platform === generated_1.AppPlatform.Ios ? 'app' : 'apk');
+    }
 }
-exports.downloadAndExtractAppAsync = downloadAndExtractAppAsync;
-async function extractAppFromLocalArchiveAsync(appArchivePath, applicationExtension) {
+exports.downloadAndMaybeExtractAppAsync = downloadAndMaybeExtractAppAsync;
+async function extractAppFromLocalArchiveAsync(appArchivePath, platform) {
     const outputDir = path_1.default.join((0, paths_1.getTmpDirectory)(), (0, uuid_1.v4)());
     await fs_1.default.promises.mkdir(outputDir, { recursive: true });
     await tarExtractAsync(appArchivePath, outputDir);
-    return await getAppPathAsync(outputDir, applicationExtension);
+    return await getAppPathAsync(outputDir, platform === generated_1.AppPlatform.Android ? 'apk' : 'app');
 }
 exports.extractAppFromLocalArchiveAsync = extractAppFromLocalArchiveAsync;
 async function getAppPathAsync(outputDir, applicationExtension) {

package/build/utils/progress.d.ts

@@ -10,6 +10,6 @@ export declare type ProgressHandler = (props: {
 }) => void;
 export declare function createProgressTracker({ total, message, completedMessage, }: {
     total?: number;
-    message: string | ((ratio: number) => string);
+    message: string | ((ratio: number, total: number) => string);
     completedMessage: string | ((duration: string) => string);
 }): ProgressHandler;

package/build/utils/progress.js

@@ -11,16 +11,18 @@ function createProgressTracker({ total, message, completedMessage, }) {
     let transferredSoFar = 0;
     let current = 0;
     const timerLabel = String(Date.now());
-    const getMessage = (v) => {
+    const getMessage = (v, total) => {
         const ratio = Math.min(Math.max(v, 0), 1);
         const percent = Math.floor(ratio * 100);
-        return typeof message === 'string' ? `${message} ${percent.toFixed(0)}%` : message(ratio);
+        return typeof message === 'string'
+            ? `${message} ${percent.toFixed(0)}%`
+            : message(ratio, total);
     };
     return ({ progress, isComplete, error }) => {
         if (progress) {
             if (!bar && (progress.total !== undefined || total !== undefined)) {
                 calcTotal = (total !== null && total !== void 0 ? total : progress.total);
-                bar = (0, ora_1.ora)(getMessage(0)).start();
+                bar = (0, ora_1.ora)(getMessage(0, calcTotal)).start();
                 (0, timer_1.startTimer)(timerLabel);
             }
             if (progress.total) {
@@ -35,7 +37,7 @@ function createProgressTracker({ total, message, completedMessage, }) {
                     current += progress.transferred - transferredSoFar;
                     percentage = current / calcTotal;
                 }
-                bar.text = getMessage(percentage);
+                bar.text = getMessage(percentage, calcTotal);
             }
             transferredSoFar = progress.transferred;
         }