@better-update/cli 0.3.0 → 0.3.2

package/src/commands/build/ios.ts

@@ -1,199 +0,0 @@
-import path from "node:path";
-
-import { Command, FileSystem } from "@effect/platform";
-import { Effect } from "effect";
-
-import type { CommandExecutor } from "@effect/platform";
-import type { PlatformError } from "@effect/platform/Error";
-import type { Scope } from "effect";
-
-import { findIosArtifact } from "../../lib/artifact-finder";
-import { downloadIosCredentials } from "../../lib/credentials-downloader";
-import { BuildFailedError } from "../../lib/exit-codes";
-import { renderExportOptionsPlist } from "../../lib/ios-export-options";
-import { acquireKeychain } from "../../lib/ios-keychain";
-import { installProvisioningProfile } from "../../lib/ios-provisioning";
-import { validateIosBuild } from "../../lib/post-build-validation";
-import { sha256File } from "../../lib/sha256";
-import { createXcodebuildFormatter } from "../../lib/xcpretty-formatter";
-import { CliRuntime } from "../../services/cli-runtime";
-import { runStep, runStepFormatted } from "./run-step";
-
-import type { IosProfile } from "../../lib/build-profile";
-import type {
-  ArtifactNotFoundError,
-  KeychainError,
-  MissingCredentialsError,
-  ProvisioningError,
-} from "../../lib/exit-codes";
-import type { ApiClient } from "../../services/api-client";
-
-export interface RunIosBuildInput {
-  readonly api: ApiClient;
-  readonly tempDir: string;
-  readonly projectRoot: string;
-  readonly iosProfile: IosProfile;
-  readonly bundleId: string;
-  readonly envVars: Record<string, string>;
-  readonly projectId: string;
-  readonly rawOutput?: boolean | undefined;
-}
-
-export interface RunIosBuildResult {
-  readonly artifactPath: string;
-  readonly byteSize: number;
-  readonly sha256: string;
-}
-
-const findXcworkspace = (
-  iosDir: string,
-): Effect.Effect<string, BuildFailedError | PlatformError, FileSystem.FileSystem> =>
-  Effect.gen(function* () {
-    const fs = yield* FileSystem.FileSystem;
-    const entries = yield* fs.readDirectory(iosDir);
-    const workspace = entries.find((entry) => entry.endsWith(".xcworkspace"));
-    if (!workspace) {
-      return yield* new BuildFailedError({
-        step: "detect xcworkspace",
-        exitCode: 1,
-        message: `No .xcworkspace found under ${iosDir}. Did "pod install" run?`,
-      });
-    }
-    return workspace;
-  });
-
-export const runIosBuild = (
-  input: RunIosBuildInput,
-): Effect.Effect<
-  RunIosBuildResult,
-  | BuildFailedError
-  | MissingCredentialsError
-  | KeychainError
-  | ProvisioningError
-  | ArtifactNotFoundError
-  | PlatformError,
-  CliRuntime | CommandExecutor.CommandExecutor | FileSystem.FileSystem | Scope.Scope
-> =>
-  // eslint-disable-next-line eslint/max-statements -- ios build orchestration is inherently sequential (prebuild → pod → credentials → archive → exportArchive → find artifact → sha256); splitting further fragments the pipeline without clarifying it
-  Effect.gen(function* () {
-    const { api, tempDir, projectRoot, iosProfile, bundleId, envVars, projectId } = input;
-    const runtime = yield* CliRuntime;
-
-    const iosDir = path.join(projectRoot, "ios");
-    const { distribution } = iosProfile;
-    const commandEnv = yield* runtime.commandEnvironment(envVars);
-
-    // 1. Download credentials (p12 + mobileprovision) into tempDir.
-    const credentials = yield* downloadIosCredentials(api, {
-      projectId,
-      bundleIdentifier: bundleId,
-      distribution,
-      tempDir,
-    });
-
-    // 2. Expo prebuild (ios).
-    yield* runStep(
-      Command.make("bunx", "expo", "prebuild", "--platform", "ios", "--clean").pipe(
-        Command.workingDirectory(projectRoot),
-        Command.env(commandEnv),
-      ),
-      "expo prebuild ios",
-    );
-
-    // 3. pod install.
-    yield* runStep(
-      Command.make("pod", "install").pipe(
-        Command.workingDirectory(iosDir),
-        Command.env(commandEnv),
-      ),
-      "pod install",
-    );
-
-    // 4. Scoped ephemeral keychain (auto-cleaned on scope close).
-    const keychain = yield* acquireKeychain({
-      tempDir,
-      p12Path: credentials.p12Path,
-      p12Password: credentials.p12Password,
-    });
-
-    // 5. Scoped provisioning profile install.
-    const provisioning = yield* installProvisioningProfile({
-      profilePath: credentials.profilePath,
-    });
-
-    // 6. Detect workspace + scheme.
-    const workspaceFilename = yield* findXcworkspace(iosDir);
-    const scheme = iosProfile.scheme ?? workspaceFilename.replace(/\.xcworkspace$/, "");
-    const configuration = iosProfile.buildConfiguration ?? "Release";
-
-    // 7. xcodebuild archive.
-    const archivePath = path.join(tempDir, "build.xcarchive");
-    const archiveCmd = Command.make(
-      "xcodebuild",
-      "-workspace",
-      workspaceFilename,
-      "-scheme",
-      scheme,
-      "-configuration",
-      configuration,
-      "-archivePath",
-      archivePath,
-      "-allowProvisioningUpdates",
-      "archive",
-      "CODE_SIGN_STYLE=Manual",
-      `DEVELOPMENT_TEAM=${provisioning.teamId}`,
-      `CODE_SIGN_IDENTITY=${keychain.signingIdentity}`,
-      `PROVISIONING_PROFILE_SPECIFIER=${provisioning.name}`,
-    ).pipe(Command.workingDirectory(iosDir), Command.env(commandEnv));
-
-    const formatter = input.rawOutput ? undefined : createXcodebuildFormatter(projectRoot);
-    yield* formatter
-      ? runStepFormatted(archiveCmd, "xcodebuild archive", formatter)
-      : runStep(archiveCmd, "xcodebuild archive");
-
-    const fs = yield* FileSystem.FileSystem;
-    const exportOptionsPath = path.join(tempDir, "ExportOptions.plist");
-    yield* fs.writeFileString(
-      exportOptionsPath,
-      renderExportOptionsPlist({
-        method: distribution,
-        teamId: provisioning.teamId,
-        bundleId,
-        provisioningProfileName: provisioning.name,
-      }),
-    );
-
-    // 9. xcodebuild exportArchive.
-    const exportPath = path.join(tempDir, "export");
-    const exportCmd = Command.make(
-      "xcodebuild",
-      "-exportArchive",
-      "-archivePath",
-      archivePath,
-      "-exportPath",
-      exportPath,
-      "-exportOptionsPlist",
-      exportOptionsPath,
-      "-allowProvisioningUpdates",
-    ).pipe(Command.workingDirectory(iosDir), Command.env(commandEnv));
-
-    yield* formatter
-      ? runStepFormatted(exportCmd, "xcodebuild exportArchive", formatter)
-      : runStep(exportCmd, "xcodebuild exportArchive");
-
-    // 10. Post-build validation (non-blocking).
-    yield* validateIosBuild({
-      archivePath,
-      expectedBundleId: bundleId,
-      expectedTeamId: provisioning.teamId,
-      expectedProfileUuid: provisioning.uuid,
-    });
-
-    // 11. Locate artifact.
-    const artifactPath = yield* findIosArtifact({ exportPath });
-
-    // 12. SHA-256 + byte size.
-    const { sha256, byteSize } = yield* sha256File(artifactPath);
-
-    return { artifactPath, byteSize, sha256 };
-  });

