@hot-updater/firebase 0.29.2 → 0.29.4

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/iac/index.cjs

@@ -22,6 +22,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	enumerable: true
 }) : target, mod));
 //#endregion
+let fs = require("fs");
+fs = __toESM(fs);
+let path = require("path");
+path = __toESM(path);
 let _hot_updater_cli_tools = require("@hot-updater/cli-tools");
 let node_url = require("node:url");
 let node_child_process = require("node:child_process");
@@ -33,10 +37,6 @@ let node_tty = require("node:tty");
 node_tty = __toESM(node_tty);
 let node_path = require("node:path");
 node_path = __toESM(node_path);
-let path = require("path");
-path = __toESM(path);
-let fs = require("fs");
-fs = __toESM(fs);
 let node_timers_promises = require("node:timers/promises");
 let node_os = require("node:os");
 let node_events = require("node:events");
@@ -6780,7 +6780,7 @@ const syncFunctionsPackageJson = async (functionsDir) => {
 	const packageJsonPath = path.default.join(functionsDir, "package.json");
 	const packageJson = JSON.parse(await fs.default.promises.readFile(packageJsonPath, "utf-8"));
 	packageJson.dependencies = {
-		...packageJson.dependencies ?? {},
+		...packageJson.dependencies,
 		"@hot-updater/server": runtimePackageInfo.serverPackageVersion,
 		hono: runtimePackageInfo.honoVersion
 	};

package/dist/iac/index.mjs

@@ -1,4 +1,6 @@
 import { createRequire } from "node:module";
+import fs from "fs";
+import path from "path";
 import { ConfigBuilder, HOT_UPDATER_SERVER_PACKAGE_VERSION_ENV, copyDirToTmp, link, makeEnv, p, resolveHotUpdaterServerVersion, resolvePackageVersion, transformEnv, transformTemplate } from "@hot-updater/cli-tools";
 import { fileURLToPath } from "node:url";
 import { ChildProcess, execFile, spawn, spawnSync } from "node:child_process";
@@ -6,9 +8,7 @@ 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 from "node:path";
-import path$1 from "path";
-import fs from "fs";
+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";
@@ -1431,33 +1431,33 @@ function toPath(urlOrPath) {
 }
 function traversePathUp(startPath) {
 	return { *[Symbol.iterator]() {
-		let currentPath = path.resolve(toPath(startPath));
+		let currentPath = path$1.resolve(toPath(startPath));
 		let previousPath;
 		while (previousPath !== currentPath) {
 			yield currentPath;
 			previousPath = currentPath;
-			currentPath = path.resolve(currentPath, "..");
+			currentPath = path$1.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.resolve(toPath(cwd));
+	const cwdPath = path$1.resolve(toPath(cwd));
 	const result = [];
-	const pathParts = pathOption.split(path.delimiter);
+	const pathParts = pathOption.split(path$1.delimiter);
 	if (preferLocal) applyPreferLocal(result, pathParts, cwdPath);
 	if (addExecPath) applyExecPath(result, pathParts, execPath, cwdPath);
-	return pathOption === "" || pathOption === path.delimiter ? `${result.join(path.delimiter)}${pathOption}` : [...result, pathOption].join(path.delimiter);
+	return pathOption === "" || pathOption === path$1.delimiter ? `${result.join(path$1.delimiter)}${pathOption}` : [...result, pathOption].join(path$1.delimiter);
 };
 const applyPreferLocal = (result, pathParts, cwdPath) => {
 	for (const directory of traversePathUp(cwdPath)) {
-		const pathPart = path.join(directory, "node_modules/.bin");
+		const pathPart = path$1.join(directory, "node_modules/.bin");
 		if (!pathParts.includes(pathPart)) result.push(pathPart);
 	}
 };
 const applyExecPath = (result, pathParts, execPath, cwdPath) => {
-	const pathPart = path.resolve(cwdPath, toPath(execPath), "..");
+	const pathPart = path$1.resolve(cwdPath, toPath(execPath), "..");
 	if (!pathParts.includes(pathPart)) result.push(pathPart);
 };
 const npmRunPathEnv = ({ env = process$1.env, ...options } = {}) => {
@@ -2467,7 +2467,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.resolve(cwd, normalizedNodePath);
+	const resolvedNodePath = path$1.resolve(cwd, normalizedNodePath);
 	const newOptions = {
 		...options,
 		nodePath: resolvedNodePath,
@@ -2479,7 +2479,7 @@ const handleNodeOption = (file, commandArguments, { node: shouldHandleNode = fal
 		commandArguments,
 		newOptions
 	];
-	if (path.basename(file, ".exe") === "node") throw new TypeError("When the \"node\" option is true, the first argument does not need to be \"node\".");
+	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\".");
 	return [
 		resolvedNodePath,
 		[
@@ -2563,7 +2563,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.resolve(cwdString);
+	return path$1.resolve(cwdString);
 };
 const getDefaultCwd = () => {
 	try {
@@ -2601,7 +2601,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.basename(file, ".exe") === "cmd") commandArguments.unshift("/q");
+	if (process$1.platform === "win32" && path$1.basename(file, ".exe") === "cmd") commandArguments.unshift("/q");
 	return {
 		file,
 		commandArguments,
@@ -6427,8 +6427,8 @@ const ensureExists = async (targetPath, description) => {
 	}
 };
 const normalizeFunctionsPackage = async (functionsDir) => {
-	const templatePackagePath = path.join(functionsDir, "_package.json");
-	const packageJsonPath = path.join(functionsDir, "package.json");
+	const templatePackagePath = path$1.join(functionsDir, "_package.json");
+	const packageJsonPath = path$1.join(functionsDir, "package.json");
 	try {
 		await fs$1.rename(templatePackagePath, packageJsonPath);
 	} catch (error) {
@@ -6437,12 +6437,12 @@ const normalizeFunctionsPackage = async (functionsDir) => {
 	}
 };
 const prepareFirebaseTemplate = async (firebaseRootDir) => {
-	const publicDir = path.join(firebaseRootDir, "public");
-	const builtFunctionsDir = path.join(firebaseRootDir, "functions");
+	const publicDir = path$1.join(firebaseRootDir, "public");
+	const builtFunctionsDir = path$1.join(firebaseRootDir, "functions");
 	await ensureExists(publicDir, "public template directory");
 	await ensureExists(builtFunctionsDir, "functions build directory");
 	const { tmpDir, removeTmpDir } = await copyDirToTmp(publicDir);
-	const functionsDir = path.join(tmpDir, "functions");
+	const functionsDir = path$1.join(tmpDir, "functions");
 	await fs$1.cp(builtFunctionsDir, functionsDir, { recursive: true });
 	await normalizeFunctionsPackage(functionsDir);
 	return {
@@ -6763,7 +6763,7 @@ const REGIONS = [
 	}
 ];
 const getFirebaseRuntimePackageInfo = () => {
-	const firebasePackageRoot = path$1.dirname(__require.resolve("@hot-updater/firebase/package.json"));
+	const firebasePackageRoot = path.dirname(__require.resolve("@hot-updater/firebase/package.json"));
 	return {
 		currentPackageVersion: resolvePackageVersion("@hot-updater/firebase"),
 		serverPackageVersion: resolveHotUpdaterServerVersion("@hot-updater/firebase"),
@@ -6772,10 +6772,10 @@ const getFirebaseRuntimePackageInfo = () => {
 };
 const syncFunctionsPackageJson = async (functionsDir) => {
 	const runtimePackageInfo = getFirebaseRuntimePackageInfo();
-	const packageJsonPath = path$1.join(functionsDir, "package.json");
+	const packageJsonPath = path.join(functionsDir, "package.json");
 	const packageJson = JSON.parse(await fs.promises.readFile(packageJsonPath, "utf-8"));
 	packageJson.dependencies = {
-		...packageJson.dependencies ?? {},
+		...packageJson.dependencies,
 		"@hot-updater/server": runtimePackageInfo.serverPackageVersion,
 		hono: runtimePackageInfo.honoVersion
 	};
@@ -6810,9 +6810,9 @@ const deployFirestore = async (cwd) => {
 			fieldOverrides: []
 		};
 	} catch {}
-	const newIndexes = JSON.parse(await fs.promises.readFile(path$1.join(cwd, "firestore.indexes.json"), "utf-8"));
+	const newIndexes = JSON.parse(await fs.promises.readFile(path.join(cwd, "firestore.indexes.json"), "utf-8"));
 	const mergedIndexes = mergeIndexes(originalIndexes, newIndexes);
-	await fs.promises.writeFile(path$1.join(cwd, "firestore.indexes.json"), JSON.stringify(mergedIndexes, null, 2));
+	await fs.promises.writeFile(path.join(cwd, "firestore.indexes.json"), JSON.stringify(mergedIndexes, null, 2));
 	try {
 		await execa("npx", [
 			"firebase",
@@ -6884,8 +6884,8 @@ const runInit = async ({ build }) => {
 		p.log.step(link("https://cloud.google.com/sdk/docs/install"));
 		process.exit(1);
 	}
-	const { tmpDir, removeTmpDir, functionsDir } = await prepareFirebaseTemplate(path$1.dirname(path$1.dirname(__require.resolve("@hot-updater/firebase/functions"))));
-	const functionsIndexPath = path$1.join(functionsDir, "index.cjs");
+	const { tmpDir, removeTmpDir, functionsDir } = await prepareFirebaseTemplate(path.dirname(path.dirname(__require.resolve("@hot-updater/firebase/functions"))));
+	const functionsIndexPath = path.join(functionsDir, "index.cjs");
 	const runtimePackageInfo = await syncFunctionsPackageJson(functionsDir);
 	const initializeVariable = await initFirebaseUser(tmpDir);
 	let currentRegion;

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.4",
   "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.4",
+    "@hot-updater/plugin-core": "0.29.4",
+    "@hot-updater/server": "0.29.4",
+    "@hot-updater/core": "0.29.4"
   },
   "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.4",
+    "@hot-updater/mock": "0.29.4",
+    "@hot-updater/test-utils": "0.29.4"
   },
   "peerDependencies": {
     "firebase-admin": "*",