@better-update/cli 0.3.0 → 0.3.2

package/src/services/api-client.ts

@@ -1,42 +0,0 @@
-import { ManagementApi } from "@better-update/api";
-import { HttpApiClient, HttpClient, HttpClientRequest } from "@effect/platform";
-import { Context, Effect, Layer } from "effect";
-
-import { AuthStore } from "./auth-store";
-import { ConfigStore } from "./config-store";
-
-import type { AuthRequiredError } from "../lib/exit-codes";
-
-const client = HttpApiClient.make(ManagementApi);
-export type ApiClient = Effect.Effect.Success<typeof client>;
-
-export class ApiClientService extends Context.Tag("cli/ApiClient")<
-  ApiClientService,
-  {
-    readonly get: Effect.Effect<ApiClient, AuthRequiredError>;
-  }
->() {}
-
-export const apiClient: Effect.Effect<ApiClient, AuthRequiredError, ApiClientService> =
-  // eslint-disable-next-line unicorn/no-array-method-this-argument -- Effect.flatMap, not Array.prototype.flatMap; the second arg is a continuation, not a thisArg
-  Effect.flatMap(ApiClientService, ({ get }) => get);
-
-export const ApiClientLive = Layer.effect(
-  ApiClientService,
-  Effect.gen(function* () {
-    const clientService = yield* HttpClient.HttpClient;
-    const authStore = yield* AuthStore;
-    const configStore = yield* ConfigStore;
-
-    return {
-      get: Effect.gen(function* () {
-        const token = yield* authStore.getToken;
-        const baseUrl = yield* configStore.getBaseUrl;
-        return yield* HttpApiClient.make(ManagementApi, {
-          transformClient: HttpClient.mapRequest(HttpClientRequest.bearerToken(token)),
-          baseUrl,
-        }).pipe(Effect.provideService(HttpClient.HttpClient, clientService));
-      }),
-    };
-  }),
-);

package/src/services/apple-session-store.ts

@@ -1,100 +0,0 @@
-import path from "node:path";
-
-import { safeJsonParse } from "@better-update/safe-json";
-import { FileSystem } from "@effect/platform";
-import { Context, Effect, Layer } from "effect";
-
-import type { Auth } from "@expo/apple-utils";
-
-import { AppleAuthError } from "../lib/exit-codes";
-import { formatCause } from "../lib/format-error";
-import { isRecord } from "../lib/record";
-import { CliRuntime } from "./cli-runtime";
-
-// The cookies payload accepted by @expo/apple-utils Auth.loginWithCookiesAsync.
-// Derived structurally so we don't depend on the un-exported `CookiesJSON` alias.
-export type AppleSessionCookies = Parameters<typeof Auth.loginWithCookiesAsync>[0]["cookies"];
-
-export interface SerializedAppleSession {
-  readonly cookies: AppleSessionCookies;
-  readonly teamId: string;
-  readonly username: string;
-  readonly providerId?: number;
-}
-
-export class AppleSessionStore extends Context.Tag("cli/AppleSessionStore")<
-  AppleSessionStore,
-  {
-    readonly loadSession: Effect.Effect<SerializedAppleSession | null>;
-    readonly saveSession: (session: SerializedAppleSession) => Effect.Effect<void, AppleAuthError>;
-    readonly clearSession: Effect.Effect<void>;
-  }
->() {}
-
-export const AppleSessionStoreLive = Layer.effect(
-  AppleSessionStore,
-  Effect.gen(function* () {
-    const fs = yield* FileSystem.FileSystem;
-    const runtime = yield* CliRuntime;
-    const homeDirectory = yield* runtime.homeDirectory;
-    const sessionDir = path.join(homeDirectory, ".better-update");
-    const sessionFile = path.join(sessionDir, "apple-session.json");
-
-    return {
-      loadSession: Effect.gen(function* () {
-        const content = yield* fs
-          .readFileString(sessionFile)
-          .pipe(Effect.catchAll(() => Effect.succeed(null)));
-
-        if (!content) {
-          return null;
-        }
-
-        const parsed = safeJsonParse(content);
-        if (!isRecord(parsed)) {
-          return null;
-        }
-
-        if (
-          typeof parsed["teamId"] !== "string" ||
-          typeof parsed["username"] !== "string" ||
-          !parsed["cookies"]
-        ) {
-          return null;
-        }
-
-        const providerIdRaw = parsed["providerId"];
-        const hasProviderId = typeof providerIdRaw === "number" && Number.isInteger(providerIdRaw);
-
-        // eslint-disable-next-line typescript/no-unsafe-type-assertion, typescript/no-unsafe-assignment -- AppleSessionCookies is an opaque cookies payload from @expo/apple-utils; round-tripped verbatim from disk
-        const cookies = parsed["cookies"] as AppleSessionCookies;
-
-        const session: SerializedAppleSession = {
-          // eslint-disable-next-line typescript/no-unsafe-assignment -- see disable on the `cookies` declaration above; same opaque value
-          cookies,
-          teamId: parsed["teamId"],
-          username: parsed["username"],
-          ...(hasProviderId ? { providerId: providerIdRaw } : {}),
-        };
-        return session;
-      }),
-
-      saveSession: (session: SerializedAppleSession) =>
-        Effect.gen(function* () {
-          yield* fs.makeDirectory(sessionDir, { recursive: true });
-          yield* fs.chmod(sessionDir, 0o700);
-          yield* fs.writeFileString(sessionFile, `${JSON.stringify(session, null, 2)}\n`);
-          yield* fs.chmod(sessionFile, 0o600);
-        }).pipe(
-          Effect.mapError(
-            (cause) =>
-              new AppleAuthError({
-                message: `Failed to save Apple session: ${formatCause(cause)}`,
-              }),
-          ),
-        ),
-
-      clearSession: fs.remove(sessionFile).pipe(Effect.catchAll(() => Effect.void)),
-    };
-  }),
-);

