@hot-updater/cloudflare 0.31.4 → 0.33.0

package/dist/index.cjs

@@ -6,7 +6,7 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __commonJSMin = (cb, mod) => () => (mod || (cb((mod = { exports: {} }).exports, mod), cb = null), mod.exports);
+var __commonJSMin = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
 var __copyProps = (to, from, except, desc) => {
 	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
 		key = keys[i];
@@ -25,21 +25,25 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 let _hot_updater_core = require("@hot-updater/core");
 let _hot_updater_plugin_core = require("@hot-updater/plugin-core");
 let cloudflare = require("cloudflare");
-cloudflare = __toESM(cloudflare, 1);
+cloudflare = __toESM(cloudflare);
 let node_fs_promises = require("node:fs/promises");
-node_fs_promises = __toESM(node_fs_promises, 1);
+node_fs_promises = __toESM(node_fs_promises);
 let node_path = require("node:path");
-node_path = __toESM(node_path, 1);
+node_path = __toESM(node_path);
+let _aws_sdk_client_s3 = require("@aws-sdk/client-s3");
+let _aws_sdk_lib_storage = require("@aws-sdk/lib-storage");
+let _aws_sdk_s3_request_presigner = require("@aws-sdk/s3-request-presigner");
+let node_os = require("node:os");
+node_os = __toESM(node_os);
 let node_url = require("node:url");
 let node_child_process = require("node:child_process");
 let node_string_decoder = require("node:string_decoder");
 let node_util = require("node:util");
 let node_process = require("node:process");
-node_process = __toESM(node_process, 1);
+node_process = __toESM(node_process);
 let node_tty = require("node:tty");
-node_tty = __toESM(node_tty, 1);
+node_tty = __toESM(node_tty);
 let node_timers_promises = require("node:timers/promises");
-let node_os = require("node:os");
 let node_events = require("node:events");
 let node_v8 = require("node:v8");
 let node_fs = require("node:fs");
@@ -277,6 +281,11 @@ var import_lib = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin(((export
 	parser.parsingErrorCode = error.parsingErrorCode;
 	module.exports = parser;
 })))(), 1);
