@hot-updater/supabase 0.32.0 → 0.33.0

package/dist/edge.cjs

@@ -1,4 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_supabaseEdgeFunctionStorage = require("./supabaseEdgeFunctionStorage-D933mGy9.cjs");
+const require_supabaseEdgeFunctionStorage = require("./supabaseEdgeFunctionStorage-DRxwDPRy.cjs");
 exports.supabaseEdgeFunctionDatabase = require_supabaseEdgeFunctionStorage.supabaseEdgeFunctionDatabase;
 exports.supabaseEdgeFunctionStorage = require_supabaseEdgeFunctionStorage.supabaseEdgeFunctionStorage;

package/dist/edge.mjs

@@ -1,2 +1,2 @@
-import { n as supabaseEdgeFunctionDatabase, t as supabaseEdgeFunctionStorage } from "./supabaseEdgeFunctionStorage-B4KN0khj.mjs";
+import { n as supabaseEdgeFunctionDatabase, t as supabaseEdgeFunctionStorage } from "./supabaseEdgeFunctionStorage-CO70azPw.mjs";
 export { supabaseEdgeFunctionDatabase, supabaseEdgeFunctionStorage };

package/dist/index.cjs

@@ -21,7 +21,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	enumerable: true
 }) : target, mod));
 //#endregion
-const require_supabaseEdgeFunctionStorage = require("./supabaseEdgeFunctionStorage-D933mGy9.cjs");
+const require_supabaseEdgeFunctionStorage = require("./supabaseEdgeFunctionStorage-DRxwDPRy.cjs");
 let _hot_updater_plugin_core = require("@hot-updater/plugin-core");
 let _supabase_supabase_js = require("@supabase/supabase-js");
 let fs_promises = require("fs/promises");

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { i as resolveSupabaseServiceRoleKey, n as supabaseEdgeFunctionDatabase, r as supabaseDatabase, t as supabaseEdgeFunctionStorage } from "./supabaseEdgeFunctionStorage-B4KN0khj.mjs";
+import { i as resolveSupabaseServiceRoleKey, n as supabaseEdgeFunctionDatabase, r as supabaseDatabase, t as supabaseEdgeFunctionStorage } from "./supabaseEdgeFunctionStorage-CO70azPw.mjs";
 import { createStorageKeyBuilder, createUniversalStoragePlugin, getContentType, parseStorageUri } from "@hot-updater/plugin-core";
 import { createClient } from "@supabase/supabase-js";
 import fs from "fs/promises";

package/dist/{supabaseEdgeFunctionStorage-B4KN0khj.mjs → supabaseEdgeFunctionStorage-CO70azPw.mjs}

@@ -1,14 +1,8 @@
-import { DEFAULT_ROLLOUT_COHORT_COUNT, getAssetBaseStorageUri, getBundlePatches, getManifestFileHash, getManifestStorageUri, stripBundleArtifactMetadata } from "@hot-updater/core";
-import { calculatePagination, createDatabasePlugin, createDatabasePluginGetUpdateInfo, createRuntimeStoragePlugin } from "@hot-updater/plugin-core";
+import { DEFAULT_ROLLOUT_COHORT_COUNT, NIL_UUID, getAssetBaseStorageUri, getBundlePatches, getManifestFileHash, getManifestStorageUri, stripBundleArtifactMetadata } from "@hot-updater/core";
+import { calculatePagination, createDatabasePlugin, createRuntimeStoragePlugin, filterCompatibleAppVersions } from "@hot-updater/plugin-core";
 import { createClient } from "@supabase/supabase-js";
