@hot-updater/cloudflare 0.30.11 → 0.31.0

package/dist/index.mjs

@@ -1,15 +1,15 @@
 import { createRequire } from "node:module";
-import { DEFAULT_ROLLOUT_COHORT_COUNT } from "@hot-updater/core";
-import { calculatePagination, createDatabasePlugin, createDatabasePluginGetUpdateInfo, createStorageKeyBuilder, createStoragePlugin, getContentType, parseStorageUri } from "@hot-updater/plugin-core";
+import { DEFAULT_ROLLOUT_COHORT_COUNT, getAssetBaseStorageUri, getBundlePatches, getManifestFileHash, getManifestStorageUri, stripBundleArtifactMetadata } from "@hot-updater/core";
+import { calculatePagination, createDatabasePlugin, createDatabasePluginGetUpdateInfo, createNodeStoragePlugin, createStorageKeyBuilder, getContentType, parseStorageUri } from "@hot-updater/plugin-core";
 import Cloudflare from "cloudflare";
-import path from "path";
+import fs from "node:fs/promises";
+import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { ChildProcess, execFile, spawn, spawnSync } from "node:child_process";
 import { StringDecoder } from "node:string_decoder";
 import { aborted, callbackify, debuglog, inspect, promisify, stripVTControlCharacters } from "node:util";
 import process$1, { execArgv, execPath, hrtime, platform } from "node:process";
 import tty from "node:tty";
-import path$1 from "node:path";
 import { scheduler, setImmediate, setTimeout } from "node:timers/promises";
 import { constants } from "node:os";
 import { EventEmitter, addAbortListener, on, once, setMaxListeners } from "node:events";
@@ -353,7 +353,34 @@ function parseTargetCohorts(value) {
 	}
 	return null;
 }
