@hot-updater/cloudflare 0.30.11 → 0.31.0

package/dist/worker/index.cjs

@@ -79,7 +79,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) => (0, _hot_updater_core.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,
@@ -92,7 +119,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: (0, _hot_updater_core.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 ?? _hot_updater_core.DEFAULT_ROLLOUT_COHORT_COUNT,
 		targetCohorts: parseTargetCohorts(row.target_cohorts)
 	};
@@ -111,12 +146,30 @@ const d1WorkerDatabase = () => (0, _hot_updater_plugin_core.createDatabasePlugin
 		const queryFirst = async (sql, params = [], context) => {
 			return await config.getDb(context).prepare(sql).bind(...params).first() ?? null;
 		};
+		const getPatchMap = async (bundleIds, context) => {
+			const patchMap = /* @__PURE__ */ new Map();
+			if (bundleIds.length === 0) return patchMap;
+			const rows = await queryAll(`
+            SELECT *
+            FROM bundle_patches
+            WHERE bundle_id IN (${bundleIds.map(() => "?").join(", ")})
+            ORDER BY order_index ASC, base_bundle_id ASC
+          `, bundleIds, context);
+			for (const row of rows) {
+				const current = patchMap.get(row.bundle_id) ?? [];
+				current.push(row);
+				patchMap.set(row.bundle_id, current);
+			}
+			return patchMap;
+		};
 		const queryBundlesForUpdateInfo = async (conditions, context) => {
 			const { sql: whereClause, params } = buildWhereClause(conditions);
-			return (await queryAll(`
+			const rows = await queryAll(`
             SELECT * FROM bundles
             ${whereClause}
-          `, params, context)).map(transformRowToBundle);
+          `, params, context);
+			const patchMap = await getPatchMap(rows.map((row) => row.id), context);
+			return rows.map((row) => transformRowToBundle(row, patchMap.get(row.id)));
 		};
 		const getTargetAppVersionsForUpdateInfo = async ({ platform, channel, minBundleId }, context) => {
 			return (await queryAll(`
@@ -157,8 +210,8 @@ const d1WorkerDatabase = () => (0, _hot_updater_plugin_core.createDatabasePlugin
 				}
 			}),
 			async getBundleById(bundleId, context) {
-				const row = await queryFirst("SELECT * FROM bundles WHERE id = ? LIMIT 1", [bundleId], context);
-				return row ? transformRowToBundle(row) : null;
+				const [row, patchMap] = await Promise.all([queryFirst("SELECT * FROM bundles WHERE id = ? LIMIT 1", [bundleId], context), getPatchMap([bundleId], context)]);
+				return row ? transformRowToBundle(row, patchMap.get(bundleId)) : null;
 			},
 			async getBundles(options, context) {
 				const { where, limit, orderBy } = options;
@@ -166,12 +219,14 @@ const d1WorkerDatabase = () => (0, _hot_updater_plugin_core.createDatabasePlugin
 				const { sql: whereClause, params } = buildWhereClause(where);
 				const orderSql = orderBy?.direction === "asc" ? "ORDER BY id ASC" : "ORDER BY id DESC";
 				const total = (await queryAll(`SELECT COUNT(*) as total FROM bundles${whereClause}`, params, context))[0]?.total ?? 0;
+				const rows = await queryAll(`SELECT * FROM bundles${whereClause} ${orderSql} LIMIT ? OFFSET ?`, [
+					...params,
+					limit,
+					offset
+				], context);
+				const patchMap = await getPatchMap(rows.map((row) => row.id), context);
 				return {
-					data: (await queryAll(`SELECT * FROM bundles${whereClause} ${orderSql} LIMIT ? OFFSET ?`, [
-						...params,
-						limit,
-						offset
-					], context)).map(transformRowToBundle),
+					data: rows.map((row) => transformRowToBundle(row, patchMap.get(row.id))),
 					pagination: (0, _hot_updater_plugin_core.calculatePagination)(total, {
 						limit,
 						offset
@@ -186,6 +241,8 @@ const d1WorkerDatabase = () => (0, _hot_updater_plugin_core.createDatabasePlugin
 				const db = config.getDb(context);
 				for (const operation of changedSets) {
 					if (operation.operation === "delete") {
+						await db.prepare("DELETE FROM bundle_patches WHERE bundle_id = ?").bind(operation.data.id).run();
+						await db.prepare("DELETE FROM bundle_patches WHERE base_bundle_id = ?").bind(operation.data.id).run();
 						await db.prepare("DELETE FROM bundles WHERE id = ?").bind(operation.data.id).run();
 						continue;
 					}
@@ -204,11 +261,28 @@ const d1WorkerDatabase = () => (0, _hot_updater_plugin_core.createDatabasePlugin
                   storage_uri,
                   fingerprint_hash,
                   metadata,
+                  manifest_storage_uri,
+                  manifest_file_hash,
+                  asset_base_storage_uri,
                   rollout_cohort_count,
                   target_cohorts
                 )
-                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-              `).bind(bundle.id, bundle.channel, bundle.enabled ? 1 : 0, bundle.shouldForceUpdate ? 1 : 0, bundle.fileHash, bundle.gitCommitHash || null, bundle.message || null, bundle.platform, bundle.targetAppVersion, bundle.storageUri, bundle.fingerprintHash, JSON.stringify(bundle.metadata ?? {}), bundle.rolloutCohortCount ?? _hot_updater_core.DEFAULT_ROLLOUT_COHORT_COUNT, bundle.targetCohorts ? JSON.stringify(bundle.targetCohorts) : null).run();
+                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+              `).bind(bundle.id, bundle.channel, bundle.enabled ? 1 : 0, bundle.shouldForceUpdate ? 1 : 0, bundle.fileHash, bundle.gitCommitHash || null, bundle.message || null, bundle.platform, bundle.targetAppVersion, bundle.storageUri, bundle.fingerprintHash, JSON.stringify((0, _hot_updater_core.stripBundleArtifactMetadata)(bundle.metadata) ?? {}), (0, _hot_updater_core.getManifestStorageUri)(bundle), (0, _hot_updater_core.getManifestFileHash)(bundle), (0, _hot_updater_core.getAssetBaseStorageUri)(bundle), bundle.rolloutCohortCount ?? _hot_updater_core.DEFAULT_ROLLOUT_COHORT_COUNT, bundle.targetCohorts ? JSON.stringify(bundle.targetCohorts) : null).run();
+					await db.prepare("DELETE FROM bundle_patches WHERE bundle_id = ?").bind(bundle.id).run();
+					const patchRows = bundleToPatchRows(bundle);
+					for (const patchRow of patchRows) await db.prepare(`
+                  INSERT OR REPLACE INTO bundle_patches (
+                    id,
+                    bundle_id,
+                    base_bundle_id,
+                    base_file_hash,
+                    patch_file_hash,
+                    patch_storage_uri,
+                    order_index
+                  )
+                  VALUES (?, ?, ?, ?, ?, ?, ?)
+                `).bind(patchRow.id, patchRow.bundle_id, patchRow.base_bundle_id, patchRow.base_file_hash, patchRow.patch_file_hash, patchRow.patch_storage_uri, patchRow.order_index ?? 0).run();
 				}
 			}
 		};
@@ -224,21 +298,31 @@ const resolveJwtSecretFromContext = (context) => {
 	if (!jwtSecret) throw new Error("r2WorkerStorage requires env.JWT_SECRET in the hot updater context.");
 	return jwtSecret;
 };
+const resolveR2BucketFromContext = (context) => {
+	const bucket = context?.env?.BUCKET;
+	if (!bucket) throw new Error("r2WorkerStorage requires env.BUCKET in the hot updater context.");
+	return bucket;
+};
+const createPublicObjectPath = (storageUrl) => `${storageUrl.host}${storageUrl.pathname}`;
+const createR2ObjectKey = (storageUrl) => storageUrl.pathname.replace(/^\/+/, "");
 const r2WorkerStorage = (config) => {
-	return () => {
-		return {
-			name: "r2WorkerStorage",
-			supportedProtocol: "r2",
-			async upload() {
-				throw new Error("r2WorkerStorage does not support upload() in the worker runtime.");
-			},
-			async delete() {
-				throw new Error("r2WorkerStorage does not support delete() in the worker runtime.");
+	return (0, _hot_updater_plugin_core.createRuntimeStoragePlugin)({
+		name: "r2WorkerStorage",
+		supportedProtocol: "r2",
+		factory: (config) => ({
+			async readText(storageUri, context) {
+				const storageUrl = new URL(storageUri);
+				if (storageUrl.protocol !== "r2:") throw new Error("Invalid R2 storage URI protocol");
+				const bucket = resolveR2BucketFromContext(context);
+				const key = createR2ObjectKey(storageUrl);
+				const object = await bucket.get(key);
+				if (!object) return null;
+				return object.text();
 			},
 			async getDownloadUrl(storageUri, context) {
 				const storageUrl = new URL(storageUri);
 				if (storageUrl.protocol !== "r2:") throw new Error("Invalid R2 storage URI protocol");
-				const key = `${storageUrl.host}${storageUrl.pathname}`;
+				const key = createPublicObjectPath(storageUrl);
 				const [jwtSecret, publicBaseUrl] = await Promise.all([resolveContextValue(config.jwtSecret ?? resolveJwtSecretFromContext, context), resolveContextValue(config.publicBaseUrl, context)]);
 				const token = await (0, _hot_updater_js.signToken)(key, jwtSecret);
 				const url = new URL(publicBaseUrl);
@@ -247,8 +331,8 @@ const r2WorkerStorage = (config) => {
 				url.searchParams.set("token", token);
 				return { fileUrl: url.toString() };
 			}
-		};
-	};
+		})
+	})(config);
 };
 //#endregion
 //#region src/worker/index.ts

package/dist/worker/index.d.cts

@@ -23,6 +23,11 @@ interface CloudflareWorkerDatabaseEnv {
 //#region src/r2WorkerStorage.d.ts
 interface CloudflareWorkerStorageEnv {
   JWT_SECRET: string;
+  BUCKET: {
+    get: (key: string) => Promise<{
+      text: () => Promise<string>;
+    } | null>;
+  };
 }
 type ContextResolver<TContext, TValue> = (context?: HotUpdaterContext<TContext>) => TValue | Promise<TValue>;
 interface CloudflareWorkerStorageConfig<TContext extends RequestEnvContext$1<CloudflareWorkerStorageEnv>> {
@@ -34,6 +39,6 @@ interface CloudflareWorkerStorageConfig<TContext extends RequestEnvContext$1<Clo
 interface CloudflareWorkerRuntimeEnv extends CloudflareWorkerDatabaseEnv, CloudflareWorkerStorageEnv {}
 type RequestEnvContext<TEnv = CloudflareWorkerRuntimeEnv> = RequestEnvContext$1<TEnv>;
 declare const d1Database: <TContext extends RequestEnvContext<CloudflareWorkerRuntimeEnv> = RequestEnvContext<CloudflareWorkerRuntimeEnv>>() => () => _$_hot_updater_plugin_core0.DatabasePlugin<TContext>;
-declare const r2Storage: <TContext extends RequestEnvContext<CloudflareWorkerRuntimeEnv> = RequestEnvContext<CloudflareWorkerRuntimeEnv>>(config: CloudflareWorkerStorageConfig<TContext>) => () => _$_hot_updater_plugin_core0.StoragePlugin<TContext>;
+declare const r2Storage: <TContext extends RequestEnvContext<CloudflareWorkerRuntimeEnv> = RequestEnvContext<CloudflareWorkerRuntimeEnv>>(config: CloudflareWorkerStorageConfig<TContext>) => () => _$_hot_updater_plugin_core0.RuntimeStoragePlugin<TContext>;
 //#endregion
 export { type CloudflareWorkerDatabaseEnv, CloudflareWorkerRuntimeEnv, type CloudflareWorkerStorageEnv, RequestEnvContext, d1Database, r2Storage, verifyJwtSignedUrl };

package/dist/worker/index.d.mts

@@ -23,6 +23,11 @@ interface CloudflareWorkerDatabaseEnv {
 //#region src/r2WorkerStorage.d.ts
 interface CloudflareWorkerStorageEnv {
   JWT_SECRET: string;
+  BUCKET: {
+    get: (key: string) => Promise<{
+      text: () => Promise<string>;
+    } | null>;
+  };
 }
 type ContextResolver<TContext, TValue> = (context?: HotUpdaterContext<TContext>) => TValue | Promise<TValue>;
 interface CloudflareWorkerStorageConfig<TContext extends RequestEnvContext$1<CloudflareWorkerStorageEnv>> {
@@ -34,6 +39,6 @@ interface CloudflareWorkerStorageConfig<TContext extends RequestEnvContext$1<Clo
 interface CloudflareWorkerRuntimeEnv extends CloudflareWorkerDatabaseEnv, CloudflareWorkerStorageEnv {}
 type RequestEnvContext<TEnv = CloudflareWorkerRuntimeEnv> = RequestEnvContext$1<TEnv>;
 declare const d1Database: <TContext extends RequestEnvContext<CloudflareWorkerRuntimeEnv> = RequestEnvContext<CloudflareWorkerRuntimeEnv>>() => () => _$_hot_updater_plugin_core0.DatabasePlugin<TContext>;
-declare const r2Storage: <TContext extends RequestEnvContext<CloudflareWorkerRuntimeEnv> = RequestEnvContext<CloudflareWorkerRuntimeEnv>>(config: CloudflareWorkerStorageConfig<TContext>) => () => _$_hot_updater_plugin_core0.StoragePlugin<TContext>;
+declare const r2Storage: <TContext extends RequestEnvContext<CloudflareWorkerRuntimeEnv> = RequestEnvContext<CloudflareWorkerRuntimeEnv>>(config: CloudflareWorkerStorageConfig<TContext>) => () => _$_hot_updater_plugin_core0.RuntimeStoragePlugin<TContext>;
 //#endregion
 export { type CloudflareWorkerDatabaseEnv, CloudflareWorkerRuntimeEnv, type CloudflareWorkerStorageEnv, RequestEnvContext, d1Database, r2Storage, verifyJwtSignedUrl };

package/dist/worker/index.mjs

@@ -1,6 +1,6 @@
 import { signToken, verifyJwtSignedUrl } from "@hot-updater/js";
-import { DEFAULT_ROLLOUT_COHORT_COUNT } from "@hot-updater/core";
-import { calculatePagination, createDatabasePlugin, createDatabasePluginGetUpdateInfo } from "@hot-updater/plugin-core";
+import { DEFAULT_ROLLOUT_COHORT_COUNT, getAssetBaseStorageUri, getBundlePatches, getManifestFileHash, getManifestStorageUri, stripBundleArtifactMetadata } from "@hot-updater/core";
+import { calculatePagination, createDatabasePlugin, createDatabasePluginGetUpdateInfo, createRuntimeStoragePlugin } from "@hot-updater/plugin-core";
 //#region src/cloudflareWorkerDatabase.ts
 function buildWhereClause(conditions) {
 	if (!conditions) return {
@@ -78,7 +78,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,
@@ -91,7 +118,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)
 	};
@@ -110,12 +145,30 @@ const d1WorkerDatabase = () => createDatabasePlugin({
 		const queryFirst = async (sql, params = [], context) => {
 			return await config.getDb(context).prepare(sql).bind(...params).first() ?? null;
 		};
+		const getPatchMap = async (bundleIds, context) => {
+			const patchMap = /* @__PURE__ */ new Map();
+			if (bundleIds.length === 0) return patchMap;
+			const rows = await queryAll(`
+            SELECT *
+            FROM bundle_patches
+            WHERE bundle_id IN (${bundleIds.map(() => "?").join(", ")})
+            ORDER BY order_index ASC, base_bundle_id ASC
+          `, bundleIds, context);
+			for (const row of rows) {
+				const current = patchMap.get(row.bundle_id) ?? [];
+				current.push(row);
+				patchMap.set(row.bundle_id, current);
+			}
+			return patchMap;
+		};
 		const queryBundlesForUpdateInfo = async (conditions, context) => {
 			const { sql: whereClause, params } = buildWhereClause(conditions);
-			return (await queryAll(`
+			const rows = await queryAll(`
             SELECT * FROM bundles
             ${whereClause}
-          `, params, context)).map(transformRowToBundle);
+          `, params, context);
+			const patchMap = await getPatchMap(rows.map((row) => row.id), context);
+			return rows.map((row) => transformRowToBundle(row, patchMap.get(row.id)));
 		};
 		const getTargetAppVersionsForUpdateInfo = async ({ platform, channel, minBundleId }, context) => {
 			return (await queryAll(`
@@ -156,8 +209,8 @@ const d1WorkerDatabase = () => createDatabasePlugin({
 				}
 			}),
 			async getBundleById(bundleId, context) {
-				const row = await queryFirst("SELECT * FROM bundles WHERE id = ? LIMIT 1", [bundleId], context);
-				return row ? transformRowToBundle(row) : null;
+				const [row, patchMap] = await Promise.all([queryFirst("SELECT * FROM bundles WHERE id = ? LIMIT 1", [bundleId], context), getPatchMap([bundleId], context)]);
+				return row ? transformRowToBundle(row, patchMap.get(bundleId)) : null;
 			},
 			async getBundles(options, context) {
 				const { where, limit, orderBy } = options;
@@ -165,12 +218,14 @@ const d1WorkerDatabase = () => createDatabasePlugin({
 				const { sql: whereClause, params } = buildWhereClause(where);
 				const orderSql = orderBy?.direction === "asc" ? "ORDER BY id ASC" : "ORDER BY id DESC";
 				const total = (await queryAll(`SELECT COUNT(*) as total FROM bundles${whereClause}`, params, context))[0]?.total ?? 0;
+				const rows = await queryAll(`SELECT * FROM bundles${whereClause} ${orderSql} LIMIT ? OFFSET ?`, [
+					...params,
+					limit,
+					offset
+				], context);
+				const patchMap = await getPatchMap(rows.map((row) => row.id), context);
 				return {
-					data: (await queryAll(`SELECT * FROM bundles${whereClause} ${orderSql} LIMIT ? OFFSET ?`, [
-						...params,
-						limit,
-						offset
-					], context)).map(transformRowToBundle),
+					data: rows.map((row) => transformRowToBundle(row, patchMap.get(row.id))),
 					pagination: calculatePagination(total, {
 						limit,
 						offset
@@ -185,6 +240,8 @@ const d1WorkerDatabase = () => createDatabasePlugin({
 				const db = config.getDb(context);
 				for (const operation of changedSets) {
 					if (operation.operation === "delete") {
+						await db.prepare("DELETE FROM bundle_patches WHERE bundle_id = ?").bind(operation.data.id).run();
+						await db.prepare("DELETE FROM bundle_patches WHERE base_bundle_id = ?").bind(operation.data.id).run();
 						await db.prepare("DELETE FROM bundles WHERE id = ?").bind(operation.data.id).run();
 						continue;
 					}
@@ -203,11 +260,28 @@ const d1WorkerDatabase = () => createDatabasePlugin({
                   storage_uri,
                   fingerprint_hash,
                   metadata,
+                  manifest_storage_uri,
+                  manifest_file_hash,
+                  asset_base_storage_uri,
                   rollout_cohort_count,
                   target_cohorts
                 )
-                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-              `).bind(bundle.id, bundle.channel, bundle.enabled ? 1 : 0, bundle.shouldForceUpdate ? 1 : 0, bundle.fileHash, bundle.gitCommitHash || null, bundle.message || null, bundle.platform, bundle.targetAppVersion, bundle.storageUri, bundle.fingerprintHash, JSON.stringify(bundle.metadata ?? {}), bundle.rolloutCohortCount ?? DEFAULT_ROLLOUT_COHORT_COUNT, bundle.targetCohorts ? JSON.stringify(bundle.targetCohorts) : null).run();
+                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+              `).bind(bundle.id, bundle.channel, bundle.enabled ? 1 : 0, bundle.shouldForceUpdate ? 1 : 0, bundle.fileHash, bundle.gitCommitHash || null, bundle.message || null, bundle.platform, bundle.targetAppVersion, bundle.storageUri, bundle.fingerprintHash, JSON.stringify(stripBundleArtifactMetadata(bundle.metadata) ?? {}), getManifestStorageUri(bundle), getManifestFileHash(bundle), getAssetBaseStorageUri(bundle), bundle.rolloutCohortCount ?? DEFAULT_ROLLOUT_COHORT_COUNT, bundle.targetCohorts ? JSON.stringify(bundle.targetCohorts) : null).run();
+					await db.prepare("DELETE FROM bundle_patches WHERE bundle_id = ?").bind(bundle.id).run();
+					const patchRows = bundleToPatchRows(bundle);
+					for (const patchRow of patchRows) await db.prepare(`
+                  INSERT OR REPLACE INTO bundle_patches (
+                    id,
+                    bundle_id,
+                    base_bundle_id,
+                    base_file_hash,
+                    patch_file_hash,
+                    patch_storage_uri,
+                    order_index
+                  )
+                  VALUES (?, ?, ?, ?, ?, ?, ?)
+                `).bind(patchRow.id, patchRow.bundle_id, patchRow.base_bundle_id, patchRow.base_file_hash, patchRow.patch_file_hash, patchRow.patch_storage_uri, patchRow.order_index ?? 0).run();
 				}
 			}
 		};
@@ -223,21 +297,31 @@ const resolveJwtSecretFromContext = (context) => {
 	if (!jwtSecret) throw new Error("r2WorkerStorage requires env.JWT_SECRET in the hot updater context.");
 	return jwtSecret;
 };
+const resolveR2BucketFromContext = (context) => {
+	const bucket = context?.env?.BUCKET;
+	if (!bucket) throw new Error("r2WorkerStorage requires env.BUCKET in the hot updater context.");
+	return bucket;
+};
+const createPublicObjectPath = (storageUrl) => `${storageUrl.host}${storageUrl.pathname}`;
+const createR2ObjectKey = (storageUrl) => storageUrl.pathname.replace(/^\/+/, "");
 const r2WorkerStorage = (config) => {
-	return () => {
-		return {
-			name: "r2WorkerStorage",
-			supportedProtocol: "r2",
-			async upload() {
-				throw new Error("r2WorkerStorage does not support upload() in the worker runtime.");
-			},
-			async delete() {
-				throw new Error("r2WorkerStorage does not support delete() in the worker runtime.");
+	return createRuntimeStoragePlugin({
+		name: "r2WorkerStorage",
+		supportedProtocol: "r2",
+		factory: (config) => ({
+			async readText(storageUri, context) {
+				const storageUrl = new URL(storageUri);
+				if (storageUrl.protocol !== "r2:") throw new Error("Invalid R2 storage URI protocol");
+				const bucket = resolveR2BucketFromContext(context);
+				const key = createR2ObjectKey(storageUrl);
+				const object = await bucket.get(key);
+				if (!object) return null;
+				return object.text();
 			},
 			async getDownloadUrl(storageUri, context) {
 				const storageUrl = new URL(storageUri);
 				if (storageUrl.protocol !== "r2:") throw new Error("Invalid R2 storage URI protocol");
-				const key = `${storageUrl.host}${storageUrl.pathname}`;
+				const key = createPublicObjectPath(storageUrl);
 				const [jwtSecret, publicBaseUrl] = await Promise.all([resolveContextValue(config.jwtSecret ?? resolveJwtSecretFromContext, context), resolveContextValue(config.publicBaseUrl, context)]);
 				const token = await signToken(key, jwtSecret);
 				const url = new URL(publicBaseUrl);
@@ -246,8 +330,8 @@ const r2WorkerStorage = (config) => {
 				url.searchParams.set("token", token);
 				return { fileUrl: url.toString() };
 			}
-		};
-	};
+		})
+	})(config);
 };
 //#endregion
 //#region src/worker/index.ts

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hot-updater/cloudflare",
   "type": "module",
-  "version": "0.30.11",
+  "version": "0.31.0",
   "description": "React Native OTA solution for self-hosted",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -50,11 +50,11 @@
     "cloudflare": "4.2.0",
     "hono": "4.12.9",
     "uuidv7": "^1.0.2",
-    "@hot-updater/cli-tools": "0.30.11",
-    "@hot-updater/core": "0.30.11",
-    "@hot-updater/js": "0.30.11",
-    "@hot-updater/server": "0.30.11",
-    "@hot-updater/plugin-core": "0.30.11"
+    "@hot-updater/core": "0.31.0",
+    "@hot-updater/cli-tools": "0.31.0",
+    "@hot-updater/plugin-core": "0.31.0",
+    "@hot-updater/js": "0.31.0",
+    "@hot-updater/server": "0.31.0"
   },
   "devDependencies": {
     "@cloudflare/vitest-pool-workers": "0.13.0",
@@ -71,7 +71,7 @@
     "vitest": "4.1.4",
     "wrangler": "^4.5.0",
     "xdg-app-paths": "^8.3.0",
-    "@hot-updater/test-utils": "0.30.11"
+    "@hot-updater/test-utils": "0.31.0"
   },
   "scripts": {
     "build": "tsdown && pnpm build:worker",

package/sql/bundles.sql

@@ -9,14 +9,34 @@ CREATE TABLE bundles (
     file_hash TEXT NOT NULL,
     git_commit_hash TEXT,
     message TEXT,
-    channel TEXT NOT NULL,
-    storage_uri TEXT,
+    channel TEXT NOT NULL DEFAULT 'production',
+    storage_uri TEXT NOT NULL,
     fingerprint_hash TEXT,
     metadata JSONB DEFAULT '{}',
+    manifest_storage_uri TEXT,
+    manifest_file_hash TEXT,
+    asset_base_storage_uri TEXT,
     rollout_cohort_count INTEGER DEFAULT 1000
       CHECK (rollout_cohort_count >= 0 AND rollout_cohort_count <= 1000),
-    target_cohorts TEXT
+    target_cohorts TEXT,
+    CHECK ((target_app_version IS NOT NULL) OR (fingerprint_hash IS NOT NULL))
+);
+
+CREATE TABLE bundle_patches (
+    id TEXT PRIMARY KEY,
+    bundle_id TEXT NOT NULL,
+    base_bundle_id TEXT NOT NULL,
+    base_file_hash TEXT NOT NULL,
+    patch_file_hash TEXT NOT NULL,
+    patch_storage_uri TEXT NOT NULL,
+    order_index INTEGER NOT NULL DEFAULT 0,
+    FOREIGN KEY (bundle_id) REFERENCES bundles(id) ON DELETE CASCADE,
+    FOREIGN KEY (base_bundle_id) REFERENCES bundles(id) ON DELETE CASCADE
 );
 
 CREATE INDEX bundles_target_app_version_idx ON bundles(target_app_version);
 CREATE INDEX bundles_fingerprint_hash_idx ON bundles(fingerprint_hash);
+CREATE INDEX bundles_channel_idx ON bundles(channel);
+CREATE INDEX bundles_rollout_idx ON bundles(rollout_cohort_count);
+CREATE INDEX bundle_patches_bundle_id_idx ON bundle_patches(bundle_id);
+CREATE INDEX bundle_patches_base_bundle_id_idx ON bundle_patches(base_bundle_id);