+const buildJsonEachInClause = (columnName, values, params) => {
+	if (values.length === 0) return "1 = 0";
+	params.push(JSON.stringify(values));
+	return `${columnName} IN (SELECT value FROM json_each(?))`;
+};
 async function resolvePage(singlePage) {
 	const results = [];
 	for await (const page of singlePage.iterPages()) {
@@ -300,11 +309,7 @@ function buildWhereClause(conditions) {
 		clauses.push("enabled = ?");
 		params.push(conditions.enabled ? 1 : 0);
 	}
-	if (conditions.id?.in) if (conditions.id.in.length === 0) clauses.push("1 = 0");
-	else {
-		clauses.push(`id IN (${conditions.id.in.map(() => "?").join(", ")})`);
-		params.push(...conditions.id.in);
-	}
+	if (conditions.id?.in) clauses.push(buildJsonEachInClause("id", conditions.id.in, params));
 	if (conditions.id?.eq) {
 		clauses.push("id = ?");
 		params.push(conditions.id.eq);
@@ -331,11 +336,7 @@ function buildWhereClause(conditions) {
 		clauses.push("target_app_version = ?");
 		params.push(conditions.targetAppVersion);
 	}
-	if (conditions.targetAppVersionIn) if (conditions.targetAppVersionIn.length === 0) clauses.push("1 = 0");
-	else {
-		clauses.push(`target_app_version IN (${conditions.targetAppVersionIn.map(() => "?").join(", ")})`);
-		params.push(...conditions.targetAppVersionIn);
-	}
+	if (conditions.targetAppVersionIn) clauses.push(buildJsonEachInClause("target_app_version", conditions.targetAppVersionIn, params));
 	if (conditions.fingerprintHash !== void 0) if (conditions.fingerprintHash === null) clauses.push("fingerprint_hash IS NULL");
 	else {
 		clauses.push("fingerprint_hash = ?");
@@ -420,13 +421,13 @@ const d1Database = (0, _hot_updater_plugin_core.createDatabasePlugin)({
 			const sql = (0, import_lib.default)(`
         SELECT *
         FROM bundle_patches
-        WHERE bundle_id IN (${bundleIds.map(() => "?").join(", ")})
+        WHERE bundle_id IN (SELECT value FROM json_each(?))
         ORDER BY order_index ASC, base_bundle_id ASC
       `);
 			const rows = await resolvePage(await cf.d1.database.query(config.databaseId, {
 				account_id: config.accountId,
 				sql,
-				params: bundleIds
+				params: [JSON.stringify(bundleIds)]
 			}));
 			for (const row of rows) {
 				const current = patchMap.get(row.bundle_id) ?? [];
@@ -669,6 +670,112 @@ const d1Database = (0, _hot_updater_plugin_core.createDatabasePlugin)({
 	}
 });
 //#endregion
+//#region src/r2S3Storage.ts
+const ensureExpectedR2Bucket$1 = (bucket, bucketName) => {
+	if (bucket !== bucketName) throw new Error(`Bucket name mismatch: expected "${bucketName}", but found "${bucket}".`);
+};
+const isS3ObjectNotFoundError = (error) => {
+	if (error instanceof Error) return error.name === "NotFound" || error.name === "NoSuchKey";
+	if (typeof error === "object" && error !== null && "$metadata" in error) return error.$metadata?.httpStatusCode === 404;
+	return false;
+};
+const createS3Client = (config) => {
+	const { accountId, basePath: _basePath, bucketName: _bucketName, endpoint, forcePathStyle, region, ...s3Config } = config;
+	return new _aws_sdk_client_s3.S3Client({
+		...s3Config,
+		endpoint: endpoint ?? `https://${accountId}.r2.cloudflarestorage.com`,
+		forcePathStyle: forcePathStyle ?? true,
+		region: region ?? "auto"
+	});
+};
+const createS3StorageProfile = (config) => {
+	const { bucketName } = config;
+	const client = createS3Client(config);
+	const getStorageKey = (0, _hot_updater_plugin_core.createStorageKeyBuilder)(config.basePath);
+	return {
+		async delete(storageUri) {
+			const { bucket, key } = (0, _hot_updater_plugin_core.parseStorageUri)(storageUri, "r2");
+			ensureExpectedR2Bucket$1(bucket, bucketName);
+			await client.send(new _aws_sdk_client_s3.DeleteObjectCommand({
+				Bucket: bucketName,
+				Key: key
+			}));
+		},
+		async upload(key, filePath) {
+			const Body = await node_fs_promises.default.readFile(filePath);
+			const ContentType = (0, _hot_updater_plugin_core.getContentType)(filePath);
+			const Key = getStorageKey(key, node_path.default.basename(filePath));
+			await new _aws_sdk_lib_storage.Upload({
+				client,
+				params: {
+					Body,
+					Bucket: bucketName,
+					CacheControl: "max-age=31536000",
+					ContentType,
+					Key
+				}
+			}).done();
+			return { storageUri: `r2://${bucketName}/${Key}` };
+		},
+		async exists(storageUri) {
+			const { bucket, key } = (0, _hot_updater_plugin_core.parseStorageUri)(storageUri, "r2");
+			ensureExpectedR2Bucket$1(bucket, bucketName);
+			try {
+				await client.send(new _aws_sdk_client_s3.HeadObjectCommand({
+					Bucket: bucketName,
+					Key: key
+				}));
+				return true;
+			} catch (error) {
+				if (isS3ObjectNotFoundError(error)) return false;
+				throw error;
+			}
+		},
+		async downloadFile(storageUri, filePath) {
+			const { bucket, key } = (0, _hot_updater_plugin_core.parseStorageUri)(storageUri, "r2");
+			ensureExpectedR2Bucket$1(bucket, bucketName);
+			const response = await client.send(new _aws_sdk_client_s3.GetObjectCommand({
+				Bucket: bucketName,
+				Key: key
+			}));
+			if (!response.Body) throw new Error("R2 object body is empty");
+			await node_fs_promises.default.mkdir(node_path.default.dirname(filePath), { recursive: true });
+			await node_fs_promises.default.writeFile(filePath, await response.Body.transformToByteArray());
+		}
+	};
+};
+const createS3RuntimeStorageProfile = (config) => {
+	const { bucketName } = config;
+	const client = createS3Client(config);
+	return {
+		async readText(storageUri) {
+			const { bucket, key } = (0, _hot_updater_plugin_core.parseStorageUri)(storageUri, "r2");
+			ensureExpectedR2Bucket$1(bucket, bucketName);
+			try {
+				const response = await client.send(new _aws_sdk_client_s3.GetObjectCommand({
+					Bucket: bucketName,
+					Key: key
+				}));
+				if (!response.Body) return null;
+				return response.Body.transformToString();
+			} catch (error) {
+				if (isS3ObjectNotFoundError(error)) return null;
+				throw error;
+			}
+		},
+		async getDownloadUrl(storageUri) {
+			const { bucket, key } = (0, _hot_updater_plugin_core.parseStorageUri)(storageUri, "r2");
+			ensureExpectedR2Bucket$1(bucket, bucketName);
+			const signedUrl = await (0, _aws_sdk_s3_request_presigner.getSignedUrl)(client, new _aws_sdk_client_s3.GetObjectCommand({
+				Bucket: bucketName,
+				Key: key
+			}), { expiresIn: 3600 });
+			if (!signedUrl) throw new Error("Failed to presign R2 URL");
+			return { fileUrl: signedUrl };
+		}
+	};
+};
+//#endregion
 //#region ../../node_modules/.pnpm/is-plain-obj@4.1.0/node_modules/is-plain-obj/index.js
 function isPlainObject(value) {
 	if (typeof value !== "object" || value === null) return false;
@@ -6842,55 +6949,108 @@ const createWrangler = ({ stdio, accountId, cloudflareApiToken, cwd }) => {
 	return (...command) => $("npx", ["wrangler", ...command]);
 };
 //#endregion
+//#region src/r2WranglerStorage.ts
+const ensureExpectedR2Bucket = (bucket, bucketName) => {
+	if (bucket !== bucketName) throw new Error(`Bucket name mismatch: expected "${bucketName}", but found "${bucket}".`);
+};
+const isR2ObjectNotFoundError = (error) => {
+	const output = [
+		error.stderr,
+		error.stdout,
+		error.shortMessage,
+		error.message
+	].filter(Boolean).join("\n").toLowerCase();
+	return output.includes("not found") || output.includes("no such object") || output.includes("does not exist");
+};
+const createWranglerStorageProfile = (config) => {
+	const { bucketName, cloudflareApiToken, accountId } = config;
+	const wrangler = createWrangler({
+		accountId,
+		cloudflareApiToken,
+		cwd: process.cwd()
+	});
+	const getStorageKey = (0, _hot_updater_plugin_core.createStorageKeyBuilder)(config.basePath);
+	return {
+		async delete(storageUri) {
+			const { bucket, key } = (0, _hot_updater_plugin_core.parseStorageUri)(storageUri, "r2");
+			ensureExpectedR2Bucket(bucket, bucketName);
+			try {
+				await wrangler("r2", "object", "delete", [bucketName, key].join("/"), "--remote");
+			} catch {
+				throw new Error("Can not delete bundle");
+			}
+		},
+		async upload(key, filePath) {
+			const contentType = (0, _hot_updater_plugin_core.getContentType)(filePath);
+			const Key = getStorageKey(key, node_path.default.basename(filePath));
+			try {
+				const { stderr, exitCode } = await wrangler("r2", "object", "put", [bucketName, Key].join("/"), "--file", filePath, "--content-type", contentType, "--remote");
+				if (exitCode !== 0 && stderr) throw new Error(stderr);
+			} catch (error) {
+				if (error instanceof ExecaError) throw new Error(error.stderr || error.stdout);
+				throw error;
+			}
+			return { storageUri: `r2://${bucketName}/${Key}` };
+		},
+		async exists(storageUri) {
+			const { bucket, key } = (0, _hot_updater_plugin_core.parseStorageUri)(storageUri, "r2");
+			ensureExpectedR2Bucket(bucket, bucketName);
+			const tempDir = await node_fs_promises.default.mkdtemp(node_path.default.join(node_os.default.tmpdir(), "hot-updater-r2-exists-"));
+			const tempFilePath = node_path.default.join(tempDir, "object");
+			try {
+				await wrangler("r2", "object", "get", [bucketName, key].join("/"), "--file", tempFilePath, "--remote");
+				return true;
+			} catch (error) {
+				if (error instanceof ExecaError && isR2ObjectNotFoundError(error)) return false;
+				throw error;
+			} finally {
+				await node_fs_promises.default.rm(tempDir, {
+					force: true,
+					recursive: true
+				});
+			}
+		},
+		async downloadFile(storageUri, filePath) {
+			const { bucket, key } = (0, _hot_updater_plugin_core.parseStorageUri)(storageUri, "r2");
+			ensureExpectedR2Bucket(bucket, bucketName);
+			try {
+				await node_fs_promises.default.mkdir(node_path.default.dirname(filePath), { recursive: true });
+				const { stderr, exitCode } = await wrangler("r2", "object", "get", [bucketName, key].join("/"), "--file", filePath, "--remote");
+				if (exitCode !== 0 && stderr) throw new Error(stderr);
+			} catch (error) {
+				if (error instanceof ExecaError) throw new Error(error.stderr || error.stdout);
+				throw error;
+			}
+		}
+	};
+};
+const createWranglerRuntimeStorageProfile = () => {
+	const error = /* @__PURE__ */ new Error("r2Storage runtime profile requires R2 S3 credentials. Wrangler-based R2 access is only supported by the node profile.");
+	return {
+		async readText() {
+			throw error;
+		},
+		async getDownloadUrl() {
+			throw error;
+		}
+	};
+};
+//#endregion
 //#region src/r2Storage.ts
-/**
-* Cloudflare R2 storage plugin for Hot Updater.
-*/
-const r2Storage = (0, _hot_updater_plugin_core.createNodeStoragePlugin)({
+const hasS3Credentials = (config) => {
+	return Boolean(config.credentials);
+};
+const r2Storage = (0, _hot_updater_plugin_core.createUniversalStoragePlugin)({
 	name: "r2Storage",
 	supportedProtocol: "r2",
 	factory: (config) => {
-		const { bucketName, cloudflareApiToken, accountId } = config;
-		const wrangler = createWrangler({
-			accountId,
-			cloudflareApiToken,
-			cwd: process.cwd()
-		});
-		const getStorageKey = (0, _hot_updater_plugin_core.createStorageKeyBuilder)(config.basePath);
+		if (hasS3Credentials(config)) return {
+			node: createS3StorageProfile(config),
+			runtime: createS3RuntimeStorageProfile(config)
+		};
 		return {
-			async delete(storageUri) {
-				const { bucket, key } = (0, _hot_updater_plugin_core.parseStorageUri)(storageUri, "r2");
-				if (bucket !== bucketName) throw new Error(`Bucket name mismatch: expected "${bucketName}", but found "${bucket}".`);
-				try {
-					await wrangler("r2", "object", "delete", [bucketName, key].join("/"), "--remote");
-				} catch {
-					throw new Error("Can not delete bundle");
-				}
-			},
-			async upload(key, filePath) {
-				const contentType = (0, _hot_updater_plugin_core.getContentType)(filePath);
-				const Key = getStorageKey(key, node_path.default.basename(filePath));
-				try {
-					const { stderr, exitCode } = await wrangler("r2", "object", "put", [bucketName, Key].join("/"), "--file", filePath, "--content-type", contentType, "--remote");
-					if (exitCode !== 0 && stderr) throw new Error(stderr);
-				} catch (error) {
-					if (error instanceof ExecaError) throw new Error(error.stderr || error.stdout);
-					throw error;
-				}
-				return { storageUri: `r2://${bucketName}/${Key}` };
-			},
-			async downloadFile(storageUri, filePath) {
-				const { bucket, key } = (0, _hot_updater_plugin_core.parseStorageUri)(storageUri, "r2");
-				if (bucket !== bucketName) throw new Error(`Bucket name mismatch: expected "${bucketName}", but found "${bucket}".`);
-				try {
-					await node_fs_promises.default.mkdir(node_path.default.dirname(filePath), { recursive: true });
-					const { stderr, exitCode } = await wrangler("r2", "object", "get", [bucketName, key].join("/"), "--file", filePath, "--remote");
-					if (exitCode !== 0 && stderr) throw new Error(stderr);
-				} catch (error) {
-					if (error instanceof ExecaError) throw new Error(error.stderr || error.stdout);
-					throw error;
-				}
-			}
+			node: createWranglerStorageProfile(config),
+			runtime: createWranglerRuntimeStorageProfile()
 		};
 	}
 });

package/dist/index.d.cts

@@ -1,24 +1,64 @@
+import * as _$_hot_updater_plugin_core0 from "@hot-updater/plugin-core";
+import { StoragePluginHooks, UniversalStoragePlugin } from "@hot-updater/plugin-core";
+import { S3ClientConfig } from "@aws-sdk/client-s3";
+
 //#region src/d1Database.d.ts
 interface D1DatabaseConfig {
   databaseId: string;
   accountId: string;
   cloudflareApiToken: string;
 }
-declare const d1Database: (config: D1DatabaseConfig, hooks?: import("@hot-updater/plugin-core").DatabasePluginHooks) => () => import("@hot-updater/plugin-core").DatabasePlugin<unknown>;
+declare const d1Database: (config: D1DatabaseConfig, hooks?: _$_hot_updater_plugin_core0.DatabasePluginHooks) => () => _$_hot_updater_plugin_core0.DatabasePlugin<unknown>;
 //#endregion
-//#region src/r2Storage.d.ts
-interface R2StorageConfig {
-  cloudflareApiToken: string;
+//#region src/r2S3Storage.d.ts
+interface R2S3StorageConfig extends S3ClientConfig {
+  accountId: string;
+  bucketName: string;
+  credentials: NonNullable<S3ClientConfig["credentials"]>;
+  /**
+   * Base path where bundles will be stored in the bucket
+   */
+  basePath?: string;
+}
+//#endregion
+//#region src/r2WranglerStorage.d.ts
+/**
+ * @deprecated `cloudflareApiToken` uses the Wrangler CLI for R2 operations,
+ * which is slower than direct S3-compatible API access. Create R2
+ * S3-compatible credentials in the Cloudflare dashboard and pass them with
+ * `r2Storage({ credentials })` instead.
+ */
+interface R2WranglerStorageConfig {
   accountId: string;
   bucketName: string;
+  /**
+   * @deprecated This token keeps R2 access on the slower Wrangler CLI path.
+   * Create R2 S3-compatible credentials in the Cloudflare dashboard and use
+   * `credentials` instead.
+   */
+  cloudflareApiToken: string;
   /**
    * Base path where bundles will be stored in the bucket
    */
   basePath?: string;
+  credentials?: never;
 }
+//#endregion
+//#region src/r2Storage.d.ts
+type R2StorageConfig = R2S3StorageConfig | R2WranglerStorageConfig;
 /**
  * Cloudflare R2 storage plugin for Hot Updater.
  */
-declare const r2Storage: (config: R2StorageConfig, hooks?: import("@hot-updater/plugin-core").StoragePluginHooks) => () => import("@hot-updater/plugin-core").NodeStoragePlugin;
+interface R2Storage {
+  (config: R2S3StorageConfig, hooks?: StoragePluginHooks): () => UniversalStoragePlugin;
+  /**
+   * @deprecated `cloudflareApiToken` uses the Wrangler CLI for R2 operations,
+   * which is slower than direct S3-compatible API access. Create R2
+   * S3-compatible credentials in the Cloudflare dashboard and pass them with
+   * `r2Storage({ credentials })` instead.
+   */
+  (config: R2WranglerStorageConfig, hooks?: StoragePluginHooks): () => UniversalStoragePlugin;
+}
+declare const r2Storage: R2Storage;
 //#endregion
-export { D1DatabaseConfig, R2StorageConfig, d1Database, r2Storage };
+export { D1DatabaseConfig, type R2S3StorageConfig, R2StorageConfig, type R2WranglerStorageConfig, d1Database, r2Storage };

package/dist/index.d.mts

@@ -1,24 +1,64 @@
+import * as _$_hot_updater_plugin_core0 from "@hot-updater/plugin-core";
+import { StoragePluginHooks, UniversalStoragePlugin } from "@hot-updater/plugin-core";
+import { S3ClientConfig } from "@aws-sdk/client-s3";
+
 //#region src/d1Database.d.ts
 interface D1DatabaseConfig {
   databaseId: string;
   accountId: string;
   cloudflareApiToken: string;
 }
-declare const d1Database: (config: D1DatabaseConfig, hooks?: import("@hot-updater/plugin-core").DatabasePluginHooks) => () => import("@hot-updater/plugin-core").DatabasePlugin<unknown>;
+declare const d1Database: (config: D1DatabaseConfig, hooks?: _$_hot_updater_plugin_core0.DatabasePluginHooks) => () => _$_hot_updater_plugin_core0.DatabasePlugin<unknown>;
 //#endregion
-//#region src/r2Storage.d.ts
-interface R2StorageConfig {
-  cloudflareApiToken: string;
+//#region src/r2S3Storage.d.ts
+interface R2S3StorageConfig extends S3ClientConfig {
+  accountId: string;
+  bucketName: string;
+  credentials: NonNullable<S3ClientConfig["credentials"]>;
+  /**
+   * Base path where bundles will be stored in the bucket
+   */
+  basePath?: string;
+}
+//#endregion
+//#region src/r2WranglerStorage.d.ts
+/**
+ * @deprecated `cloudflareApiToken` uses the Wrangler CLI for R2 operations,
+ * which is slower than direct S3-compatible API access. Create R2
+ * S3-compatible credentials in the Cloudflare dashboard and pass them with
+ * `r2Storage({ credentials })` instead.
+ */
+interface R2WranglerStorageConfig {
   accountId: string;
   bucketName: string;
+  /**
+   * @deprecated This token keeps R2 access on the slower Wrangler CLI path.
+   * Create R2 S3-compatible credentials in the Cloudflare dashboard and use
+   * `credentials` instead.
+   */
+  cloudflareApiToken: string;
   /**
    * Base path where bundles will be stored in the bucket
    */
   basePath?: string;
+  credentials?: never;
 }
+//#endregion
+//#region src/r2Storage.d.ts
+type R2StorageConfig = R2S3StorageConfig | R2WranglerStorageConfig;
 /**
  * Cloudflare R2 storage plugin for Hot Updater.
  */
-declare const r2Storage: (config: R2StorageConfig, hooks?: import("@hot-updater/plugin-core").StoragePluginHooks) => () => import("@hot-updater/plugin-core").NodeStoragePlugin;
+interface R2Storage {
+  (config: R2S3StorageConfig, hooks?: StoragePluginHooks): () => UniversalStoragePlugin;
+  /**
+   * @deprecated `cloudflareApiToken` uses the Wrangler CLI for R2 operations,
+   * which is slower than direct S3-compatible API access. Create R2
+   * S3-compatible credentials in the Cloudflare dashboard and pass them with
+   * `r2Storage({ credentials })` instead.
+   */
+  (config: R2WranglerStorageConfig, hooks?: StoragePluginHooks): () => UniversalStoragePlugin;
+}
+declare const r2Storage: R2Storage;
 //#endregion
-export { D1DatabaseConfig, R2StorageConfig, d1Database, r2Storage };
+export { D1DatabaseConfig, type R2S3StorageConfig, R2StorageConfig, type R2WranglerStorageConfig, d1Database, r2Storage };