@hot-updater/firebase 1.0.0-rc.43 → 1.0.0-rc.44

package/dist/firebase/functions/index.cjs

@@ -1426,31 +1426,6 @@ var ReleaseCatalogMutationError = class extends Error {
 	}
 };
 //#endregion
-//#region ../plugin-core/dist/storageDownloadPath.mjs
-const decodeBase64Url$1 = (value) => {
-	try {
-		const base64 = value.replaceAll("-", "+").replaceAll("_", "/");
-		const binary = atob(base64.padEnd(Math.ceil(base64.length / 4) * 4, "="));
-		return new TextDecoder(void 0, { fatal: true }).decode(Uint8Array.from(binary, (character) => character.charCodeAt(0)));
-	} catch {
-		return null;
-	}
-};
-const parseStorageDownloadPath = (path) => {
-	const match = /^\/storage\/([^/]+)\/([^/]+)$/.exec(path);
-	if (!match) return null;
-	const storageUri = decodeBase64Url$1(match[1]);
-	if (storageUri === null) return null;
-	try {
-		return {
-			signature: decodeURIComponent(match[2]),
-			storageUri
-		};
-	} catch {
-		return null;
-	}
-};
-//#endregion
 //#region ../plugin-core/dist/serverPlugin/definePlugin.mjs
 /** Declares a plugin; Hot Updater's own plugins and third-party ones use the same contract. */
 const definePlugin = (plugin) => plugin;
@@ -4591,7 +4566,7 @@ const createKvAdapter = ({ store, tablePrefix = "" }) => {
 };
 //#endregion
 //#region ../../packages/server/dist/version.mjs
-const HOT_UPDATER_SERVER_VERSION = "1.0.0-rc.43";
+const HOT_UPDATER_SERVER_VERSION = "1.0.0-rc.44";
 //#endregion
 //#region ../../packages/server/dist/handlerVersionRoutes.mjs
 /**
@@ -6777,6 +6752,22 @@ const privateNotFound = () => Response.json({ error: "Not found" }, {
 	status: 404,
 	headers: { "cache-control": "private, no-store" }
 });
+const badRequest = (error) => Response.json({ error }, {
+	status: 400,
+	headers: { "cache-control": "private, no-store" }
+});
+/**
+* A 400 for a catalog path whose scope is malformed, such as a channel name
+* where its base64url key belongs; null for a well-formed scope.
+*/
+const invalidScope = (input) => {
+	try {
+		createReleaseCatalogScopeKey(input);
+		return null;
+	} catch (error) {
+		return badRequest(error instanceof Error ? error.message : "Invalid Release Catalog scope");
+	}
+};
 /**
 * A scope with no catalog yet, such as a store version before its first
 * OTA release: cached like a catalog, so its update checks don't all reach
@@ -6855,16 +6846,15 @@ const createReleaseCatalogRouteHandlers = () => {
 		appVersionReleaseCatalog: async (params, request, { core }) => {
 			const rawAppVersion = requireRouteParam(params, "appVersion");
 			const appVersion = canonicalizeAppVersion(rawAppVersion);
-			if (appVersion === null || appVersion !== rawAppVersion) return Response.json({ error: "Invalid app version" }, {
-				status: 400,
-				headers: { "cache-control": "private, no-store" }
-			});
+			if (appVersion === null || appVersion !== rawAppVersion) return badRequest("Invalid app version");
 			const input = {
 				appVersion,
 				channelKey: requireRouteParam(params, "channelKey"),
 				platform: requirePlatformParam(params),
 				strategy: "APP_VERSION"
 			};
+			const invalid = invalidScope(input);
+			if (invalid) return invalid;
 			return catalogResponse(await loadCatalog(`app-version:${JSON.stringify(input)}`, () => core.getReleaseCatalog(input)), request);
 		},
 		fingerprintReleaseCatalog: async (params, request, { core }) => {
@@ -6874,6 +6864,8 @@ const createReleaseCatalogRouteHandlers = () => {
 				platform: requirePlatformParam(params),
 				strategy: "FINGERPRINT"
 			};
+			const invalid = invalidScope(input);
+			if (invalid) return invalid;
 			return catalogResponse(await loadCatalog(`fingerprint:${JSON.stringify(input)}`, () => core.getReleaseCatalog(input)), request);
 		},
 		artifactV1: async (params, _request, { core }) => {
@@ -6955,8 +6947,8 @@ const errorResponse = (error, status) => Response.json({ error }, {
 	headers: { "cache-control": "private, no-store" },
 	status
 });
-/** `/version` and storage downloads never pass through the client policy. */
-const PUBLIC_CLIENT_ROUTES = /* @__PURE__ */ new Set(["version", "downloadStorageObject"]);
+/** `/version` never passes through the client policy. */
+const PUBLIC_CLIENT_ROUTES = /* @__PURE__ */ new Set(["version"]);
 const routesOf = Symbol.for("@hot-updater/server/routes");
 const withVary = (response, varyHeaders) => {
 	const cacheControl = response.headers.get("cache-control") ?? "";
@@ -7001,26 +6993,11 @@ const createRequestHandler = ({ api, clientPolicy, privateResponses = false, rou
 		});
 	}
 };