-//#region src/supabaseConfig.ts
-const resolveSupabaseServiceRoleKey = (config) => {
-	const key = config.supabaseServiceRoleKey ?? config.supabaseAnonKey;
-	if (!key) throw new Error("Supabase service role key is required. Set supabaseServiceRoleKey.");
-	return key;
-};
-//#endregion
-//#region src/supabaseDatabase.ts
+//#region src/supabaseBundleMapper.ts
+const BUNDLE_SELECT_COLUMNS = "id, channel, enabled, platform, should_force_update, file_hash, git_commit_hash, message, fingerprint_hash, target_app_version, storage_uri, metadata, manifest_storage_uri, manifest_file_hash, asset_base_storage_uri, rollout_cohort_count, target_cohorts";
 const normalizeMetadata = (value) => {
 	if (!value) return {};
 	if (typeof value === "string") try {
@@ -19,27 +13,6 @@ const normalizeMetadata = (value) => {
 	if (typeof value === "object" && !Array.isArray(value)) return value;
 	return {};
 };
-const BUNDLE_SELECT_COLUMNS = "id, channel, enabled, platform, should_force_update, file_hash, git_commit_hash, message, fingerprint_hash, target_app_version, storage_uri, metadata, manifest_storage_uri, manifest_file_hash, asset_base_storage_uri, rollout_cohort_count, target_cohorts";
-const createSupabaseError = (error) => {
-	if (error instanceof Error) return error;
-	if (error && typeof error === "object") {
-		const properties = {};
-		let target = error;
-		while (target && target !== Object.prototype) {
-			for (const key of Object.getOwnPropertyNames(target)) properties[key] = error[key];
-			target = Object.getPrototypeOf(target);
-		}
-		return new Error(JSON.stringify({
-			name: error.constructor.name,
-			...properties
-		}));
-	}
-	try {
-		return new Error(JSON.stringify(error));
-	} catch {
-		return new Error(String(error));
-	}
-};
 const buildBundlePatchId = (bundleId, baseBundleId) => `${bundleId}:${baseBundleId}`;
 const mapRowToBundle = (row, patchRows = []) => {
 	const rawMetadata = normalizeMetadata(row.metadata);
@@ -103,6 +76,43 @@ const bundleToPatchRows = (bundle) => getBundlePatches(bundle).map((patch, index
 	patch_storage_uri: patch.patchStorageUri,
 	order_index: index
 }));
+//#endregion
+//#region src/supabaseConfig.ts
+const resolveSupabaseServiceRoleKey = (config) => {
+	const key = config.supabaseServiceRoleKey ?? config.supabaseAnonKey;
+	if (!key) throw new Error("Supabase service role key is required. Set supabaseServiceRoleKey.");
+	return key;
+};
+//#endregion
+//#region src/supabaseDatabase.ts
+const createSupabaseError = (error) => {
+	if (error instanceof Error) return error;
+	if (error && typeof error === "object") {
+		const properties = {};
+		let target = error;
+		while (target && target !== Object.prototype) {
+			for (const key of Object.getOwnPropertyNames(target)) properties[key] = error[key];
+			target = Object.getPrototypeOf(target);
+		}
+		return new Error(JSON.stringify({
+			name: error.constructor.name,
+			...properties
+		}));
+	}
+	try {
+		return new Error(JSON.stringify(error));
+	} catch {
+		return new Error(String(error));
+	}
+};
+const mapUpdateInfoRow = (row) => ({
+	id: row.id,
+	shouldForceUpdate: row.should_force_update,
+	message: row.message,
+	status: row.status,
+	storageUri: row.storage_uri,
+	fileHash: row.file_hash
+});
 const supabaseDatabase = createDatabasePlugin({
 	name: "supabaseDatabase",
 	factory: (config) => {
@@ -119,28 +129,42 @@ const supabaseDatabase = createDatabasePlugin({
 			}
 			return patchMap;
 		};
-		const mapRowsToBundles = async (rows) => {
-			const patchMap = await fetchPatchMap(rows.map((row) => row.id));
-			return rows.map((row) => mapRowToBundle(row, patchMap.get(row.id)));
-		};
 		return {
-			getUpdateInfo: createDatabasePluginGetUpdateInfo({
-				async listTargetAppVersions({ platform, channel, minBundleId }) {
-					const { data, error } = await supabase.from("bundles").select("target_app_version").eq("platform", platform).eq("channel", channel).eq("enabled", true).gte("id", minBundleId).not("target_app_version", "is", null);
+			async getUpdateInfo(args) {
+				const channel = args.channel ?? "production";
+				const minBundleId = args.minBundleId ?? NIL_UUID;
+				if (args._updateStrategy === "appVersion") {
+					const { data: targetAppVersionRows, error: targetAppVersionError } = await supabase.rpc("get_target_app_version_list", {
+						app_platform: args.platform,
+						min_bundle_id: minBundleId
+					});
+					if (targetAppVersionError) throw createSupabaseError(targetAppVersionError);
+					const targetAppVersionList = filterCompatibleAppVersions((targetAppVersionRows ?? []).map((row) => row.target_app_version).filter((version) => Boolean(version)), args.appVersion);
+					const { data, error } = await supabase.rpc("get_update_info_by_app_version", {
+						app_platform: args.platform,
+						app_version: args.appVersion,
+						bundle_id: args.bundleId,
+						min_bundle_id: minBundleId,
+						target_channel: channel,
+						target_app_version_list: targetAppVersionList,
+						cohort: args.cohort ?? null
+					});
 					if (error) throw createSupabaseError(error);
-					return Array.from(new Set((data ?? []).map((row) => row.target_app_version).filter((version) => Boolean(version))));
-				},
-				async getBundlesByTargetAppVersions({ platform, channel, minBundleId }, targetAppVersions) {
-					const { data, error } = await supabase.from("bundles").select(BUNDLE_SELECT_COLUMNS).eq("platform", platform).eq("channel", channel).eq("enabled", true).gte("id", minBundleId).in("target_app_version", targetAppVersions);
-					if (error) throw createSupabaseError(error);
-					return mapRowsToBundles(data ?? []);
-				},
-				async getBundlesByFingerprint({ platform, channel, minBundleId, fingerprintHash }) {
-					const { data, error } = await supabase.from("bundles").select(BUNDLE_SELECT_COLUMNS).eq("platform", platform).eq("channel", channel).eq("enabled", true).gte("id", minBundleId).eq("fingerprint_hash", fingerprintHash);
-					if (error) throw createSupabaseError(error);
-					return mapRowsToBundles(data ?? []);
+					const updateInfo = data?.[0] ?? null;
+					return updateInfo ? mapUpdateInfoRow(updateInfo) : null;
 				}
-			}),
+				const { data, error } = await supabase.rpc("get_update_info_by_fingerprint_hash", {
+					app_platform: args.platform,
+					bundle_id: args.bundleId,
+					min_bundle_id: minBundleId,
+					target_channel: channel,
+					target_fingerprint_hash: args.fingerprintHash,
+					cohort: args.cohort ?? null
+				});
+				if (error) throw createSupabaseError(error);
+				const updateInfo = data?.[0] ?? null;
+				return updateInfo ? mapUpdateInfoRow(updateInfo) : null;
+			},
 			async getBundleById(bundleId) {
 				const [{ data, error }, patchMap] = await Promise.all([supabase.from("bundles").select(BUNDLE_SELECT_COLUMNS).eq("id", bundleId).single(), fetchPatchMap([bundleId])]);
 				if (!data || error) return null;

package/dist/{supabaseEdgeFunctionStorage-D933mGy9.cjs → supabaseEdgeFunctionStorage-DRxwDPRy.cjs}

@@ -2,14 +2,8 @@ require("./index.cjs");
 let _hot_updater_core = require("@hot-updater/core");
 let _hot_updater_plugin_core = require("@hot-updater/plugin-core");
 let _supabase_supabase_js = require("@supabase/supabase-js");
-//#region src/supabaseConfig.ts
-const resolveSupabaseServiceRoleKey = (config) => {
-	const key = config.supabaseServiceRoleKey ?? config.supabaseAnonKey;
-	if (!key) throw new Error("Supabase service role key is required. Set supabaseServiceRoleKey.");
-	return key;
-};
-//#endregion
-//#region src/supabaseDatabase.ts
+//#region src/supabaseBundleMapper.ts
+const BUNDLE_SELECT_COLUMNS = "id, channel, enabled, platform, should_force_update, file_hash, git_commit_hash, message, fingerprint_hash, target_app_version, storage_uri, metadata, manifest_storage_uri, manifest_file_hash, asset_base_storage_uri, rollout_cohort_count, target_cohorts";
 const normalizeMetadata = (value) => {
 	if (!value) return {};
 	if (typeof value === "string") try {
@@ -20,27 +14,6 @@ const normalizeMetadata = (value) => {
 	if (typeof value === "object" && !Array.isArray(value)) return value;
 	return {};
 };
-const BUNDLE_SELECT_COLUMNS = "id, channel, enabled, platform, should_force_update, file_hash, git_commit_hash, message, fingerprint_hash, target_app_version, storage_uri, metadata, manifest_storage_uri, manifest_file_hash, asset_base_storage_uri, rollout_cohort_count, target_cohorts";
-const createSupabaseError = (error) => {
-	if (error instanceof Error) return error;
-	if (error && typeof error === "object") {
-		const properties = {};
-		let target = error;
-		while (target && target !== Object.prototype) {
-			for (const key of Object.getOwnPropertyNames(target)) properties[key] = error[key];
-			target = Object.getPrototypeOf(target);
-		}
-		return new Error(JSON.stringify({
-			name: error.constructor.name,
-			...properties
-		}));
-	}
-	try {
-		return new Error(JSON.stringify(error));
-	} catch {
-		return new Error(String(error));
-	}
-};
 const buildBundlePatchId = (bundleId, baseBundleId) => `${bundleId}:${baseBundleId}`;
 const mapRowToBundle = (row, patchRows = []) => {
 	const rawMetadata = normalizeMetadata(row.metadata);
@@ -104,6 +77,43 @@ const bundleToPatchRows = (bundle) => (0, _hot_updater_core.getBundlePatches)(bu
 	patch_storage_uri: patch.patchStorageUri,
 	order_index: index
 }));
+//#endregion
+//#region src/supabaseConfig.ts
+const resolveSupabaseServiceRoleKey = (config) => {
+	const key = config.supabaseServiceRoleKey ?? config.supabaseAnonKey;
+	if (!key) throw new Error("Supabase service role key is required. Set supabaseServiceRoleKey.");
+	return key;
+};
+//#endregion
+//#region src/supabaseDatabase.ts
+const createSupabaseError = (error) => {
+	if (error instanceof Error) return error;
+	if (error && typeof error === "object") {
+		const properties = {};
+		let target = error;
+		while (target && target !== Object.prototype) {
+			for (const key of Object.getOwnPropertyNames(target)) properties[key] = error[key];
+			target = Object.getPrototypeOf(target);
+		}
+		return new Error(JSON.stringify({
+			name: error.constructor.name,
+			...properties
+		}));
+	}
+	try {
+		return new Error(JSON.stringify(error));
+	} catch {
+		return new Error(String(error));
+	}
+};
+const mapUpdateInfoRow = (row) => ({
+	id: row.id,
+	shouldForceUpdate: row.should_force_update,
+	message: row.message,
+	status: row.status,
+	storageUri: row.storage_uri,
+	fileHash: row.file_hash
+});
 const supabaseDatabase = (0, _hot_updater_plugin_core.createDatabasePlugin)({
 	name: "supabaseDatabase",
 	factory: (config) => {
@@ -120,28 +130,42 @@ const supabaseDatabase = (0, _hot_updater_plugin_core.createDatabasePlugin)({
 			}
 			return patchMap;
 		};
-		const mapRowsToBundles = async (rows) => {
-			const patchMap = await fetchPatchMap(rows.map((row) => row.id));
-			return rows.map((row) => mapRowToBundle(row, patchMap.get(row.id)));
-		};
 		return {
-			getUpdateInfo: (0, _hot_updater_plugin_core.createDatabasePluginGetUpdateInfo)({
-				async listTargetAppVersions({ platform, channel, minBundleId }) {
-					const { data, error } = await supabase.from("bundles").select("target_app_version").eq("platform", platform).eq("channel", channel).eq("enabled", true).gte("id", minBundleId).not("target_app_version", "is", null);
+			async getUpdateInfo(args) {
+				const channel = args.channel ?? "production";
+				const minBundleId = args.minBundleId ?? _hot_updater_core.NIL_UUID;
+				if (args._updateStrategy === "appVersion") {
+					const { data: targetAppVersionRows, error: targetAppVersionError } = await supabase.rpc("get_target_app_version_list", {
+						app_platform: args.platform,
+						min_bundle_id: minBundleId
+					});
+					if (targetAppVersionError) throw createSupabaseError(targetAppVersionError);
+					const targetAppVersionList = (0, _hot_updater_plugin_core.filterCompatibleAppVersions)((targetAppVersionRows ?? []).map((row) => row.target_app_version).filter((version) => Boolean(version)), args.appVersion);
+					const { data, error } = await supabase.rpc("get_update_info_by_app_version", {
+						app_platform: args.platform,
+						app_version: args.appVersion,
+						bundle_id: args.bundleId,
+						min_bundle_id: minBundleId,
+						target_channel: channel,
+						target_app_version_list: targetAppVersionList,
+						cohort: args.cohort ?? null
+					});
 					if (error) throw createSupabaseError(error);
-					return Array.from(new Set((data ?? []).map((row) => row.target_app_version).filter((version) => Boolean(version))));
-				},
-				async getBundlesByTargetAppVersions({ platform, channel, minBundleId }, targetAppVersions) {
-					const { data, error } = await supabase.from("bundles").select(BUNDLE_SELECT_COLUMNS).eq("platform", platform).eq("channel", channel).eq("enabled", true).gte("id", minBundleId).in("target_app_version", targetAppVersions);
-					if (error) throw createSupabaseError(error);
-					return mapRowsToBundles(data ?? []);
-				},
-				async getBundlesByFingerprint({ platform, channel, minBundleId, fingerprintHash }) {
-					const { data, error } = await supabase.from("bundles").select(BUNDLE_SELECT_COLUMNS).eq("platform", platform).eq("channel", channel).eq("enabled", true).gte("id", minBundleId).eq("fingerprint_hash", fingerprintHash);
-					if (error) throw createSupabaseError(error);
-					return mapRowsToBundles(data ?? []);
+					const updateInfo = data?.[0] ?? null;
+					return updateInfo ? mapUpdateInfoRow(updateInfo) : null;
 				}
-			}),
+				const { data, error } = await supabase.rpc("get_update_info_by_fingerprint_hash", {
+					app_platform: args.platform,
+					bundle_id: args.bundleId,
+					min_bundle_id: minBundleId,
+					target_channel: channel,
+					target_fingerprint_hash: args.fingerprintHash,
+					cohort: args.cohort ?? null
+				});
+				if (error) throw createSupabaseError(error);
+				const updateInfo = data?.[0] ?? null;
+				return updateInfo ? mapUpdateInfoRow(updateInfo) : null;
+			},
 			async getBundleById(bundleId) {
 				const [{ data, error }, patchMap] = await Promise.all([supabase.from("bundles").select(BUNDLE_SELECT_COLUMNS).eq("id", bundleId).single(), fetchPatchMap([bundleId])]);
 				if (!data || error) return null;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hot-updater/supabase",
   "type": "module",
-  "version": "0.32.0",
+  "version": "0.33.0",
   "description": "React Native OTA solution for self-hosted",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -47,10 +47,10 @@
     "@supabase/supabase-js": "2.76.1",
     "hono": "4.12.9",
     "uuidv7": "^1.0.2",
-    "@hot-updater/core": "0.32.0",
-    "@hot-updater/plugin-core": "0.32.0",
-    "@hot-updater/cli-tools": "0.32.0",
-    "@hot-updater/server": "0.32.0"
+    "@hot-updater/core": "0.33.0",
+    "@hot-updater/plugin-core": "0.33.0",
+    "@hot-updater/server": "0.33.0",
+    "@hot-updater/cli-tools": "0.33.0"
   },
   "devDependencies": {
     "@electric-sql/pglite": "0.2.17",
@@ -60,10 +60,10 @@
     "execa": "9.5.2",
     "@types/node": "^20",
     "mime": "^4.0.4",
-    "@hot-updater/js": "0.32.0",
-    "@hot-updater/mock": "0.32.0",
-    "@hot-updater/test-utils": "0.32.0",
-    "@hot-updater/postgres": "0.32.0"
+    "@hot-updater/js": "0.33.0",
+    "@hot-updater/mock": "0.33.0",
+    "@hot-updater/postgres": "0.33.0",
+    "@hot-updater/test-utils": "0.33.0"
   },
   "scripts": {
     "build": "tsdown",