Address review: explicit platform branch, channel check first, safe zip.close

Author: gwdp

packages/build-tools/src/utils/__tests__/expoUpdatesEmbedded.test.ts

@@ -88,7 +88,7 @@ describe('uploadEmbeddedBundleAsync', () => {
     expect(artifacts.findArtifacts).not.toHaveBeenCalled();
   });
 
-  it('warns when no channel is configured', async () => {
+  it('warns when no channel is configured and does not look for the archive', async () => {
     const ctx = makeCtx({ platform: Platform.ANDROID });
 
     await uploadEmbeddedBundleAsync(ctx);
@@ -97,6 +97,17 @@ describe('uploadEmbeddedBundleAsync', () => {
       'Skipping embedded bundle upload: no channel configured for this build profile.'
     );
     expect(ctx.markBuildPhaseHasWarnings).toHaveBeenCalled();
+    expect(artifacts.findArtifacts).not.toHaveBeenCalled();
+  });
+
+  it('throws for an unsupported platform', async () => {
+    const ctx = makeCtx({ platform: Platform.ANDROID, channel: 'production' });
+    (ctx.job as { platform: string }).platform = 'web';
+
+    await expect(uploadEmbeddedBundleAsync(ctx)).rejects.toThrow(
+      'Uploading embedded updates is not supported for the web platform.'
+    );
+    expect(artifacts.findArtifacts).not.toHaveBeenCalled();
   });
 
   it('uploads from Android APK archives', async () => {
@@ -243,4 +254,20 @@ describe('uploadEmbeddedBundleAsync', () => {
     );
     expect(ctx.markBuildPhaseHasWarnings).toHaveBeenCalled();
   });
+
+  it('swallows zip.close() failures so they do not mask the upload result', async () => {
+    jest.mocked(artifacts.findArtifacts).mockResolvedValue(['/tmp/app-release.apk']);
+    mockZipEntries.mockResolvedValue(
+      zipEntryMap({
+        'assets/index.android.bundle': true,
+        'assets/app.manifest': true,
+      })
+    );
+    mockZipClose.mockRejectedValue(new Error('close failed'));
+    const ctx = makeCtx({ platform: Platform.ANDROID, channel: 'production' });
+
+    await expect(uploadEmbeddedBundleAsync(ctx)).resolves.toBeUndefined();
+    expect(easCli.runEasCliCommand).toHaveBeenCalled();
+    expect(mockZipClose).toHaveBeenCalled();
+  });
 });

packages/build-tools/src/utils/expoUpdatesEmbedded.ts

@@ -1,5 +1,6 @@
 import { Android, BuildJob, Ios, Platform } from '@expo/eas-build-job';
 import { PipeMode } from '@expo/logger';
+import { asyncResult } from '@expo/results';
 import fs from 'fs-extra';
 import os from 'os';
 import path from 'path';
@@ -24,15 +25,25 @@ export async function uploadEmbeddedBundleAsync(ctx: BuildContext<BuildJob>): Pr
   }
 
   const channel = ctx.job.updates?.channel;
+  if (!channel) {
+    ctx.logger.warn(
+      'Skipping embedded bundle upload: no channel configured for this build profile.'
+    );
+    ctx.markBuildPhaseHasWarnings();
+    return;
+  }
+
   const projectDir = ctx.getReactNativeProjectDirectory();
 
   let archivePattern: string;
   if (platform === Platform.IOS) {
     archivePattern = resolveArtifactPath(ctx as BuildContext<Ios.Job>);
-  } else {
+  } else if (platform === Platform.ANDROID) {
     archivePattern =
       (ctx as BuildContext<Android.Job>).job.applicationArchivePath ??
       'android/app/build/outputs/**/*.{apk,aab}';
+  } else {
+    throw new Error(`Uploading embedded updates is not supported for the ${platform} platform.`);
   }
 
   const [archivePath] = await findArtifacts({
@@ -41,10 +52,8 @@ export async function uploadEmbeddedBundleAsync(ctx: BuildContext<BuildJob>): Pr
     logger: null,
   }).catch(() => [] as string[]);
 
-  if (!channel || !archivePath) {
-    ctx.logger.warn(
-      `Skipping embedded bundle upload: ${!channel ? 'no channel configured for this build profile' : 'build archive not found'}.`
-    );
+  if (!archivePath) {
+    ctx.logger.warn('Skipping embedded bundle upload: build archive not found.');
     ctx.markBuildPhaseHasWarnings();
     return;
   }
@@ -104,6 +113,6 @@ export async function uploadEmbeddedBundleAsync(ctx: BuildContext<BuildJob>): Pr
     ctx.logger.warn({ err }, 'Failed to upload embedded bundle.');
     ctx.markBuildPhaseHasWarnings();
   } finally {
-    await zip.close();
+    await asyncResult(zip.close());
   }
 }