alchemy 0.76.0 → 0.77.0

package/bin/alchemy.js

@@ -36534,32 +36534,75 @@ var Lock = class {
 
 //#endregion
 //#region src/encrypt.ts
+const KEY_LEN = 32;
+const SCRYPT_N = 16384;
+const SCRYPT_R = 8;
+const SCRYPT_P = 1;
+const SALT_LEN = 16;
+const IV_LEN = 12;
+const ALGO = "aes-256-gcm";
 /**
-* Encrypt a value with a symmetric key using libsodium
-*
-* @param value - The value to encrypt
-* @param key - The encryption key
-* @returns The base64-encoded encrypted value with nonce
+* Decrypts a value encrypted with a symmetric key.
+* For backwards compatibility, uses the legacy libsodium implementation if the value is a string.
+* Otherwise, uses the AES-256-GCM implementation with scrypt key derivation.
 */
-async function encrypt(value, key) {
-	const sodium = (await import("libsodium-wrappers")).default;
-	await sodium.ready;
-	const cryptoKey = sodium.crypto_generichash(sodium.crypto_secretbox_KEYBYTES, sodium.from_string(key));
-	const nonce = sodium.randombytes_buf(sodium.crypto_secretbox_NONCEBYTES);
-	const encryptedBin = sodium.crypto_secretbox_easy(sodium.from_string(value), nonce, cryptoKey);
-	const combined = new Uint8Array(nonce.length + encryptedBin.length);
-	combined.set(nonce);
-	combined.set(encryptedBin, nonce.length);
-	return sodium.to_base64(combined, sodium.base64_variants.ORIGINAL);
+function decryptWithKey(value, key) {
+	if (typeof value === "string") return libsodiumDecrypt(value, key);
+	return aes256Decrypt(value, key);
+}
+/**
+* Encrypt a value with a symmetric key using AES-256-GCM with scrypt key derivation.
+*/
+async function encrypt(value, passphrase) {
+	const salt = crypto$1.randomBytes(SALT_LEN);
+	const key = await deriveScryptKey(passphrase, salt);
+	const iv = crypto$1.randomBytes(IV_LEN);
+	const cipher = crypto$1.createCipheriv(ALGO, key, iv);
+	const ciphertext = Buffer.concat([cipher.update(value, "utf8"), cipher.final()]);
+	const tag = cipher.getAuthTag();
+	return {
+		version: "v1",
+		ciphertext: ciphertext.toString("base64"),
+		iv: iv.toString("base64"),
+		salt: salt.toString("base64"),
+		tag: tag.toString("base64")
+	};
 }
 /**
-* Decrypt a value encrypted with a symmetric key
+* Decrypt a value encrypted with a symmetric key using AES-256-GCM with scrypt key derivation.
+* @internal - Exposed for testing. Use `decryptWithKey` instead.
+*/
+async function aes256Decrypt(parts, passphrase) {
+	const salt = Buffer.from(parts.salt, "base64");
+	const iv = Buffer.from(parts.iv, "base64");
+	const ciphertext = Buffer.from(parts.ciphertext, "base64");
+	const tag = Buffer.from(parts.tag, "base64");
+	const key = await deriveScryptKey(passphrase, salt);
+	const decipher = crypto$1.createDecipheriv(ALGO, key, iv);
+	decipher.setAuthTag(tag);
+	return Buffer.concat([decipher.update(ciphertext), decipher.final()]).toString("utf8");
+}
+async function deriveScryptKey(passphrase, salt) {
+	return new Promise((resolve$1, reject) => {
+		crypto$1.scrypt(passphrase, salt, KEY_LEN, {
+			N: SCRYPT_N,
+			r: SCRYPT_R,
+			p: SCRYPT_P
+		}, (err, derivedKey) => {
+			if (err) reject(err);
+			else resolve$1(derivedKey);
+		});
+	});
+}
+/**
+* Decrypt a value encrypted with a symmetric key using libsodium.
+* @internal - Exposed to test backwards compatibility. Use `decryptWithKey` instead.
 *
 * @param encryptedValue - The base64-encoded encrypted value with nonce
 * @param key - The decryption key
 * @returns The decrypted string
 */
-async function decryptWithKey(encryptedValue, key) {
+async function libsodiumDecrypt(encryptedValue, key) {
 	const sodium = (await import("libsodium-wrappers")).default;
 	await sodium.ready;
 	const cryptoKey = sodium.crypto_generichash(sodium.crypto_secretbox_KEYBYTES, sodium.from_string(key));
@@ -36605,7 +36648,7 @@ async function deserialize(scope, value, options) {
 	if (value && typeof value === "object") {
 		if (value["@secret"]) {
 			if (!scope.password) throw new Error("Cannot deserialize secret without password, did you forget to set password when initializing your alchemy app?\nSee: https://alchemy.run/concepts/secret/#encryption-password");
-			if (typeof value["@secret"] === "object") return new Secret(JSON.parse(await decryptWithKey(value["@secret"].data, scope.password)));
+			if (typeof value["@secret"] === "object" && "data" in value["@secret"]) return new Secret(JSON.parse(await decryptWithKey(value["@secret"].data, scope.password)));
 			return new Secret(await decryptWithKey(value["@secret"], scope.password));
 		} else if ("@schema" in value) return value["@schema"];
 		else if ("@date" in value) return new Date(value["@date"]);
@@ -36780,7 +36823,7 @@ function envPaths(name$1, { suffix = "nodejs" } = {}) {
 //#endregion
 //#region package.json
 var name = "alchemy";
-var version = "0.76.0";
+var version = "0.77.0";
 var license = "Apache-2.0";
 var author = "Sam Goodwin <sam@alchemy.run>";
 var homepage = "https://alchemy.run";
@@ -36793,13 +36836,11 @@ var type = "module";
 var module$1 = "./lib/index.js";
 var bin = { "alchemy": "bin/alchemy.js" };
 var scripts = {
-	"build:cli": "tsdown",
-	"dev:cli": "tsdown --watch",
-	"build:workers": "bun ./scripts/build-workers.ts",
-	"build": "rm -rf ./*.tsbuildinfo && rm -rf ./lib && tsc -b && bun run build:cli && bun run build:workers",
+	"build": "rm -rf ./*.tsbuildinfo && rm -rf ./lib && tsc -b && tsdown",
+	"dev": "tsdown --watch",
 	"drizzle:generate": "bun run scripts/drizzle-generate.ts",
 	"postbuild": "cpx 'src/**/*/types.d.ts' lib && cpx 'src/**/*.txt' lib",
-	"publish:npm": "cp ../README.md . && bun run build && bun run build:cli && bun publish && rm README.md"
+	"publish:npm": "cp ../README.md . && bun run build && tsdown && bun publish && rm README.md"
 };
 var files = [
 	"bin",
@@ -36830,6 +36871,10 @@ var exports$1 = {
 		"bun": "./src/aws/index.ts",
 		"import": "./lib/aws/index.js"
 	},
+	"./aws/ec2": {
+		"bun": "./src/aws/ec2/index.ts",
+		"import": "./lib/aws/ec2/index.js"
+	},
 	"./aws/control": {
 		"bun": "./src/aws/control/index.ts",
 		"import": "./lib/aws/control/index.js"
@@ -36950,7 +36995,7 @@ var exports$1 = {
 };
 var dependencies = {
 	"@aws-sdk/credential-providers": "^3.0.0",
-	"@cloudflare/unenv-preset": "^2.6.3",
+	"@cloudflare/unenv-preset": "2.7.7",
 	"@cloudflare/workers-types": "catalog:",
 	"@iarna/toml": "^2.2.5",
 	"@octokit/rest": "^21.1.1",
@@ -36974,7 +37019,7 @@ var dependencies = {
 	"picocolors": "^1.1.1",
 	"proper-lockfile": "^4.1.2",
 	"signal-exit": "^4.1.0",
-	"unenv": "2.0.0-rc.19",
+	"unenv": "2.0.0-rc.21",
 	"ws": "^8.18.3",
 	"yaml": "^2.0.0"
 };
@@ -36989,7 +37034,7 @@ var peerDependencies = {
 	"@aws-sdk/client-sqs": "^3.0.0",
 	"@aws-sdk/client-ssm": "^3.0.0",
 	"@aws-sdk/client-sts": "^3.0.0",
-	"@cloudflare/vite-plugin": "^1.10.1",
+	"@cloudflare/vite-plugin": "catalog:",
 	"@libsql/client": "^0.15.12",
 	"@opennextjs/cloudflare": "^1.6.5",
 	"astro": "^5.13.2",
@@ -37339,11 +37384,13 @@ async function fetchNoResponse(url$2, options = {}) {
 		port: parsedUrl.port || (isHttps ? 443 : 80),
 		path: parsedUrl.pathname + parsedUrl.search,
 		method: options.method || "GET",
-		headers
+		headers,
+		signal: AbortSignal.timeout(options?.timeout ?? 3e3)
 	};
 	await new Promise((resolve$1, reject) => {
 		const req = client.request(requestOptions);
 		req.on("error", (error$84) => {
+			if (error$84.name === "AbortError" && !SUPPRESS_TELEMETRY_ERRORS) logger.warn("Telemetry request timed out");
 			reject(error$84);
 		});
 		if (body) req.write(body);
@@ -37875,6 +37922,30 @@ var Scope = class Scope {
 		this.onCleanup(result.stop);
 		return result.extracted;
 	}
+	async exec(id, command) {
+		const logFilePath = path$1.join(this.dotAlchemy, "logs", `${id}.log`);
+		const [cmd, ...args] = command.split(/\s+/);
+		const child = spawn(cmd, args, { stdio: "pipe" });
+		await once(child, "spawn");
+		await fs$1.mkdir(path$1.dirname(logFilePath), { recursive: true });
+		const logFile = await fs$1.open(logFilePath, "w");
+		let stdout$1 = "";
+		let stderr = "";
+		child.stdout.on("data", (chunk) => {
+			stdout$1 += chunk.toString();
+			logFile.write(chunk);
+		});
+		child.stderr.on("data", (chunk) => {
+			stderr += chunk.toString();
+			logFile.write(chunk);
+		});
+		const [exitCode] = await once(child, "exit");
+		return {
+			exitCode,
+			stdout: stdout$1,
+			stderr
+		};
+	}
 	/**
 	* @internal
 	*/
@@ -39215,7 +39286,8 @@ let CloudflareAuth;
 		"pipelines:write",
 		"secrets_store:write",
 		"containers:write",
-		"cloudchamber:write"
+		"cloudchamber:write",
+		"vectorize:write"
 	];
 	_CloudflareAuth.formatHeadersWithRefresh = async (input) => {
 		if (!Credentials.isOAuthExpired(input.credentials)) return formatHeaders(input.credentials);
@@ -55371,7 +55443,16 @@ async function execAlchemy(main, { cwd: cwd$1 = process.cwd(), quiet, force: for
 		execArgs$1.push("--watch");
 		args.push("--watch");
 	}
-	if (envFile && await exists(envFile)) execArgs$1.push(`--env-file ${envFile}`);
+	if (envFile) {
+		if (!await exists(envFile)) {
+			M.error(pc.red(`Environment file ${envFile} does not exist.`));
+			throw new ExitSignal(1);
+		}
+		execArgs$1.push(`--env-file ${envFile}`);
+	} else {
+		const envFile$1 = resolve(cwd$1, ".env");
+		if (await exists(envFile$1)) execArgs$1.push(`--env-file ${envFile$1}`);
+	}
 	if (dev$1) args.push("--dev");
 	if (inspect$1) execArgs$1.push("--inspect");
 	if (inspectWait) execArgs$1.push("--inspect-wait");

package/bin/services/execute-alchemy.ts

@@ -140,8 +140,17 @@ export async function execAlchemy(
     execArgs.push("--watch");
     args.push("--watch");
   }
-  if (envFile && (await exists(envFile))) {
+  if (envFile) {
+    if (!(await exists(envFile))) {
+      log.error(pc.red(`Environment file ${envFile} does not exist.`));
+      throw new ExitSignal(1);
+    }
     execArgs.push(`--env-file ${envFile}`);
+  } else {
+    const envFile = resolve(cwd, ".env");
+    if (await exists(envFile)) {
+      execArgs.push(`--env-file ${envFile}`);
+    }
   }
   if (dev) args.push("--dev");
   if (inspect) execArgs.push("--inspect");

package/lib/aws/ec2/index.d.ts

@@ -4,6 +4,7 @@ export * from "./nat-gateway.ts";
 export * from "./route-table-association.ts";
 export * from "./route-table.ts";
 export * from "./route.ts";
+export * from "./security-group-rule.ts";
 export * from "./security-group.ts";
 export * from "./subnet.ts";
 export * from "./vpc.ts";

package/lib/aws/ec2/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/aws/ec2/index.ts"],"names":[],"mappings":"AAAA,cAAc,kCAAkC,CAAC;AACjD,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC;AACjC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,kBAAkB,CAAC;AACjC,cAAc,YAAY,CAAC;AAC3B,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/aws/ec2/index.ts"],"names":[],"mappings":"AAAA,cAAc,kCAAkC,CAAC;AACjD,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC;AACjC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,kBAAkB,CAAC;AACjC,cAAc,YAAY,CAAC;AAC3B,cAAc,0BAA0B,CAAC;AACzC,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC"}

package/lib/aws/ec2/index.js

@@ -4,6 +4,7 @@ export * from "./nat-gateway.js";
 export * from "./route-table-association.js";
 export * from "./route-table.js";
 export * from "./route.js";
+export * from "./security-group-rule.js";
 export * from "./security-group.js";
 export * from "./subnet.js";
 export * from "./vpc.js";

package/lib/aws/ec2/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/aws/ec2/index.ts"],"names":[],"mappings":"AAAA,cAAc,kCAAkC,CAAC;AACjD,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC;AACjC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,kBAAkB,CAAC;AACjC,cAAc,YAAY,CAAC;AAC3B,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/aws/ec2/index.ts"],"names":[],"mappings":"AAAA,cAAc,kCAAkC,CAAC;AACjD,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC;AACjC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,kBAAkB,CAAC;AACjC,cAAc,YAAY,CAAC;AAC3B,cAAc,0BAA0B,CAAC;AACzC,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC"}

package/lib/aws/index.d.ts

@@ -2,6 +2,7 @@ export * from "./account-id.ts";
 export * from "./bucket.ts";
 export * from "./client-props.ts";
 export * from "./credentials.ts";
+export * from "./ec2/index.ts";
 export * from "./function.ts";
 export * from "./policy-attachment.ts";
 export * from "./policy.ts";
@@ -11,11 +12,4 @@ export * from "./s3-state-store.ts";
 export * from "./ses.ts";
 export * from "./ssm-parameter.ts";
 export * from "./table.ts";
-export * from "./ec2/internet-gateway.ts";
-export * from "./ec2/nat-gateway.ts";
-export * from "./ec2/route-table.ts";
-export * from "./ec2/route.ts";
-export * from "./ec2/security-group.ts";
-export * from "./ec2/subnet.ts";
-export * from "./ec2/vpc.ts";
 //# sourceMappingURL=index.d.ts.map

package/lib/aws/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/aws/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,wBAAwB,CAAC;AACvC,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,qBAAqB,CAAC;AACpC,cAAc,UAAU,CAAC;AACzB,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC;AAG3B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,yBAAyB,CAAC;AACxC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/aws/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,wBAAwB,CAAC;AACvC,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,qBAAqB,CAAC;AACpC,cAAc,UAAU,CAAC;AACzB,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC"}

package/lib/aws/index.js

@@ -2,6 +2,7 @@ export * from "./account-id.js";
 export * from "./bucket.js";
 export * from "./client-props.js";
 export * from "./credentials.js";
+export * from "./ec2/index.js";
 export * from "./function.js";
 export * from "./policy-attachment.js";
 export * from "./policy.js";
@@ -11,12 +12,4 @@ export * from "./s3-state-store.js";
 export * from "./ses.js";
 export * from "./ssm-parameter.js";
 export * from "./table.js";
-// EC2 Resources
-export * from "./ec2/internet-gateway.js";
-export * from "./ec2/nat-gateway.js";
-export * from "./ec2/route-table.js";
-export * from "./ec2/route.js";
-export * from "./ec2/security-group.js";
-export * from "./ec2/subnet.js";
-export * from "./ec2/vpc.js";
 //# sourceMappingURL=index.js.map

package/lib/aws/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/aws/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,wBAAwB,CAAC;AACvC,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,qBAAqB,CAAC;AACpC,cAAc,UAAU,CAAC;AACzB,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC;AAE3B,gBAAgB;AAChB,cAAc,2BAA2B,CAAC;AAC1C,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,yBAAyB,CAAC;AACxC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/aws/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,wBAAwB,CAAC;AACvC,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,qBAAqB,CAAC;AACpC,cAAc,UAAU,CAAC;AACzB,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC"}

package/lib/cloudflare/auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/cloudflare/auth.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,yBAAiB,cAAc,CAAC;IACvB,MAAM,MAAM,aAQjB,CAAC;IAEH,KAAY,QAAQ,GAAG;QACrB,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACK,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAkFtB,CAAC;IACK,MAAM,cAAc,UAkB1B,CAAC;IAEF;;;OAGG;IACI,MAAM,wBAAwB,GAAU,OAAO;QACpD,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;QAC5B,WAAW,EAAE,WAAW,CAAC;KAC1B,oCAgBA,CAAC;IAEF;;OAEG;IACI,MAAM,aAAa,GACxB,aAAa,WAAW,KACvB,MAAM,CAAC,MAAM,EAAE,MAAM,CAYvB,CAAC;CACH"}
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/cloudflare/auth.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,yBAAiB,cAAc,CAAC;IACvB,MAAM,MAAM,aAQjB,CAAC;IAEH,KAAY,QAAQ,GAAG;QACrB,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACK,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAkFtB,CAAC;IACK,MAAM,cAAc,UAmB1B,CAAC;IAEF;;;OAGG;IACI,MAAM,wBAAwB,GAAU,OAAO;QACpD,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;QAC5B,WAAW,EAAE,WAAW,CAAC;KAC1B,oCAgBA,CAAC;IAEF;;OAEG;IACI,MAAM,aAAa,GACxB,aAAa,WAAW,KACvB,MAAM,CAAC,MAAM,EAAE,MAAM,CAYvB,CAAC;CACH"}

package/lib/cloudflare/auth.js

@@ -104,6 +104,7 @@ export var CloudflareAuth;
         "secrets_store:write",
         "containers:write",
         "cloudchamber:write",
+        "vectorize:write",
     ];
     /**
      * Format Cloudflare credentials as headers, refreshing OAuth credentials if expired.

package/lib/cloudflare/auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/cloudflare/auth.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/cloudflare/auth.ts"],"names":[],"mappings":"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"}

package/lib/cloudflare/bucket-custom-domain.d.ts

@@ -0,0 +1,90 @@
+import type { Context } from "../context";
+import { CloudflareApi, type CloudflareApiOptions } from "./api";
+import { type R2BucketJurisdiction } from "./bucket";
+import type { Zone } from "./zone";
+export interface R2BucketCustomDomainProps extends CloudflareApiOptions, R2BucketCustomDomainOptions {
+    /**
+     * The bucket to attach the domain to.
+     */
+    bucketName: string;
+    /**
+     * The jurisdiction of the bucket.
+     * @default "default"
+     */
+    jurisdiction?: R2BucketJurisdiction;
+    /**
+     * Development mode properties
+     * @internal
+     */
+    dev?: {
+        remote?: boolean;
+    };
+}
+export interface R2BucketCustomDomainOptions {
+    /**
+     * The domain name to attach to the bucket.
+     */
+    domain: string;
+    /**
+     * Whether the domain is enabled.
+     * @default true
+     */
+    enabled?: boolean;
+    /**
+     * The zone to attach the domain to.
+     */
+    zone?: string | Zone;
+    /**
+     * An allowlist of ciphers for TLS termination. These ciphers must be in the BoringSSL format.
+     */
+    ciphers?: string[];
+    /**
+     * The minimum TLS version to support.
+     */
+    minTLS?: "1.0" | "1.1" | "1.2" | "1.3" | (string & {});
+    /**
+     * Whether to adopt an existing custom domain binding during creation.
+     * If false and the domain already exists, creation will fail.
+     * This only applies during the create phase.
+     * @default false
+     */
+    adopt?: boolean;
+    /**
+     * Whether to delete the custom domain binding during deletion.
+     * If false, the custom domain binding will remain but the resource will be removed from state
+     * @default true
+     */
+    delete?: boolean;
+}
+export type R2BucketCustomDomain = {
+    /**
+     * The domain name.
+     */
+    domain: string;
+    /**
+     * Whether the domain is enabled.
+     */
+    enabled: boolean;
+    /**
+     * The zone ID.
+     */
+    zoneId: string;
+    /**
+     * The ciphers to support.
+     */
+    ciphers?: string[];
+    /**
+     * The minimum TLS version to support.
+     */
+    minTLS?: "1.0" | "1.1" | "1.2" | "1.3" | (string & {});
+};
+export declare const R2BucketCustomDomain: (((this: any, id: string, props?: {}) => never) & (new (_: never) => never)) | ((this: Context<R2BucketCustomDomain>, _id: string, props: R2BucketCustomDomainProps) => Promise<R2BucketCustomDomain>);
+export declare function deleteBucketCustomDomain(api: CloudflareApi, bucket: string, domain: string, jurisdiction: R2BucketJurisdiction | undefined): Promise<unknown>;
+export declare function getBucketCustomDomain(api: CloudflareApi, bucket: string, domain: string, jurisdiction: R2BucketJurisdiction | undefined): Promise<void | (R2BucketCustomDomain & {
+    zoneName?: string;
+    status: {
+        ownership: "pending" | "active" | "deactivated" | "blocked" | "error" | "unknown";
+        ssl: "initializing" | "pending" | "active" | "deactivated" | "error" | "unknown";
+    };
+})>;
+//# sourceMappingURL=bucket-custom-domain.d.ts.map

package/lib/cloudflare/bucket-custom-domain.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bucket-custom-domain.d.ts","sourceRoot":"","sources":["../../src/cloudflare/bucket-custom-domain.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAG1C,OAAO,EACL,aAAa,EAEb,KAAK,oBAAoB,EAC1B,MAAM,OAAO,CAAC;AAGf,OAAO,EAAoB,KAAK,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAEvE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEnC,MAAM,WAAW,yBACf,SAAQ,oBAAoB,EAC1B,2BAA2B;IAC7B;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,YAAY,CAAC,EAAE,oBAAoB,CAAC;IAEpC;;;OAGG;IACH,GAAG,CAAC,EAAE;QACJ,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,CAAC;CACH;AAED,MAAM,WAAW,2BAA2B;IAC1C;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAErB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB;;OAEG;IACH,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;IAEvD;;;;;OAKG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;;;OAIG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB;;OAEG;IACH,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;CACxD,CAAC;AAEF,eAAO,MAAM,oBAAoB,yFAGvB,OAAO,CAAC,oBAAoB,CAAC,OAC9B,MAAM,SACJ,yBAAyB,KAC/B,OAAO,CAAC,oBAAoB,CAAC,CA+EjC,CAAC;AAkCF,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,aAAa,EAClB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,oBAAoB,GAAG,SAAS,oBAa/C;AAED,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,aAAa,EAClB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,oBAAoB,GAAG,SAAS;eAI/B,MAAM;YACT;QACN,SAAS,EACL,SAAS,GACT,QAAQ,GACR,aAAa,GACb,SAAS,GACT,OAAO,GACP,SAAS,CAAC;QACd,GAAG,EACC,cAAc,GACd,SAAS,GACT,QAAQ,GACR,aAAa,GACb,OAAO,GACP,SAAS,CAAC;KACf;IAeN"}

package/lib/cloudflare/bucket-custom-domain.js

@@ -0,0 +1,81 @@
+import { Resource } from "../resource";
+import { diff } from "../util/diff";
+import { CloudflareApi, createCloudflareApi, } from "./api";
+import { CloudflareApiError } from "./api-error";
+import { extractCloudflareResult } from "./api-response";
+import { withJurisdiction } from "./bucket";
+import { inferZoneIdFromPattern } from "./route";
+export const R2BucketCustomDomain = Resource("cloudflare::R2BucketCustomDomain", async function (_id, props) {
+    if (this.scope.local && !props.dev?.remote && this.phase !== "delete") {
+        return {
+            domain: props.domain,
+            enabled: props.enabled ?? false,
+            zoneId: typeof props.zone === "string"
+                ? props.zone
+                : (props.zone?.id ?? "noop-zone"),
+            ciphers: props.ciphers,
+            minTLS: props.minTLS,
+        };
+    }
+    const adopt = props.adopt ?? this.scope.adopt;
+    const api = await createCloudflareApi(props);
+    const payload = {
+        domain: props.domain,
+        enabled: props.enabled ?? true,
+        zoneId: typeof props.zone === "string"
+            ? props.zone
+            : (props.zone?.id ??
+                (await inferZoneIdFromPattern(api, props.domain))),
+        ciphers: props.ciphers,
+        minTLS: props.minTLS,
+    };
+    switch (this.phase) {
+        case "create": {
+            await createBucketCustomDomain(api, props.bucketName, props.jurisdiction, payload).catch(async (error) => {
+                if (error instanceof CloudflareApiError &&
+                    error.status === 409 &&
+                    adopt) {
+                    return await updateBucketCustomDomain(api, props.bucketName, props.jurisdiction, payload);
+                }
+                throw error;
+            });
+            return payload;
+        }
+        case "update": {
+            if (diff(this.output, payload).some((property) => property === "domain" || property === "zoneId")) {
+                return this.replace();
+            }
+            await updateBucketCustomDomain(api, props.bucketName, props.jurisdiction, payload);
+            return payload;
+        }
+        case "delete": {
+            if (props.delete !== false) {
+                await deleteBucketCustomDomain(api, props.bucketName, props.domain, props.jurisdiction);
+            }
+            return this.destroy();
+        }
+    }
+});
+async function createBucketCustomDomain(api, bucket, jurisdiction, payload) {
+    return await extractCloudflareResult(`create custom domain for bucket "${bucket}"`, api.post(`/accounts/${api.accountId}/r2/buckets/${bucket}/domains/custom`, payload, { headers: withJurisdiction({ jurisdiction }) }));
+}
+async function updateBucketCustomDomain(api, bucket, jurisdiction, payload) {
+    return await extractCloudflareResult(`update custom domain for bucket "${bucket}"`, api.put(`/accounts/${api.accountId}/r2/buckets/${bucket}/domains/custom/${encodeURIComponent(payload.domain)}`, payload, { headers: withJurisdiction({ jurisdiction }) }));
+}
+export async function deleteBucketCustomDomain(api, bucket, domain, jurisdiction) {
+    return await extractCloudflareResult(`delete custom domain for bucket "${bucket}"`, api.delete(`/accounts/${api.accountId}/r2/buckets/${bucket}/domains/custom/${encodeURIComponent(domain)}`, { headers: withJurisdiction({ jurisdiction }) })).catch((error) => {
+        if (!(error instanceof CloudflareApiError && error.status === 404)) {
+            throw error;
+        }
+    });
+}
+export async function getBucketCustomDomain(api, bucket, domain, jurisdiction) {
+    return await extractCloudflareResult(`get custom domain for bucket "${bucket}"`, api.get(`/accounts/${api.accountId}/r2/buckets/${bucket}/domains/custom/${encodeURIComponent(domain)}`, {
+        headers: withJurisdiction({ jurisdiction }),
+    })).catch((error) => {
+        if (!(error instanceof CloudflareApiError && error.status === 404)) {
+            throw error;
+        }
+    });
+}
+//# sourceMappingURL=bucket-custom-domain.js.map

package/lib/cloudflare/bucket-custom-domain.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bucket-custom-domain.js","sourceRoot":"","sources":["../../src/cloudflare/bucket-custom-domain.ts"],"names":[],"mappings":"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"}

package/lib/cloudflare/bucket.d.ts

@@ -1,6 +1,7 @@
 import type { R2PutOptions } from "@cloudflare/workers-types/experimental/index.ts";
 import type { Context } from "../context.ts";
 import { type CloudflareApi, type CloudflareApiOptions } from "./api.ts";
+import { type R2BucketCustomDomainOptions } from "./bucket-custom-domain.ts";
 export type R2BucketJurisdiction = "default" | "eu" | "fedramp";
 /**
  * Properties for creating or updating an R2 Bucket
@@ -32,8 +33,18 @@ export interface BucketProps extends CloudflareApiOptions {
     /**
      * Whether to allow public access through the r2.dev subdomain
      * Only for development purposes - use custom domains for production
+     * @deprecated Use `devDomain` instead
      */
     allowPublicAccess?: boolean;
+    /**
+     * Whether to allow public access through the r2.dev subdomain
+     * Only for development purposes - use custom domains for production
+     */
+    devDomain?: boolean;
+    /**
+     * The custom domain(s) to attach to the bucket.
+     */
+    domains?: string | R2BucketCustomDomainOptions | string[] | R2BucketCustomDomainOptions[];
     /**
      * Whether to delete the bucket.
      * If set to false, the bucket will remain but the resource will be removed from state
@@ -254,7 +265,7 @@ export type R2Bucket = _R2Bucket & {
 /**
  * Output returned after R2 Bucket creation/update
  */
-type _R2Bucket = Omit<BucketProps, "delete" | "dev"> & {
+type _R2Bucket = Omit<BucketProps, "delete" | "dev" | "domains" | "devDomain"> & {
     /**
      * Resource type identifier
      */
@@ -273,8 +284,17 @@ type _R2Bucket = Omit<BucketProps, "delete" | "dev"> & {
     creationDate: Date;
     /**
      * The `r2.dev` subdomain for the bucket, if `allowPublicAccess` is true
+     * @deprecated Use `devDomain` instead
      */
-    domain: string | undefined;
+    domain?: string;
+    /**
+     * The `r2.dev` subdomain for the bucket, if `devDomain` is true
+     */
+    devDomain: string | undefined;
+    /**
+     * The custom domains for the bucket, if applicable
+     */
+    domains: string[] | undefined;
     /**
      * Development mode properties
      * @internal
@@ -425,12 +445,16 @@ export declare function putBucketLifecycleRules(api: CloudflareApi, bucketName:
 /**
  * Get lifecycle rules for a bucket
  */
-export declare function getBucketLifecycleRules(api: CloudflareApi, bucketName: string, props?: BucketProps): Promise<R2BucketLifecycleRule[]>;
+export declare function getBucketLifecycleRules(api: CloudflareApi, bucketName: string, props: {
+    jurisdiction?: string;
+}): Promise<R2BucketLifecycleRule[]>;
 export declare function putBucketLockRules(api: CloudflareApi, bucketName: string, props: BucketProps): Promise<void>;
 /**
  * Get lock rules for a bucket
  */
-export declare function getBucketLockRules(api: CloudflareApi, bucketName: string, props?: BucketProps): Promise<R2BucketLockRule[]>;
+export declare function getBucketLockRules(api: CloudflareApi, bucketName: string, props: {
+    jurisdiction?: R2BucketJurisdiction;
+}): Promise<R2BucketLockRule[]>;
 export declare function headObject(api: CloudflareApi, { bucketName, key }: {
     bucketName: string;
     key: string;