@hot-updater/firebase 1.0.0-rc.46 → 1.0.0-rc.47

package/dist/firebase/functions/index.cjs

@@ -1129,29 +1129,23 @@ function validateReleases(releases, strategy) {
 		if (seenIds.has(release.id)) throw new ReleaseCatalogCompilationError("INVALID_RELEASE", `Duplicate Release ID: ${release.id}`);
 		seenIds.add(release.id);
 		if (release.strategy !== strategy) throw new ReleaseCatalogCompilationError("INVALID_RELEASE", `Release ${release.id} has the wrong strategy`);
-		if (release.kind === "BUNDLE" && release.bundleId === null || release.kind === "EMBEDDED" && release.bundleId !== null) throw new ReleaseCatalogCompilationError("INVALID_RELEASE", `Release ${release.id} has an invalid kind/Bundle combination`);
+		if (release.bundleId === null) throw new ReleaseCatalogCompilationError("INVALID_RELEASE", `Release ${release.id} has no Bundle`);
 		if (release.targetCohorts.length > 100) throw new ReleaseCatalogCompilationError("TARGET_COHORT_LIMIT", `Release ${release.id} exceeds 100 target cohorts`);
 		if (strategy === "APP_VERSION" && (release.targetAppVersion === null || release.fingerprintHash !== null)) throw new ReleaseCatalogCompilationError("INVALID_RELEASE", `Release ${release.id} has an invalid app-version target`);
 		if (strategy === "FINGERPRINT" && (release.fingerprintHash === null || release.targetAppVersion !== null)) throw new ReleaseCatalogCompilationError("INVALID_RELEASE", `Release ${release.id} has an invalid fingerprint target`);
 	}
-	return enabled.filter((release) => release.kind === "BUNDLE");
+	return enabled;
 }
 function collectFrontierReleaseIds(releases) {
 	if (releases.every((release) => normalizeRolloutCohortCount(release.rolloutCohortCount) >= 1e3)) {
 		const retained = /* @__PURE__ */ new Set();
 		const bundleIds = /* @__PURE__ */ new Set();
-		let embedded = false;
 		for (const release of releases) {
-			if (release.kind === "EMBEDDED") {
-				if (!embedded) {
-					embedded = true;
-					retained.add(release.id);
-				}
-			} else if (release.bundleId !== null && bundleIds.size < 11 && !bundleIds.has(release.bundleId)) {
+			if (release.bundleId !== null && !bundleIds.has(release.bundleId)) {
 				bundleIds.add(release.bundleId);
 				retained.add(release.id);
 			}
-			if (embedded && bundleIds.size >= 11) break;
+			if (bundleIds.size >= 11) break;
 		}
 		return retained;
 	}
@@ -1168,7 +1162,6 @@ function collectFrontierReleaseIds(releases) {
 			normalized,
 			numeric: normalized === void 0 ? null : getNumericCohortValue(normalized),
 			bundleIds: /* @__PURE__ */ new Set(),
-			embedded: false,
 			complete: false
 		};
 	});