package/src/services/auth-store.ts

@@ -1,85 +0,0 @@
-import path from "node:path";
-
-import { FileSystem } from "@effect/platform";
-import { Context, Effect, Layer } from "effect";
-
-import { AuthRequiredError } from "../lib/exit-codes";
-import { formatCause } from "../lib/format-error";
-import { isRecord } from "../lib/record";
-import { CliRuntime } from "./cli-runtime";
-
-export class AuthStore extends Context.Tag("cli/AuthStore")<
-  AuthStore,
-  {
-    readonly getToken: Effect.Effect<string, AuthRequiredError>;
-    readonly saveToken: (token: string) => Effect.Effect<void, AuthRequiredError>;
-    readonly clearToken: Effect.Effect<void>;
-  }
->() {}
-
-export const AuthStoreLive = Layer.effect(
-  AuthStore,
-  Effect.gen(function* () {
-    const fs = yield* FileSystem.FileSystem;
-    const runtime = yield* CliRuntime;
-    const homeDirectory = yield* runtime.homeDirectory;
-    const authDir = path.join(homeDirectory, ".better-update");
-    const authFile = path.join(authDir, "auth.json");
-
-    return {
-      getToken: Effect.gen(function* () {
-        const envToken = yield* runtime.getEnv("BETTER_UPDATE_TOKEN");
-        if (envToken) {
-          return envToken;
-        }
-
-        const content = yield* fs.readFileString(authFile).pipe(
-          Effect.mapError(
-            () =>
-              new AuthRequiredError({
-                message: "Not logged in. Run `better-update login` to authenticate.",
-              }),
-          ),
-        );
-
-        const parsed = yield* Effect.try({
-          try: (): unknown => JSON.parse(content),
-          catch: () =>
-            new AuthRequiredError({
-              message: "Corrupted auth file. Run `better-update login` to re-authenticate.",
-            }),
-        });
-        if (!isRecord(parsed)) {
-          return yield* new AuthRequiredError({
-            message: "Invalid auth file. Run `better-update login` to re-authenticate.",
-          });
-        }
-        const { token } = parsed;
-        if (typeof token !== "string") {
-          return yield* new AuthRequiredError({
-            message: "Invalid auth file. Run `better-update login` to re-authenticate.",
-          });
-        }
-
-        return token;
-      }),
-
-      saveToken: (token: string) =>
-        Effect.gen(function* () {
-          yield* fs.makeDirectory(authDir, { recursive: true });
-          yield* fs.chmod(authDir, 0o700);
-          yield* fs.writeFileString(authFile, `${JSON.stringify({ token }, null, 2)}\n`);
-          yield* fs.chmod(authFile, 0o600);
-        }).pipe(
-          Effect.mapError(
-            (cause) =>
-              new AuthRequiredError({
-                message: `Failed to save auth token: ${formatCause(cause)}`,
-              }),
-          ),
-        ),
-
-      clearToken: fs.remove(authFile).pipe(Effect.catchAll(() => Effect.void)),
-    };
-  }),
-);

