@hot-updater/postgres 0.30.11 → 0.31.0

package/dist/index.cjs

@@ -1908,11 +1908,95 @@ const getUpdateInfo = (pool, args) => {
 };
 //#endregion
 //#region src/postgres.ts
+const normalizeMetadata = (value) => {
+	if (!value) return;
+	if (typeof value === "string") try {
+		return normalizeMetadata(JSON.parse(value));
+	} catch {
+		return;
+	}
+	if (typeof value === "object" && !Array.isArray(value)) return value;
+};
+const buildBundlePatchId = (bundleId, baseBundleId) => `${bundleId}:${baseBundleId}`;
+const mapPatchRowToPatch = (row) => ({
+	baseBundleId: row.base_bundle_id,
+	baseFileHash: row.base_file_hash,
+	patchFileHash: row.patch_file_hash,
+	patchStorageUri: row.patch_storage_uri
+});
+const mapRowToBundle = (data, patchRows = []) => {
+	const rawMetadata = normalizeMetadata(data.metadata);
+	const patches = patchRows.slice().sort((left, right) => left.order_index - right.order_index || left.base_bundle_id.localeCompare(right.base_bundle_id)).map(mapPatchRowToPatch);
+	const primaryPatch = patches[0] ?? null;
+	return {
+		enabled: data.enabled,
+		shouldForceUpdate: data.should_force_update,
+		fileHash: data.file_hash,
+		gitCommitHash: data.git_commit_hash,
+		id: data.id,
+		message: data.message,
+		platform: data.platform,
+		targetAppVersion: data.target_app_version,
+		channel: data.channel,
+		storageUri: data.storage_uri,
+		fingerprintHash: data.fingerprint_hash,
+		metadata: (0, _hot_updater_core.stripBundleArtifactMetadata)(rawMetadata),
+		manifestStorageUri: data.manifest_storage_uri ?? null,
+		manifestFileHash: data.manifest_file_hash ?? null,
+		assetBaseStorageUri: data.asset_base_storage_uri ?? null,
+		patches,
+		patchBaseBundleId: primaryPatch?.baseBundleId ?? null,
+		patchBaseFileHash: primaryPatch?.baseFileHash ?? null,
+		patchFileHash: primaryPatch?.patchFileHash ?? null,
+		patchStorageUri: primaryPatch?.patchStorageUri ?? null,
+		rolloutCohortCount: data.rollout_cohort_count,
+		targetCohorts: data.target_cohorts
+	};
+};
+const bundleToRowValues = (bundle) => ({
+	id: bundle.id,
+	enabled: bundle.enabled,
+	should_force_update: bundle.shouldForceUpdate,
+	file_hash: bundle.fileHash,
+	git_commit_hash: bundle.gitCommitHash,
+	message: bundle.message,
+	platform: bundle.platform,
+	target_app_version: bundle.targetAppVersion,
+	channel: bundle.channel,
+	storage_uri: bundle.storageUri,
+	fingerprint_hash: bundle.fingerprintHash,
+	metadata: (0, _hot_updater_core.stripBundleArtifactMetadata)(bundle.metadata) ?? {},
+	manifest_storage_uri: (0, _hot_updater_core.getManifestStorageUri)(bundle),
+	manifest_file_hash: (0, _hot_updater_core.getManifestFileHash)(bundle),
+	asset_base_storage_uri: (0, _hot_updater_core.getAssetBaseStorageUri)(bundle),
+	rollout_cohort_count: bundle.rolloutCohortCount ?? null,
+	target_cohorts: bundle.targetCohorts ?? null
+});
+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
+}));
 const postgres = (0, _hot_updater_plugin_core.createDatabasePlugin)({
 	name: "postgres",
 	factory: (config) => {
 		const pool = new pg.Pool(config);
 		const db = new kysely.Kysely({ dialect: new kysely.PostgresDialect({ pool }) });
+		const fetchPatchMap = async (bundleIds) => {
+			const patchMap = /* @__PURE__ */ new Map();
+			if (bundleIds.length === 0) return patchMap;
+			const rows = await db.selectFrom("bundle_patches").selectAll().where("bundle_id", "in", bundleIds).orderBy("order_index", "asc").execute();
+			for (const row of rows) {
+				const current = patchMap.get(row.bundle_id) ?? [];
+				current.push(row);
+				patchMap.set(row.bundle_id, current);
+			}
+			return patchMap;
+		};
 		return {
 			async onUnmount() {
 				await db.destroy();
@@ -1922,21 +2006,9 @@ const postgres = (0, _hot_updater_plugin_core.createDatabasePlugin)({
 				return getUpdateInfo(pool, args);
 			},
 			async getBundleById(bundleId) {
-				const data = await db.selectFrom("bundles").selectAll().where("id", "=", bundleId).executeTakeFirst();
+				const [data, patchMap] = await Promise.all([db.selectFrom("bundles").selectAll().where("id", "=", bundleId).executeTakeFirst(), fetchPatchMap([bundleId])]);
 				if (!data) return null;
-				return {
-					enabled: data.enabled,
-					shouldForceUpdate: data.should_force_update,
-					fileHash: data.file_hash,
-					gitCommitHash: data.git_commit_hash,
-					id: data.id,
-					message: data.message,
-					platform: data.platform,
-					targetAppVersion: data.target_app_version,
-					channel: data.channel,
-					storageUri: data.storage_uri,
-					fingerprintHash: data.fingerprint_hash
-				};
+				return mapRowToBundle(data, patchMap.get(bundleId) ?? []);
 			},
 			async getBundles(options) {
 				const { where, limit, orderBy } = options ?? {};
@@ -1972,20 +2044,10 @@ const postgres = (0, _hot_updater_plugin_core.createDatabasePlugin)({
 				if (where?.id?.in) query = query.where("id", "in", where.id.in);
 				if (limit) query = query.limit(limit);
 				if (offset) query = query.offset(offset);
+				const data = await query.selectAll().execute();
+				const patchMap = await fetchPatchMap(data.map((bundle) => bundle.id));
 				return {
-					data: (await query.selectAll().execute()).map((bundle) => ({
-						enabled: bundle.enabled,
-						shouldForceUpdate: bundle.should_force_update,
-						fileHash: bundle.file_hash,
-						gitCommitHash: bundle.git_commit_hash,
-						id: bundle.id,
-						message: bundle.message,
-						platform: bundle.platform,
-						targetAppVersion: bundle.target_app_version,
-						channel: bundle.channel,
-						storageUri: bundle.storage_uri,
-						fingerprintHash: bundle.fingerprint_hash
-					})),
+					data: data.map((bundle) => mapRowToBundle(bundle, patchMap.get(bundle.id) ?? [])),
 					pagination: (0, _hot_updater_plugin_core.calculatePagination)(total, {
 						limit,
 						offset
@@ -1999,33 +2061,17 @@ const postgres = (0, _hot_updater_plugin_core.createDatabasePlugin)({
 				if (changedSets.length === 0) return;
 				await db.transaction().execute(async (tx) => {
 					for (const op of changedSets) if (op.operation === "delete") {
+						await tx.deleteFrom("bundle_patches").where("bundle_id", "=", op.data.id).execute();
+						await tx.deleteFrom("bundle_patches").where("base_bundle_id", "=", op.data.id).execute();
 						if ((await tx.deleteFrom("bundles").where("id", "=", op.data.id).executeTakeFirst()).numDeletedRows === 0n) throw new Error(`Bundle with id ${op.data.id} not found`);
 					} else if (op.operation === "insert" || op.operation === "update") {
 						const bundle = op.data;
-						await tx.insertInto("bundles").values({
-							id: bundle.id,
-							enabled: bundle.enabled,
-							should_force_update: bundle.shouldForceUpdate,
-							file_hash: bundle.fileHash,
-							git_commit_hash: bundle.gitCommitHash,
-							message: bundle.message,
-							platform: bundle.platform,
-							target_app_version: bundle.targetAppVersion,
-							channel: bundle.channel,
-							storage_uri: bundle.storageUri,
-							fingerprint_hash: bundle.fingerprintHash
-						}).onConflict((oc) => oc.column("id").doUpdateSet({
-							enabled: bundle.enabled,
-							should_force_update: bundle.shouldForceUpdate,
-							file_hash: bundle.fileHash,
-							git_commit_hash: bundle.gitCommitHash,
-							message: bundle.message,
-							platform: bundle.platform,
-							target_app_version: bundle.targetAppVersion,
-							channel: bundle.channel,
-							storage_uri: bundle.storageUri,
-							fingerprint_hash: bundle.fingerprintHash
-						})).execute();
+						const values = bundleToRowValues(bundle);
+						const patchRows = bundleToPatchRows(bundle);
+						const { id: _id, ...updateValues } = values;
+						await tx.insertInto("bundles").values(values).onConflict((oc) => oc.column("id").doUpdateSet(updateValues)).execute();
+						await tx.deleteFrom("bundle_patches").where("bundle_id", "=", bundle.id).execute();
+						if (patchRows.length > 0) await tx.insertInto("bundle_patches").values(patchRows).execute();
 					}
 				});
 			}

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { createRequire } from "node:module";
-import { NIL_UUID } from "@hot-updater/core";
+import { NIL_UUID, getAssetBaseStorageUri, getBundlePatches, getManifestFileHash, getManifestStorageUri, stripBundleArtifactMetadata } from "@hot-updater/core";
 import { calculatePagination, createDatabasePlugin } from "@hot-updater/plugin-core";
 import { Kysely, PostgresDialect } from "kysely";
 import { Pool } from "pg";
@@ -1909,11 +1909,95 @@ const getUpdateInfo = (pool, args) => {
 };
 //#endregion
 //#region src/postgres.ts
+const normalizeMetadata = (value) => {
+	if (!value) return;
+	if (typeof value === "string") try {
+		return normalizeMetadata(JSON.parse(value));
+	} catch {
+		return;
+	}
+	if (typeof value === "object" && !Array.isArray(value)) return value;
+};
+const buildBundlePatchId = (bundleId, baseBundleId) => `${bundleId}:${baseBundleId}`;
+const mapPatchRowToPatch = (row) => ({
+	baseBundleId: row.base_bundle_id,
+	baseFileHash: row.base_file_hash,
+	patchFileHash: row.patch_file_hash,
+	patchStorageUri: row.patch_storage_uri
+});
+const mapRowToBundle = (data, patchRows = []) => {
+	const rawMetadata = normalizeMetadata(data.metadata);
+	const patches = patchRows.slice().sort((left, right) => left.order_index - right.order_index || left.base_bundle_id.localeCompare(right.base_bundle_id)).map(mapPatchRowToPatch);
+	const primaryPatch = patches[0] ?? null;
+	return {
+		enabled: data.enabled,
+		shouldForceUpdate: data.should_force_update,
+		fileHash: data.file_hash,
+		gitCommitHash: data.git_commit_hash,
+		id: data.id,
+		message: data.message,
+		platform: data.platform,
+		targetAppVersion: data.target_app_version,
+		channel: data.channel,
+		storageUri: data.storage_uri,
+		fingerprintHash: data.fingerprint_hash,
+		metadata: stripBundleArtifactMetadata(rawMetadata),
+		manifestStorageUri: data.manifest_storage_uri ?? null,
+		manifestFileHash: data.manifest_file_hash ?? null,
+		assetBaseStorageUri: data.asset_base_storage_uri ?? null,
+		patches,
+		patchBaseBundleId: primaryPatch?.baseBundleId ?? null,
+		patchBaseFileHash: primaryPatch?.baseFileHash ?? null,
+		patchFileHash: primaryPatch?.patchFileHash ?? null,
+		patchStorageUri: primaryPatch?.patchStorageUri ?? null,
+		rolloutCohortCount: data.rollout_cohort_count,
+		targetCohorts: data.target_cohorts
+	};
+};
+const bundleToRowValues = (bundle) => ({
+	id: bundle.id,
+	enabled: bundle.enabled,
+	should_force_update: bundle.shouldForceUpdate,
+	file_hash: bundle.fileHash,
+	git_commit_hash: bundle.gitCommitHash,
+	message: bundle.message,
+	platform: bundle.platform,
+	target_app_version: bundle.targetAppVersion,
+	channel: bundle.channel,
+	storage_uri: bundle.storageUri,
+	fingerprint_hash: bundle.fingerprintHash,
+	metadata: stripBundleArtifactMetadata(bundle.metadata) ?? {},
+	manifest_storage_uri: getManifestStorageUri(bundle),
+	manifest_file_hash: getManifestFileHash(bundle),
+	asset_base_storage_uri: getAssetBaseStorageUri(bundle),
+	rollout_cohort_count: bundle.rolloutCohortCount ?? null,
+	target_cohorts: bundle.targetCohorts ?? null
+});
+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
+}));
 const postgres = createDatabasePlugin({
 	name: "postgres",
 	factory: (config) => {
 		const pool = new Pool(config);
 		const db = new Kysely({ dialect: new PostgresDialect({ pool }) });
+		const fetchPatchMap = async (bundleIds) => {
+			const patchMap = /* @__PURE__ */ new Map();
+			if (bundleIds.length === 0) return patchMap;
+			const rows = await db.selectFrom("bundle_patches").selectAll().where("bundle_id", "in", bundleIds).orderBy("order_index", "asc").execute();
+			for (const row of rows) {
+				const current = patchMap.get(row.bundle_id) ?? [];
+				current.push(row);
+				patchMap.set(row.bundle_id, current);
+			}
+			return patchMap;
+		};
 		return {
 			async onUnmount() {
 				await db.destroy();
@@ -1923,21 +2007,9 @@ const postgres = createDatabasePlugin({
 				return getUpdateInfo(pool, args);
 			},
 			async getBundleById(bundleId) {
-				const data = await db.selectFrom("bundles").selectAll().where("id", "=", bundleId).executeTakeFirst();
+				const [data, patchMap] = await Promise.all([db.selectFrom("bundles").selectAll().where("id", "=", bundleId).executeTakeFirst(), fetchPatchMap([bundleId])]);
 				if (!data) return null;
-				return {
-					enabled: data.enabled,
-					shouldForceUpdate: data.should_force_update,
-					fileHash: data.file_hash,
-					gitCommitHash: data.git_commit_hash,
-					id: data.id,
-					message: data.message,
-					platform: data.platform,
-					targetAppVersion: data.target_app_version,
-					channel: data.channel,
-					storageUri: data.storage_uri,
-					fingerprintHash: data.fingerprint_hash
-				};
+				return mapRowToBundle(data, patchMap.get(bundleId) ?? []);
 			},
 			async getBundles(options) {
 				const { where, limit, orderBy } = options ?? {};
@@ -1973,20 +2045,10 @@ const postgres = createDatabasePlugin({
 				if (where?.id?.in) query = query.where("id", "in", where.id.in);
 				if (limit) query = query.limit(limit);
 				if (offset) query = query.offset(offset);
+				const data = await query.selectAll().execute();
+				const patchMap = await fetchPatchMap(data.map((bundle) => bundle.id));
 				return {
-					data: (await query.selectAll().execute()).map((bundle) => ({
-						enabled: bundle.enabled,
-						shouldForceUpdate: bundle.should_force_update,
-						fileHash: bundle.file_hash,
-						gitCommitHash: bundle.git_commit_hash,
-						id: bundle.id,
-						message: bundle.message,
-						platform: bundle.platform,
-						targetAppVersion: bundle.target_app_version,
-						channel: bundle.channel,
-						storageUri: bundle.storage_uri,
-						fingerprintHash: bundle.fingerprint_hash
-					})),
+					data: data.map((bundle) => mapRowToBundle(bundle, patchMap.get(bundle.id) ?? [])),
 					pagination: calculatePagination(total, {
 						limit,
 						offset
@@ -2000,33 +2062,17 @@ const postgres = createDatabasePlugin({
 				if (changedSets.length === 0) return;
 				await db.transaction().execute(async (tx) => {
 					for (const op of changedSets) if (op.operation === "delete") {
+						await tx.deleteFrom("bundle_patches").where("bundle_id", "=", op.data.id).execute();
+						await tx.deleteFrom("bundle_patches").where("base_bundle_id", "=", op.data.id).execute();
 						if ((await tx.deleteFrom("bundles").where("id", "=", op.data.id).executeTakeFirst()).numDeletedRows === 0n) throw new Error(`Bundle with id ${op.data.id} not found`);
 					} else if (op.operation === "insert" || op.operation === "update") {
 						const bundle = op.data;
-						await tx.insertInto("bundles").values({
-							id: bundle.id,
-							enabled: bundle.enabled,
-							should_force_update: bundle.shouldForceUpdate,
-							file_hash: bundle.fileHash,
-							git_commit_hash: bundle.gitCommitHash,
-							message: bundle.message,
-							platform: bundle.platform,
-							target_app_version: bundle.targetAppVersion,
-							channel: bundle.channel,
-							storage_uri: bundle.storageUri,
-							fingerprint_hash: bundle.fingerprintHash
-						}).onConflict((oc) => oc.column("id").doUpdateSet({
-							enabled: bundle.enabled,
-							should_force_update: bundle.shouldForceUpdate,
-							file_hash: bundle.fileHash,
-							git_commit_hash: bundle.gitCommitHash,
-							message: bundle.message,
-							platform: bundle.platform,
-							target_app_version: bundle.targetAppVersion,
-							channel: bundle.channel,
-							storage_uri: bundle.storageUri,
-							fingerprint_hash: bundle.fingerprintHash
-						})).execute();
+						const values = bundleToRowValues(bundle);
+						const patchRows = bundleToPatchRows(bundle);
+						const { id: _id, ...updateValues } = values;
+						await tx.insertInto("bundles").values(values).onConflict((oc) => oc.column("id").doUpdateSet(updateValues)).execute();
+						await tx.deleteFrom("bundle_patches").where("bundle_id", "=", bundle.id).execute();
+						if (patchRows.length > 0) await tx.insertInto("bundle_patches").values(patchRows).execute();
 					}
 				});
 			}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hot-updater/postgres",
   "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",
@@ -31,8 +31,8 @@
   "dependencies": {
     "kysely": "0.28.16",
     "pg": "8.13.1",
-    "@hot-updater/core": "0.30.11",
-    "@hot-updater/plugin-core": "0.30.11"
+    "@hot-updater/core": "0.31.0",
+    "@hot-updater/plugin-core": "0.31.0"
   },
   "devDependencies": {
     "@electric-sql/pglite": "0.2.17",
@@ -40,8 +40,8 @@
     "@types/pg": "^8.11.10",
     "camelcase-keys": "^9.1.3",
     "pg-minify": "^1.6.5",
-    "@hot-updater/js": "0.30.11",
-    "@hot-updater/test-utils": "0.30.11"
+    "@hot-updater/js": "0.31.0",
+    "@hot-updater/test-utils": "0.31.0"
   },
   "inlinedDependencies": {
     "camelcase": "8.0.0",

package/sql/bundles.sql

@@ -18,13 +18,28 @@ CREATE TABLE bundles (
         (target_app_version IS NOT NULL) OR (fingerprint_hash IS NOT NULL)
     ),
     metadata jsonb DEFAULT '{}'::jsonb,
+    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[]
 );
 
+CREATE TABLE bundle_patches (
+    id text PRIMARY KEY,
+    bundle_id uuid NOT NULL REFERENCES bundles(id) ON DELETE CASCADE,
+    base_bundle_id uuid NOT NULL REFERENCES bundles(id) ON DELETE CASCADE,
+    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
+);
+
 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 bundles_target_cohorts_idx ON bundles USING GIN (target_cohorts);
+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);

package/sql/get_update_info.spec.ts

@@ -157,6 +157,7 @@ const getUpdateInfo = createGetUpdateInfo(db);
 
 describe("getUpdateInfo", () => {
   beforeEach(async () => {
+    await db.exec("DELETE FROM bundle_patches");
     await db.exec("DELETE FROM bundles");
   });