package/src/commands/build/reserve-and-upload.test.ts

@@ -1,263 +0,0 @@
-import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-
-import { FileSystem, HttpClient, HttpClientResponse } from "@effect/platform";
-import { BunFileSystem } from "@effect/platform-bun";
-import { it } from "@effect/vitest";
-import { Effect, Exit, Layer } from "effect";
-
-import {
-  CompleteError,
-  PresignedUrlExpiredError,
-  ReserveError,
-  UploadFailedError,
-} from "../../lib/exit-codes";
-import { failureError } from "../../lib/test-utils";
-import { PresignedUploadClientLive } from "../../services/presigned-upload";
-import { reserveAndUpload } from "./reserve-and-upload";
-
-import type { ApiClient } from "../../services/api-client";
-
-// ── helpers ───────────────────────────────────────────────────────
-
-interface ApiStubOptions {
-  readonly reserve?: (args: { payload: Record<string, unknown> }) => Effect.Effect<
-    {
-      id: string;
-      uploadMode: "single";
-      uploadUrl: string;
-      uploadExpiresAt: string;
-      uploadHeaders: Record<string, string>;
-    },
-    unknown
-  >;
-  readonly complete?: (args: {
-    path: { id: string };
-    payload: { sha256: string; byteSize: number };
-  }) => Effect.Effect<{ id: string; artifact: unknown }, unknown>;
-}
-
-const makeApi = (opts: ApiStubOptions): ApiClient =>
-  ({
-    builds: {
-      reserve:
-        opts.reserve ??
-        (() =>
-          Effect.succeed({
-            id: "build_1",
-            uploadMode: "single" as const,
-            uploadUrl: "https://example.com/upload",
-            uploadExpiresAt: new Date(Date.now() + 60 * 60 * 1000).toISOString(),
-            uploadHeaders: {
-              "content-type": "application/octet-stream",
-              "x-amz-checksum-sha256": "checksum",
-            },
-          })),
-      complete:
-        opts.complete ??
-        (() =>
-          Effect.succeed({
-            id: "build_1",
-            artifact: {
-              r2Key: "r2/build_1",
-              format: "ipa",
-              contentType: "application/octet-stream",
-              byteSize: 11,
-              sha256: "deadbeef",
-            },
-          })),
-    },
-  }) as unknown as ApiClient;
-
-const makeHttpClientLayer = (
-  respond: () => globalThis.Response,
-): Layer.Layer<HttpClient.HttpClient> =>
-  Layer.succeed(
-    HttpClient.HttpClient,
-    HttpClient.make((request) => Effect.sync(() => HttpClientResponse.fromWeb(request, respond()))),
-  );
-
-const makePresignedUploadLayer = (
-  fileSystemLayer: Layer.Layer<FileSystem.FileSystem>,
-  respond: () => globalThis.Response,
-) =>
-  PresignedUploadClientLive.pipe(
-    Layer.provide(Layer.mergeAll(fileSystemLayer, makeHttpClientLayer(respond))),
-  );
-
-const okResponse = () => new Response(null, { status: 200 });
-
-const withTempFile = (bytes: Buffer): { path: string; dispose: () => void } => {
-  const dir = mkdtempSync(join(tmpdir(), "reserve-test-"));
-  const filePath = join(dir, "artifact.bin");
-  writeFileSync(filePath, bytes);
-  return {
-    path: filePath,
-    dispose: () => rmSync(dir, { recursive: true, force: true }),
-  };
-};
-
-const baseInput = (artifactPath: string) => ({
-  projectId: "proj_1",
-  target: {
-    platform: "ios" as const,
-    distribution: "app-store" as const,
-    artifactFormat: "ipa" as const,
-  },
-  profileName: "production",
-  runtimeVersion: "1.2.3",
-  appVersion: "1.2.0",
-  buildNumber: "42",
-  bundleId: "com.example.app",
-  gitContext: { ref: "main", commit: "abc123", dirty: false },
-  message: "test build",
-  artifactPath,
-  sha256: "deadbeef",
-  byteSize: 11,
-});
-
-// ── tests ─────────────────────────────────────────────────────────
-
-describe(reserveAndUpload, () => {
-  it.effect("happy path: reserves, uploads, completes", () =>
-    Effect.gen(function* () {
-      const file = withTempFile(Buffer.from("hello world"));
-      let reservePayload: Record<string, unknown> | undefined;
-      let completePath: { id: string } | undefined;
-
-      const api = makeApi({
-        reserve: ({ payload }) => {
-          reservePayload = payload;
-          return Effect.succeed({
-            id: "build_123",
-            uploadMode: "single" as const,
-            uploadUrl: "https://example.com/upload",
-            uploadExpiresAt: new Date(Date.now() + 60 * 60 * 1000).toISOString(),
-            uploadHeaders: {
-              "content-type": "application/octet-stream",
-              "x-amz-checksum-sha256": "checksum",
-            },
-          });
-        },
-        complete: ({ path, payload }) => {
-          completePath = path;
-          return Effect.succeed({
-            id: path.id,
-            artifact: {
-              r2Key: `r2/${path.id}`,
-              format: "ipa",
-              contentType: "application/octet-stream",
-              byteSize: payload.byteSize,
-              sha256: payload.sha256,
-            },
-          });
-        },
-      });
-
-      const result = yield* reserveAndUpload(api, baseInput(file.path)).pipe(
-        Effect.provide(makePresignedUploadLayer(BunFileSystem.layer, okResponse)),
-        Effect.ensuring(Effect.sync(file.dispose)),
-      );
-
-      expect(result.id).toBe("build_123");
-      expect(result.status).toBe("uploaded");
-      expect(reservePayload?.["projectId"]).toBe("proj_1");
-      expect(reservePayload?.["platform"]).toBe("ios");
-      expect(reservePayload?.["profile"]).toBe("production");
-      expect(reservePayload?.["distribution"]).toBe("app-store");
-      expect(reservePayload?.["runtimeVersion"]).toBe("1.2.3");
-      expect(reservePayload?.["gitRef"]).toBe("main");
-      expect(reservePayload?.["gitCommit"]).toBe("abc123");
-      expect(reservePayload?.["bundleId"]).toBe("com.example.app");
-      expect(reservePayload?.["sha256"]).toBe("deadbeef");
-      expect(reservePayload?.["byteSize"]).toBe(11);
-      expect(completePath?.id).toBe("build_123");
-    }),
-  );
-
-  it.effect("fails with ReserveError when reserve endpoint fails", () =>
-    Effect.gen(function* () {
-      const api = makeApi({
-        reserve: () => Effect.fail(new Error("server down")),
-      });
-      const exit = yield* reserveAndUpload(api, baseInput("/dev/null")).pipe(
-        Effect.provide(makePresignedUploadLayer(FileSystem.layerNoop({}), okResponse)),
-        Effect.exit,
-      );
-      expect(Exit.isFailure(exit)).toBe(true);
-      if (Exit.isFailure(exit)) {
-        const error = failureError(exit);
-        expect(error).toBeInstanceOf(ReserveError);
-      }
-    }),
-  );
-
-  it.effect("fails with PresignedUrlExpiredError when upload URL expired", () =>
-    Effect.gen(function* () {
-      const api = makeApi({
-        reserve: () =>
-          Effect.succeed({
-            id: "build_1",
-            uploadMode: "single" as const,
-            uploadUrl: "https://example.com/upload",
-            uploadExpiresAt: new Date(Date.now() - 1000).toISOString(),
-            uploadHeaders: {
-              "content-type": "application/octet-stream",
-              "x-amz-checksum-sha256": "checksum",
-            },
-          }),
-      });
-      const exit = yield* reserveAndUpload(api, baseInput("/dev/null")).pipe(
-        Effect.provide(makePresignedUploadLayer(FileSystem.layerNoop({}), okResponse)),
-        Effect.exit,
-      );
-      expect(Exit.isFailure(exit)).toBe(true);
-      if (Exit.isFailure(exit)) {
-        const error = failureError(exit);
-        expect(error).toBeInstanceOf(PresignedUrlExpiredError);
-      }
-    }),
-  );
-
-  it.effect("fails with UploadFailedError when PUT returns 403", () =>
-    Effect.gen(function* () {
-      const file = withTempFile(Buffer.from("hello world"));
-      const api = makeApi({});
-      const exit = yield* reserveAndUpload(api, baseInput(file.path)).pipe(
-        Effect.provide(
-          makePresignedUploadLayer(
-            BunFileSystem.layer,
-            () => new Response("AccessDenied", { status: 403, statusText: "Forbidden" }),
-          ),
-        ),
-        Effect.ensuring(Effect.sync(file.dispose)),
-        Effect.exit,
-      );
-      expect(Exit.isFailure(exit)).toBe(true);
-      if (Exit.isFailure(exit)) {
-        const error = failureError(exit);
-        expect(error).toBeInstanceOf(UploadFailedError);
-      }
-    }),
-  );
-
-  it.effect("fails with CompleteError when complete endpoint fails", () =>
-    Effect.gen(function* () {
-      const file = withTempFile(Buffer.from("hello world"));
-      const api = makeApi({
-        complete: () => Effect.fail(new Error("db error")),
-      });
-      const exit = yield* reserveAndUpload(api, baseInput(file.path)).pipe(
-        Effect.provide(makePresignedUploadLayer(BunFileSystem.layer, okResponse)),
-        Effect.ensuring(Effect.sync(file.dispose)),
-        Effect.exit,
-      );
-      expect(Exit.isFailure(exit)).toBe(true);
-      if (Exit.isFailure(exit)) {
-        const error = failureError(exit);
-        expect(error).toBeInstanceOf(CompleteError);
-      }
-    }),
-  );
-});

