alepha 0.20.1 → 0.20.3

package/dist/cli/platform/index.js

@@ -69,7 +69,7 @@ const cloudflareKVSchema = t.object({
 });
 const cloudflareR2Schema = t.object({
 	name: t.string(),
-	creation_date: t.string()
+	creation_date: t.optional(t.string())
 });
 const cloudflareR2ListSchema = t.object({ buckets: t.array(cloudflareR2Schema) });
 const cloudflareQueueSchema = t.object({
@@ -77,8 +77,9 @@ const cloudflareQueueSchema = t.object({
 	queue_name: t.string()
 });
 const cloudflareQueueConsumerSchema = t.object({
+	consumer_id: t.string(),
 	service: t.string(),
-	environment: t.string()
+	environment: t.optional(t.string())
 });
 const cloudflareHyperdriveOriginSchema = t.object({ host: t.string() });
 const cloudflareHyperdriveSchema = t.object({
@@ -225,12 +226,6 @@ var WranglerApi = class {
 			env: { CI: "1" }
 		});
 	}
-	/**
-	* Push secrets in bulk to a worker.
-	*/
-	async secretBulk(secretsPath, workerName) {
-		await this.runShell(`wrangler secret bulk ${secretsPath} --name=${workerName}`, { resolve: true });
-	}
 };
 //#endregion
 //#region ../../src/cli/platform/services/CloudflareApi.ts
@@ -260,6 +255,15 @@ var CloudflareApi = class CloudflareApi {
 		this.jurisdiction = jurisdiction;
 	}
 	/**
+	* Override the Cloudflare account ID (from platform config).
+	*
+	* When unset, `resolveAccountId` falls back to `CLOUDFLARE_ACCOUNT_ID` env
+	* var or the token's single account.
+	*/
+	setAccountId(accountId) {
+		this.accountId = accountId;
+	}
+	/**
 	* Obtain the current auth token from wrangler.
 	*/
 	async resolveToken() {
@@ -274,24 +278,32 @@ var CloudflareApi = class CloudflareApi {
 	*/
 	async resolveAccountId() {
 		if (this.accountId) return this.accountId;
+		const fromEnv = process.env.CLOUDFLARE_ACCOUNT_ID;
+		if (fromEnv) {
+			this.accountId = fromEnv;
+			return this.accountId;
+		}
 		const res = await this.fetch("/accounts", { schema: t.array(cloudflareAccountSchema) });
 		if (res.length === 0) throw new AlephaError("No Cloudflare accounts found for this token.");
+		if (res.length > 1) {
+			const list = res.map((a) => `  - ${a.id}  ${a.name}`).join("\n");
+			throw new AlephaError(`Cloudflare token has access to ${res.length} accounts; set \`CLOUDFLARE_ACCOUNT_ID\` or the \`accountId\` field in your platform config to pick one:\n${list}`);
+		}
 		this.accountId = res[0].id;
 		return this.accountId;
 	}
 	async listD1() {
 		const accountId = await this.resolveAccountId();
-		return await this.fetch(`/accounts/${accountId}/d1/database`, { schema: t.array(cloudflareD1Schema) });
+		return await this.paginate(`/accounts/${accountId}/d1/database`, cloudflareD1Schema);
 	}
 	async createD1(name, location = "weur") {
 		const accountId = await this.resolveAccountId();
+		const body = { name };
+		if (this.jurisdiction) body.jurisdiction = this.jurisdiction;
+		else body.primary_location_hint = location;
 		return await this.fetch(`/accounts/${accountId}/d1/database`, {
 			method: "POST",
-			body: {
-				name,
-				primary_location_hint: location,
-				...this.jurisdiction ? { jurisdiction: this.jurisdiction } : {}
-			},
+			body,
 			bodySchema: createD1BodySchema,
 			schema: cloudflareD1Schema
 		});
@@ -302,7 +314,7 @@ var CloudflareApi = class CloudflareApi {
 	}
 	async listKV() {
 		const accountId = await this.resolveAccountId();
-		return await this.fetch(`/accounts/${accountId}/storage/kv/namespaces`, { schema: t.array(cloudflareKVSchema) });
+		return await this.paginate(`/accounts/${accountId}/storage/kv/namespaces`, cloudflareKVSchema, 100);
 	}
 	async createKV(title) {
 		const accountId = await this.resolveAccountId();
@@ -319,7 +331,7 @@ var CloudflareApi = class CloudflareApi {
 	}
 	async listR2() {
 		const accountId = await this.resolveAccountId();
-		return (await this.fetch(`/accounts/${accountId}/r2/buckets`, { schema: cloudflareR2ListSchema })).buckets;
+		return await this.paginateCursor(`/accounts/${accountId}/r2/buckets`, "buckets", cloudflareR2Schema);
 	}
 	async createR2(name) {
 		const accountId = await this.resolveAccountId();
@@ -335,7 +347,7 @@ var CloudflareApi = class CloudflareApi {
 	}
 	async listQueues() {
 		const accountId = await this.resolveAccountId();
-		return await this.fetch(`/accounts/${accountId}/queues`, { schema: t.array(cloudflareQueueSchema) });
+		return await this.paginate(`/accounts/${accountId}/queues`, cloudflareQueueSchema);
 	}
 	async createQueue(name) {
 		const accountId = await this.resolveAccountId();
@@ -352,15 +364,17 @@ var CloudflareApi = class CloudflareApi {
 	}
 	async listQueueConsumers(queueId) {
 		const accountId = await this.resolveAccountId();
-		return await this.fetch(`/accounts/${accountId}/queues/${queueId}/consumers`, { schema: t.array(cloudflareQueueConsumerSchema) });
+		return await this.paginate(`/accounts/${accountId}/queues/${queueId}/consumers`, cloudflareQueueConsumerSchema);
 	}
 	async deleteQueueConsumer(queueId, consumerService) {
 		const accountId = await this.resolveAccountId();
-		await this.fetch(`/accounts/${accountId}/queues/${queueId}/consumers/${consumerService}`, { method: "DELETE" });
+		const consumer = (await this.listQueueConsumers(queueId)).find((c) => c.service === consumerService);
+		if (!consumer) return;
+		await this.fetch(`/accounts/${accountId}/queues/${queueId}/consumers/${consumer.consumer_id}`, { method: "DELETE" });
 	}
 	async listHyperdrive() {
 		const accountId = await this.resolveAccountId();
-		return await this.fetch(`/accounts/${accountId}/hyperdrive/configs`, { schema: t.array(cloudflareHyperdriveSchema) });
+		return await this.paginate(`/accounts/${accountId}/hyperdrive/configs`, cloudflareHyperdriveSchema);
 	}
 	async createHyperdrive(name, connectionString) {
 		const accountId = await this.resolveAccountId();
@@ -395,11 +409,14 @@ var CloudflareApi = class CloudflareApi {
 	}
 	async listDeployments(scriptName) {
 		const accountId = await this.resolveAccountId();
-		return (await this.fetch(`/accounts/${accountId}/workers/scripts/${scriptName}/deployments`, { schema: cloudflareDeploymentListSchema })).deployments;
+		return (await this.fetch(`/accounts/${accountId}/workers/scripts/${scriptName}/deployments`, {
+			schema: cloudflareDeploymentListSchema,
+			query: { per_page: "100" }
+		})).deployments;
 	}
 	async listVersions(scriptName) {
 		const accountId = await this.resolveAccountId();
-		return (await this.fetch(`/accounts/${accountId}/workers/scripts/${scriptName}/versions`, { schema: cloudflareVersionListSchema })).items;
+		return await this.paginateCursor(`/accounts/${accountId}/workers/scripts/${scriptName}/versions`, "items", cloudflareVersionSchema);
 	}
 	async listSecrets(scriptName) {
 		const accountId = await this.resolveAccountId();
@@ -442,6 +459,55 @@ var CloudflareApi = class CloudflareApi {
 		return json.result;
 	}
 	/**
+	* Paginate a page-based list endpoint (`result_info.total_pages`).
+	*
+	* Cloudflare defaults to `per_page=20`; we push it to 1000 (max on most
+	* list endpoints) and loop if more pages exist. Each page is validated
+	* against the item schema.
+	*/
+	async paginate(path, itemSchema, perPage = 1e3) {
+		const results = [];
+		let page = 1;
+		while (true) {
+			const token = await this.resolveToken();
+			const url = `${CloudflareApi.BASE}${path}?per_page=${perPage}&page=${page}`;
+			const headers = { Authorization: `Bearer ${token}` };
+			if (this.jurisdiction && /\/r2\//.test(path)) headers["cf-r2-jurisdiction"] = this.jurisdiction;
+			const json = await (await globalThis.fetch(url, {
+				method: "GET",
+				headers
+			})).json();
+			if (!json.success) throw new AlephaError(`Cloudflare API error (GET ${path}): ${json.errors.map((e) => e.message).join(", ")}`);
+			const validated = this.alepha.codec.validate(t.array(itemSchema), json.result);
+			results.push(...validated);
+			const totalPages = json.result_info?.total_pages;
+			if (!totalPages || page >= totalPages || validated.length === 0) break;
+			page++;
+		}
+		return results;
+	}
+	/**
+	* Paginate a cursor-based list endpoint where `result` is an object
+	* containing both the items array and a `cursor` field (R2 buckets,
+	* Workers versions). Returns the flattened item array.
+	*/
+	async paginateCursor(path, itemsKey, itemSchema, perPage = 1e3) {
+		const results = [];
+		let cursor;
+		while (true) {
+			const query = { per_page: String(perPage) };
+			if (cursor) query.cursor = cursor;
+			const res = await this.fetch(path, { query });
+			const items = res[itemsKey] ?? [];
+			const validated = this.alepha.codec.validate(t.array(itemSchema), items);
+			results.push(...validated);
+			const nextCursor = res.cursor;
+			if (!nextCursor || validated.length === 0) break;
+			cursor = nextCursor;
+		}
+		return results;
+	}
+	/**
 	* Parse a postgres:// connection string into Hyperdrive origin fields.
 	*/
 	parseConnectionString(connectionString) {
@@ -496,7 +562,6 @@ var CloudflareAdapter = class CloudflareAdapter extends PlatformAdapter {
 	log = $logger();
 	fs = $inject(FileSystemProvider);
 	shell = $inject(ShellProvider);
-	utils = $inject(AlephaCliUtils);
 	cache = $inject(PlatformCacheProvider);
 	alepha = $inject(Alepha);
 	envUtils = $inject(EnvUtils);
@@ -524,6 +589,7 @@ var CloudflareAdapter = class CloudflareAdapter extends PlatformAdapter {
 	*/
 	configureApi(ctx) {
 		this.api.setJurisdiction(ctx.envConfig.jurisdiction);
+		this.api.setAccountId(ctx.envConfig.accountId);
 	}
 	async runShell(command, options = {}) {
 		const capture = options.capture;
@@ -634,8 +700,7 @@ var CloudflareAdapter = class CloudflareAdapter extends PlatformAdapter {
 			await run({
 				name: `push secrets to ${workerName}`,
 				handler: async () => {
-					const secretsPath = await this.utils.writeConfigFile("secrets.json", JSON.stringify(secrets), ctx.root);
-					await this.wrangler.secretBulk(secretsPath, workerName);
+					for (const [name, value] of Object.entries(secrets)) await this.api.putSecret(workerName, name, value);
 				}
 			});
 		}
@@ -1000,7 +1065,7 @@ var CloudflareAdapter = class CloudflareAdapter extends PlatformAdapter {
 	* Get the currently active deployment for a worker.
 	*/
 	async getActiveDeployment(workerName) {
-		const latest = (await this.api.listDeployments(workerName)).at(-1);
+		const latest = [...await this.api.listDeployments(workerName)].sort((a, b) => b.created_on.localeCompare(a.created_on))[0];
 		if (!latest?.versions?.[0]) return;
 		const activeVersionId = latest.versions[0].version_id;
 		const version = (await this.api.listVersions(workerName)).find((v) => v.id === activeVersionId);
@@ -1462,17 +1527,65 @@ const platformOptions = $atom({
 	name: "alepha.cli.platform.options",
 	description: "Platform deployment configuration",
 	schema: t.optional(t.object({
+		/**
+		* Project name override. Defaults to root package.json "name".
+		*/
 		name: t.optional(t.text()),
+		/**
+		* Monorepo app paths relative to root. Omit for standalone apps.
+		*/
 		apps: t.optional(t.array(t.text())),
+		/**
+		* Default environment when --env is omitted.
+		*
+		* @default "production"
+		*/
 		default: t.optional(t.text()),
+		/**
+		* Secret store configuration for syncing .env secrets
+		* to external providers (e.g. GitHub Actions environments).
+		*/
 		secrets: t.optional(t.object({
+			/**
+			* Secret store backend.
+			*/
 			store: t.enum(["github"]),
+			/**
+			* Pattern for resolving environment names in the store.
+			* Placeholders: {project}, {env}.
+			*
+			* @default "{project}-{env}"
+			*/
 			environmentPattern: t.optional(t.text())
 		})),
+		/**
+		* Named environments with their adapter and configuration.
+		*/
 		environments: t.record(t.text({ description: "Environment name (e.g. 'production', 'staging', 'preview'). Used in resource naming and selected via --env." }), t.object({
 			adapter: t.enum(["cloudflare", "vercel"]),
+			/**
+			* Custom domain for the deployed worker (e.g. "api.example.com").
+			*
+			* On Cloudflare this is attached as a custom-domain route.
+			* Omit to use the adapter's default `*.workers.dev` / preview URL.
+			*/
 			domain: t.optional(t.text()),
-			jurisdiction: t.optional(t.enum(["eu", "fedramp"]))
+			/**
+			* Cloudflare data jurisdiction for R2 buckets and D1 databases.
+			* - "eu": data stays within the EU
+			* - "fedramp": FedRAMP-authorized regions
+			*
+			* Omit for the default (global) jurisdiction.
+			*/
+			jurisdiction: t.optional(t.enum(["eu", "fedramp"])),
+			/**
+			* Cloudflare account ID to deploy into.
+			*
+			* Falls back to `CLOUDFLARE_ACCOUNT_ID` env var, then to the
+			* token's account when the token is scoped to exactly one.
+			* Required when the token has access to multiple accounts.
+			*/
+			accountId: t.optional(t.text())
 		}))
 	}))
 });