@better-update/cli 0.3.0 → 0.4.0

package/tests/helpers/cli-e2e.ts

@@ -1,426 +0,0 @@
-import { execSync, spawnSync } from "node:child_process";
-import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
-import os from "node:os";
-import path from "node:path";
-import { setTimeout as sleep } from "node:timers/promises";
-
-import { applyProcessEnv, createServerE2EEnvironment } from "../../../server/tests/helpers/e2e-env";
-
-import type { unstable_startWorker } from "../../../server/node_modules/wrangler";
-
-const CLI_DIR = path.resolve(import.meta.dirname, "../..");
-const SERVER_DIR = path.resolve(import.meta.dirname, "../../../server");
-
-export interface SetupCliE2EOptions {
-  /** Use an existing directory as the CLI project root instead of creating a temp dir. */
-  readonly projectDir?: string;
-  /** Custom app.json template. ScopeKey and project name are derived from expo.owner/slug/name. */
-  readonly appJsonTemplate?: Record<string, unknown>;
-}
-
-const defaultAppJsonTemplate = {
-  expo: {
-    name: "CLI E2E App",
-    slug: "cli-e2e-app",
-    owner: "cli-e2e",
-    version: "1.0.0",
-    runtimeVersion: "1.0.0",
-    ios: {
-      bundleIdentifier: "com.example.cli",
-      buildNumber: "1",
-    },
-    android: {
-      package: "com.example.cli",
-      versionCode: 1,
-    },
-    extra: {
-      betterUpdate: {
-        profiles: {
-          production: {
-            environment: "production",
-            ios: { distribution: "ad-hoc" },
-            android: { distribution: "direct", format: "apk" },
-          },
-        },
-      },
-    },
-  },
-};
-
-const parseCookies = (response: Response): string => {
-  const setCookie = response.headers.getSetCookie();
-  return setCookie
-    .map((cookie) => cookie.split(";")[0])
-    .filter(Boolean)
-    .join("; ");
-};
-
-const sqlString = (value: string) => `'${value.replaceAll("'", "''")}'`;
-
-const getNodeErrorCode = (error: unknown): string | undefined => {
-  if (!(error instanceof Error)) {
-    return undefined;
-  }
-
-  const directCode = (error as NodeJS.ErrnoException).code;
-  if (typeof directCode === "string") {
-    return directCode;
-  }
-
-  const { cause } = error as Error & { readonly cause?: unknown };
-  if (typeof cause !== "object" || cause === null) {
-    return undefined;
-  }
-
-  const nestedCode = (cause as NodeJS.ErrnoException).code;
-  return typeof nestedCode === "string" ? nestedCode : undefined;
-};
-
-const isRetryableFetchError = (error: unknown) => {
-  const code = getNodeErrorCode(error);
-  return code !== undefined && ["ECONNRESET", "EPIPE", "UND_ERR_SOCKET"].includes(code);
-};
-
-export interface CliCommandResult {
-  readonly stdout: string;
-  readonly stderr: string;
-  readonly exitCode: number;
-}
-
-export interface CliE2EContext {
-  readonly getBaseUrl: () => string;
-  readonly getProjectDir: () => string;
-  readonly getProjectId: () => string;
-  readonly readAppJson: () => Record<string, unknown>;
-  readonly runCli: (...args: readonly string[]) => CliCommandResult;
-  readonly seedSql: (sql: string) => void;
-  readonly post: (
-    path: string,
-    body: unknown,
-    headers?: Record<string, string>,
-  ) => Promise<Response>;
-  readonly get: (path: string, headers?: Record<string, string>) => Promise<Response>;
-  readonly getAuthorized: (path: string, headers?: Record<string, string>) => Promise<Response>;
-  readonly postAuthorized: (
-    path: string,
-    body: unknown,
-    headers?: Record<string, string>,
-  ) => Promise<Response>;
-  readonly patchAuthorized: (
-    path: string,
-    body: unknown,
-    headers?: Record<string, string>,
-  ) => Promise<Response>;
-  readonly deleteAuthorized: (
-    path: string,
-    body: unknown,
-    headers?: Record<string, string>,
-  ) => Promise<Response>;
-}
-
-export const setupCliE2E = (persistDir: string, options?: SetupCliE2EOptions): CliE2EContext => {
-  const template = options?.appJsonTemplate ?? defaultAppJsonTemplate;
-  const expoConfig = (template as { expo?: Record<string, unknown> }).expo ?? {};
-  const slugRaw = expoConfig["slug"];
-  const slug = typeof slugRaw === "string" ? slugRaw : "cli-e2e-app";
-  const nameRaw = expoConfig["name"];
-  const projectName = `${typeof nameRaw === "string" ? nameRaw : "E2E"} Project`;
-  const useExternalProjectDir = options?.projectDir !== undefined;
-
-  const state = {
-    worker: null as Awaited<ReturnType<typeof unstable_startWorker>> | null,
-    baseUrl: "",
-    cookies: "",
-    organizationId: "",
-    projectId: "",
-    apiKey: "",
-    projectDir: "",
-    homeDir: "",
-    restoreProcessEnv: undefined as (() => void) | undefined,
-    originalAppJson: undefined as string | undefined,
-  };
-
-  const persistPath = path.resolve(SERVER_DIR, persistDir);
-  const persistArg = path.relative(SERVER_DIR, persistPath) || ".";
-  const seedFileId = persistDir.replaceAll(/[^a-zA-Z0-9]+/gu, "-");
-  const seedFile = path.resolve(SERVER_DIR, `.wrangler/seed-${seedFileId}.sql`);
-
-  const post = async (requestPath: string, body: unknown, headers?: Record<string, string>) =>
-    requestWithRetry(async () =>
-      fetch(`${state.baseUrl}${requestPath}`, {
-        method: "POST",
-        headers: { "content-type": "application/json", ...headers },
-        body: JSON.stringify(body),
-      }),
-    );
-
-  const get = async (requestPath: string, headers?: Record<string, string>) =>
-    requestWithRetry(async () =>
-      fetch(`${state.baseUrl}${requestPath}`, headers ? { headers } : {}),
-    );
-
-  const patch = async (requestPath: string, body: unknown, headers?: Record<string, string>) =>
-    requestWithRetry(async () =>
-      fetch(`${state.baseUrl}${requestPath}`, {
-        method: "PATCH",
-        headers: { "content-type": "application/json", ...headers },
-        body: JSON.stringify(body),
-      }),
-    );
-
-  const del = async (requestPath: string, body: unknown, headers?: Record<string, string>) =>
-    requestWithRetry(async () =>
-      fetch(`${state.baseUrl}${requestPath}`, {
-        method: "DELETE",
-        headers: { "content-type": "application/json", ...headers },
-        body: JSON.stringify(body),
-      }),
-    );
-
-  const seedSql = (sql: string) => {
-    writeFileSync(seedFile, sql);
-    try {
-      execSync(
-        `bunx wrangler d1 execute DB --local --persist-to ${persistArg} --file ${seedFile}`,
-        {
-          cwd: SERVER_DIR,
-          stdio: "pipe",
-        },
-      );
-    } finally {
-      rmSync(seedFile, { force: true });
-    }
-  };
-
-  const requestWithRetry = async (run: () => Promise<Response>): Promise<Response> => {
-    const maxAttempts = 4;
-
-    for (let attempt = 1; attempt <= maxAttempts; attempt += 1) {
-      try {
-        return await run();
-      } catch (error) {
-        if (!isRetryableFetchError(error) || attempt === maxAttempts) {
-          throw error;
-        }
-
-        await sleep(attempt * 100);
-      }
-    }
-
-    throw new Error("requestWithRetry exhausted unexpectedly");
-  };
-
-  const writeAppJson = () => {
-    writeFileSync(
-      path.join(state.projectDir, "app.json"),
-      `${JSON.stringify(template, null, 2)}\n`,
-    );
-  };
-
-  const runCli = (...args: readonly string[]): CliCommandResult => {
-    const result = spawnSync("bun", [path.resolve(CLI_DIR, "src/index.ts"), ...args], {
-      cwd: state.projectDir,
-      env: {
-        ...process.env,
-        HOME: state.homeDir,
-        BETTER_UPDATE_URL: state.baseUrl,
-        BETTER_UPDATE_TOKEN: state.apiKey,
-        FORCE_COLOR: "0",
-        NO_COLOR: "1",
-      },
-      encoding: "utf8",
-    });
-
-    return {
-      stdout: result.stdout,
-      stderr: result.stderr,
-      exitCode: result.status ?? 1,
-    };
-  };
-
-  beforeAll(async () => {
-    rmSync(persistPath, { recursive: true, force: true });
-    const e2eEnv = createServerE2EEnvironment({ projectRoot: SERVER_DIR });
-    state.restoreProcessEnv = applyProcessEnv(e2eEnv.processOverrides);
-
-    execSync(`bunx wrangler d1 migrations apply DB --local --persist-to ${persistArg}`, {
-      cwd: SERVER_DIR,
-      env: e2eEnv.wranglerEnv,
-      stdio: "pipe",
-    });
-
-    const originalCwd = process.cwd();
-    process.chdir(SERVER_DIR);
-    try {
-      const { unstable_startWorker } = await import("../../../server/node_modules/wrangler");
-      state.worker = await unstable_startWorker({
-        config: path.resolve(SERVER_DIR, "wrangler.jsonc"),
-        envFiles: [],
-        bindings: e2eEnv.workerBindings,
-        build: { nodejsCompatMode: "v2" },
-        dev: {
-          server: { port: 0 },
-          inspector: false,
-          logLevel: "error",
-          persist: persistPath,
-        },
-      });
-    } finally {
-      process.chdir(originalCwd);
-    }
-
-    const url = await state.worker.url;
-    state.baseUrl = url.href.replace(/\/$/, "");
-
-    state.homeDir = mkdtempSync(path.join(os.tmpdir(), "better-update-cli-home-"));
-
-    if (useExternalProjectDir) {
-      state.projectDir = options.projectDir!;
-      const appJsonPath = path.join(state.projectDir, "app.json");
-      if (existsSync(appJsonPath)) {
-        state.originalAppJson = readFileSync(appJsonPath, "utf8");
-      }
-    } else {
-      state.projectDir = mkdtempSync(path.join(os.tmpdir(), "better-update-cli-project-"));
-    }
-    writeAppJson();
-
-    const signUpResponse = await post("/api/auth/sign-up/email", {
-      name: "CLI E2E User",
-      email: "cli-e2e@example.com",
-      password: "SecureP@ss123",
-    });
-    expect(signUpResponse.status).toBe(200);
-    state.cookies = parseCookies(signUpResponse);
-
-    const createOrgResponse = await post(
-      "/api/auth/organization/create",
-      { name: "CLI Org", slug: "cli-org" },
-      { cookie: state.cookies },
-    );
-    expect(createOrgResponse.status).toBe(200);
-    const createOrgBody = await createOrgResponse.json();
-    state.organizationId = createOrgBody.id;
-    state.cookies = parseCookies(createOrgResponse) || state.cookies;
-
-    const setActiveResponse = await post(
-      "/api/auth/organization/set-active",
-      { organizationId: state.organizationId },
-      { cookie: state.cookies },
-    );
-    expect(setActiveResponse.status).toBe(200);
-    state.cookies = parseCookies(setActiveResponse) || state.cookies;
-
-    const createProjectResponse = await post(
-      "/api/projects",
-      { name: projectName, slug },
-      { cookie: state.cookies },
-    );
-    expect(createProjectResponse.status).toBe(201);
-    const createProjectBody = await createProjectResponse.json();
-    state.projectId = createProjectBody.id;
-
-    const createKeyResponse = await post(
-      "/api/auth/api-key/create",
-      { name: "cli-e2e-key", organizationId: state.organizationId },
-      { cookie: state.cookies },
-    );
-    expect(createKeyResponse.status).toBe(200);
-    const createKeyBody = await createKeyResponse.json();
-    state.apiKey = createKeyBody.key;
-
-    const createBranchResponse = await post(
-      "/api/branches",
-      { projectId: state.projectId, name: "main" },
-      { cookie: state.cookies },
-    );
-    expect(createBranchResponse.status).toBe(201);
-
-    const createEnvVarResponse = await post(
-      "/api/env-vars",
-      {
-        projectId: state.projectId,
-        environment: "production",
-        key: "APP_SECRET",
-        value: "super-secret",
-        visibility: "secret",
-      },
-      { cookie: state.cookies },
-    );
-    expect(createEnvVarResponse.status).toBe(201);
-
-    seedSql(`
-INSERT INTO "builds" (
-  "id", "project_id", "platform", "profile", "distribution", "runtime_version",
-  "app_version", "build_number", "bundle_id", "git_ref", "git_commit",
-  "message", "metadata_json", "created_at"
-)
-VALUES (
-  'cli-build-1',
-  ${sqlString(state.projectId)},
-  'ios',
-  'production',
-  'ad-hoc',
-  '1.0.0',
-  '1.0.0',
-  '1',
-  'com.example.cli',
-  'main',
-  'abcdef1',
-  'CLI seeded build',
-  '{}',
-  '2024-04-01T00:00:00Z'
-);
-
-INSERT INTO "build_artifacts" (
-  "build_id", "r2_key", "format", "content_type", "byte_size", "sha256", "created_at"
-)
-VALUES (
-  'cli-build-1',
-  'builds/${state.organizationId}/${state.projectId}/cli-build-1.ipa',
-  'ipa',
-  'application/octet-stream',
-  1024,
-  'cli-build-sha',
-  '2024-04-01T00:00:00Z'
-);
-`);
-  });
-
-  afterAll(async () => {
-    await state.worker?.dispose();
-    state.restoreProcessEnv?.();
-    rmSync(persistPath, { recursive: true, force: true });
-    if (useExternalProjectDir) {
-      if (state.originalAppJson !== undefined) {
-        writeFileSync(path.join(state.projectDir, "app.json"), state.originalAppJson);
-      }
-    } else {
-      rmSync(state.projectDir, { recursive: true, force: true });
-    }
-    rmSync(state.homeDir, { recursive: true, force: true });
-  });
-
-  return {
-    getBaseUrl: () => state.baseUrl,
-    getProjectDir: () => state.projectDir,
-    getProjectId: () => state.projectId,
-    readAppJson: () =>
-      JSON.parse(readFileSync(path.join(state.projectDir, "app.json"), "utf8")) as Record<
-        string,
-        unknown
-      >,
-    runCli,
-    seedSql,
-    post,
-    get,
-    getAuthorized: async (requestPath, headers) =>
-      get(requestPath, { authorization: `Bearer ${state.apiKey}`, ...headers }),
-    postAuthorized: async (requestPath, body, headers) =>
-      post(requestPath, body, { authorization: `Bearer ${state.apiKey}`, ...headers }),
-    patchAuthorized: async (requestPath, body, headers) =>
-      patch(requestPath, body, { authorization: `Bearer ${state.apiKey}`, ...headers }),
-    deleteAuthorized: async (requestPath, body, headers) =>
-      del(requestPath, body, { authorization: `Bearer ${state.apiKey}`, ...headers }),
-  };
-};

