@hot-updater/firebase 0.29.2 → 0.29.3

package/dist/firebase/functions/index.cjs

@@ -1493,12 +1493,12 @@ function mergeBundleUpdate(baseBundle, patch) {
 */
 function createDatabasePlugin(options) {
 	return (config, hooks) => {
+		let cachedMethods = null;
+		const getMethods = () => {
+			if (!cachedMethods) cachedMethods = options.factory(config);
+			return cachedMethods;
+		};
 		return () => {
-			let cachedMethods = null;
-			const getMethods = () => {
-				if (!cachedMethods) cachedMethods = options.factory(config);
-				return cachedMethods;
-			};
 			const changedMap = /* @__PURE__ */ new Map();
 			const markChanged = (operation, data) => {
 				changedMap.set(data.id, {
@@ -1529,8 +1529,8 @@ function createDatabasePlugin(options) {
 					const params = { changedSets: Array.from(changedMap.values()) };
 					if (context === void 0) await methods.commitBundle(params);
 					else await methods.commitBundle(params, context);
-					await hooks?.onDatabaseUpdated?.();
 					changedMap.clear();
+					await hooks?.onDatabaseUpdated?.();
 				},
 				async updateBundle(targetBundleId, newBundle, context) {
 					const pendingChange = changedMap.get(targetBundleId);
@@ -1673,6 +1673,23 @@ const sortBundles = (bundles, orderBy) => {
 		return direction === "asc" ? result : -result;
 	});
 };
+const applyFirestoreQueryableFilters = (query, where) => {
+	let nextQuery = query;
+	if (where?.channel) nextQuery = nextQuery.where("channel", "==", where.channel);
+	if (where?.platform) nextQuery = nextQuery.where("platform", "==", where.platform);
+	if (where?.enabled !== void 0) nextQuery = nextQuery.where("enabled", "==", where.enabled);
+	if (where?.fingerprintHash !== void 0 && where.fingerprintHash !== null) nextQuery = nextQuery.where("fingerprint_hash", "==", where.fingerprintHash);
+	if (where?.targetAppVersion !== void 0 && where.targetAppVersion !== null) nextQuery = nextQuery.where("target_app_version", "==", where.targetAppVersion);
+	if (where?.id?.eq) nextQuery = nextQuery.where("id", "==", where.id.eq);
+	if (where?.id?.gt) nextQuery = nextQuery.where("id", ">", where.id.gt);
+	if (where?.id?.gte) nextQuery = nextQuery.where("id", ">=", where.id.gte);
+	if (where?.id?.lt) nextQuery = nextQuery.where("id", "<", where.id.lt);
+	if (where?.id?.lte) nextQuery = nextQuery.where("id", "<=", where.id.lte);
+	return nextQuery;
+};
+const requiresInMemoryFiltering = (where) => {
+	return Boolean(where?.id?.in || where?.targetAppVersionIn || where?.targetAppVersionNotNull || where?.targetAppVersion === null || where?.fingerprintHash === null);
+};
 const convertToBundle = (firestoreData) => ({
 	channel: firestoreData.channel,
 	enabled: Boolean(firestoreData.enabled),
@@ -1692,7 +1709,6 @@ const convertToBundle = (firestoreData) => ({
 const firebaseDatabase = createDatabasePlugin({
 	name: "firebaseDatabase",
 	factory: (config) => {
-		let bundles = [];
 		let app;
 		try {
 			app = firebase_admin.default.app();
@@ -1703,32 +1719,30 @@ const firebaseDatabase = createDatabasePlugin({
 		const bundlesCollection = db.collection("bundles");
 		return {
 			async getBundleById(bundleId) {
-				const found = bundles.find((b) => b.id === bundleId);
-				if (found) return found;
 				const bundleSnap = await bundlesCollection.doc(bundleId).get();
 				if (!bundleSnap.exists) return null;
 				return convertToBundle(bundleSnap.data());
 			},
 			async getBundles(options) {
 				const { where, limit, offset, orderBy } = options;
-				let query = bundlesCollection;
-				if (where?.channel) query = query.where("channel", "==", where.channel);
-				if (where?.platform) query = query.where("platform", "==", where.platform);
-				if (where?.enabled !== void 0) query = query.where("enabled", "==", where.enabled);
-				if (where?.fingerprintHash !== void 0 && where.fingerprintHash !== null) query = query.where("fingerprint_hash", "==", where.fingerprintHash);
-				if (where?.targetAppVersion !== void 0 && where.targetAppVersion !== null) query = query.where("target_app_version", "==", where.targetAppVersion);
-				if (where?.id?.eq) query = query.where("id", "==", where.id.eq);
-				if (where?.id?.gt) query = query.where("id", ">", where.id.gt);
-				if (where?.id?.gte) query = query.where("id", ">=", where.id.gte);
-				if (where?.id?.lt) query = query.where("id", "<", where.id.lt);
-				if (where?.id?.lte) query = query.where("id", "<=", where.id.lte);
+				let query = applyFirestoreQueryableFilters(bundlesCollection, where);
 				query = query.orderBy("id", orderBy?.direction === "asc" ? "asc" : "desc");
+				if (requiresInMemoryFiltering(where)) {
+					const filteredBundles = sortBundles((await query.get()).docs.map((doc) => convertToBundle(doc.data())).filter((bundle) => bundleMatchesQueryWhere(bundle, where)), orderBy);
+					const total = filteredBundles.length;
+					return {
+						data: filteredBundles.slice(offset, offset + limit),
+						pagination: calculatePagination(total, {
+							limit,
+							offset
+						})
+					};
+				}
 				const total = (await query.get()).size;
 				if (offset > 0) query = query.offset(offset);
 				if (limit) query = query.limit(limit);
-				bundles = sortBundles((await query.get()).docs.map((doc) => convertToBundle(doc.data())).filter((bundle) => bundleMatchesQueryWhere(bundle, where)), orderBy);
 				return {
-					data: bundles,
+					data: sortBundles((await query.get()).docs.map((doc) => convertToBundle(doc.data())), orderBy),
 					pagination: calculatePagination(total, {
 						limit,
 						offset
@@ -1748,7 +1762,6 @@ const firebaseDatabase = createDatabasePlugin({
 			async commitBundle({ changedSets }) {
 				if (changedSets.length === 0) return;
 				let isTargetAppVersionChanged = false;
-				const deletedBundleIds = /* @__PURE__ */ new Set();
 				await db.runTransaction(async (transaction) => {
 					const bundlesSnapshot = await transaction.get(bundlesCollection);
 					const targetVersionsSnapshot = await transaction.get(db.collection("target_app_versions"));
@@ -1779,7 +1792,6 @@ const firebaseDatabase = createDatabasePlugin({
 						} else if (operation === "delete") {
 							if (!bundlesMap[data.id]) throw new Error(`Bundle with id ${data.id} not found`);
 							delete bundlesMap[data.id];
-							deletedBundleIds.add(data.id);
 							isTargetAppVersionChanged = true;
 						}
 					}
@@ -1827,7 +1839,6 @@ const firebaseDatabase = createDatabasePlugin({
 					}
 					for (const channelDoc of channelsSnapshot.docs) if (!requiredChannels.has(channelDoc.id)) transaction.delete(channelDoc.ref);
 				});
-				for (const bundleId of deletedBundleIds) bundles = bundles.filter((b) => b.id !== bundleId);
 			}
 		};
 	}

package/dist/index.cjs

@@ -54,6 +54,23 @@ const sortBundles = (bundles, orderBy) => {
 		return direction === "asc" ? result : -result;
 	});
 };
+const applyFirestoreQueryableFilters = (query, where) => {
+	let nextQuery = query;
+	if (where?.channel) nextQuery = nextQuery.where("channel", "==", where.channel);
+	if (where?.platform) nextQuery = nextQuery.where("platform", "==", where.platform);
+	if (where?.enabled !== void 0) nextQuery = nextQuery.where("enabled", "==", where.enabled);
+	if (where?.fingerprintHash !== void 0 && where.fingerprintHash !== null) nextQuery = nextQuery.where("fingerprint_hash", "==", where.fingerprintHash);
+	if (where?.targetAppVersion !== void 0 && where.targetAppVersion !== null) nextQuery = nextQuery.where("target_app_version", "==", where.targetAppVersion);
+	if (where?.id?.eq) nextQuery = nextQuery.where("id", "==", where.id.eq);
+	if (where?.id?.gt) nextQuery = nextQuery.where("id", ">", where.id.gt);
+	if (where?.id?.gte) nextQuery = nextQuery.where("id", ">=", where.id.gte);
+	if (where?.id?.lt) nextQuery = nextQuery.where("id", "<", where.id.lt);
+	if (where?.id?.lte) nextQuery = nextQuery.where("id", "<=", where.id.lte);
+	return nextQuery;
+};
+const requiresInMemoryFiltering = (where) => {
+	return Boolean(where?.id?.in || where?.targetAppVersionIn || where?.targetAppVersionNotNull || where?.targetAppVersion === null || where?.fingerprintHash === null);
+};
 const convertToBundle = (firestoreData) => ({
 	channel: firestoreData.channel,
 	enabled: Boolean(firestoreData.enabled),
@@ -73,7 +90,6 @@ const convertToBundle = (firestoreData) => ({
 const firebaseDatabase = (0, _hot_updater_plugin_core.createDatabasePlugin)({
 	name: "firebaseDatabase",
 	factory: (config) => {
-		let bundles = [];
 		let app;
 		try {
 			app = firebase_admin.default.app();
@@ -84,32 +100,30 @@ const firebaseDatabase = (0, _hot_updater_plugin_core.createDatabasePlugin)({
 		const bundlesCollection = db.collection("bundles");
 		return {
 			async getBundleById(bundleId) {
-				const found = bundles.find((b) => b.id === bundleId);
-				if (found) return found;
 				const bundleSnap = await bundlesCollection.doc(bundleId).get();
 				if (!bundleSnap.exists) return null;
 				return convertToBundle(bundleSnap.data());
 			},
 			async getBundles(options) {
 				const { where, limit, offset, orderBy } = options;
-				let query = bundlesCollection;
-				if (where?.channel) query = query.where("channel", "==", where.channel);
-				if (where?.platform) query = query.where("platform", "==", where.platform);
-				if (where?.enabled !== void 0) query = query.where("enabled", "==", where.enabled);
-				if (where?.fingerprintHash !== void 0 && where.fingerprintHash !== null) query = query.where("fingerprint_hash", "==", where.fingerprintHash);
-				if (where?.targetAppVersion !== void 0 && where.targetAppVersion !== null) query = query.where("target_app_version", "==", where.targetAppVersion);
-				if (where?.id?.eq) query = query.where("id", "==", where.id.eq);
-				if (where?.id?.gt) query = query.where("id", ">", where.id.gt);
-				if (where?.id?.gte) query = query.where("id", ">=", where.id.gte);
-				if (where?.id?.lt) query = query.where("id", "<", where.id.lt);
-				if (where?.id?.lte) query = query.where("id", "<=", where.id.lte);
+				let query = applyFirestoreQueryableFilters(bundlesCollection, where);
 				query = query.orderBy("id", orderBy?.direction === "asc" ? "asc" : "desc");
+				if (requiresInMemoryFiltering(where)) {
+					const filteredBundles = sortBundles((await query.get()).docs.map((doc) => convertToBundle(doc.data())).filter((bundle) => bundleMatchesQueryWhere(bundle, where)), orderBy);
+					const total = filteredBundles.length;
+					return {
+						data: filteredBundles.slice(offset, offset + limit),
+						pagination: (0, _hot_updater_plugin_core.calculatePagination)(total, {
+							limit,
+							offset
+						})
+					};
+				}
 				const total = (await query.get()).size;
 				if (offset > 0) query = query.offset(offset);
 				if (limit) query = query.limit(limit);
-				bundles = sortBundles((await query.get()).docs.map((doc) => convertToBundle(doc.data())).filter((bundle) => bundleMatchesQueryWhere(bundle, where)), orderBy);
 				return {
-					data: bundles,
+					data: sortBundles((await query.get()).docs.map((doc) => convertToBundle(doc.data())), orderBy),
 					pagination: (0, _hot_updater_plugin_core.calculatePagination)(total, {
 						limit,
 						offset
@@ -129,7 +143,6 @@ const firebaseDatabase = (0, _hot_updater_plugin_core.createDatabasePlugin)({
 			async commitBundle({ changedSets }) {
 				if (changedSets.length === 0) return;
 				let isTargetAppVersionChanged = false;
-				const deletedBundleIds = /* @__PURE__ */ new Set();
 				await db.runTransaction(async (transaction) => {
 					const bundlesSnapshot = await transaction.get(bundlesCollection);
 					const targetVersionsSnapshot = await transaction.get(db.collection("target_app_versions"));
@@ -160,7 +173,6 @@ const firebaseDatabase = (0, _hot_updater_plugin_core.createDatabasePlugin)({
 						} else if (operation === "delete") {
 							if (!bundlesMap[data.id]) throw new Error(`Bundle with id ${data.id} not found`);
 							delete bundlesMap[data.id];
-							deletedBundleIds.add(data.id);
 							isTargetAppVersionChanged = true;
 						}
 					}
@@ -208,7 +220,6 @@ const firebaseDatabase = (0, _hot_updater_plugin_core.createDatabasePlugin)({
 					}
 					for (const channelDoc of channelsSnapshot.docs) if (!requiredChannels.has(channelDoc.id)) transaction.delete(channelDoc.ref);
 				});
-				for (const bundleId of deletedBundleIds) bundles = bundles.filter((b) => b.id !== bundleId);
 			}
 		};
 	}

package/dist/index.mjs

@@ -28,6 +28,23 @@ const sortBundles = (bundles, orderBy) => {
 		return direction === "asc" ? result : -result;
 	});
 };
+const applyFirestoreQueryableFilters = (query, where) => {
+	let nextQuery = query;
+	if (where?.channel) nextQuery = nextQuery.where("channel", "==", where.channel);
+	if (where?.platform) nextQuery = nextQuery.where("platform", "==", where.platform);
+	if (where?.enabled !== void 0) nextQuery = nextQuery.where("enabled", "==", where.enabled);
+	if (where?.fingerprintHash !== void 0 && where.fingerprintHash !== null) nextQuery = nextQuery.where("fingerprint_hash", "==", where.fingerprintHash);
+	if (where?.targetAppVersion !== void 0 && where.targetAppVersion !== null) nextQuery = nextQuery.where("target_app_version", "==", where.targetAppVersion);
+	if (where?.id?.eq) nextQuery = nextQuery.where("id", "==", where.id.eq);
+	if (where?.id?.gt) nextQuery = nextQuery.where("id", ">", where.id.gt);
+	if (where?.id?.gte) nextQuery = nextQuery.where("id", ">=", where.id.gte);
+	if (where?.id?.lt) nextQuery = nextQuery.where("id", "<", where.id.lt);
+	if (where?.id?.lte) nextQuery = nextQuery.where("id", "<=", where.id.lte);
+	return nextQuery;
+};
+const requiresInMemoryFiltering = (where) => {
+	return Boolean(where?.id?.in || where?.targetAppVersionIn || where?.targetAppVersionNotNull || where?.targetAppVersion === null || where?.fingerprintHash === null);
+};
 const convertToBundle = (firestoreData) => ({
 	channel: firestoreData.channel,
 	enabled: Boolean(firestoreData.enabled),
@@ -47,7 +64,6 @@ const convertToBundle = (firestoreData) => ({
 const firebaseDatabase = createDatabasePlugin({
 	name: "firebaseDatabase",
 	factory: (config) => {
-		let bundles = [];
 		let app;
 		try {
 			app = admin.app();
@@ -58,32 +74,30 @@ const firebaseDatabase = createDatabasePlugin({
 		const bundlesCollection = db.collection("bundles");
 		return {
 			async getBundleById(bundleId) {
-				const found = bundles.find((b) => b.id === bundleId);
-				if (found) return found;
 				const bundleSnap = await bundlesCollection.doc(bundleId).get();
 				if (!bundleSnap.exists) return null;
 				return convertToBundle(bundleSnap.data());
 			},
 			async getBundles(options) {
 				const { where, limit, offset, orderBy } = options;
-				let query = bundlesCollection;
-				if (where?.channel) query = query.where("channel", "==", where.channel);
-				if (where?.platform) query = query.where("platform", "==", where.platform);
-				if (where?.enabled !== void 0) query = query.where("enabled", "==", where.enabled);
-				if (where?.fingerprintHash !== void 0 && where.fingerprintHash !== null) query = query.where("fingerprint_hash", "==", where.fingerprintHash);
-				if (where?.targetAppVersion !== void 0 && where.targetAppVersion !== null) query = query.where("target_app_version", "==", where.targetAppVersion);
-				if (where?.id?.eq) query = query.where("id", "==", where.id.eq);
-				if (where?.id?.gt) query = query.where("id", ">", where.id.gt);
-				if (where?.id?.gte) query = query.where("id", ">=", where.id.gte);
-				if (where?.id?.lt) query = query.where("id", "<", where.id.lt);
-				if (where?.id?.lte) query = query.where("id", "<=", where.id.lte);
+				let query = applyFirestoreQueryableFilters(bundlesCollection, where);
 				query = query.orderBy("id", orderBy?.direction === "asc" ? "asc" : "desc");
+				if (requiresInMemoryFiltering(where)) {
+					const filteredBundles = sortBundles((await query.get()).docs.map((doc) => convertToBundle(doc.data())).filter((bundle) => bundleMatchesQueryWhere(bundle, where)), orderBy);
+					const total = filteredBundles.length;
+					return {
+						data: filteredBundles.slice(offset, offset + limit),
+						pagination: calculatePagination(total, {
+							limit,
+							offset
+						})
+					};
+				}
 				const total = (await query.get()).size;
 				if (offset > 0) query = query.offset(offset);
 				if (limit) query = query.limit(limit);
-				bundles = sortBundles((await query.get()).docs.map((doc) => convertToBundle(doc.data())).filter((bundle) => bundleMatchesQueryWhere(bundle, where)), orderBy);
 				return {
-					data: bundles,
+					data: sortBundles((await query.get()).docs.map((doc) => convertToBundle(doc.data())), orderBy),
 					pagination: calculatePagination(total, {
 						limit,
 						offset
@@ -103,7 +117,6 @@ const firebaseDatabase = createDatabasePlugin({
 			async commitBundle({ changedSets }) {
 				if (changedSets.length === 0) return;
 				let isTargetAppVersionChanged = false;
-				const deletedBundleIds = /* @__PURE__ */ new Set();
 				await db.runTransaction(async (transaction) => {
 					const bundlesSnapshot = await transaction.get(bundlesCollection);
 					const targetVersionsSnapshot = await transaction.get(db.collection("target_app_versions"));
@@ -134,7 +147,6 @@ const firebaseDatabase = createDatabasePlugin({
 						} else if (operation === "delete") {
 							if (!bundlesMap[data.id]) throw new Error(`Bundle with id ${data.id} not found`);
 							delete bundlesMap[data.id];
-							deletedBundleIds.add(data.id);
 							isTargetAppVersionChanged = true;
 						}
 					}
@@ -182,7 +194,6 @@ const firebaseDatabase = createDatabasePlugin({
 					}
 					for (const channelDoc of channelsSnapshot.docs) if (!requiredChannels.has(channelDoc.id)) transaction.delete(channelDoc.ref);
 				});
-				for (const bundleId of deletedBundleIds) bundles = bundles.filter((b) => b.id !== bundleId);
 			}
 		};
 	}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hot-updater/firebase",
   "type": "module",
-  "version": "0.29.2",
+  "version": "0.29.3",
   "description": "React Native OTA solution for self-hosted",
   "main": "dist/index.cjs",
   "types": "dist/index.d.cts",
@@ -36,10 +36,10 @@
   "dependencies": {
     "firebase": "^11.3.1",
     "hono": "4.12.9",
-    "@hot-updater/cli-tools": "0.29.2",
-    "@hot-updater/core": "0.29.2",
-    "@hot-updater/plugin-core": "0.29.2",
-    "@hot-updater/server": "0.29.2"
+    "@hot-updater/cli-tools": "0.29.3",
+    "@hot-updater/core": "0.29.3",
+    "@hot-updater/plugin-core": "0.29.3",
+    "@hot-updater/server": "0.29.3"
   },
   "publishConfig": {
     "access": "public"
@@ -54,9 +54,9 @@
     "firebase-tools": "^13.32.0",
     "fkill": "^9.0.0",
     "mime": "^4.0.4",
-    "@hot-updater/js": "0.29.2",
-    "@hot-updater/mock": "0.29.2",
-    "@hot-updater/test-utils": "0.29.2"
+    "@hot-updater/js": "0.29.3",
+    "@hot-updater/test-utils": "0.29.3",
+    "@hot-updater/mock": "0.29.3"
   },
   "peerDependencies": {
     "firebase-admin": "*",