@hot-updater/vercel 1.0.4 → 1.0.6

package/dist/function/index.mjs

@@ -17558,7 +17558,7 @@ const postgres = (config) => {
 };
 //#endregion
 //#region ../../packages/server/dist/version.mjs
-const HOT_UPDATER_SERVER_VERSION = "1.0.4";
+const HOT_UPDATER_SERVER_VERSION = "1.0.6";
 //#endregion
 //#region ../../packages/server/dist/handlerVersionRoutes.mjs
 const createVersionRouteHandlers = (plugins = []) => {
@@ -17847,6 +17847,85 @@ async function resolveManifestArtifacts({ currentBundle, resolveFileUrl, readSto
 		...archiveUrl ? { archiveUrl } : {}
 	};
 }
+async function loadTargetPlan({ currentBundle, readStorageText, targetBundle }) {
+	const manifestStorageUri = getManifestStorageUri(targetBundle);
+	const manifestFileHash = getManifestFileHash(targetBundle);
+	const assetBaseStorageUri = getAssetBaseStorageUri(targetBundle);
+	if (!manifestStorageUri || !manifestFileHash || !assetBaseStorageUri) return null;
+	const targetManifest = await fetchBundleManifest(manifestStorageUri, readStorageText);
+	if (!targetManifest) return null;
+	return {
+		manifestFileHash,
+		manifestStorageUri,
+		plan: createManifestArtifactPlan({
+			assetBaseStorageUri,
+			currentBundle,
+			targetBundle,
+			targetManifest
+		}),
+		targetManifest
+	};
+}
+async function resolveManifestArtifactsV2({ currentBundle, resolveFileUrl, readStorageText, targetBundle }) {
+	const target = await loadTargetPlan({
+		currentBundle,
+		readStorageText,
+		targetBundle
+	});
+	if (!target) return null;
+	const manifestUrl = await resolveFileUrl(target.manifestStorageUri);
+	if (!manifestUrl) return null;
+	const patched = target.plan.assets.find((asset) => asset.patch !== null);
+	let patch;
+	if (patched?.patch && !(patched.file.byteSize !== null && patched.patch.byteSize !== null && patched.patch.byteSize >= patched.file.byteSize)) try {
+		const patchUrl = await resolveFileUrl(patched.patch.storageUri);
+		if (patchUrl) patch = {
+			algorithm: "bsdiff",
+			assetPath: patched.assetPath,
+			baseBundleId: patched.patch.baseBundleId,
+			baseFileHash: patched.patch.baseFileHash,
+			patchFileHash: patched.patch.patchFileHash,
+			patchUrl,
+			...patched.patch.byteSize === null ? {} : { byteSize: patched.patch.byteSize }
+		};
+	} catch {}
+	let archiveUrl = null;
+	const archive = target.targetManifest.archive;
+	if (archive && isContentAddressedAssetFileHash(archive.downloadFileHash) && (asByteSize(archive.downloadByteSize) ?? 0) > 0 && (asByteSize(archive.tarByteSize) ?? 0) > 0) try {
+		archiveUrl = await resolveFileUrl(getBundleArchiveStorageUri({
+			manifestStorageUri: target.manifestStorageUri,
+			bundleId: targetBundle.id
+		}));
+	} catch {}
+	return {
+		artifactProtocolVersion: 2,
+		manifestFileHash: target.manifestFileHash,
+		manifestUrl,
+		...archiveUrl ? { archiveUrl } : {},
+		...patch ? { patch } : {}
+	};
+}
+async function resolveManifestArtifactFiles({ paths, resolveFileUrl, readStorageText, targetBundle }) {
+	if (paths.length === 0 || paths.length > 100 || new Set(paths).size !== paths.length) return null;
+	const target = await loadTargetPlan({
+		currentBundle: null,
+		readStorageText,
+		targetBundle
+	});
+	if (!target) return null;
+	const planned = new Map(target.plan.assets.map((asset) => [asset.assetPath, asset]));
+	const requested = paths.map((path) => planned.get(path));
+	if (requested.some((asset) => asset === void 0)) return null;
+	const files = await Promise.all(requested.map(async (asset) => {
+		const url = await resolveFileUrl(asset.file.storageUri);
+		if (!url) return null;
+		const file = { url };
+		if (asset.file.compression) file.compression = asset.file.compression;
+		return [asset.assetPath, file];
+	}));
+	if (files.some((file) => file === null)) return null;
+	return { files: Object.fromEntries(files.filter((file) => file !== null)) };
+}
 //#endregion
 //#region ../../node_modules/.pnpm/verkit@0.4.0/node_modules/verkit/dist/comparison-DenM3wCn.js
 const LETTER_DASH_NUMBER = "[a-zA-Z0-9-]";
@@ -18308,20 +18387,33 @@ const createCoreReads = (db, storage) => {
 			const row = await db.findOne("release_catalogs", { scope_key: scopeKey });
 			return projectReleaseCatalogRow(row === null ? null : toCatalogRow(row), input, scopeKey);
 		},
-		async getArtifactInfo(targetBundleId, currentBundleId, artifactProtocolVersion) {
+		getArtifactInfo: (async (targetBundleId, currentBundleId, artifactProtocolVersion) => {
 			const { readStorageText } = storage;
-			if (artifactProtocolVersion !== 1 || readStorageText === void 0) return null;
+			if (artifactProtocolVersion !== 1 && artifactProtocolVersion !== 2 || readStorageText === void 0) return null;
 			const withCurrent = currentBundleId !== NIL_UUID;
 			const [[target, current], patch] = await Promise.all([db.findByKeys("bundles", withCurrent ? [{ id: targetBundleId }, { id: currentBundleId }] : [{ id: targetBundleId }]), withCurrent ? db.findOne("bundle_patches", {
 				bundle_id: targetBundleId,
 				base_bundle_id: currentBundleId
 			}) : null]);
 			if (target === null || target === void 0) return null;
-			return resolveManifestArtifacts({
+			const input = {
 				currentBundle: current ? rowToBundle(toBundleRow(current)) : null,
 				readStorageText,
 				resolveFileUrl: storage.resolveFileUrl,
 				targetBundle: rowToBundle(toBundleRow(target), patch === null ? [] : [toPatchRow(patch)])
+			};
+			return artifactProtocolVersion === 2 ? resolveManifestArtifactsV2(input) : resolveManifestArtifacts(input);
+		}),
+		async getArtifactFiles(bundleId, paths) {
+			const { readStorageText } = storage;
+			if (readStorageText === void 0) return null;
+			const row = await db.findOne("bundles", { id: bundleId });
+			if (row === null) return null;
+			return resolveManifestArtifactFiles({
+				paths,
+				readStorageText,
+				resolveFileUrl: storage.resolveFileUrl,
+				targetBundle: rowToBundle(toBundleRow(row))
 			});
 		},
 		async getBundle(id) {
@@ -19598,11 +19690,23 @@ const ADMIN_ROUTES = [
 //#region ../../packages/server/dist/handlerReleaseCatalogRoutes.mjs
 const CATALOG_CONTENT_TYPE = "application/vnd.hot-updater.release-catalog+json; version=1";
 const ARTIFACT_CONTENT_TYPE = "application/vnd.hot-updater.artifact+json; version=1";
+const ARTIFACT_V2_CONTENT_TYPE = "application/vnd.hot-updater.artifact+json; version=2";
 const ORIGIN_CACHE_TTL_MS = 5e3;
 const ORIGIN_CACHE_MAX_ENTRIES = 128;
 const NO_CATALOG_HEADER = "x-hot-updater-catalog";
 const CATALOG_CACHE_CONTROL = "public, max-age=0, s-maxage=5";
 const CATALOG_CDN_CACHE_CONTROL = "public, max-age=5, stale-while-revalidate=5, stale-if-error=0";
+const readArtifactFilePaths = async (request) => {
+	let body;
+	try {
+		body = await request.json();
+	} catch {
+		return null;
+	}
+	const paths = body?.paths;
+	if (!Array.isArray(paths) || paths.length === 0 || paths.length > 100 || !paths.every((path) => typeof path === "string" && path.length > 0) || new Set(paths).size !== paths.length) return null;
+	return paths;
+};
 const privateNotFound = () => Response.json({ error: "Not found" }, {
 	status: 404,
 	headers: { "cache-control": "private, no-store" }
@@ -19712,6 +19816,30 @@ const createReleaseCatalogRouteHandlers = () => {
 			if (invalid) return invalid;
 			return catalogResponse(await loadCatalog(`fingerprint:${JSON.stringify(input)}`, () => core.getReleaseCatalog(input)), request);
 		},
+		artifactV2: async (params, _request, { core }) => {
+			const info = await core.getArtifactInfo(requireRouteParam(params, "targetBundleId"), requireRouteParam(params, "currentBundleId"), 2);
+			if (info === null) return privateNotFound();
+			return new Response(JSON.stringify(info), {
+				status: 200,
+				headers: {
+					"cache-control": "private, no-store",
+					"content-type": ARTIFACT_V2_CONTENT_TYPE
+				}
+			});
+		},
+		artifactFilesV2: async (params, request, { core }) => {
+			const paths = await readArtifactFilePaths(request);
+			if (paths === null) return badRequest(`paths must be 1 to 100 unique strings`);
+			const files = await core.getArtifactFiles(requireRouteParam(params, "targetBundleId"), paths);
+			if (files === null) return privateNotFound();
+			return new Response(JSON.stringify(files), {
+				status: 200,
+				headers: {
+					"cache-control": "private, no-store",
+					"content-type": ARTIFACT_V2_CONTENT_TYPE
+				}
+			});
+		},
 		artifactV1: async (params, _request, { core }) => {
 			const info = await core.getArtifactInfo(requireRouteParam(params, "targetBundleId"), requireRouteParam(params, "currentBundleId"), 1);
 			if (info === null) return privateNotFound();
@@ -19862,6 +19990,8 @@ function createHotUpdaterHandlers({ api, clientPolicy, endpoints = [], plugins =
 	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");
+	addClientRoute("GET", "/artifacts/v2/:targetBundleId/from/:currentBundleId", "artifactV2");
+	addClientRoute("POST", "/artifacts/v2/:targetBundleId/files", "artifactFilesV2");
 	const adminRouter = createRouter();
 	const addAdminRoute = mount(adminRouter, true);
 	addAdminRoute("GET", "/version", "adminVersion");

package/dist/init/index.cjs

@@ -6536,10 +6536,6 @@ const createVercelApi = ({ token, teamId, fetch: fetchImpl = fetch }) => {
 				envVarPrefix: input.envVarPrefix
 			} });
 		},
-		/** Removes a store's connection, and the variables it added, from a project. */
-		async disconnectBlobStore(storeId, connectionId) {
-			await request("DELETE", `/v1/storage/stores/${encodeURIComponent(storeId)}/connections/${encodeURIComponent(connectionId)}`);
-		},
 		async listProjectEnv(projectId) {
 			return (await paginate(`/v10/projects/${encodeURIComponent(projectId)}/env`, "envs")).flatMap((env) => isRecord(env) && typeof env.id === "string" && typeof env.key === "string" ? [{
 				id: env.id,
@@ -6838,38 +6834,13 @@ const resolveProjectName = async (savedName, nonInteractive) => {
 	}));
 };
 /**
-* The saved store, or one the user selects or creates; `replaces` is a saved
-* public store the selection takes the place of.
+* The saved private store, or one the user selects or creates. Bundles
+* download only through signed URLs, so a public store is never used.
 */
 const selectBlobStore = async ({ nonInteractive, savedId, savedName, stores }) => {
-	const found = stores.find((store) => store.id === savedId) ?? (savedId === void 0 ? stores.find((store) => store.name === savedName) : void 0);
-	const publicStore = found?.access === "public" ? found : void 0;
-	const replacement = publicStore && `Blob store ${publicStore.name} is public. Hot Updater keeps bundles in a private store, and the bundles deployed to ${publicStore.name} stop downloading until you deploy them again.`;
-	const saved = publicStore ? void 0 : found;
 	const privateStores = stores.filter((store) => store.access === "private");
+	const saved = privateStores.find((store) => store.id === savedId) ?? (savedId === void 0 ? privateStores.find((store) => store.name === savedName) : void 0);
 	if (nonInteractive) {
-		if (publicStore) {
-			const named = stores.find((store) => store.name === savedName);
-			if (savedName && savedName !== publicStore.name) {
-				if (named?.access === "private") {
-					_hot_updater_cli_tools.p.log.warn(replacement);
-					return {
-						kind: "existing",
-						store: named,
-						replaces: publicStore
-					};
-				}
-				if (!named) {
-					_hot_updater_cli_tools.p.log.warn(replacement);
-					return {
-						kind: "create",
-						name: savedName,
-						replaces: publicStore
-					};
-				}
-			}
-			throw new _hot_updater_cli_tools.InitError(`${replacement} Set ${inputs.blobStoreName.envKey} to a private or new store to replace it.`);
-		}
 		if (saved) return {
 			kind: "existing",
 			store: saved
@@ -6880,13 +6851,7 @@ const selectBlobStore = async ({ nonInteractive, savedId, savedName, stores }) =
 		};
 		throw new _hot_updater_cli_tools.InitError(`${inputs.blobStoreName.envKey} is required to select the Blob store.`);
 	}
-	if (publicStore) {
-		_hot_updater_cli_tools.p.log.warn(replacement);
-		if (!exitIfCancelled(await _hot_updater_cli_tools.p.confirm({
-			message: `Replace ${publicStore.name} with a private Blob store?`,
-			initialValue: false
-		}))) process.exit(1);
-	} else if ((savedId || savedName) && !saved) _hot_updater_cli_tools.p.log.warn("The saved Blob store was not found. Select a store again.");
+	if ((savedId || savedName) && !saved) _hot_updater_cli_tools.p.log.warn("The saved Blob store was not found. Select a store again.");
 	const createKey = "\0create";
 	const selected = exitIfCancelled(await _hot_updater_cli_tools.p.select({
 		message: "Select the Blob store for bundles",
@@ -6900,21 +6865,18 @@ const selectBlobStore = async ({ nonInteractive, savedId, savedName, stores }) =
 		}]
 	}));
 	const store = privateStores.find((candidate) => candidate.id === selected);
-	const replaces = publicStore ? { replaces: publicStore } : {};
 	if (store) return {
 		kind: "existing",
-		store,
-		...replaces
+		store
 	};
 	const prompt = inputs.blobStoreName.prompt;
 	return {
 		kind: "create",
 		name: exitIfCancelled(await _hot_updater_cli_tools.p.text({
-			...(0, _hot_updater_cli_tools.getInitProviderTextPromptValues)(prompt, savedName === publicStore?.name ? void 0 : savedName),
+			...(0, _hot_updater_cli_tools.getInitProviderTextPromptValues)(prompt, savedName),
 			message: prompt.message,
 			validate: (value) => isVercelBlobStoreName(value) ? void 0 : "Use up to 32 letters, digits, '_', or '-'."
-		})),
-		...replaces
+		}))
 	};
 };
 /**
@@ -7086,11 +7048,6 @@ const runInit = async ({ build, envFile }) => {
 		...saved.databaseUrl ? { savedUrl: saved.databaseUrl } : {}
 	});
 	assertPostgresCanInitialize(await readHotUpdaterTables(databaseUrl));
-	for (const connection of storeSelection.replaces?.connections ?? []) {
-		if (connection.projectId !== project.id) continue;
-		await api.disconnectBlobStore(storeSelection.replaces.id, connection.id);
-		_hot_updater_cli_tools.p.log.info(`Disconnected Blob store ${storeSelection.replaces.name} from ${project.name}`);
-	}
 	let store;
 	if (storeSelection.kind === "existing") {
 		store = storeSelection.store;

package/dist/init/index.mjs

@@ -6530,10 +6530,6 @@ const createVercelApi = ({ token, teamId, fetch: fetchImpl = fetch }) => {
 				envVarPrefix: input.envVarPrefix
 			} });
 		},
-		/** Removes a store's connection, and the variables it added, from a project. */
-		async disconnectBlobStore(storeId, connectionId) {
-			await request("DELETE", `/v1/storage/stores/${encodeURIComponent(storeId)}/connections/${encodeURIComponent(connectionId)}`);
-		},
 		async listProjectEnv(projectId) {
 			return (await paginate(`/v10/projects/${encodeURIComponent(projectId)}/env`, "envs")).flatMap((env) => isRecord(env) && typeof env.id === "string" && typeof env.key === "string" ? [{
 				id: env.id,
@@ -6832,38 +6828,13 @@ const resolveProjectName = async (savedName, nonInteractive) => {
 	}));
 };
 /**
-* The saved store, or one the user selects or creates; `replaces` is a saved
-* public store the selection takes the place of.
+* The saved private store, or one the user selects or creates. Bundles
+* download only through signed URLs, so a public store is never used.
 */
 const selectBlobStore = async ({ nonInteractive, savedId, savedName, stores }) => {
-	const found = stores.find((store) => store.id === savedId) ?? (savedId === void 0 ? stores.find((store) => store.name === savedName) : void 0);
-	const publicStore = found?.access === "public" ? found : void 0;
-	const replacement = publicStore && `Blob store ${publicStore.name} is public. Hot Updater keeps bundles in a private store, and the bundles deployed to ${publicStore.name} stop downloading until you deploy them again.`;
-	const saved = publicStore ? void 0 : found;
 	const privateStores = stores.filter((store) => store.access === "private");
+	const saved = privateStores.find((store) => store.id === savedId) ?? (savedId === void 0 ? privateStores.find((store) => store.name === savedName) : void 0);
 	if (nonInteractive) {
-		if (publicStore) {
-			const named = stores.find((store) => store.name === savedName);
-			if (savedName && savedName !== publicStore.name) {
-				if (named?.access === "private") {
-					p.log.warn(replacement);
-					return {
-						kind: "existing",
-						store: named,
-						replaces: publicStore
-					};
-				}
-				if (!named) {
-					p.log.warn(replacement);
-					return {
-						kind: "create",
-						name: savedName,
-						replaces: publicStore
-					};
-				}
-			}
-			throw new InitError(`${replacement} Set ${inputs.blobStoreName.envKey} to a private or new store to replace it.`);
-		}
 		if (saved) return {
 			kind: "existing",
 			store: saved
@@ -6874,13 +6845,7 @@ const selectBlobStore = async ({ nonInteractive, savedId, savedName, stores }) =
 		};
 		throw new InitError(`${inputs.blobStoreName.envKey} is required to select the Blob store.`);
 	}
-	if (publicStore) {
-		p.log.warn(replacement);
-		if (!exitIfCancelled(await p.confirm({
-			message: `Replace ${publicStore.name} with a private Blob store?`,
-			initialValue: false
-		}))) process.exit(1);
-	} else if ((savedId || savedName) && !saved) p.log.warn("The saved Blob store was not found. Select a store again.");
+	if ((savedId || savedName) && !saved) p.log.warn("The saved Blob store was not found. Select a store again.");
 	const createKey = "\0create";
 	const selected = exitIfCancelled(await p.select({
 		message: "Select the Blob store for bundles",
@@ -6894,21 +6859,18 @@ const selectBlobStore = async ({ nonInteractive, savedId, savedName, stores }) =
 		}]
 	}));
 	const store = privateStores.find((candidate) => candidate.id === selected);
-	const replaces = publicStore ? { replaces: publicStore } : {};
 	if (store) return {
 		kind: "existing",
-		store,
-		...replaces
+		store
 	};
 	const prompt = inputs.blobStoreName.prompt;
 	return {
 		kind: "create",
 		name: exitIfCancelled(await p.text({
-			...getInitProviderTextPromptValues(prompt, savedName === publicStore?.name ? void 0 : savedName),
+			...getInitProviderTextPromptValues(prompt, savedName),
 			message: prompt.message,
 			validate: (value) => isVercelBlobStoreName(value) ? void 0 : "Use up to 32 letters, digits, '_', or '-'."
-		})),
-		...replaces
+		}))
 	};
 };
 /**
@@ -7080,11 +7042,6 @@ const runInit = async ({ build, envFile }) => {
 		...saved.databaseUrl ? { savedUrl: saved.databaseUrl } : {}
 	});
 	assertPostgresCanInitialize(await readHotUpdaterTables(databaseUrl));
-	for (const connection of storeSelection.replaces?.connections ?? []) {
-		if (connection.projectId !== project.id) continue;
-		await api.disconnectBlobStore(storeSelection.replaces.id, connection.id);
-		p.log.info(`Disconnected Blob store ${storeSelection.replaces.name} from ${project.name}`);
-	}
 	let store;
 	if (storeSelection.kind === "existing") {
 		store = storeSelection.store;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hot-updater/vercel",
   "type": "module",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "React Native OTA solution for self-hosted",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -41,11 +41,11 @@
     "@vercel/cli-auth": "0.3.10",
     "@vercel/cli-config": "0.3.1",
     "pg": "8.13.1",
-    "@hot-updater/cli-tools": "1.0.4",
-    "@hot-updater/plugin-core": "1.0.4",
-    "@hot-updater/postgres": "1.0.4",
-    "@hot-updater/protocol": "1.0.4",
-    "@hot-updater/server": "1.0.4"
+    "@hot-updater/cli-tools": "1.0.6",
+    "@hot-updater/plugin-core": "1.0.6",
+    "@hot-updater/server": "1.0.6",
+    "@hot-updater/postgres": "1.0.6",
+    "@hot-updater/protocol": "1.0.6"
   },
   "devDependencies": {
     "@types/node": "^20",
@@ -54,7 +54,7 @@
     "execa": "9.5.2",
     "kysely": "0.28.17",
     "vitest": "4.1.4",
-    "@hot-updater/test-utils": "1.0.4"
+    "@hot-updater/test-utils": "1.0.6"
   },
   "scripts": {
     "build": "tsdown",