package/tests/helpers/pty-driver.ts

@@ -1,142 +0,0 @@
-import { setTimeout as sleep } from "node:timers/promises";
-
-import { spawn } from "node-pty";
-
-import type { IPty } from "node-pty";
-
-export interface PtySpawnOptions {
-  readonly cwd?: string;
-  readonly env?: NodeJS.ProcessEnv;
-  readonly cols?: number;
-  readonly rows?: number;
-}
-
-export interface PtyDriver {
-  readonly output: () => string;
-  readonly stripped: () => string;
-  readonly expect: (
-    pattern: string | RegExp,
-    options?: { readonly timeoutMs?: number },
-  ) => Promise<void>;
-  readonly send: (text: string) => void;
-  readonly enter: () => void;
-  readonly down: (count?: number) => void;
-  readonly up: (count?: number) => void;
-  readonly waitExit: (options?: { readonly timeoutMs?: number }) => Promise<number>;
-  readonly kill: () => void;
-}
-
-const ANSI_REGEX =
-  // eslint-disable-next-line no-control-regex -- stripping ANSI escapes
-  /[\u001B\u009B][[()#;?]*(?:\d{1,4}(?:;\d{0,4})*)?[\dA-ORZcf-ntqry=><]/g;
-
-export const stripAnsi = (input: string) => input.replace(ANSI_REGEX, "");
-
-export const spawnPty = (
-  command: string,
-  args: readonly string[],
-  options?: PtySpawnOptions,
-): PtyDriver => {
-  const ptyProcess: IPty = spawn(command, [...args], {
-    cols: options?.cols ?? 120,
-    rows: options?.rows ?? 40,
-    cwd: options?.cwd ?? process.cwd(),
-    env: { ...process.env, ...options?.env } as Record<string, string>,
-    name: "xterm-256color",
-  });
-
-  let buffer = "";
-  let exitCode: number | null = null;
-  const waiters: (() => void)[] = [];
-
-  const drainWaiters = () => {
-    const pending = waiters.splice(0);
-    for (const waiter of pending) {
-      waiter();
-    }
-  };
-
-  ptyProcess.onData((chunk) => {
-    buffer += chunk;
-    drainWaiters();
-  });
-
-  ptyProcess.onExit(({ exitCode: code }) => {
-    exitCode = code;
-    drainWaiters();
-  });
-
-  const waitFor = async (timeoutMs: number, predicate: () => boolean) =>
-    new Promise<void>((resolve, reject) => {
-      if (predicate()) {
-        resolve();
-        return;
-      }
-      let settled = false;
-      const tick = () => {
-        if (settled) {
-          return;
-        }
-        if (predicate()) {
-          settled = true;
-          clearTimeout(timer);
-          resolve();
-        } else if (exitCode === null) {
-          waiters.push(tick);
-        } else {
-          settled = true;
-          clearTimeout(timer);
-          reject(
-            new Error(
-              `pty exited (code=${exitCode}) before predicate matched. Buffer:\n${stripAnsi(buffer)}`,
-            ),
-          );
-        }
-      };
-      const timer = setTimeout(() => {
-        if (settled) {
-          return;
-        }
-        settled = true;
-        reject(new Error(`pty wait timed out after ${timeoutMs}ms. Buffer:\n${stripAnsi(buffer)}`));
-      }, timeoutMs);
-      waiters.push(tick);
-    });
-
-  return {
-    output: () => buffer,
-    stripped: () => stripAnsi(buffer),
-    expect: async (pattern, { timeoutMs = 5000 } = {}) => {
-      const matcher =
-        typeof pattern === "string"
-          ? (text: string) => text.includes(pattern)
-          : (text: string) => pattern.test(text);
-      await waitFor(timeoutMs, () => matcher(stripAnsi(buffer)));
-    },
-    send: (text) => {
-      ptyProcess.write(text);
-    },
-    enter: () => {
-      ptyProcess.write("\r");
-    },
-    down: (count = 1) => {
-      for (let index = 0; index < count; index += 1) {
-        ptyProcess.write("\u001B[B");
-      }
-    },
-    up: (count = 1) => {
-      for (let index = 0; index < count; index += 1) {
-        ptyProcess.write("\u001B[A");
-      }
-    },
-    waitExit: async ({ timeoutMs = 10_000 } = {}) => {
-      await waitFor(timeoutMs, () => exitCode !== null);
-      // Give the pty a beat to flush any trailing bytes.
-      await sleep(10);
-      return exitCode ?? -1;
-    },
-    kill: () => {
-      ptyProcess.kill();
-    },
-  };
-};

package/tests/interactive/harness/provider-prompt.ts

@@ -1,54 +0,0 @@
-#!/usr/bin/env bun
-import process from "node:process";
-
-import { BunContext, BunRuntime } from "@effect/platform-bun";
-import { Effect, Layer } from "effect";
-
-import type { Session } from "@expo/apple-utils";
-// eslint-disable-next-line import-plugin/no-namespace -- harness casts a stub as `typeof AppleUtils` (whole module shape) to satisfy resolveProvider's injected module param
-import type * as AppleUtils from "@expo/apple-utils";
-
-import { resolveProvider } from "../../../src/lib/apple-auth";
-import { CliRuntimeLive } from "../../../src/services/cli-runtime";
-
-// Force the prompt branch: ignore any APPLE_PROVIDER_ID from the host shell.
-delete process.env["APPLE_PROVIDER_ID"];
-
-const fakeAppleUtils = {
-  Session: {
-    setSessionProviderIdAsync: async (_id: number) => null,
-  },
-} as unknown as typeof AppleUtils;
-
-const providers: readonly Session.SessionProvider[] = [
-  {
-    providerId: 10,
-    publicProviderId: "pub-10",
-    name: "Org Alpha",
-    contentTypes: ["SOFTWARE"],
-    subType: "ORGANIZATION",
-  },
-  {
-    providerId: 20,
-    publicProviderId: "pub-20",
-    name: "Org Beta",
-    contentTypes: ["SOFTWARE"],
-    subType: "ORGANIZATION",
-  },
-  {
-    providerId: 30,
-    publicProviderId: "pub-30",
-    name: "Org Gamma",
-    contentTypes: ["SOFTWARE"],
-    subType: "ORGANIZATION",
-  },
-];
-
-const program = Effect.gen(function* () {
-  const result = yield* resolveProvider(fakeAppleUtils, providers, undefined, undefined);
-  // Distinctive marker so the PTY test can extract the JSON past any rendered prompt text.
-  // eslint-disable-next-line eslint/no-console -- interactive PTY harness prints a parseable marker to stdout; Effect.Console adds formatting that breaks the parser
-  console.log(`RESULT=${JSON.stringify(result)}`);
-});
-
-program.pipe(Effect.provide(Layer.mergeAll(BunContext.layer, CliRuntimeLive)), BunRuntime.runMain);

package/tests/interactive/login.test.ts

@@ -1,47 +0,0 @@
-import { mkdtempSync, readFileSync, rmSync } from "node:fs";
-import os from "node:os";
-import path from "node:path";
-
-import { spawnPty } from "../helpers/pty-driver";
-
-const CLI_ENTRY = path.resolve(import.meta.dirname, "../../src/index.ts");
-
-describe("login --api-key (interactive PoC)", () => {
-  let homeDir: string;
-
-  beforeEach(() => {
-    homeDir = mkdtempSync(path.join(os.tmpdir(), "better-update-pty-home-"));
-  });
-
-  afterEach(() => {
-    rmSync(homeDir, { recursive: true, force: true });
-  });
-
-  it("prompts for API key, stores token on enter", async () => {
-    const driver = spawnPty("bun", [CLI_ENTRY, "login", "--api-key"], {
-      env: {
-        HOME: homeDir,
-        FORCE_COLOR: "0",
-        NO_COLOR: "1",
-        // Layer construction currently yields apiClient eagerly via UpdateAssetUploaderLive,
-        // So every CLI invocation resolves a token. Pass a placeholder — login still writes
-        // The prompted token to auth.json, which is what we assert.
-        BETTER_UPDATE_TOKEN: "startup-placeholder",
-      },
-    });
-
-    await driver.expect(/Paste your API key/, { timeoutMs: 15_000 });
-
-    driver.send("pk_test_abc123");
-    driver.enter();
-
-    await driver.expect("Logged in successfully", { timeoutMs: 10_000 });
-    const code = await driver.waitExit({ timeoutMs: 5000 });
-    expect(code).toBe(0);
-
-    const authJson = JSON.parse(
-      readFileSync(path.join(homeDir, ".better-update/auth.json"), "utf8"),
-    ) as { token: string };
-    expect(authJson.token).toBe("pk_test_abc123");
-  });
-});