@@ -1193,16 +1186,11 @@ function collectFrontierReleaseIds(releases) {
 		for (const index of eligibleStateIndexes) {
 			const state = cohortStates[index];
 			if (state.complete) continue;
-			if (release.kind === "EMBEDDED") {
-				if (!state.embedded) {
-					state.embedded = true;
-					retained.add(release.id);
-				}
-			} else if (release.bundleId !== null && state.bundleIds.size < 11 && !state.bundleIds.has(release.bundleId)) {
+			if (release.bundleId !== null && !state.bundleIds.has(release.bundleId)) {
 				state.bundleIds.add(release.bundleId);
 				retained.add(release.id);
 			}
-			if (state.embedded && state.bundleIds.size >= 11) {
+			if (state.bundleIds.size >= 11) {
 				state.complete = true;
 				incompleteStateCount -= 1;
 			}
@@ -1387,12 +1375,11 @@ function projectCompiledCatalog(catalog, appVersion) {
 }
 function projectCompiledRollbackCatalog(catalog, appVersion) {
 	let indexes;
-	if (catalog.strategy === "FINGERPRINT") indexes = catalog.rollbackReleaseIndexes ?? catalog.releaseIndexes;
+	if (catalog.strategy === "FINGERPRINT") indexes = catalog.rollbackReleaseIndexes;
 	else {
 		const canonicalVersion = appVersion && canonicalizeAppVersion(appVersion);
 		if (!canonicalVersion) return [];
-		const segment = catalog.segments.find((candidate) => versionInSegment(canonicalVersion, candidate));
-		indexes = segment?.rollbackReleaseIndexes ?? segment?.releaseIndexes ?? [];
+		indexes = catalog.segments.find((segment) => versionInSegment(canonicalVersion, segment))?.rollbackReleaseIndexes ?? [];
 	}
 	return indexes.map((index) => catalog.releaseDescriptors[index]);
 }
@@ -1914,7 +1901,7 @@ const SETTINGS_TABLE = {
 const ENGINE_SCHEMA_KEY = "schema.engine";
 const CORE_SCHEMA_KEY = "schema.core";
 const stored = ({ key, expected, found }) => `"${key}" is ${found === null ? "missing" : `"${found}"`}; expected "${expected}"`;
-const settingMessage = (adapterName, { key, expected, found }) => `Hot Updater schema setting "${key}" for ${adapterName} is ${found === null ? "missing" : `"${found}"`}; expected "${expected}". ${key === "schema.engine" ? "Create a new empty database and run `hot-updater db migrate`; databases from before the storage engine are not converted." : "Run `hot-updater db migrate`."}`;
+const settingMessage = (adapterName, { key, expected, found }) => `Hot Updater schema setting "${key}" for ${adapterName} is ${found === null ? "missing" : `"${found}"`}; expected "${expected}". Run \`hot-updater db migrate\`.`;
 /** The plugin a `schema.<id>` setting belongs to; undefined for core's and the engine's. */
 const pluginOf = ({ key }) => key.startsWith("schema.") && key !== "schema.engine" && key !== CORE_SCHEMA_KEY ? key.slice(7) : void 0;
 const listed = (items) => items.length < 2 ? items.join("") : `${items.slice(0, -1).join(", ")} and ${items.at(-1)}`;
@@ -2032,26 +2019,13 @@ const METER = Symbol.for("@hot-updater/plugin-core/read-meter");
 const readMeterOf = (database) => typeof database === "object" && database !== null ? database[METER] : void 0;
 //#endregion
 //#region ../plugin-core/dist/engine/db/schemaSettings.mjs
-/** Refuses a database with `schema.core` but no `schema.engine`: it predates the engine. */
-const assertEngineDatabase = (adapterName, stored) => {
-	if (stored.get("schema.core") && !stored.get("schema.engine")) throw new HotUpdaterSchemaMigrationRequiredError(adapterName, String(stored.get("schema.core").value), {
-		key: ENGINE_SCHEMA_KEY,
-		expected: "1",
-		found: null
-	});
-};
 const storedSettings = async (adapter, keys) => {
 	const rows = await readSettings(adapter, keys);
 	return new Map(keys.map((key, position) => [key, rows[position] ?? null]));
 };
-/** Writes the settings rows after every table exists, refusing a pre-engine database. */
+/** Writes the settings rows after every table exists. */
 const writeSchemaSettings = async (adapter, adapterName, settings) => {
-	const stored = await storedSettings(adapter, [.../* @__PURE__ */ new Set([
-		"schema.core",
-		ENGINE_SCHEMA_KEY,
-		...Object.keys(settings)
-	])]);
-	assertEngineDatabase(adapterName, stored);
+	const stored = await storedSettings(adapter, Object.keys(settings));
 	const ops = Object.entries(settings).flatMap(([key, value]) => {
 		const row = stored.get(key);
 		if (row === null || row === void 0) return [{
@@ -2074,19 +2048,11 @@ const writeSchemaSettings = async (adapter, adapterName, settings) => {
 		}];
 	});
 	if (ops.length === 0) return;
-	if (!(await adapter.write(ops)).ok) throw new Error("The schema settings changed during the migration; run it again.");
+	if (!(await adapter.write(ops)).ok) throw new Error(`${adapterName}: the schema settings changed during the migration; run it again.`);
 };
-/**
-* Creates or updates every table, then writes the settings rows last. A
-* pre-engine database is refused before any table changes.
-*/
+/** Creates or updates every table, then writes the settings rows last. */
 const migrateSchema = async (adapter, adapterName, tables, settings) => {
 	if (adapter.migrations === void 0) throw new Error(`${adapterName} creates its tables with its own tooling; write only the settings rows.`);
-	const stored = await storedSettings(adapter, ["schema.core", ENGINE_SCHEMA_KEY]).catch((error) => {
-		if (!isMissingSchemaError(error)) throw error;
-		return /* @__PURE__ */ new Map();
-	});
-	assertEngineDatabase(adapterName, stored);
 	await adapter.migrations.apply([...tables, SETTINGS_TABLE]);
 	await writeSchemaSettings(adapter, adapterName, settings);
 };
@@ -2378,15 +2344,14 @@ const storedSchemaVersion = (stored) => {
 	const version = stored?.get("schema.core") ?? stored?.get("version");
 	return typeof version === "string" ? version : void 0;
 };
-/** A v0 or pre-engine database is recreated, never converted. */
-const refusePreEngineDatabase = (adapterName, stored) => {
-	const version = storedSchemaVersion(stored);
-	if (version === void 0 || stored.has("schema.engine")) return;
-	throw new HotUpdaterSchemaMigrationRequiredError(adapterName, version, stored.has("schema.core") ? {
-		key: ENGINE_SCHEMA_KEY,
-		expected: "1",
-		found: null
-	} : void 0);
+/**
+* A v0 database, whose settings hold `version` and no `schema.engine`, is
+* recreated, never converted.
+*/
+const refuseV0Database = (adapterName, stored) => {
+	const version = stored.get("version");
+	if (typeof version !== "string" || stored.has("schema.engine")) return;
+	throw new HotUpdaterSchemaMigrationRequiredError(adapterName, version);
 };
 //#endregion
 //#region ../plugin-core/dist/engine/database/cursor.mjs
@@ -3449,13 +3414,13 @@ const resolveSchema = (modules) => {
 * `hot-updater db migrate` for a store whose adapter creates its own tables
 * (MongoDB and the key-value stores): the tables and indexes, then the
 * settings rows, applied when a setting is missing or different, and refused
-* on a database from before the engine.
+* on a v0 database.
 */
 const createEngineMigrator = (options) => {
 	const getVersion = async () => storedSchemaVersion(await options.readSettings());
 	const makeResult = async (migrate = {}) => {
 		const stored = await options.readSettings();
-		refusePreEngineDatabase(options.adapterName, stored);
+		refuseV0Database(options.adapterName, stored);
 		if (Object.entries(options.settings).every(([key, value]) => stored.get(key) === value)) return getEmptyMigrationResult();
 		return {
 			operations: [...options.schema.tables.map((table) => ({
@@ -4560,7 +4525,7 @@ const createKvAdapter = ({ store, tablePrefix = "" }) => {
 };
 //#endregion
 //#region ../../packages/server/dist/version.mjs
-const HOT_UPDATER_SERVER_VERSION = "1.0.0-rc.46";
+const HOT_UPDATER_SERVER_VERSION = "1.0.0-rc.47";
 //#endregion
 //#region ../../packages/server/dist/handlerVersionRoutes.mjs
 /**
@@ -5249,7 +5214,7 @@ const baseBundleIdsOf = (row, range, bundleId, limit) => {
 	for (const { descriptor, index } of newestFirst) {
 		if (ids.length >= limit) break;
 		const id = descriptor.bundleId;
-		if (serving.has(index) && descriptor.kind === "BUNDLE" && id !== null && id < bundleId && !ids.includes(id)) ids.push(id);
+		if (serving.has(index) && id !== null && id < bundleId && !ids.includes(id)) ids.push(id);
 	}
 	return ids;
 };
@@ -6015,7 +5980,7 @@ const createCoreOperations = (db, { now = Date.now } = {}) => {
 		}),
 		promoteRelease: (input) => withChannels(async () => {
 			const checkSource = (source) => {
-				if (source.kind !== "BUNDLE" || source.bundle_id === null) throw new ReleaseManagementError("TARGET_RELEASE_INVALID", "Only a Bundle Release can be promoted.");
+				if (source.bundle_id === null) throw new ReleaseManagementError("TARGET_RELEASE_INVALID", "Only a Bundle Release can be promoted.");
 			};
 			checkSource((await db.transaction((tx) => loadTarget(tx, input))).release);
 			const targetChannel = input.targetChannel.trim();
@@ -6214,7 +6179,6 @@ const fail = (message) => {
 const isRecord$6 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 const checkPlugin = (value, at) => {
 	if (!isRecord$6(value)) return fail(`${at} is not a plugin.`);
-	if ("kind" in value) fail(`${at} has a kind; core is built in and is never passed as a plugin.`);
 	const unknown = Object.keys(value).find((key) => !PLUGIN_KEYS.has(key));
 	if (unknown !== void 0) fail(`${at} has an unknown key "${unknown}".`);
 	const plugin = value;

package/dist/init/index.cjs

@@ -6706,17 +6706,6 @@ const FIREBASE_V1_FUNCTION_NAME = "hot-updater-v1";
 * the data, so item partitions are table names with no prefix.
 */
 const FIREBASE_V1_COLLECTION = "hot_updater_v1";
-/**
-* The collections a 1.0 release candidate wrote before the storage engine.
-* Init reads them only to refuse such a database.
-*/
-const FIREBASE_PRE_ENGINE_COLLECTIONS = [
-	"hot_updater_v1_private_settings",
-	"hot_updater_v1_bundles",
-	"hot_updater_v1_bundle_patches",
-	"hot_updater_v1_channels",
-	"hot_updater_v1_release_catalogs"
-];
 //#endregion
 //#region src/firestoreStore.ts
 /**
@@ -6954,11 +6943,9 @@ const inputFirebaseApplicationCredentials = async ({ applicationCredentials, non
 const ENGINE_SETTING = "schema.engine";
 /**
 * v1 once the storage engine's schema settings are written; incompatible
-* when a 1.0 release candidate's collections hold data, or another engine
-* version is recorded; otherwise fresh.
+* when another engine version is recorded; otherwise fresh.
 */
-const resolveFirebaseInfrastructureState = ({ engine, preEngineData }) => {
-	if (preEngineData) return "incompatible";
+const resolveFirebaseInfrastructureState = ({ engine }) => {
 	if (engine === void 0) return "fresh";
 	return engine === _hot_updater_plugin_core.coreSettings[ENGINE_SETTING] ? "v1" : "incompatible";
 };
@@ -6974,13 +6961,8 @@ const assertFirebaseInfrastructureCanInitialize = async ({ applicationCredential
 		projectId
 	}, `hot-updater-init-${projectId}-${Date.now()}`);
 	try {
-		const db = (0, firebase_admin_firestore.getFirestore)(app);
-		const setting = await db.collection(FIREBASE_V1_COLLECTION).doc(firebaseEngineSettingDocumentId()).get();
-		const preEngine = await Promise.all(FIREBASE_PRE_ENGINE_COLLECTIONS.map((name) => db.collection(name).limit(1).get()));
-		if (resolveFirebaseInfrastructureState({
-			engine: setting.exists ? setting.get("row.value") : void 0,
-			preEngineData: preEngine.some((snapshot) => !snapshot.empty)
-		}) === "incompatible") throw new _hot_updater_cli_tools.InitError(`Firebase v1 infrastructure in project ${projectId} holds data from a 1.0 release candidate or an unsupported database version. Use a new Firebase project, or delete the hot_updater_v1_* collections, then rerun init.`);
+		const setting = await (0, firebase_admin_firestore.getFirestore)(app).collection(FIREBASE_V1_COLLECTION).doc(firebaseEngineSettingDocumentId()).get();
+		if (resolveFirebaseInfrastructureState({ engine: setting.exists ? setting.get("row.value") : void 0 }) === "incompatible") throw new _hot_updater_cli_tools.InitError(`Firebase v1 infrastructure in project ${projectId} records an unsupported database version. Use a new Firebase project, or delete the ${FIREBASE_V1_COLLECTION} collection, then rerun init.`);
 	} catch (error) {
 		if (error instanceof _hot_updater_cli_tools.InitError) throw error;
 		const code = typeof error === "object" && error !== null ? Reflect.get(error, "code") : void 0;

package/dist/init/index.mjs

@@ -6699,17 +6699,6 @@ const FIREBASE_V1_FUNCTION_NAME = "hot-updater-v1";
 * the data, so item partitions are table names with no prefix.
 */
 const FIREBASE_V1_COLLECTION = "hot_updater_v1";
-/**
-* The collections a 1.0 release candidate wrote before the storage engine.
-* Init reads them only to refuse such a database.
-*/
-const FIREBASE_PRE_ENGINE_COLLECTIONS = [
-	"hot_updater_v1_private_settings",
-	"hot_updater_v1_bundles",
-	"hot_updater_v1_bundle_patches",
-	"hot_updater_v1_channels",
-	"hot_updater_v1_release_catalogs"
-];
 //#endregion
 //#region src/firestoreStore.ts
 /**
@@ -6947,11 +6936,9 @@ const inputFirebaseApplicationCredentials = async ({ applicationCredentials, non
 const ENGINE_SETTING = "schema.engine";
 /**
 * v1 once the storage engine's schema settings are written; incompatible
-* when a 1.0 release candidate's collections hold data, or another engine
-* version is recorded; otherwise fresh.
+* when another engine version is recorded; otherwise fresh.
 */
-const resolveFirebaseInfrastructureState = ({ engine, preEngineData }) => {
-	if (preEngineData) return "incompatible";
+const resolveFirebaseInfrastructureState = ({ engine }) => {
 	if (engine === void 0) return "fresh";
 	return engine === coreSettings[ENGINE_SETTING] ? "v1" : "incompatible";
 };
@@ -6967,13 +6954,8 @@ const assertFirebaseInfrastructureCanInitialize = async ({ applicationCredential
 		projectId
 	}, `hot-updater-init-${projectId}-${Date.now()}`);
 	try {
-		const db = getFirestore(app);
-		const setting = await db.collection(FIREBASE_V1_COLLECTION).doc(firebaseEngineSettingDocumentId()).get();
-		const preEngine = await Promise.all(FIREBASE_PRE_ENGINE_COLLECTIONS.map((name) => db.collection(name).limit(1).get()));
-		if (resolveFirebaseInfrastructureState({
-			engine: setting.exists ? setting.get("row.value") : void 0,
-			preEngineData: preEngine.some((snapshot) => !snapshot.empty)
-		}) === "incompatible") throw new InitError(`Firebase v1 infrastructure in project ${projectId} holds data from a 1.0 release candidate or an unsupported database version. Use a new Firebase project, or delete the hot_updater_v1_* collections, then rerun init.`);
+		const setting = await getFirestore(app).collection(FIREBASE_V1_COLLECTION).doc(firebaseEngineSettingDocumentId()).get();
+		if (resolveFirebaseInfrastructureState({ engine: setting.exists ? setting.get("row.value") : void 0 }) === "incompatible") throw new InitError(`Firebase v1 infrastructure in project ${projectId} records an unsupported database version. Use a new Firebase project, or delete the ${FIREBASE_V1_COLLECTION} collection, then rerun init.`);
 	} catch (error) {
 		if (error instanceof InitError) throw error;
 		const code = typeof error === "object" && error !== null ? Reflect.get(error, "code") : void 0;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hot-updater/firebase",
   "type": "module",
-  "version": "1.0.0-rc.46",
+  "version": "1.0.0-rc.47",
   "description": "React Native OTA solution for self-hosted",
   "main": "dist/index.cjs",
   "types": "dist/index.d.cts",
@@ -37,10 +37,10 @@
   ],
   "dependencies": {
     "hono": "4.12.34",
-    "@hot-updater/cli-tools": "1.0.0-rc.46",
-    "@hot-updater/protocol": "1.0.0-rc.46",
-    "@hot-updater/plugin-core": "1.0.0-rc.46",
-    "@hot-updater/server": "1.0.0-rc.46"
+    "@hot-updater/plugin-core": "1.0.0-rc.47",
+    "@hot-updater/cli-tools": "1.0.0-rc.47",
+    "@hot-updater/protocol": "1.0.0-rc.47",
+    "@hot-updater/server": "1.0.0-rc.47"
   },
   "publishConfig": {
     "access": "public"
@@ -55,8 +55,8 @@
     "firebase-tools": "15.29.0",
     "fkill": "^9.0.0",
     "mime": "^4.0.4",
-    "@hot-updater/mock": "1.0.0-rc.46",
-    "@hot-updater/test-utils": "1.0.0-rc.46"
+    "@hot-updater/mock": "1.0.0-rc.47",
+    "@hot-updater/test-utils": "1.0.0-rc.47"
   },
   "peerDependencies": {
     "firebase-admin": "*",