@hot-updater/firebase 0.29.4 → 0.29.6

package/dist/firebase/public/firestore.indexes.json

@@ -1,5 +1,16 @@
 {
   "indexes": [
+    {
+      "collectionGroup": "bundles",
+      "queryScope": "COLLECTION",
+      "fields": [
+        { "fieldPath": "channel", "order": "ASCENDING" },
+        { "fieldPath": "enabled", "order": "ASCENDING" },
+        { "fieldPath": "platform", "order": "ASCENDING" },
+        { "fieldPath": "target_app_version", "order": "ASCENDING" },
+        { "fieldPath": "id", "order": "ASCENDING" }
+      ]
+    },
     {
       "collectionGroup": "bundles",
       "queryScope": "COLLECTION",
@@ -36,6 +47,17 @@
         { "fieldPath": "id", "order": "DESCENDING" }
       ]
     },
+    {
+      "collectionGroup": "bundles",
+      "queryScope": "COLLECTION",
+      "fields": [
+        { "fieldPath": "channel", "order": "ASCENDING" },
+        { "fieldPath": "enabled", "order": "ASCENDING" },
+        { "fieldPath": "platform", "order": "ASCENDING" },
+        { "fieldPath": "fingerprint_hash", "order": "ASCENDING" },
+        { "fieldPath": "id", "order": "ASCENDING" }
+      ]
+    },
     {
       "collectionGroup": "bundles",
       "queryScope": "COLLECTION",

package/dist/iac/index.cjs

@@ -1034,7 +1034,7 @@ const handleCommand = (filePath, rawArguments, rawOptions) => {
 var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = isexe;
 	isexe.sync = sync;
-	var fs$6 = require("fs");
+	var fs$5 = require("fs");
 	function checkPathExt(path, options) {
 		var pathext = options.pathExt !== void 0 ? options.pathExt : process.env.PATHEXT;
 		if (!pathext) return true;
@@ -1051,12 +1051,12 @@ var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		return checkPathExt(path, options);
 	}
 	function isexe(path, options, cb) {
-		fs$6.stat(path, function(er, stat) {
+		fs$5.stat(path, function(er, stat) {
 			cb(er, er ? false : checkStat(stat, path, options));
 		});
 	}
 	function sync(path, options) {
-		return checkStat(fs$6.statSync(path), path, options);
+		return checkStat(fs$5.statSync(path), path, options);
 	}
 }));
 //#endregion
@@ -1064,14 +1064,14 @@ var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 var require_mode = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = isexe;
 	isexe.sync = sync;
-	var fs$5 = require("fs");
+	var fs$4 = require("fs");
 	function isexe(path, options, cb) {
-		fs$5.stat(path, function(er, stat) {
+		fs$4.stat(path, function(er, stat) {
 			cb(er, er ? false : checkStat(stat, options));
 		});
 	}
 	function sync(path, options) {
-		return checkStat(fs$5.statSync(path), options);
+		return checkStat(fs$4.statSync(path), options);
 	}
 	function checkStat(stat, options) {
 		return stat.isFile() && checkMode(stat, options);
@@ -1286,16 +1286,16 @@ var require_shebang_command = /* @__PURE__ */ __commonJSMin(((exports, module) =
 //#endregion
 //#region ../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/util/readShebang.js
 var require_readShebang = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	const fs$4 = require("fs");
+	const fs$3 = require("fs");
 	const shebangCommand = require_shebang_command();
 	function readShebang(command) {
 		const size = 150;
 		const buffer = Buffer.alloc(size);
 		let fd;
 		try {
-			fd = fs$4.openSync(command, "r");
-			fs$4.readSync(fd, buffer, 0, size, 0);
-			fs$4.closeSync(fd);
+			fd = fs$3.openSync(command, "r");
+			fs$3.readSync(fd, buffer, 0, size, 0);
+			fs$3.closeSync(fd);
 		} catch (e) {}
 		return shebangCommand(buffer.toString());
 	}
@@ -6458,7 +6458,7 @@ const prepareFirebaseTemplate = async (firebaseRootDir) => {
 };
 //#endregion
 //#region iac/select.ts
-const getConfigTemplate = (build) => {
+const getConfigScaffold = (build) => {
 	const storageConfig = {
 		imports: [{
 			pkg: "@hot-updater/firebase",
@@ -6480,16 +6480,20 @@ const getConfigTemplate = (build) => {
     credential,
   })`
 	};
-	const intermediate = `
+	const helperStatements = [{
+		name: "credential",
+		strategy: "preserve-existing",
+		code: `
 // https://firebase.google.com/docs/admin/setup?hl=en#initialize_the_sdk_in_non-google_environments
 // Check your .env file and add the credentials
 // Set the GOOGLE_APPLICATION_CREDENTIALS environment variable to your credentials file path
 // Example: GOOGLE_APPLICATION_CREDENTIALS=./firebase-adminsdk-credentials.json
-const credential = admin.credential.applicationDefault();`.trim();
-	return new _hot_updater_cli_tools.ConfigBuilder().setBuildType(build).setStorage(storageConfig).setDatabase(databaseConfig).addImport({
+const credential = admin.credential.applicationDefault();`.trim()
+	}];
+	return (0, _hot_updater_cli_tools.createHotUpdaterConfigScaffoldFromBuilder)(new _hot_updater_cli_tools.ConfigBuilder().setBuildType(build).setStorage(storageConfig).setDatabase(databaseConfig).addImport({
 		pkg: "firebase-admin",
 		defaultOrNamespace: "admin"
-	}).setIntermediateCode(intermediate).getResult();
+	}).setIntermediateCode(helperStatements.map((statement) => statement.code.trim()).join("\n\n")), { helperStatements });
 };
 const setEnv = async ({ projectId, storageBucket, build }) => {
 	await (0, _hot_updater_cli_tools.makeEnv)({
@@ -6499,11 +6503,13 @@ const setEnv = async ({ projectId, storageBucket, build }) => {
 		},
 		HOT_UPDATER_FIREBASE_PROJECT_ID: projectId,
 		HOT_UPDATER_FIREBASE_STORAGE_BUCKET: storageBucket
-	});
+	}, ".env.hotupdater", { preserveKeys: ["GOOGLE_APPLICATION_CREDENTIALS"] });
 	_hot_updater_cli_tools.p.log.success("Firebase credentials have been successfully configured.");
 	try {
-		await fs.default.promises.writeFile("hot-updater.config.ts", getConfigTemplate(build));
-		_hot_updater_cli_tools.p.log.success("Configuration file 'hot-updater.config.ts' has been created.");
+		const configWriteResult = await (0, _hot_updater_cli_tools.writeHotUpdaterConfig)(getConfigScaffold(build));
+		if (configWriteResult.status === "created") _hot_updater_cli_tools.p.log.success("Configuration file 'hot-updater.config.ts' has been created.");
+		else if (configWriteResult.status === "merged") _hot_updater_cli_tools.p.log.success("Configuration file 'hot-updater.config.ts' has been updated.");
+		else _hot_updater_cli_tools.p.log.warn(`Existing 'hot-updater.config.ts' was left unchanged: ${configWriteResult.reason}`);
 	} catch (error) {
 		console.error("Error writing configuration file:", error.message);
 	}

package/dist/iac/index.mjs

@@ -1,7 +1,7 @@
 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 { ConfigBuilder, HOT_UPDATER_SERVER_PACKAGE_VERSION_ENV, copyDirToTmp, createHotUpdaterConfigScaffoldFromBuilder, link, makeEnv, p, resolveHotUpdaterServerVersion, resolvePackageVersion, transformEnv, transformTemplate, writeHotUpdaterConfig } from "@hot-updater/cli-tools";
 import { fileURLToPath } from "node:url";
 import { ChildProcess, execFile, spawn, spawnSync } from "node:child_process";
 import { StringDecoder } from "node:string_decoder";
@@ -6453,7 +6453,7 @@ const prepareFirebaseTemplate = async (firebaseRootDir) => {
 };
 //#endregion
 //#region iac/select.ts
-const getConfigTemplate = (build) => {
+const getConfigScaffold = (build) => {
 	const storageConfig = {
 		imports: [{
 			pkg: "@hot-updater/firebase",
@@ -6475,16 +6475,20 @@ const getConfigTemplate = (build) => {
     credential,
   })`
 	};
-	const intermediate = `
+	const helperStatements = [{
+		name: "credential",
+		strategy: "preserve-existing",
+		code: `
 // https://firebase.google.com/docs/admin/setup?hl=en#initialize_the_sdk_in_non-google_environments
 // Check your .env file and add the credentials
 // Set the GOOGLE_APPLICATION_CREDENTIALS environment variable to your credentials file path
 // Example: GOOGLE_APPLICATION_CREDENTIALS=./firebase-adminsdk-credentials.json
-const credential = admin.credential.applicationDefault();`.trim();
-	return new ConfigBuilder().setBuildType(build).setStorage(storageConfig).setDatabase(databaseConfig).addImport({
+const credential = admin.credential.applicationDefault();`.trim()
+	}];
+	return createHotUpdaterConfigScaffoldFromBuilder(new ConfigBuilder().setBuildType(build).setStorage(storageConfig).setDatabase(databaseConfig).addImport({
 		pkg: "firebase-admin",
 		defaultOrNamespace: "admin"
-	}).setIntermediateCode(intermediate).getResult();
+	}).setIntermediateCode(helperStatements.map((statement) => statement.code.trim()).join("\n\n")), { helperStatements });
 };
 const setEnv = async ({ projectId, storageBucket, build }) => {
 	await makeEnv({
@@ -6494,11 +6498,13 @@ const setEnv = async ({ projectId, storageBucket, build }) => {
 		},
 		HOT_UPDATER_FIREBASE_PROJECT_ID: projectId,
 		HOT_UPDATER_FIREBASE_STORAGE_BUCKET: storageBucket
-	});
+	}, ".env.hotupdater", { preserveKeys: ["GOOGLE_APPLICATION_CREDENTIALS"] });
 	p.log.success("Firebase credentials have been successfully configured.");
 	try {
-		await fs.promises.writeFile("hot-updater.config.ts", getConfigTemplate(build));
-		p.log.success("Configuration file 'hot-updater.config.ts' has been created.");
+		const configWriteResult = await writeHotUpdaterConfig(getConfigScaffold(build));
+		if (configWriteResult.status === "created") p.log.success("Configuration file 'hot-updater.config.ts' has been created.");
+		else if (configWriteResult.status === "merged") p.log.success("Configuration file 'hot-updater.config.ts' has been updated.");
+		else p.log.warn(`Existing 'hot-updater.config.ts' was left unchanged: ${configWriteResult.reason}`);
 	} catch (error) {
 		console.error("Error writing configuration file:", error.message);
 	}

package/dist/index.cjs

@@ -71,6 +71,11 @@ const applyFirestoreQueryableFilters = (query, where) => {
 const requiresInMemoryFiltering = (where) => {
 	return Boolean(where?.id?.in || where?.targetAppVersionIn || where?.targetAppVersionNotNull || where?.targetAppVersion === null || where?.fingerprintHash === null);
 };
+const chunkValues = (values, size) => {
+	const chunks = [];
+	for (let index = 0; index < values.length; index += size) chunks.push(values.slice(index, index + size));
+	return chunks;
+};
 const convertToBundle = (firestoreData) => ({
 	channel: firestoreData.channel,
 	enabled: Boolean(firestoreData.enabled),
@@ -98,14 +103,28 @@ const firebaseDatabase = (0, _hot_updater_plugin_core.createDatabasePlugin)({
 		}
 		const db = firebase_admin.default.firestore(app);
 		const bundlesCollection = db.collection("bundles");
+		const targetAppVersionsCollection = db.collection("target_app_versions");
 		return {
+			getUpdateInfo: (0, _hot_updater_plugin_core.createDatabasePluginGetUpdateInfo)({
+				async listTargetAppVersions({ platform, channel }) {
+					const querySnapshot = await targetAppVersionsCollection.where("platform", "==", platform).where("channel", "==", channel).select("target_app_version").get();
+					return Array.from(new Set(querySnapshot.docs.map((doc) => doc.data().target_app_version).filter((version) => Boolean(version))));
+				},
+				async getBundlesByTargetAppVersions({ platform, channel, minBundleId }, targetAppVersions) {
+					return (await Promise.all(chunkValues(targetAppVersions, 10).map((versions) => bundlesCollection.where("platform", "==", platform).where("channel", "==", channel).where("enabled", "==", true).where("id", ">=", minBundleId).where("target_app_version", "in", versions).get()))).flatMap((snapshot) => snapshot.docs.map((doc) => convertToBundle(doc.data())));
+				},
+				async getBundlesByFingerprint({ platform, channel, minBundleId, fingerprintHash }) {
+					return (await bundlesCollection.where("platform", "==", platform).where("channel", "==", channel).where("enabled", "==", true).where("id", ">=", minBundleId).where("fingerprint_hash", "==", fingerprintHash).get()).docs.map((doc) => convertToBundle(doc.data()));
+				}
+			}),
 			async getBundleById(bundleId) {
 				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;
+				const { where, limit, orderBy } = options;
+				const offset = ("offset" in options ? options.offset : void 0) ?? 0;
 				let query = applyFirestoreQueryableFilters(bundlesCollection, where);
 				query = query.orderBy("id", orderBy?.direction === "asc" ? "asc" : "desc");
 				if (requiresInMemoryFiltering(where)) {

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { DEFAULT_ROLLOUT_COHORT_COUNT } from "@hot-updater/core";
-import { calculatePagination, createDatabasePlugin, createStorageKeyBuilder, createStoragePlugin, getContentType, parseStorageUri } from "@hot-updater/plugin-core";
+import { calculatePagination, createDatabasePlugin, createDatabasePluginGetUpdateInfo, createStorageKeyBuilder, createStoragePlugin, getContentType, parseStorageUri } from "@hot-updater/plugin-core";
 import admin from "firebase-admin";
 import fs from "fs/promises";
 import path from "path";
@@ -45,6 +45,11 @@ const applyFirestoreQueryableFilters = (query, where) => {
 const requiresInMemoryFiltering = (where) => {
 	return Boolean(where?.id?.in || where?.targetAppVersionIn || where?.targetAppVersionNotNull || where?.targetAppVersion === null || where?.fingerprintHash === null);
 };
+const chunkValues = (values, size) => {
+	const chunks = [];
+	for (let index = 0; index < values.length; index += size) chunks.push(values.slice(index, index + size));
+	return chunks;
+};
 const convertToBundle = (firestoreData) => ({
 	channel: firestoreData.channel,
 	enabled: Boolean(firestoreData.enabled),
@@ -72,14 +77,28 @@ const firebaseDatabase = createDatabasePlugin({
 		}
 		const db = admin.firestore(app);
 		const bundlesCollection = db.collection("bundles");
+		const targetAppVersionsCollection = db.collection("target_app_versions");
 		return {
+			getUpdateInfo: createDatabasePluginGetUpdateInfo({
+				async listTargetAppVersions({ platform, channel }) {
+					const querySnapshot = await targetAppVersionsCollection.where("platform", "==", platform).where("channel", "==", channel).select("target_app_version").get();
+					return Array.from(new Set(querySnapshot.docs.map((doc) => doc.data().target_app_version).filter((version) => Boolean(version))));
+				},
+				async getBundlesByTargetAppVersions({ platform, channel, minBundleId }, targetAppVersions) {
+					return (await Promise.all(chunkValues(targetAppVersions, 10).map((versions) => bundlesCollection.where("platform", "==", platform).where("channel", "==", channel).where("enabled", "==", true).where("id", ">=", minBundleId).where("target_app_version", "in", versions).get()))).flatMap((snapshot) => snapshot.docs.map((doc) => convertToBundle(doc.data())));
+				},
+				async getBundlesByFingerprint({ platform, channel, minBundleId, fingerprintHash }) {
+					return (await bundlesCollection.where("platform", "==", platform).where("channel", "==", channel).where("enabled", "==", true).where("id", ">=", minBundleId).where("fingerprint_hash", "==", fingerprintHash).get()).docs.map((doc) => convertToBundle(doc.data()));
+				}
+			}),
 			async getBundleById(bundleId) {
 				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;
+				const { where, limit, orderBy } = options;
+				const offset = ("offset" in options ? options.offset : void 0) ?? 0;
 				let query = applyFirestoreQueryableFilters(bundlesCollection, where);
 				query = query.orderBy("id", orderBy?.direction === "asc" ? "asc" : "desc");
 				if (requiresInMemoryFiltering(where)) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hot-updater/firebase",
   "type": "module",
-  "version": "0.29.4",
+  "version": "0.29.6",
   "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.4",
-    "@hot-updater/plugin-core": "0.29.4",
-    "@hot-updater/server": "0.29.4",
-    "@hot-updater/core": "0.29.4"
+    "@hot-updater/cli-tools": "0.29.6",
+    "@hot-updater/plugin-core": "0.29.6",
+    "@hot-updater/server": "0.29.6",
+    "@hot-updater/core": "0.29.6"
   },
   "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.4",
-    "@hot-updater/mock": "0.29.4",
-    "@hot-updater/test-utils": "0.29.4"
+    "@hot-updater/js": "0.29.6",
+    "@hot-updater/mock": "0.29.6",
+    "@hot-updater/test-utils": "0.29.6"
   },
   "peerDependencies": {
     "firebase-admin": "*",