-function transformRowToBundle(row) {
+const parseMetadata = (value) => {
+	if (!value) return void 0;
+	if (typeof value === "string") try {
+		return parseMetadata(JSON.parse(value));
+	} catch {
+		return;
+	}
+	return typeof value === "object" && !Array.isArray(value) ? value : void 0;
+};
+const buildBundlePatchId = (bundleId, baseBundleId) => `${bundleId}:${baseBundleId}`;
+const bundleToPatchRows = (bundle) => getBundlePatches(bundle).map((patch, index) => ({
+	id: buildBundlePatchId(bundle.id, patch.baseBundleId),
+	bundle_id: bundle.id,
+	base_bundle_id: patch.baseBundleId,
+	base_file_hash: patch.baseFileHash,
+	patch_file_hash: patch.patchFileHash,
+	patch_storage_uri: patch.patchStorageUri,
+	order_index: index
+}));
+function transformRowToBundle(row, patchRows = []) {
+	const rawMetadata = parseMetadata(row.metadata);
+	const patches = patchRows.slice().sort((left, right) => (left.order_index ?? 0) - (right.order_index ?? 0) || left.base_bundle_id.localeCompare(right.base_bundle_id)).map((patch) => ({
+		baseBundleId: patch.base_bundle_id,
+		baseFileHash: patch.base_file_hash,
+		patchFileHash: patch.patch_file_hash,
+		patchStorageUri: patch.patch_storage_uri
+	}));
+	const primaryPatch = patches[0] ?? null;
 	return {
 		id: row.id,
 		channel: row.channel,
@@ -366,7 +393,15 @@ function transformRowToBundle(row) {
 		targetAppVersion: row.target_app_version,
 		storageUri: row.storage_uri,
 		fingerprintHash: row.fingerprint_hash,
-		metadata: row?.metadata ? JSON.parse(row?.metadata) : {},
+		metadata: stripBundleArtifactMetadata(rawMetadata),
+		manifestStorageUri: row.manifest_storage_uri ?? null,
+		manifestFileHash: row.manifest_file_hash ?? null,
+		assetBaseStorageUri: row.asset_base_storage_uri ?? null,
+		patches,
+		patchBaseBundleId: primaryPatch?.baseBundleId ?? null,
+		patchBaseFileHash: primaryPatch?.baseFileHash ?? null,
+		patchFileHash: primaryPatch?.patchFileHash ?? null,
+		patchStorageUri: primaryPatch?.patchStorageUri ?? null,
 		rolloutCohortCount: row.rollout_cohort_count ?? DEFAULT_ROLLOUT_COHORT_COUNT,
 		targetCohorts: parseTargetCohorts(row.target_cohorts)
 	};
@@ -375,6 +410,27 @@ const d1Database = createDatabasePlugin({
 	name: "d1Database",
 	factory: (config) => {
 		const cf = new Cloudflare({ apiToken: config.cloudflareApiToken });
+		const getPatchMap = async (bundleIds) => {
+			const patchMap = /* @__PURE__ */ new Map();
+			if (bundleIds.length === 0) return patchMap;
+			const sql = (0, import_lib.default)(`
+        SELECT *
+        FROM bundle_patches
+        WHERE bundle_id IN (${bundleIds.map(() => "?").join(", ")})
+        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
+			}));
+			for (const row of rows) {
+				const current = patchMap.get(row.bundle_id) ?? [];
+				current.push(row);
+				patchMap.set(row.bundle_id, current);
+			}
+			return patchMap;
+		};
 		async function getTotalCount(conditions) {
 			const { sql: whereClause, params } = buildWhereClause(conditions);
 			const countSql = (0, import_lib.default)(`SELECT COUNT(*) as total FROM bundles${whereClause}`);
@@ -394,11 +450,13 @@ const d1Database = createDatabasePlugin({
       OFFSET ?
     `);
 			params.push(limit, offset);
-			return (await resolvePage(await cf.d1.database.query(config.databaseId, {
+			const rows = await resolvePage(await cf.d1.database.query(config.databaseId, {
 				account_id: config.accountId,
 				sql,
 				params
-			}))).map(transformRowToBundle);
+			}));
+			const patchMap = await getPatchMap(rows.map((row) => row.id));
+			return rows.map((row) => transformRowToBundle(row, patchMap.get(row.id)));
 		}
 		async function queryBundlesForUpdateInfo(conditions) {
 			const { sql: whereClause, params } = buildWhereClause(conditions);
@@ -406,11 +464,13 @@ const d1Database = createDatabasePlugin({
         SELECT * FROM bundles
         ${whereClause}
       `);
-			return (await resolvePage(await cf.d1.database.query(config.databaseId, {
+			const rows = await resolvePage(await cf.d1.database.query(config.databaseId, {
 				account_id: config.accountId,
 				sql,
 				params
-			}))).map(transformRowToBundle);
+			}));
+			const patchMap = await getPatchMap(rows.map((row) => row.id));
+			return rows.map((row) => transformRowToBundle(row, patchMap.get(row.id)));
 		}
 		async function getTargetAppVersionsForUpdateInfo({ platform, channel, minBundleId }) {
 			const sql = (0, import_lib.default)(`
@@ -458,13 +518,14 @@ const d1Database = createDatabasePlugin({
 			async getBundleById(bundleId) {
 				const sql = (0, import_lib.default)(`
           SELECT * FROM bundles WHERE id = ? LIMIT 1`);
-				const rows = await resolvePage(await cf.d1.database.query(config.databaseId, {
+				const [singlePage, patchMap] = await Promise.all([cf.d1.database.query(config.databaseId, {
 					account_id: config.accountId,
 					sql,
 					params: [bundleId]
-				}));
+				}), getPatchMap([bundleId])]);
+				const rows = await resolvePage(singlePage);
 				if (rows.length === 0) return null;
-				return transformRowToBundle(rows[0]);
+				return transformRowToBundle(rows[0], patchMap.get(bundleId));
 			},
 			async getBundles(options) {
 				const { where = {}, limit, orderBy } = options;
@@ -494,6 +555,22 @@ const d1Database = createDatabasePlugin({
 					const deleteSql = (0, import_lib.default)(`
               DELETE FROM bundles WHERE id = ?
             `);
+					const deletePatchSql = (0, import_lib.default)(`
+              DELETE FROM bundle_patches WHERE bundle_id = ?
+            `);
+					await cf.d1.database.query(config.databaseId, {
+						account_id: config.accountId,
+						sql: deletePatchSql,
+						params: [op.data.id]
+					});
+					const deleteBasePatchSql = (0, import_lib.default)(`
+              DELETE FROM bundle_patches WHERE base_bundle_id = ?
+            `);
+					await cf.d1.database.query(config.databaseId, {
+						account_id: config.accountId,
+						sql: deleteBasePatchSql,
+						params: [op.data.id]
+					});
 					await cf.d1.database.query(config.databaseId, {
 						account_id: config.accountId,
 						sql: deleteSql,
@@ -515,10 +592,13 @@ const d1Database = createDatabasePlugin({
                 storage_uri,
                 fingerprint_hash,
                 metadata,
+                manifest_storage_uri,
+                manifest_file_hash,
+                asset_base_storage_uri,
                 rollout_cohort_count,
                 target_cohorts
               )
-              VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+              VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
             `);
 					const params = [
 						bundle.id,
@@ -532,7 +612,10 @@ const d1Database = createDatabasePlugin({
 						bundle.targetAppVersion,
 						bundle.storageUri,
 						bundle.fingerprintHash,
-						bundle.metadata ? JSON.stringify(bundle.metadata) : JSON.stringify({}),
+						JSON.stringify(stripBundleArtifactMetadata(bundle.metadata) ?? {}),
+						getManifestStorageUri(bundle),
+						getManifestFileHash(bundle),
+						getAssetBaseStorageUri(bundle),
 						bundle.rolloutCohortCount ?? DEFAULT_ROLLOUT_COHORT_COUNT,
 						bundle.targetCohorts ? JSON.stringify(bundle.targetCohorts) : null
 					];
@@ -541,6 +624,41 @@ const d1Database = createDatabasePlugin({
 						sql: upsertSql,
 						params
 					});
+					await cf.d1.database.query(config.databaseId, {
+						account_id: config.accountId,
+						sql: (0, import_lib.default)(`
+                DELETE FROM bundle_patches WHERE bundle_id = ?
+              `),
+						params: [bundle.id]
+					});
+					const patchRows = bundleToPatchRows(bundle);
+					if (patchRows.length > 0) {
+						const patchInsertSql = (0, import_lib.default)(`
+                INSERT OR REPLACE INTO bundle_patches (
+                  id,
+                  bundle_id,
+                  base_bundle_id,
+                  base_file_hash,
+                  patch_file_hash,
+                  patch_storage_uri,
+                  order_index
+                )
+                VALUES (?, ?, ?, ?, ?, ?, ?)
+              `);
+						for (const patchRow of patchRows) await cf.d1.database.query(config.databaseId, {
+							account_id: config.accountId,
+							sql: patchInsertSql,
+							params: [
+								patchRow.id,
+								patchRow.bundle_id,
+								patchRow.base_bundle_id,
+								patchRow.base_file_hash,
+								patchRow.patch_file_hash,
+								patchRow.patch_storage_uri,
+								String(patchRow.order_index ?? 0)
+							]
+						});
+					}
 				}
 			}
 		};
@@ -1316,7 +1434,7 @@ const handleCommand = (filePath, rawArguments, rawOptions) => {
 var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = isexe;
 	isexe.sync = sync;
-	var fs$2 = __require("fs");
+	var fs$3 = __require("fs");
 	function checkPathExt(path, options) {
 		var pathext = options.pathExt !== void 0 ? options.pathExt : process.env.PATHEXT;
 		if (!pathext) return true;
@@ -1333,12 +1451,12 @@ var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		return checkPathExt(path, options);
 	}
 	function isexe(path, options, cb) {
-		fs$2.stat(path, function(er, stat) {
+		fs$3.stat(path, function(er, stat) {
 			cb(er, er ? false : checkStat(stat, path, options));
 		});
 	}
 	function sync(path, options) {
-		return checkStat(fs$2.statSync(path), path, options);
+		return checkStat(fs$3.statSync(path), path, options);
 	}
 }));
 //#endregion
@@ -1346,14 +1464,14 @@ var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 var require_mode = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = isexe;
 	isexe.sync = sync;
-	var fs$1 = __require("fs");
+	var fs$2 = __require("fs");
 	function isexe(path, options, cb) {
-		fs$1.stat(path, function(er, stat) {
+		fs$2.stat(path, function(er, stat) {
 			cb(er, er ? false : checkStat(stat, options));
 		});
 	}
 	function sync(path, options) {
-		return checkStat(fs$1.statSync(path), options);
+		return checkStat(fs$2.statSync(path), options);
 	}
 	function checkStat(stat, options) {
 		return stat.isFile() && checkMode(stat, options);
@@ -1417,7 +1535,7 @@ var require_isexe = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 //#region ../../node_modules/.pnpm/which@2.0.2/node_modules/which/which.js
 var require_which = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const isWindows = process.platform === "win32" || process.env.OSTYPE === "cygwin" || process.env.OSTYPE === "msys";
-	const path$4 = __require("path");
+	const path$3 = __require("path");
 	const COLON = isWindows ? ";" : ":";
 	const isexe = require_isexe();
 	const getNotFoundError = (cmd) => Object.assign(/* @__PURE__ */ new Error(`not found: ${cmd}`), { code: "ENOENT" });
@@ -1447,7 +1565,7 @@ var require_which = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			if (i === pathEnv.length) return opt.all && found.length ? resolve(found) : reject(getNotFoundError(cmd));
 			const ppRaw = pathEnv[i];
 			const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
-			const pCmd = path$4.join(pathPart, cmd);
+			const pCmd = path$3.join(pathPart, cmd);
 			resolve(subStep(!pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd, i, 0));
 		});
 		const subStep = (p, i, ii) => new Promise((resolve, reject) => {
@@ -1468,7 +1586,7 @@ var require_which = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		for (let i = 0; i < pathEnv.length; i++) {
 			const ppRaw = pathEnv[i];
 			const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
-			const pCmd = path$4.join(pathPart, cmd);
+			const pCmd = path$3.join(pathPart, cmd);
 			const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
 			for (let j = 0; j < pathExt.length; j++) {
 				const cur = p + pathExt[j];
@@ -1499,7 +1617,7 @@ var require_path_key = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 //#endregion
 //#region ../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/util/resolveCommand.js
 var require_resolveCommand = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	const path$3 = __require("path");
+	const path$2 = __require("path");
 	const which = require_which();
 	const getPathKey = require_path_key();
 	function resolveCommandAttempt(parsed, withoutPathExt) {
@@ -1514,12 +1632,12 @@ var require_resolveCommand = /* @__PURE__ */ __commonJSMin(((exports, module) =>
 		try {
 			resolved = which.sync(parsed.command, {
 				path: env[getPathKey({ env })],
-				pathExt: withoutPathExt ? path$3.delimiter : void 0
+				pathExt: withoutPathExt ? path$2.delimiter : void 0
 			});
 		} catch (e) {} finally {
 			if (shouldSwitchCwd) process.chdir(cwd);
 		}
-		if (resolved) resolved = path$3.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
+		if (resolved) resolved = path$2.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
 		return resolved;
 	}
 	function resolveCommand(parsed) {
@@ -1568,16 +1686,16 @@ var require_shebang_command = /* @__PURE__ */ __commonJSMin(((exports, module) =
 //#endregion
 //#region ../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/util/readShebang.js
 var require_readShebang = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	const fs = __require("fs");
+	const fs$1 = __require("fs");
 	const shebangCommand = require_shebang_command();
 	function readShebang(command) {
 		const size = 150;
 		const buffer = Buffer.alloc(size);
 		let fd;
 		try {
-			fd = fs.openSync(command, "r");
-			fs.readSync(fd, buffer, 0, size, 0);
-			fs.closeSync(fd);
+			fd = fs$1.openSync(command, "r");
+			fs$1.readSync(fd, buffer, 0, size, 0);
+			fs$1.closeSync(fd);
 		} catch (e) {}
 		return shebangCommand(buffer.toString());
 	}
@@ -1586,7 +1704,7 @@ var require_readShebang = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 //#endregion
 //#region ../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/parse.js
 var require_parse = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	const path$2 = __require("path");
+	const path$1 = __require("path");
 	const resolveCommand = require_resolveCommand();
 	const escape = require_escape();
 	const readShebang = require_readShebang();
@@ -1609,7 +1727,7 @@ var require_parse = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		const needsShell = !isExecutableRegExp.test(commandFile);
 		if (parsed.options.forceShell || needsShell) {
 			const needsDoubleEscapeMetaChars = isCmdShimRegExp.test(commandFile);
-			parsed.command = path$2.normalize(parsed.command);
+			parsed.command = path$1.normalize(parsed.command);
 			parsed.command = escape.command(parsed.command);
 			parsed.args = parsed.args.map((arg) => escape.argument(arg, needsDoubleEscapeMetaChars));
 			parsed.args = [
@@ -1718,33 +1836,33 @@ function toPath(urlOrPath) {
 }
 function traversePathUp(startPath) {
 	return { *[Symbol.iterator]() {
-		let currentPath = path$1.resolve(toPath(startPath));
+		let currentPath = path.resolve(toPath(startPath));
 		let previousPath;
 		while (previousPath !== currentPath) {
 			yield currentPath;
 			previousPath = currentPath;
-			currentPath = path$1.resolve(currentPath, "..");
+			currentPath = path.resolve(currentPath, "..");
 		}
 	} };
 }
 //#endregion
 //#region ../../node_modules/.pnpm/npm-run-path@6.0.0/node_modules/npm-run-path/index.js
 const npmRunPath = ({ cwd = process$1.cwd(), path: pathOption = process$1.env[pathKey()], preferLocal = true, execPath = process$1.execPath, addExecPath = true } = {}) => {
-	const cwdPath = path$1.resolve(toPath(cwd));
+	const cwdPath = path.resolve(toPath(cwd));
 	const result = [];
-	const pathParts = pathOption.split(path$1.delimiter);
+	const pathParts = pathOption.split(path.delimiter);
 	if (preferLocal) applyPreferLocal(result, pathParts, cwdPath);
 	if (addExecPath) applyExecPath(result, pathParts, execPath, cwdPath);
-	return pathOption === "" || pathOption === path$1.delimiter ? `${result.join(path$1.delimiter)}${pathOption}` : [...result, pathOption].join(path$1.delimiter);
+	return pathOption === "" || pathOption === path.delimiter ? `${result.join(path.delimiter)}${pathOption}` : [...result, pathOption].join(path.delimiter);
 };
 const applyPreferLocal = (result, pathParts, cwdPath) => {
 	for (const directory of traversePathUp(cwdPath)) {
-		const pathPart = path$1.join(directory, "node_modules/.bin");
+		const pathPart = path.join(directory, "node_modules/.bin");
 		if (!pathParts.includes(pathPart)) result.push(pathPart);
 	}
 };
 const applyExecPath = (result, pathParts, execPath, cwdPath) => {
-	const pathPart = path$1.resolve(cwdPath, toPath(execPath), "..");
+	const pathPart = path.resolve(cwdPath, toPath(execPath), "..");
 	if (!pathParts.includes(pathPart)) result.push(pathPart);
 };
 const npmRunPathEnv = ({ env = process$1.env, ...options } = {}) => {
@@ -2754,7 +2872,7 @@ const mapNode = ({ options }) => {
 const handleNodeOption = (file, commandArguments, { node: shouldHandleNode = false, nodePath = execPath, nodeOptions = execArgv.filter((nodeOption) => !nodeOption.startsWith("--inspect")), cwd, execPath: formerNodePath, ...options }) => {
 	if (formerNodePath !== void 0) throw new TypeError("The \"execPath\" option has been removed. Please use the \"nodePath\" option instead.");
 	const normalizedNodePath = safeNormalizeFileUrl(nodePath, "The \"nodePath\" option");
-	const resolvedNodePath = path$1.resolve(cwd, normalizedNodePath);
+	const resolvedNodePath = path.resolve(cwd, normalizedNodePath);
 	const newOptions = {
 		...options,
 		nodePath: resolvedNodePath,
@@ -2766,7 +2884,7 @@ const handleNodeOption = (file, commandArguments, { node: shouldHandleNode = fal
 		commandArguments,
 		newOptions
 	];
-	if (path$1.basename(file, ".exe") === "node") throw new TypeError("When the \"node\" option is true, the first argument does not need to be \"node\".");
+	if (path.basename(file, ".exe") === "node") throw new TypeError("When the \"node\" option is true, the first argument does not need to be \"node\".");
 	return [
 		resolvedNodePath,
 		[
@@ -2850,7 +2968,7 @@ const serializeEncoding = (encoding) => typeof encoding === "string" ? `"${encod
 //#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/arguments/cwd.js
 const normalizeCwd = (cwd = getDefaultCwd()) => {
 	const cwdString = safeNormalizeFileUrl(cwd, "The \"cwd\" option");
-	return path$1.resolve(cwdString);
+	return path.resolve(cwdString);
 };
 const getDefaultCwd = () => {
 	try {
@@ -2888,7 +3006,7 @@ const normalizeOptions = (filePath, rawArguments, rawOptions) => {
 	options.killSignal = normalizeKillSignal(options.killSignal);
 	options.forceKillAfterDelay = normalizeForceKillAfterDelay(options.forceKillAfterDelay);
 	options.lines = options.lines.map((lines, fdNumber) => lines && !BINARY_ENCODINGS.has(options.encoding) && options.buffer[fdNumber]);
-	if (process$1.platform === "win32" && path$1.basename(file, ".exe") === "cmd") commandArguments.unshift("/q");
+	if (process$1.platform === "win32" && path.basename(file, ".exe") === "cmd") commandArguments.unshift("/q");
 	return {
 		file,
 		commandArguments,
@@ -6723,28 +6841,8 @@ const createWrangler = ({ stdio, accountId, cloudflareApiToken, cwd }) => {
 //#region src/r2Storage.ts
 /**
 * Cloudflare R2 storage plugin for Hot Updater.
-*
-* Note: This plugin does not support `getDownloadUrl()`.
-* If you need download URL generation, use `s3Storage` from `@hot-updater/aws` instead,
-* which is fully compatible with Cloudflare R2.
-*
-* @example
-* ```typescript
-* // Using s3Storage with Cloudflare R2 for download URL support
-* import { s3Storage } from "@hot-updater/aws";
-*
-* s3Storage({
-*   region: "auto",
-*   endpoint: "https://YOUR_ACCOUNT_ID.r2.cloudflarestorage.com",
-*   credentials: {
-*     accessKeyId: "YOUR_ACCESS_KEY_ID",
-*     secretAccessKey: "YOUR_SECRET_ACCESS_KEY",
-*   },
-*   bucketName: "YOUR_BUCKET_NAME",
-* })
-* ```
 */
-const r2Storage = createStoragePlugin({
+const r2Storage = createNodeStoragePlugin({
 	name: "r2Storage",
 	supportedProtocol: "r2",
 	factory: (config) => {
@@ -6777,8 +6875,17 @@ const r2Storage = createStoragePlugin({
 				}
 				return { storageUri: `r2://${bucketName}/${Key}` };
 			},
-			async getDownloadUrl() {
-				throw new Error("`r2Storage` does not support `getDownloadUrl()`. Use `s3Storage` from `@hot-updater/aws` instead (compatible with Cloudflare R2).\n\nExample:\ns3Storage({\n  region: 'auto',\n  endpoint: 'https://YOUR_ACCOUNT_ID.r2.cloudflarestorage.com',\n  credentials: {\n    accessKeyId: 'YOUR_ACCESS_KEY_ID',\n    secretAccessKey: 'YOUR_SECRET_ACCESS_KEY',\n  },\n  bucketName: 'YOUR_BUCKET_NAME',\n})");
+			async downloadFile(storageUri, filePath) {
+				const { bucket, key } = parseStorageUri(storageUri, "r2");
+				if (bucket !== bucketName) throw new Error(`Bucket name mismatch: expected "${bucketName}", but found "${bucket}".`);
+				try {
+					await fs.mkdir(path.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;
+				}
 			}
 		};
 	}