package/src/commands/build/reserve-and-upload.ts

@@ -1,160 +0,0 @@
-import { Effect } from "effect";
-
-import { CompleteError, ReserveError } from "../../lib/exit-codes";
-import { formatCause } from "../../lib/format-error";
-import { PresignedUploadClient } from "../../services/presigned-upload";
-
-import type { PresignedUrlExpiredError, UploadFailedError } from "../../lib/exit-codes";
-import type { ApiClient } from "../../services/api-client";
-
-export type BuildTarget =
-  | {
-      readonly platform: "ios";
-      readonly distribution: "app-store" | "ad-hoc" | "development" | "enterprise";
-      readonly artifactFormat: "ipa";
-    }
-  | {
-      readonly platform: "ios";
-      readonly distribution: "simulator";
-      readonly artifactFormat: "tar.gz";
-    }
-  | {
-      readonly platform: "android";
-      readonly distribution: "play-store";
-      readonly artifactFormat: "aab";
-    }
-  | {
-      readonly platform: "android";
-      readonly distribution: "direct";
-      readonly artifactFormat: "apk";
-    };
-
-export interface ReserveAndUploadInput {
-  readonly target: BuildTarget;
-  readonly projectId: string;
-  readonly profileName: string;
-  readonly runtimeVersion: string;
-  readonly appVersion?: string;
-  readonly buildNumber?: string;
-  readonly bundleId: string;
-  readonly gitContext: {
-    readonly ref?: string;
-    readonly commit?: string;
-    readonly dirty: boolean;
-  };
-  readonly message?: string;
-  readonly artifactPath: string;
-  readonly sha256: string;
-  readonly byteSize: number;
-}
-
-const buildReserveCommon = (input: ReserveAndUploadInput) =>
-  ({
-    projectId: input.projectId,
-    profile: input.profileName,
-    runtimeVersion: input.runtimeVersion,
-    bundleId: input.bundleId,
-    sha256: input.sha256,
-    byteSize: input.byteSize,
-    ...(input.appVersion === undefined ? {} : { appVersion: input.appVersion }),
-    ...(input.buildNumber === undefined ? {} : { buildNumber: input.buildNumber }),
-    ...(input.gitContext.ref === undefined ? {} : { gitRef: input.gitContext.ref }),
-    ...(input.gitContext.commit === undefined ? {} : { gitCommit: input.gitContext.commit }),
-    ...(input.message === undefined ? {} : { message: input.message }),
-  }) as const;
-
-const callReserve = (api: ApiClient, input: ReserveAndUploadInput) => {
-  const common = buildReserveCommon(input);
-  const { target } = input;
-  if (target.platform === "ios") {
-    return target.distribution === "simulator"
-      ? api.builds.reserve({
-          payload: {
-            ...common,
-            platform: "ios",
-            distribution: "simulator",
-            artifactFormat: "tar.gz",
-          },
-        })
-      : api.builds.reserve({
-          payload: {
-            ...common,
-            platform: "ios",
-            distribution: target.distribution,
-            artifactFormat: "ipa",
-          },
-        });
-  }
-  return target.distribution === "play-store"
-    ? api.builds.reserve({
-        payload: {
-          ...common,
-          platform: "android",
-          distribution: "play-store",
-          artifactFormat: "aab",
-        },
-      })
-    : api.builds.reserve({
-        payload: { ...common, platform: "android", distribution: "direct", artifactFormat: "apk" },
-      });
-};
-
-export interface ReserveAndUploadResult {
-  readonly id: string;
-  readonly status: string;
-}
-
-/**
- * Reserve a build record on the server, upload the artifact to the returned
- * presigned URL, and finalize the build with its sha256 + byteSize.
- */
-export const reserveAndUpload = (
-  api: ApiClient,
-  input: ReserveAndUploadInput,
-): Effect.Effect<
-  ReserveAndUploadResult,
-  ReserveError | UploadFailedError | PresignedUrlExpiredError | CompleteError,
-  PresignedUploadClient
-> =>
-  Effect.gen(function* () {
-    const presignedUploadClient = yield* PresignedUploadClient;
-
-    const reserveResult = yield* callReserve(api, input).pipe(
-      Effect.mapError(
-        (cause) =>
-          new ReserveError({
-            message: `Failed to reserve build: ${formatCause(cause)}`,
-          }),
-      ),
-    );
-
-    yield* presignedUploadClient.putToPresignedUrl({
-      url: reserveResult.uploadUrl,
-      filePath: input.artifactPath,
-      byteSize: input.byteSize,
-      expiresAt: reserveResult.uploadExpiresAt,
-      headers: reserveResult.uploadHeaders,
-    });
-
-    const completed = yield* api.builds
-      .complete({
-        path: { id: reserveResult.id },
-        payload: { sha256: input.sha256, byteSize: input.byteSize },
-      })
-      .pipe(
-        Effect.mapError(
-          (cause) =>
-            new CompleteError({
-              message: `Failed to complete build ${reserveResult.id}: ${formatCause(cause)}`,
-            }),
-        ),
-      );
-
-    if (!completed.artifact) {
-      return yield* new CompleteError({
-        message: `Build ${completed.id} completed but server returned no artifact record.`,
-      });
-    }
-
-    return { id: completed.id, status: "uploaded" };
-  });