package/src/services/cli-runtime.ts

@@ -1,46 +0,0 @@
-import process from "node:process";
-
-import { Context, Effect, Layer } from "effect";
-
-const definedEnvironment = (): Readonly<Record<string, string>> =>
-  Object.fromEntries(
-    Object.entries(process.env).flatMap(([key, value]) =>
-      typeof value === "string" ? [[key, value] as const] : [],
-    ),
-  );
-
-export class CliRuntime extends Context.Tag("cli/CliRuntime")<
-  CliRuntime,
-  {
-    readonly argv: readonly string[];
-    readonly platform: NodeJS.Platform;
-    readonly cwd: Effect.Effect<string>;
-    readonly getEnv: (name: string) => Effect.Effect<string | undefined>;
-    readonly homeDirectory: Effect.Effect<string>;
-    readonly userName: Effect.Effect<string>;
-    readonly commandEnvironment: (
-      overrides?: Readonly<Record<string, string>>,
-    ) => Effect.Effect<Readonly<Record<string, string>>>;
-    readonly setExitCode: (code: number) => Effect.Effect<void>;
-  }
->() {}
-
-export const CliRuntimeLive = Layer.succeed(CliRuntime, {
-  argv: [...process.argv],
-  platform: process.platform,
-  cwd: Effect.sync(() => process.cwd()),
-  getEnv: (name: string) => Effect.sync(() => process.env[name]),
-  homeDirectory: Effect.sync(
-    () => process.env["HOME"] ?? process.env["USERPROFILE"] ?? process.cwd(),
-  ),
-  userName: Effect.sync(() => process.env["USER"] ?? process.env["USERNAME"] ?? "better-update"),
-  commandEnvironment: (overrides = {}) =>
-    Effect.sync(() => ({
-      ...definedEnvironment(),
-      ...overrides,
-    })),
-  setExitCode: (code: number) =>
-    Effect.sync(() => {
-      process.exitCode = code;
-    }),
-});

package/src/services/config-store.ts