-const createDownloadStorageRouteHandler = (downloadStorageObject) => async (params) => {
-	const token = params.token;
-	const signature = params.signature;
-	if (!token || !signature) return errorResponse("Not found", 404);
-	const response = await downloadStorageObject(token, signature);
-	if (!response) return errorResponse("Not found", 404);
-	const headers = new Headers(response.headers);
-	if (!headers.has("cache-control")) headers.set("cache-control", "public, max-age=31536000, immutable");
-	return new Response(response.body, {
-		headers,
-		status: response.status,
-		statusText: response.statusText
-	});
-};
-function createHotUpdaterHandlers({ api, clientPolicy, downloadStorageObject, endpoints = [], plugins = [] }) {
+function createHotUpdaterHandlers({ api, clientPolicy, endpoints = [], plugins = [] }) {
 	const routeHandlers = {
 		...createVersionRouteHandlers(plugins),
 		...createReleaseCatalogRouteHandlers(),
-		...createAdminRouteHandlers(),
-		...downloadStorageObject === void 0 ? {} : { downloadStorageObject: createDownloadStorageRouteHandler(downloadStorageObject) }
+		...createAdminRouteHandlers()
 	};
 	const routes = [];
 	const shapes = /* @__PURE__ */ new Map();
@@ -7039,7 +7016,6 @@ function createHotUpdaterHandlers({ api, clientPolicy, downloadStorageObject, en
 	const clientRouter = createRouter();
 	const addClientRoute = mount(clientRouter, false);
 	addClientRoute("GET", "/version", "version");
-	if (downloadStorageObject !== void 0) addClientRoute("GET", "/storage/:token/:signature", "downloadStorageObject");
 	addClientRoute("GET", "/release-catalogs/app-version/:platform/:channelKey/:appVersion", "appVersionReleaseCatalog");
 	addClientRoute("GET", "/release-catalogs/fingerprint/:platform/:channelKey/:fingerprintHash", "fingerprintReleaseCatalog");
 	addClientRoute("GET", "/artifacts/v1/:targetBundleId/from/:currentBundleId", "artifactV1");
@@ -7071,33 +7047,23 @@ function createHotUpdaterHandlers({ api, clientPolicy, downloadStorageObject, en
 }
 //#endregion
 //#region ../../packages/server/dist/storageAccess.mjs
+/** A URL devices download from, which only an absolute HTTP(S) URL can be. */
 const assertRemoteUrl = (value) => {
-	const protocol = new URL(value).protocol;
-	if (protocol !== "http:" && protocol !== "https:") throw new Error("Storage getDownloadUrl must resolve to an HTTP(S) URL.");
+	let protocol;
+	try {
+		protocol = new URL(value).protocol;
+	} catch {}
+	if (protocol !== "http:" && protocol !== "https:") throw new Error("Storage getDownloadUrl must resolve to an absolute HTTP(S) URL.");
 	return value;
 };
 const getStorageProtocol = (storageUri) => new URL(storageUri).protocol.replace(":", "");
 const isRemoteUrlProtocol = (protocol) => protocol === "http" || protocol === "https";
-const resolveDownloadPath = (value, storageUri) => {
-	const parsed = parseStorageDownloadPath(value);
-	if (!parsed || parsed.storageUri !== storageUri) throw new Error("Storage getDownloadUrl must return an HTTP(S) URL or a valid storage download path.");
-	return value;
-};
-const tokensEqual = (left, right) => {
-	const leftBytes = new TextEncoder().encode(left);
-	const rightBytes = new TextEncoder().encode(right);
-	let difference = leftBytes.length ^ rightBytes.length;
-	const length = Math.max(leftBytes.length, rightBytes.length);
-	for (let index = 0; index < length; index += 1) difference |= (leftBytes[index] ?? 0) ^ (rightBytes[index] ?? 0);
-	return difference === 0;
-};
-const createStorageAccess = (storageAdapters) => {
-	const protocols = /* @__PURE__ */ new Set();
-	for (const storage of storageAdapters) {
-		if (protocols.has(storage.protocol)) throw new Error(`Multiple storage adapters handle protocol: ${storage.protocol}`);
-		protocols.add(storage.protocol);
-	}
-	const findStorage = (protocol) => storageAdapters.find((item) => item.protocol === protocol);
+/**
+* Reads and download URLs over the server's storage, for the URIs of its
+* protocol; an HTTP(S) URI is used as it is.
+*/
+const createStorageAccess = (storageAdapter) => {
+	const findStorage = (protocol) => storageAdapter.protocol === protocol ? storageAdapter : void 0;
 	const readStorageResponse = async (storageUri) => {
 		const protocol = getStorageProtocol(storageUri);
 		const storage = findStorage(protocol);
@@ -7121,38 +7087,12 @@ const createStorageAccess = (storageAdapters) => {
 		}
 		if (!storage.getDownloadUrl) return null;
 		const { url: downloadUrl } = await storage.getDownloadUrl({ storageUri });
-		try {
-			return assertRemoteUrl(downloadUrl);
-		} catch (error) {
-			if (/^[a-z][a-z\d+.-]*:/i.test(downloadUrl)) throw error;
-		}
-		return resolveDownloadPath(downloadUrl, storageUri);
+		return assertRemoteUrl(downloadUrl);
 	};
 	const readStorageText = async (storageUri) => {
 		return (await readStorageResponse(storageUri))?.text() ?? null;
 	};
 	return {
-		downloadStorageObject: storageAdapters.some((storage) => storage.getDownloadUrl !== void 0) ? async (storageUriToken, encodedSignature) => {
-			const requestedPath = `/storage/${storageUriToken}/${encodedSignature}`;
-			const requested = parseStorageDownloadPath(requestedPath);
-			if (!requested) return null;
-			let storage;
-			try {
-				storage = findStorage(getStorageProtocol(requested.storageUri));
-			} catch {
-				return null;
-			}
-			if (!storage?.getDownloadUrl || !storage.get) return null;
-			const { url: downloadUrl } = await storage.getDownloadUrl({ storageUri: requested.storageUri });
-			try {
-				new URL(downloadUrl);
-				return null;
-			} catch {
-				if (/^[a-z][a-z\d+.-]*:/i.test(downloadUrl)) return null;
-			}
-			if (!tokensEqual(downloadUrl, requestedPath)) return null;
-			return (await storage.get({ storageUri: requested.storageUri })).response;
-		} : void 0,
 		readStorageText,
 		resolveFileUrl
 	};
@@ -7174,17 +7114,21 @@ const databaseOf = (value) => {
 	}
 	throw new HotUpdaterConfigError("database must be a Hot Updater 1.0 database, such as kyselyAdapter(...) or postgres(...). Upgrade the provider package that created it.");
 };
-/** `"public"`, or nothing; a `clientAccess` object says what replaced it. */
+/** The configured storage, when it is a storage adapter. */
+const storageOf = (value) => {
+	if (isRecord$4(value) && typeof value.name === "string" && typeof value.protocol === "string") return value;
+	throw new HotUpdaterConfigError("storage must be a storage adapter, such as s3Storage(...): the one hot-updater.config.ts uploads with.");
+};
+/** `"public"`, or nothing. */
 const isPublic = (value) => {
 	if (value === void 0) return false;
 	if (value === "public") return true;
-	throw new HotUpdaterConfigError(isRecord$4(value) ? "clientAccess objects were removed in 1.0. Set clientAccess: \"public\", or add a plugin that provides clientAuth to plugins." : "clientAccess must be \"public\"; to protect client routes, add a plugin that provides clientAuth to plugins.");
+	throw new HotUpdaterConfigError("clientAccess must be \"public\"; to protect client routes, add a plugin that provides clientAuth to plugins.");
 };
 function createHotUpdater(options) {
-	for (const key of ["authorityId", "catalogId"]) if (Object.hasOwn(options, key)) throw new TypeError(`Remove ${key} from createHotUpdater options. Catalog identity is managed internally.`);
 	const database = databaseOf(options.database);
-	const storage = Object.freeze([...options.storage ?? []]);
-	const { downloadStorageObject, readStorageText, resolveFileUrl } = createStorageAccess(storage);
+	const storage = storageOf(options.storage);
+	const { readStorageText, resolveFileUrl } = createStorageAccess(storage);
 	const publicClients = isPublic(options.clientAccess);
 	const configured = Object.freeze([...options.plugins ?? []]);
 	const plugins = assemblePlugins(configured, database, { storage: {
@@ -7203,7 +7147,6 @@ function createHotUpdater(options) {
 	const handlers = createHotUpdaterHandlers({
 		api: { core: plugins.core },
 		...clientPolicy === void 0 ? {} : { clientPolicy },
-		downloadStorageObject,
 		endpoints: plugins.endpoints,
 		plugins: Object.keys(plugins.api)
 	});
@@ -7212,7 +7155,7 @@ function createHotUpdater(options) {
 		adapterName: database.name,
 		get handlers() {
 			if (!serving) {
-				for (const adapter of storage) assertStorageOperations(adapter, ["get", "getDownloadUrl"]);
+				assertStorageOperations(storage, ["get", "getDownloadUrl"]);
 				serving = true;
 			}
 			return handlers;
@@ -11663,11 +11606,11 @@ if (!storageBucket) throw new Error("Firebase runtime requires storageBucket to
 const hotUpdater = createHotUpdater({
 	database: firebaseDatabase({ ...adminOptions }),
 	plugins,
-	storage: [firebaseStorage({
+	storage: firebaseStorage({
 		...adminOptions,
 		storageBucket,
 		cdnUrl
-	})]
+	})
 });
 const app = new hono.Hono();
 app.get("/ping", (c) => {

package/dist/index.cjs

@@ -4,9 +4,7 @@ let firebase_admin_app = require("firebase-admin/app");
 let firebase_admin_firestore = require("firebase-admin/firestore");
 let node_crypto = require("node:crypto");
 let firebase_admin_storage = require("firebase-admin/storage");
-let _hot_updater_server_plugins_api_keys = require("@hot-updater/server/plugins/api-keys");
-let _hot_updater_server_plugins_insights = require("@hot-updater/server/plugins/insights");
-let _hot_updater_server_plugins_remote_config = require("@hot-updater/server/plugins/remote-config");
+let _hot_updater_server_plugins = require("@hot-updater/server/plugins");
 //#region src/firebaseInfrastructureNames.ts
 /**
 * The one collection the storage engine keeps every item in. It namespaces
@@ -268,9 +266,9 @@ const firebaseStorage = (config) => {
 * client route, and Remote Config. Its Cloud Function imports this list.
 */
 const plugins = [
-	(0, _hot_updater_server_plugins_insights.insights)(),
-	(0, _hot_updater_server_plugins_api_keys.apiKeys)(),
-	(0, _hot_updater_server_plugins_remote_config.remoteConfig)()
+	(0, _hot_updater_server_plugins.insights)(),
+	(0, _hot_updater_server_plugins.apiKeys)(),
+	(0, _hot_updater_server_plugins.remoteConfig)()
 ];
 //#endregion
 exports.firebaseDatabase = firebaseDatabase;

package/dist/index.mjs

@@ -3,9 +3,7 @@ import { getApp, getApps, initializeApp } from "firebase-admin/app";
 import { FieldPath, FieldValue, Timestamp, getFirestore } from "firebase-admin/firestore";
 import { createHash } from "node:crypto";
 import { getStorage } from "firebase-admin/storage";
-import { apiKeys } from "@hot-updater/server/plugins/api-keys";
-import { insights } from "@hot-updater/server/plugins/insights";
-import { remoteConfig } from "@hot-updater/server/plugins/remote-config";
+import { apiKeys, insights, remoteConfig } from "@hot-updater/server/plugins";
 //#region src/firebaseInfrastructureNames.ts
 /**
 * The one collection the storage engine keeps every item in. It namespaces

package/dist/init/index.cjs

@@ -50,9 +50,7 @@ let firebase_admin_app = require("firebase-admin/app");
 let _hot_updater_plugin_core = require("@hot-updater/plugin-core");
 let firebase_admin_firestore = require("firebase-admin/firestore");
 let node_crypto = require("node:crypto");
-let _hot_updater_server_plugins_api_keys = require("@hot-updater/server/plugins/api-keys");
-let _hot_updater_server_plugins_insights = require("@hot-updater/server/plugins/insights");
-let _hot_updater_server_plugins_remote_config = require("@hot-updater/server/plugins/remote-config");
+let _hot_updater_server_plugins = require("@hot-updater/server/plugins");
 let fs_promises = require("fs/promises");
 fs_promises = __toESM(fs_promises, 1);
 let node_fs_promises = require("node:fs/promises");
@@ -6904,9 +6902,9 @@ const firebaseDatabase = (config) => (0, _hot_updater_plugin_core.createEngineDa
 * client route, and Remote Config. Its Cloud Function imports this list.
 */
 const plugins = [
-	(0, _hot_updater_server_plugins_insights.insights)(),
-	(0, _hot_updater_server_plugins_api_keys.apiKeys)(),
-	(0, _hot_updater_server_plugins_remote_config.remoteConfig)()
+	(0, _hot_updater_server_plugins.insights)(),
+	(0, _hot_updater_server_plugins.apiKeys)(),
+	(0, _hot_updater_server_plugins.remoteConfig)()
 ];
 //#endregion
 //#region iac/init/index.ts
@@ -7239,10 +7237,14 @@ const credential = applicationDefault();`.trim()
 	}];
 	const builder = new _hot_updater_cli_tools.ConfigBuilder().setBuildType(build).setStorage(storageConfig).setDatabase(databaseConfig).setPlugins({
 		imports: [{
-			pkg: "@hot-updater/firebase",
-			named: ["plugins"]
+			pkg: "hot-updater/plugins",
+			named: [
+				"apiKeys",
+				"insights",
+				"remoteConfig"
+			]
 		}],
-		configString: "plugins"
+		configString: "[apiKeys(), insights(), remoteConfig()]"
 	}).addImport({
 		pkg: "firebase-admin/app",
 		named: ["applicationDefault"]
@@ -7262,15 +7264,10 @@ const setEnv = async ({ applicationCredentials, projectId, storageBucket, build,
 		HOT_UPDATER_FIREBASE_STORAGE_BUCKET: storageBucket
 	}, ".env.hotupdater", { preserveKeys: applicationCredentials ? [] : [initProvider.inputs.applicationCredentials.envKey] });
 	_hot_updater_cli_tools.p.log.success("Firebase credentials have been successfully configured.");
-	try {
-		await (0, _hot_updater_cli_tools.writeHotUpdaterFiles)(getConfigScaffold(build), {
-			cwd: process.cwd(),
-			settings: "Firebase"
-		});
-	} catch (error) {
-		const message = error instanceof Error ? error.message : String(error);
-		console.error("Error writing configuration file:", message);
-	}
+	await (0, _hot_updater_cli_tools.writeHotUpdaterFiles)(getConfigScaffold(build), {
+		cwd: process.cwd(),
+		settings: "Firebase"
+	});
 };
 const handleError = (err) => {
 	if (err instanceof ExecaError) _hot_updater_cli_tools.p.log.error(err.stderr || err.stdout || err.message);

package/dist/init/index.mjs

@@ -21,9 +21,7 @@ import { applicationDefault, cert, deleteApp, getApp, getApps, initializeApp } f
 import { SETTINGS_TABLE, coreSettings, createEngineDatabase, createKvAdapter, encodeKvKey, migrateCoreSchema } from "@hot-updater/plugin-core";
 import { FieldPath, FieldValue, Timestamp, getFirestore } from "firebase-admin/firestore";
 import { createHash } from "node:crypto";
-import { apiKeys } from "@hot-updater/server/plugins/api-keys";
-import { insights } from "@hot-updater/server/plugins/insights";
-import { remoteConfig } from "@hot-updater/server/plugins/remote-config";
+import { apiKeys, insights, remoteConfig } from "@hot-updater/server/plugins";
 import fs$1 from "fs/promises";
 import fs$2 from "node:fs/promises";
 //#region \0rolldown/runtime.js
@@ -7232,10 +7230,14 @@ const credential = applicationDefault();`.trim()
 	}];
 	const builder = new ConfigBuilder().setBuildType(build).setStorage(storageConfig).setDatabase(databaseConfig).setPlugins({
 		imports: [{
-			pkg: "@hot-updater/firebase",
-			named: ["plugins"]
+			pkg: "hot-updater/plugins",
+			named: [
+				"apiKeys",
+				"insights",
+				"remoteConfig"
+			]
 		}],
-		configString: "plugins"
+		configString: "[apiKeys(), insights(), remoteConfig()]"
 	}).addImport({
 		pkg: "firebase-admin/app",
 		named: ["applicationDefault"]
@@ -7255,15 +7257,10 @@ const setEnv = async ({ applicationCredentials, projectId, storageBucket, build,
 		HOT_UPDATER_FIREBASE_STORAGE_BUCKET: storageBucket
 	}, ".env.hotupdater", { preserveKeys: applicationCredentials ? [] : [initProvider.inputs.applicationCredentials.envKey] });
 	p.log.success("Firebase credentials have been successfully configured.");
-	try {
-		await writeHotUpdaterFiles(getConfigScaffold(build), {
-			cwd: process.cwd(),
-			settings: "Firebase"
-		});
-	} catch (error) {
-		const message = error instanceof Error ? error.message : String(error);
-		console.error("Error writing configuration file:", message);
-	}
+	await writeHotUpdaterFiles(getConfigScaffold(build), {
+		cwd: process.cwd(),
+		settings: "Firebase"
+	});
 };
 const handleError = (err) => {
 	if (err instanceof ExecaError) p.log.error(err.stderr || err.stdout || err.message);

package/package.json

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