@better-update/cli 0.47.1 → 0.47.3

package/dist/index.mjs

@@ -9,7 +9,7 @@ import path from "node:path";
 import process$1 from "node:process";
 import AppleUtils from "@expo/apple-utils";
 import { autocomplete, cancel, confirm, isCancel, multiselect, password, select, text } from "@clack/prompts";
-import { open, readFile, writeFile } from "node:fs/promises";
+import { mkdtemp, open, readFile, rm, writeFile } from "node:fs/promises";
 import { X509Certificate, createHash, createSign, createVerify, randomBytes, randomUUID } from "node:crypto";
 import { accessSync, chmodSync, constants, createReadStream, promises } from "node:fs";
 import { Entry } from "@napi-rs/keyring";
@@ -35,7 +35,7 @@ var __require = /* #__PURE__ */ (() => createRequire(import.meta.url))();
 
 //#endregion
 //#region package.json
-var version = "0.47.1";
+var version = "0.47.3";
 
 //#endregion
 //#region src/lib/interactive-mode.ts
@@ -3466,7 +3466,9 @@ const promptText = (message, options) => Effect.gen(function* () {
 	return handleCancel(yield* Effect.promise(async () => text(compact({
 		message,
 		placeholder: options?.placeholder,
-		defaultValue: options?.defaultValue
+		defaultValue: options?.defaultValue,
+		initialValue: options?.initialValue,
+		validate: options?.validate
 	}))));
 });
 const promptConfirm = (message, options) => Effect.gen(function* () {
@@ -21541,9 +21543,16 @@ const ExecErrorSchema = Schema.Struct({
 	stdout: Schema.optional(Schema.String),
 	stderr: Schema.optional(Schema.String)
 });
-const runAltool = (args) => Effect.tryPromise({
+const runAltool = (args, extraEnv) => Effect.tryPromise({
 	try: async () => {
-		const { stdout, stderr } = await execFileAsync("xcrun", ["altool", ...args]);
+		const options = extraEnv ? {
+			encoding: "utf8",
+			env: {
+				...process.env,
+				...extraEnv
+			}
+		} : { encoding: "utf8" };
+		const { stdout, stderr } = await execFileAsync("xcrun", ["altool", ...args], options);
 		return {
 			exitCode: 0,
 			stdout,
@@ -21693,11 +21702,23 @@ const resolveAscUploadCredentials = (params) => Effect.gen(function* () {
 		p8Pem: creds.p8Pem
 	})), Effect.catchAll((error) => printHuman(`Could not prepare ASC API key ${credsKeyId} (${messageOf(error)}).`).pipe(Effect.as(null))));
 });
-/** `altool` reads the API key from `--apiKeyDir`; write the decrypted `.p8` there. */
-const writeP8ForAltool = (credentials) => Effect.gen(function* () {
-	const target = path.join(tmpdir(), `better-update-submit-AuthKey_${credentials.keyId}.p8`);
-	yield* Effect.promise(async () => writeFile(target, credentials.p8Pem, "utf8"));
-	return target;
+/**
+* `altool --apiKey <id>` searches for a file named *exactly* `AuthKey_<id>.p8` in
+* the standard `private_keys` dirs plus `$API_PRIVATE_KEYS_DIR`. Write the decrypted
+* `.p8` under that exact name into a fresh private temp dir and return the dir so the
+* caller can point `API_PRIVATE_KEYS_DIR` at it (and remove it afterward — it holds
+* the unencrypted signing key).
+*/
+const writeP8KeyDir = (credentials) => Effect.promise(async () => {
+	const dir = await mkdtemp(path.join(tmpdir(), "better-update-asc-"));
+	await writeFile(path.join(dir, `AuthKey_${credentials.keyId}.p8`), credentials.p8Pem, "utf8");
+	return dir;
+});
+const removeKeyDir = (dir) => Effect.promise(async () => {
+	await rm(dir, {
+		recursive: true,
+		force: true
+	});
 });
 const baseAltoolArgs = (ipaPath) => [
 	"--upload-app",
@@ -21722,15 +21743,12 @@ const buildAltoolArgs = (params) => Effect.gen(function* () {
 		code: "SUBMISSION_ASC_KEY_FETCH_FAILED",
 		message: "ASC API key is required for an asc-api-key upload but was not resolved."
 	});
-	const p8Path = yield* writeP8ForAltool(params.ascCredentials);
 	return [
 		...baseAltoolArgs(params.ipaPath),
 		"--apiKey",
 		params.ascCredentials.keyId,
 		"--apiIssuer",
-		params.ascCredentials.issuerId,
-		"--apiKeyDir",
-		path.dirname(p8Path)
+		params.ascCredentials.issuerId
 	];
 });
 const runIosSubmit = (inputs) => Effect.gen(function* () {
@@ -21756,7 +21774,7 @@ const runIosSubmit = (inputs) => Effect.gen(function* () {
 		ipaPath
 	});
 	yield* patchSubmissionStatus(inputs.api, inputs.submissionId, { status: "IN_PROGRESS" });
-	const result = yield* runAltool(altoolArgs);
+	const result = inputs.auth.kind === "asc-api-key" && ascCredentials !== null ? yield* Effect.acquireUseRelease(writeP8KeyDir(ascCredentials), (keyDir) => runAltool(altoolArgs, { API_PRIVATE_KEYS_DIR: keyDir }), (keyDir) => removeKeyDir(keyDir)) : yield* runAltool(altoolArgs);
 	if (result.exitCode !== 0) {
 		yield* patchSubmissionStatus(inputs.api, inputs.submissionId, {
 			status: "ERRORED",
@@ -35046,21 +35064,34 @@ const createApp = (cookieCtx, name, companyName, input) => wrapConnect("apple-cr
 	});
 }));
 /**
-* Best-effort App Store name default. EAS-style: fall back to the Expo config's
-* `name` (app.json `expo.name`) so a never-empty default reaches `App.createAsync`
-* — Apple's iris API 500s on a blank name. Returns `undefined` for non-Expo
-* projects (no `@expo/config`) so the caller drops to a bundle-id placeholder.
+* Best-effort App Store name default to pre-fill the prompt with. Prefers the
+* Expo config's `name` (app.json `expo.name`), then the passed-in fallback (the
+* better-update project name) so non-Expo projects — which have no `@expo/config`
+* — still get a sensible default. Returns `undefined` when neither is available.
 */
-const resolveDefaultAppName = (projectRoot) => readExpoConfig(projectRoot).pipe(Effect.map((config) => config.name?.trim() ? config.name.trim() : void 0), Effect.orElseSucceed(() => void 0));
+const resolveDefaultAppName = (input) => readExpoConfig(input.projectRoot).pipe(Effect.map((config) => config.name?.trim() ? config.name.trim() : void 0), Effect.orElseSucceed(() => void 0), Effect.map((expoName) => {
+	const fallback = input.defaultAppName?.trim();
+	return expoName ?? (fallback || void 0);
+}));
+/** Reject a blank app name so the prompt re-asks instead of 500'ing `App.createAsync`. */
+const requireNonEmptyName = (value) => value?.trim() ? void 0 : "An app name is required.";
 /**
-* The App Store name to create the app under. A configured `appName` wins; else
-* prompt, pre-filled with app.json `expo.name` so an empty Enter still names the
-* app. Trimmed so a blank value is caught before reaching `App.createAsync`.
+* The App Store name to create the app under. A non-empty configured `appName`
+* wins; else prompt — pre-filled with the resolved default (Expo `expo.name` or
+* the better-update project name) and *required*, so an empty Enter re-asks
+* rather than reaching `App.createAsync` with a blank name (which Apple 500s).
 */
 const resolveAppName = (input) => Effect.gen(function* () {
-	if (input.appName !== void 0) return input.appName.trim();
-	const defaultName = yield* resolveDefaultAppName(input.projectRoot);
-	return (yield* promptText("App name (as shown on the App Store)", defaultName === void 0 ? { placeholder: input.bundleIdentifier } : { defaultValue: defaultName })).trim();
+	const configured = input.appName?.trim();
+	if (configured) return configured;
+	const defaultName = yield* resolveDefaultAppName(input);
+	return (yield* promptText("App name (as shown on the App Store)", defaultName === void 0 ? {
+		placeholder: input.bundleIdentifier,
+		validate: requireNonEmptyName
+	} : {
+		initialValue: defaultName,
+		validate: requireNonEmptyName
+	})).trim();
 });
 const ensureAscAppForSubmit = (input) => Effect.gen(function* () {
 	const ctx = buildTokenRequestContext(input.credentials);
@@ -35269,16 +35300,20 @@ const submitIosBranch = (params) => Effect.gen(function* () {
 		return false;
 	}
 	let resolvedAscAppId = iosProfile?.ascAppId;
-	if (wantsConfig && resolvedAscAppId === void 0 && ascCredentials !== null) resolvedAscAppId = toOptional(yield* ensureAscAppForSubmit({
-		credentials: ascCredentials,
-		projectRoot: params.projectRoot,
-		profileName: params.profile,
-		bundleIdentifier: iosConfig.bundleIdentifier,
-		appName: iosProfile?.appName,
-		sku: iosProfile?.sku,
-		companyName: iosProfile?.companyName,
-		primaryLocale: iosProfile?.language
-	}));
+	if (wantsConfig && resolvedAscAppId === void 0 && ascCredentials !== null) {
+		const defaultAppName = yield* api.projects.get({ path: { id: params.projectId } }).pipe(Effect.map((project) => project.name), Effect.orElseSucceed(() => void 0));
+		resolvedAscAppId = toOptional(yield* ensureAscAppForSubmit({
+			credentials: ascCredentials,
+			projectRoot: params.projectRoot,
+			profileName: params.profile,
+			bundleIdentifier: iosConfig.bundleIdentifier,
+			appName: iosProfile?.appName,
+			defaultAppName,
+			sku: iosProfile?.sku,
+			companyName: iosProfile?.companyName,
+			primaryLocale: iosProfile?.language
+		}));
+	}
 	yield* printHuman(auth.kind === "app-specific-password" ? "Running xcrun altool upload (Apple ID app-specific password)..." : "Running xcrun altool upload (ASC API key)...");
 	yield* runIosSubmit({
 		api,
@@ -35318,6 +35353,7 @@ const runFlow = (api, projectId, args) => Effect.gen(function* () {
 	if (args.platform === "ios" && iosConfig !== void 0) {
 		if (!(yield* submitIosBranch({
 			api,
+			projectId,
 			submissionId: submission.id,
 			projectRoot: args.projectRoot,
 			profile: args.profile,