@@ -1,108 +0,0 @@
-import path from "node:path";
-
-import { FileSystem } from "@effect/platform";
-import { Context, Data, Effect, Layer } from "effect";
-
-import { isRecord } from "../lib/record";
-import { CliRuntime } from "./cli-runtime";
-
-const DEFAULT_BASE_URL = "https://api.better-update.dev";
-const DEFAULT_DASHBOARD_URL = "https://better-update.dev";
-
-class ConfigStoreParseError extends Data.TaggedError("ConfigStoreParseError")<{
-  readonly message: string;
-  readonly cause: unknown;
-}> {}
-
-const normalizeUrl = (value: string): string => value.replace(/\/$/, "");
-
-const deriveDashboardUrl = (serverUrl: string): string => {
-  const normalized = normalizeUrl(serverUrl);
-  if (!URL.canParse(normalized)) {
-    return DEFAULT_DASHBOARD_URL;
-  }
-
-  const url = new URL(normalized);
-
-  if (url.hostname.startsWith("api.")) {
-    url.hostname = url.hostname.slice(4);
-    return normalizeUrl(url.toString());
-  }
-
-  if (url.pathname === "/api") {
-    url.pathname = "/";
-    return normalizeUrl(url.toString());
-  }
-
-  return normalized;
-};
-
-export class ConfigStore extends Context.Tag("cli/ConfigStore")<
-  ConfigStore,
-  {
-    readonly getBaseUrl: Effect.Effect<string>;
-    readonly getDashboardUrl: Effect.Effect<string>;
-  }
->() {}
-
-export const ConfigStoreLive = Layer.effect(
-  ConfigStore,
-  Effect.gen(function* () {
-    const fs = yield* FileSystem.FileSystem;
-    const runtime = yield* CliRuntime;
-    const homeDirectory = yield* runtime.homeDirectory;
-    const configFile = path.join(homeDirectory, ".better-update", "config.json");
-    const readConfig = fs.readFileString(configFile).pipe(
-      Effect.catchAll(() => Effect.succeed("")),
-      Effect.flatMap((content) =>
-        content.length === 0
-          ? Effect.succeed(undefined)
-          : Effect.try({
-              try: (): unknown => JSON.parse(content),
-              catch: (cause) =>
-                new ConfigStoreParseError({
-                  message: "Config file contains invalid JSON",
-                  cause,
-                }),
-            }).pipe(
-              Effect.map((parsed) => (isRecord(parsed) ? parsed : undefined)),
-              Effect.catchAll(() => Effect.succeed(undefined)),
-            ),
-      ),
-    );
-    const resolveBaseUrl = Effect.gen(function* () {
-      const envUrl = yield* runtime.getEnv("BETTER_UPDATE_URL");
-      if (envUrl) {
-        return normalizeUrl(envUrl);
-      }
-
-      const parsed = yield* readConfig;
-      const serverUrl = parsed?.["serverUrl"];
-      if (typeof serverUrl === "string") {
-        return normalizeUrl(serverUrl);
-      }
-
-      return DEFAULT_BASE_URL;
-    });
-
-    return {
-      getBaseUrl: resolveBaseUrl,
-
-      getDashboardUrl: Effect.gen(function* () {
-        const envUrl = yield* runtime.getEnv("BETTER_UPDATE_DASHBOARD_URL");
-        if (envUrl) {
-          return normalizeUrl(envUrl);
-        }
-
-        const parsed = yield* readConfig;
-        const dashboardUrl = parsed?.["dashboardUrl"];
-        if (typeof dashboardUrl === "string") {
-          return normalizeUrl(dashboardUrl);
-        }
-
-        const serverUrl = yield* resolveBaseUrl;
-        return deriveDashboardUrl(serverUrl);
-      }),
-    };
-  }),
-);

package/src/services/presigned-upload.ts

@@ -1,84 +0,0 @@
-import { FileSystem, HttpClient, HttpClientRequest } from "@effect/platform";
-import { Context, Effect, Layer } from "effect";
-
-import { PresignedUrlExpiredError, UploadFailedError } from "../lib/exit-codes";
-
-const EXPIRY_SAFETY_MARGIN_MS = 30_000;
-
-export interface PutToPresignedUrlInput {
-  readonly url: string;
-  readonly filePath: string;
-  readonly byteSize: number;
-  readonly expiresAt: string;
-  readonly headers?: Record<string, string>;
-}
-
-export class PresignedUploadClient extends Context.Tag("cli/PresignedUploadClient")<
-  PresignedUploadClient,
-  {
-    readonly putToPresignedUrl: (
-      input: PutToPresignedUrlInput,
-    ) => Effect.Effect<void, PresignedUrlExpiredError | UploadFailedError>;
-  }
->() {}
-
-export const PresignedUploadClientLive = Layer.effect(
-  PresignedUploadClient,
-  Effect.gen(function* () {
-    const client = yield* HttpClient.HttpClient;
-    const fileSystem = yield* FileSystem.FileSystem;
-
-    return {
-      putToPresignedUrl: ({
-        url,
-        filePath,
-        byteSize,
-        expiresAt,
-        headers,
-      }: PutToPresignedUrlInput) =>
-        Effect.gen(function* () {
-          const now = Date.now();
-          const expiryMs = new Date(expiresAt).getTime();
-          if (Number.isNaN(expiryMs) || now > expiryMs - EXPIRY_SAFETY_MARGIN_MS) {
-            return yield* new PresignedUrlExpiredError({
-              message: `Presigned upload URL expired or too close to expiry (expiresAt=${expiresAt}).`,
-            });
-          }
-
-          const request = yield* HttpClientRequest.put(url).pipe(
-            HttpClientRequest.bodyFile(filePath),
-            Effect.provideService(FileSystem.FileSystem, fileSystem),
-            Effect.map(
-              HttpClientRequest.setHeaders({
-                "content-length": String(byteSize),
-                ...headers,
-              }),
-            ),
-            Effect.mapError(
-              (cause) =>
-                new UploadFailedError({
-                  message: `Failed to open artifact for upload: ${String(cause)}`,
-                }),
-            ),
-          );
-
-          const response = yield* client.execute(request).pipe(
-            Effect.mapError(
-              (cause) =>
-                new UploadFailedError({
-                  message: `HTTP request to presigned URL failed: ${String(cause)}`,
-                }),
-            ),
-          );
-
-          if (response.status < 200 || response.status >= 300) {
-            const body = yield* response.text.pipe(Effect.orElseSucceed(() => ""));
-            return yield* new UploadFailedError({
-              message: `Presigned URL upload failed with status ${response.status}: ${body}`,
-            });
-          }
-          return undefined;
-        }),
-    };
-  }),
-);

