@hot-updater/firebase 0.28.0 → 0.29.0

package/dist/index.cjs

@@ -1,4 +1,5 @@
-//#region rolldown:runtime
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+//#region \0rolldown/runtime.js
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -19,18 +20,40 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	value: mod,
 	enumerable: true
 }) : target, mod));
-
 //#endregion
-let __hot_updater_plugin_core = require("@hot-updater/plugin-core");
-__hot_updater_plugin_core = __toESM(__hot_updater_plugin_core);
+let _hot_updater_core = require("@hot-updater/core");
+let _hot_updater_plugin_core = require("@hot-updater/plugin-core");
 let firebase_admin = require("firebase-admin");
 firebase_admin = __toESM(firebase_admin);
 let fs_promises = require("fs/promises");
 fs_promises = __toESM(fs_promises);
 let path = require("path");
 path = __toESM(path);
-
 //#region src/firebaseDatabase.ts
+const bundleMatchesQueryWhere = (bundle, where) => {
+	if (!where) return true;
+	if (where.channel !== void 0 && bundle.channel !== where.channel) return false;
+	if (where.platform !== void 0 && bundle.platform !== where.platform) return false;
+	if (where.enabled !== void 0 && bundle.enabled !== where.enabled) return false;
+	if (where.id?.eq !== void 0 && bundle.id !== where.id.eq) return false;
+	if (where.id?.gt !== void 0 && bundle.id.localeCompare(where.id.gt) <= 0) return false;
+	if (where.id?.gte !== void 0 && bundle.id.localeCompare(where.id.gte) < 0) return false;
+	if (where.id?.lt !== void 0 && bundle.id.localeCompare(where.id.lt) >= 0) return false;
+	if (where.id?.lte !== void 0 && bundle.id.localeCompare(where.id.lte) > 0) return false;
+	if (where.id?.in && !where.id.in.includes(bundle.id)) return false;
+	if (where.targetAppVersionNotNull && bundle.targetAppVersion === null) return false;
+	if (where.targetAppVersion !== void 0 && bundle.targetAppVersion !== where.targetAppVersion) return false;
+	if (where.targetAppVersionIn && !where.targetAppVersionIn.includes(bundle.targetAppVersion ?? "")) return false;
+	if (where.fingerprintHash !== void 0 && bundle.fingerprintHash !== where.fingerprintHash) return false;
+	return true;
+};
+const sortBundles = (bundles, orderBy) => {
+	const direction = orderBy?.direction ?? "desc";
+	return bundles.slice().sort((a, b) => {
+		const result = a.id.localeCompare(b.id);
+		return direction === "asc" ? result : -result;
+	});
+};
 const convertToBundle = (firestoreData) => ({
 	channel: firestoreData.channel,
 	enabled: Boolean(firestoreData.enabled),
@@ -43,19 +66,21 @@ const convertToBundle = (firestoreData) => ({
 	targetAppVersion: firestoreData.target_app_version,
 	storageUri: firestoreData.storage_uri,
 	fingerprintHash: firestoreData.fingerprint_hash,
-	metadata: firestoreData?.metadata ?? {}
+	metadata: firestoreData?.metadata ?? {},
+	rolloutCohortCount: firestoreData.rollout_cohort_count ?? _hot_updater_core.DEFAULT_ROLLOUT_COHORT_COUNT,
+	targetCohorts: firestoreData.target_cohorts ?? null
 });
-const firebaseDatabase = (0, __hot_updater_plugin_core.createDatabasePlugin)({
+const firebaseDatabase = (0, _hot_updater_plugin_core.createDatabasePlugin)({
 	name: "firebaseDatabase",
 	factory: (config) => {
 		let bundles = [];
 		let app;
 		try {
-			app = firebase_admin.app();
+			app = firebase_admin.default.app();
 		} catch {
-			app = firebase_admin.initializeApp(config);
+			app = firebase_admin.default.initializeApp(config);
 		}
-		const db = firebase_admin.firestore(app);
+		const db = firebase_admin.default.firestore(app);
 		const bundlesCollection = db.collection("bundles");
 		return {
 			async getBundleById(bundleId) {
@@ -66,18 +91,26 @@ const firebaseDatabase = (0, __hot_updater_plugin_core.createDatabasePlugin)({
 				return convertToBundle(bundleSnap.data());
 			},
 			async getBundles(options) {
-				const { where, limit, offset } = 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);
-				query = query.orderBy("id", "desc");
+				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);
+				query = query.orderBy("id", orderBy?.direction === "asc" ? "asc" : "desc");
 				const total = (await query.get()).size;
 				if (offset > 0) query = query.offset(offset);
 				if (limit) query = query.limit(limit);
-				bundles = (await query.get()).docs.map((doc) => convertToBundle(doc.data()));
+				bundles = sortBundles((await query.get()).docs.map((doc) => convertToBundle(doc.data())).filter((bundle) => bundleMatchesQueryWhere(bundle, where)), orderBy);
 				return {
 					data: bundles,
-					pagination: (0, __hot_updater_plugin_core.calculatePagination)(total, {
+					pagination: (0, _hot_updater_plugin_core.calculatePagination)(total, {
 						limit,
 						offset
 					})
@@ -118,7 +151,9 @@ const firebaseDatabase = (0, __hot_updater_plugin_core.createDatabasePlugin)({
 								target_app_version: data.targetAppVersion,
 								storage_uri: data.storageUri,
 								fingerprint_hash: data.fingerprintHash,
-								metadata: data.metadata ?? {}
+								metadata: data.metadata ?? {},
+								rollout_cohort_count: data.rolloutCohortCount ?? _hot_updater_core.DEFAULT_ROLLOUT_COHORT_COUNT,
+								target_cohorts: data.targetCohorts ?? null
 							};
 							const channelRef = db.collection("channels").doc(data.channel);
 							transaction.set(channelRef, { name: data.channel }, { merge: true });
@@ -153,7 +188,9 @@ const firebaseDatabase = (0, __hot_updater_plugin_core.createDatabasePlugin)({
 								target_app_version: data.targetAppVersion || null,
 								storage_uri: data.storageUri,
 								fingerprint_hash: data.fingerprintHash,
-								metadata: data.metadata ?? {}
+								metadata: data.metadata ?? {},
+								rollout_cohort_count: data.rolloutCohortCount ?? _hot_updater_core.DEFAULT_ROLLOUT_COHORT_COUNT,
+								target_cohorts: data.targetCohorts ?? null
 							}, { merge: true });
 							if (data.targetAppVersion) {
 								const versionDocId = `${data.platform}_${data.channel}_${data.targetAppVersion}`;
@@ -176,24 +213,23 @@ const firebaseDatabase = (0, __hot_updater_plugin_core.createDatabasePlugin)({
 		};
 	}
 });
-
 //#endregion
 //#region src/firebaseStorage.ts
-const firebaseStorage = (0, __hot_updater_plugin_core.createStoragePlugin)({
+const firebaseStorage = (0, _hot_updater_plugin_core.createStoragePlugin)({
 	name: "firebaseStorage",
 	supportedProtocol: "gs",
 	factory: (config) => {
 		let app;
 		try {
-			app = firebase_admin.app();
+			app = firebase_admin.default.app();
 		} catch {
-			app = firebase_admin.initializeApp(config);
+			app = firebase_admin.default.initializeApp(config);
 		}
 		const bucket = app.storage().bucket(config.storageBucket);
-		const getStorageKey = (0, __hot_updater_plugin_core.createStorageKeyBuilder)(config.basePath);
+		const getStorageKey = (0, _hot_updater_plugin_core.createStorageKeyBuilder)(config.basePath);
 		return {
 			async delete(storageUri) {
-				const { bucket: bucketName, key } = (0, __hot_updater_plugin_core.parseStorageUri)(storageUri, "gs");
+				const { bucket: bucketName, key } = (0, _hot_updater_plugin_core.parseStorageUri)(storageUri, "gs");
 				if (bucketName !== config.storageBucket) throw new Error(`Bucket name mismatch: expected "${config.storageBucket}", but found "${bucketName}".`);
 				try {
 					const [files] = await bucket.getFiles({ prefix: key });
@@ -206,7 +242,7 @@ const firebaseStorage = (0, __hot_updater_plugin_core.createStoragePlugin)({
 			async upload(key, filePath) {
 				try {
 					const fileContent = await fs_promises.default.readFile(filePath);
-					const contentType = (0, __hot_updater_plugin_core.getContentType)(filePath);
+					const contentType = (0, _hot_updater_plugin_core.getContentType)(filePath);
 					const storageKey = getStorageKey(key, path.default.basename(filePath));
 					await bucket.file(storageKey).save(fileContent, { metadata: {
 						contentType,
@@ -234,7 +270,6 @@ const firebaseStorage = (0, __hot_updater_plugin_core.createStoragePlugin)({
 		};
 	}
 });
-
 //#endregion
 exports.firebaseDatabase = firebaseDatabase;
-exports.firebaseStorage = firebaseStorage;
+exports.firebaseStorage = firebaseStorage;

package/dist/index.d.cts

@@ -1,8 +1,8 @@
-import * as _hot_updater_plugin_core1 from "@hot-updater/plugin-core";
-import * as admin from "firebase-admin";
+import * as _$_hot_updater_plugin_core0 from "@hot-updater/plugin-core";
+import admin from "firebase-admin";
 
 //#region src/firebaseDatabase.d.ts
-declare const firebaseDatabase: (config: admin.AppOptions, hooks?: _hot_updater_plugin_core1.DatabasePluginHooks) => (() => _hot_updater_plugin_core1.DatabasePlugin);
+declare const firebaseDatabase: (config: admin.AppOptions, hooks?: _$_hot_updater_plugin_core0.DatabasePluginHooks) => () => _$_hot_updater_plugin_core0.DatabasePlugin<unknown>;
 //#endregion
 //#region src/firebaseStorage.d.ts
 interface FirebaseStorageConfig extends admin.AppOptions {
@@ -12,6 +12,6 @@ interface FirebaseStorageConfig extends admin.AppOptions {
    */
   basePath?: string;
 }
-declare const firebaseStorage: (config: FirebaseStorageConfig, hooks?: _hot_updater_plugin_core1.StoragePluginHooks) => () => _hot_updater_plugin_core1.StoragePlugin;
+declare const firebaseStorage: (config: FirebaseStorageConfig, hooks?: _$_hot_updater_plugin_core0.StoragePluginHooks) => () => _$_hot_updater_plugin_core0.StoragePlugin<unknown>;
 //#endregion
 export { FirebaseStorageConfig, firebaseDatabase, firebaseStorage };

package/dist/{index.d.ts → index.d.mts}

@@ -1,8 +1,8 @@
-import * as _hot_updater_plugin_core1 from "@hot-updater/plugin-core";
-import * as admin from "firebase-admin";
+import * as _$_hot_updater_plugin_core0 from "@hot-updater/plugin-core";
+import admin from "firebase-admin";
 
 //#region src/firebaseDatabase.d.ts
-declare const firebaseDatabase: (config: admin.AppOptions, hooks?: _hot_updater_plugin_core1.DatabasePluginHooks) => (() => _hot_updater_plugin_core1.DatabasePlugin);
+declare const firebaseDatabase: (config: admin.AppOptions, hooks?: _$_hot_updater_plugin_core0.DatabasePluginHooks) => () => _$_hot_updater_plugin_core0.DatabasePlugin<unknown>;
 //#endregion
 //#region src/firebaseStorage.d.ts
 interface FirebaseStorageConfig extends admin.AppOptions {
@@ -12,6 +12,6 @@ interface FirebaseStorageConfig extends admin.AppOptions {
    */
   basePath?: string;
 }
-declare const firebaseStorage: (config: FirebaseStorageConfig, hooks?: _hot_updater_plugin_core1.StoragePluginHooks) => () => _hot_updater_plugin_core1.StoragePlugin;
+declare const firebaseStorage: (config: FirebaseStorageConfig, hooks?: _$_hot_updater_plugin_core0.StoragePluginHooks) => () => _$_hot_updater_plugin_core0.StoragePlugin<unknown>;
 //#endregion
 export { FirebaseStorageConfig, firebaseDatabase, firebaseStorage };

package/dist/{index.js → index.mjs}

@@ -1,9 +1,33 @@
+import { DEFAULT_ROLLOUT_COHORT_COUNT } from "@hot-updater/core";
 import { calculatePagination, createDatabasePlugin, createStorageKeyBuilder, createStoragePlugin, getContentType, parseStorageUri } from "@hot-updater/plugin-core";
-import * as admin from "firebase-admin";
+import admin from "firebase-admin";
 import fs from "fs/promises";
 import path from "path";
-
 //#region src/firebaseDatabase.ts
+const bundleMatchesQueryWhere = (bundle, where) => {
+	if (!where) return true;
+	if (where.channel !== void 0 && bundle.channel !== where.channel) return false;
+	if (where.platform !== void 0 && bundle.platform !== where.platform) return false;
+	if (where.enabled !== void 0 && bundle.enabled !== where.enabled) return false;
+	if (where.id?.eq !== void 0 && bundle.id !== where.id.eq) return false;
+	if (where.id?.gt !== void 0 && bundle.id.localeCompare(where.id.gt) <= 0) return false;
+	if (where.id?.gte !== void 0 && bundle.id.localeCompare(where.id.gte) < 0) return false;
+	if (where.id?.lt !== void 0 && bundle.id.localeCompare(where.id.lt) >= 0) return false;
+	if (where.id?.lte !== void 0 && bundle.id.localeCompare(where.id.lte) > 0) return false;
+	if (where.id?.in && !where.id.in.includes(bundle.id)) return false;
+	if (where.targetAppVersionNotNull && bundle.targetAppVersion === null) return false;
+	if (where.targetAppVersion !== void 0 && bundle.targetAppVersion !== where.targetAppVersion) return false;
+	if (where.targetAppVersionIn && !where.targetAppVersionIn.includes(bundle.targetAppVersion ?? "")) return false;
+	if (where.fingerprintHash !== void 0 && bundle.fingerprintHash !== where.fingerprintHash) return false;
+	return true;
+};
+const sortBundles = (bundles, orderBy) => {
+	const direction = orderBy?.direction ?? "desc";
+	return bundles.slice().sort((a, b) => {
+		const result = a.id.localeCompare(b.id);
+		return direction === "asc" ? result : -result;
+	});
+};
 const convertToBundle = (firestoreData) => ({
 	channel: firestoreData.channel,
 	enabled: Boolean(firestoreData.enabled),
@@ -16,7 +40,9 @@ const convertToBundle = (firestoreData) => ({
 	targetAppVersion: firestoreData.target_app_version,
 	storageUri: firestoreData.storage_uri,
 	fingerprintHash: firestoreData.fingerprint_hash,
-	metadata: firestoreData?.metadata ?? {}
+	metadata: firestoreData?.metadata ?? {},
+	rolloutCohortCount: firestoreData.rollout_cohort_count ?? DEFAULT_ROLLOUT_COHORT_COUNT,
+	targetCohorts: firestoreData.target_cohorts ?? null
 });
 const firebaseDatabase = createDatabasePlugin({
 	name: "firebaseDatabase",
@@ -39,15 +65,23 @@ const firebaseDatabase = createDatabasePlugin({
 				return convertToBundle(bundleSnap.data());
 			},
 			async getBundles(options) {
-				const { where, limit, offset } = 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);
-				query = query.orderBy("id", "desc");
+				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);
+				query = query.orderBy("id", orderBy?.direction === "asc" ? "asc" : "desc");
 				const total = (await query.get()).size;
 				if (offset > 0) query = query.offset(offset);
 				if (limit) query = query.limit(limit);
-				bundles = (await query.get()).docs.map((doc) => convertToBundle(doc.data()));
+				bundles = sortBundles((await query.get()).docs.map((doc) => convertToBundle(doc.data())).filter((bundle) => bundleMatchesQueryWhere(bundle, where)), orderBy);
 				return {
 					data: bundles,
 					pagination: calculatePagination(total, {
@@ -91,7 +125,9 @@ const firebaseDatabase = createDatabasePlugin({
 								target_app_version: data.targetAppVersion,
 								storage_uri: data.storageUri,
 								fingerprint_hash: data.fingerprintHash,
-								metadata: data.metadata ?? {}
+								metadata: data.metadata ?? {},
+								rollout_cohort_count: data.rolloutCohortCount ?? DEFAULT_ROLLOUT_COHORT_COUNT,
+								target_cohorts: data.targetCohorts ?? null
 							};
 							const channelRef = db.collection("channels").doc(data.channel);
 							transaction.set(channelRef, { name: data.channel }, { merge: true });
@@ -126,7 +162,9 @@ const firebaseDatabase = createDatabasePlugin({
 								target_app_version: data.targetAppVersion || null,
 								storage_uri: data.storageUri,
 								fingerprint_hash: data.fingerprintHash,
-								metadata: data.metadata ?? {}
+								metadata: data.metadata ?? {},
+								rollout_cohort_count: data.rolloutCohortCount ?? DEFAULT_ROLLOUT_COHORT_COUNT,
+								target_cohorts: data.targetCohorts ?? null
 							}, { merge: true });
 							if (data.targetAppVersion) {
 								const versionDocId = `${data.platform}_${data.channel}_${data.targetAppVersion}`;
@@ -149,7 +187,6 @@ const firebaseDatabase = createDatabasePlugin({
 		};
 	}
 });
-
 //#endregion
 //#region src/firebaseStorage.ts
 const firebaseStorage = createStoragePlugin({
@@ -207,6 +244,5 @@ const firebaseStorage = createStoragePlugin({
 		};
 	}
 });
-
 //#endregion
-export { firebaseDatabase, firebaseStorage };
+export { firebaseDatabase, firebaseStorage };

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@hot-updater/firebase",
   "type": "module",
-  "version": "0.28.0",
+  "version": "0.29.0",
   "description": "React Native OTA solution for self-hosted",
   "main": "dist/index.cjs",
-  "types": "dist/index.d.ts",
-  "module": "dist/index.js",
+  "types": "dist/index.d.cts",
+  "module": "dist/index.mjs",
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
+      "types": "./dist/index.d.cts",
+      "import": "./dist/index.mjs",
       "require": "./dist/index.cjs"
     },
     "./iac": {
-      "types": "./dist/iac/index.d.ts",
-      "import": "./dist/iac/index.js",
+      "types": "./dist/iac/index.d.cts",
+      "import": "./dist/iac/index.mjs",
       "require": "./dist/iac/index.cjs"
     },
     "./functions": {
@@ -35,9 +35,11 @@
   ],
   "dependencies": {
     "firebase": "^11.3.1",
-    "@hot-updater/plugin-core": "0.28.0",
-    "@hot-updater/cli-tools": "0.28.0",
-    "@hot-updater/core": "0.28.0"
+    "hono": "4.12.9",
+    "@hot-updater/cli-tools": "0.29.0",
+    "@hot-updater/core": "0.29.0",
+    "@hot-updater/plugin-core": "0.29.0",
+    "@hot-updater/server": "0.29.0"
   },
   "publishConfig": {
     "access": "public"
@@ -51,17 +53,21 @@
     "firebase-functions-test": "^3.4.0",
     "firebase-tools": "^13.32.0",
     "fkill": "^9.0.0",
-    "hono": "^4.6.3",
     "mime": "^4.0.4",
-    "@hot-updater/js": "0.28.0",
-    "@hot-updater/test-utils": "0.28.0"
+    "@hot-updater/js": "0.29.0",
+    "@hot-updater/mock": "0.29.0",
+    "@hot-updater/test-utils": "0.29.0"
   },
   "peerDependencies": {
-    "firebase-admin": "*"
+    "firebase-admin": "*",
+    "firebase-functions": "*"
   },
   "peerDependenciesMeta": {
     "firebase-admin": {
       "optional": false
+    },
+    "firebase-functions": {
+      "optional": false
     }
   },
   "scripts": {