package/src/services/update-asset-uploader.ts

@@ -1,72 +0,0 @@
-import { Context, Effect, Layer } from "effect";
-
-import { UpdatePublishError } from "../lib/exit-codes";
-import { formatCause } from "../lib/format-error";
-import { ApiClientService } from "./api-client";
-import { PresignedUploadClient } from "./presigned-upload";
-
-export interface UploadUpdateAssetInput {
-  readonly path: string;
-  readonly hash: string;
-  readonly byteSize: number;
-  readonly uploadUrl: string;
-  readonly uploadExpiresAt: string;
-  readonly uploadHeaders: Record<string, string>;
-}
-
-export class UpdateAssetUploader extends Context.Tag("cli/UpdateAssetUploader")<
-  UpdateAssetUploader,
-  {
-    readonly uploadAssetBinary: (
-      input: UploadUpdateAssetInput,
-    ) => Effect.Effect<void, UpdatePublishError>;
-  }
->() {}
-
-export const UpdateAssetUploaderLive = Layer.effect(
-  UpdateAssetUploader,
-  Effect.gen(function* () {
-    const presignedUploadClient = yield* PresignedUploadClient;
-    const apiService = yield* ApiClientService;
-
-    return {
-      uploadAssetBinary: (asset: UploadUpdateAssetInput) =>
-        Effect.gen(function* () {
-          const api = yield* apiService.get.pipe(
-            Effect.mapError(
-              (cause) =>
-                new UpdatePublishError({
-                  message: `Asset upload requires authentication: ${formatCause(cause)}`,
-                }),
-            ),
-          );
-
-          yield* presignedUploadClient
-            .putToPresignedUrl({
-              url: asset.uploadUrl,
-              filePath: asset.path,
-              byteSize: asset.byteSize,
-              expiresAt: asset.uploadExpiresAt,
-              headers: asset.uploadHeaders,
-            })
-            .pipe(
-              Effect.mapError(
-                (cause) =>
-                  new UpdatePublishError({
-                    message: `Asset upload failed for ${asset.hash}: ${formatCause(cause)}`,
-                  }),
-              ),
-            );
-
-          yield* api.assets.finalize({ path: { hash: asset.hash } }).pipe(
-            Effect.mapError(
-              (cause) =>
-                new UpdatePublishError({
-                  message: `Asset finalize failed for ${asset.hash}: ${formatCause(cause)}`,
-                }),
-            ),
-          );
-        }),
-    };
-  }),
-);

package/src/types/keychain.d.ts

@@ -1,22 +0,0 @@
-export type KeychainModuleMarker = never;
-
-declare module "keychain" {
-  interface KeychainOptions {
-    account: string;
-    service: string;
-    type?: string;
-  }
-
-  interface SetPasswordOptions extends KeychainOptions {
-    password: string;
-  }
-
-  interface KeychainAccess {
-    getPassword(opts: KeychainOptions, cb: (err: Error | null, password?: string) => void): void;
-    setPassword(opts: SetPasswordOptions, cb: (err: Error | null) => void): void;
-    deletePassword(opts: KeychainOptions, cb: (err: Error | null) => void): void;
-  }
-
-  const keychain: KeychainAccess;
-  export default keychain;
-}