@hot-updater/aws 0.32.0 → 0.33.0

package/dist/index.cjs

@@ -1412,6 +1412,37 @@ const streamToString = (stream) => {
 const DEFAULT_INVALIDATION_POLL_INTERVAL_MS = 2e3;
 const DEFAULT_INVALIDATION_TIMEOUT_MS = 300 * 1e3;
 const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+const getS3ErrorProperty = (error, key) => {
+	if (typeof error !== "object" || error === null) return;
+	const value = error[key];
+	return typeof value === "string" ? value : void 0;
+};
+const isArchivedS3ObjectError = (error) => {
+	if (!(error instanceof Error)) return false;
+	return error.name === "InvalidObjectState" || getS3ErrorProperty(error, "Code") === "InvalidObjectState";
+};
+const createArchivedS3ObjectError = ({ bucket, key, error }) => {
+	const storageClass = getS3ErrorProperty(error, "StorageClass") ?? "archived storage";
+	const nextError = new Error(`S3 object "${key}" in bucket "${bucket}" is archived (${storageClass}) and cannot be read. Restore the object in S3 or exclude Hot Updater metadata from lifecycle archival: "_index/**", "**/target-app-versions.json", and "**/update.json".`, { cause: error });
+	nextError.name = "S3ArchivedObjectError";
+	return nextError;
+};
+function normalizeBasePath(basePath) {
+	return basePath?.replace(/^\/+|\/+$/g, "") ?? "";
+}
+function createDatabaseKeyBuilder(basePath) {
+	const normalizedBasePath = normalizeBasePath(basePath);
+	const toStorageKey = (key) => [normalizedBasePath, key].filter(Boolean).join("/");
+	const fromStorageKey = (key) => {
+		if (!normalizedBasePath) return key;
+		const prefix = `${normalizedBasePath}/`;
+		return key.startsWith(prefix) ? key.slice(prefix.length) : key;
+	};
+	return {
+		fromStorageKey,
+		toStorageKey
+	};
+}
 /**
 * Loads JSON data from S3.
 * Returns null if NoSuchKey error occurs.
@@ -1427,6 +1458,11 @@ async function loadJsonFromS3(client, bucket, key) {
 		return JSON.parse(bodyContents);
 	} catch (e) {
 		if (e instanceof _aws_sdk_client_s3.NoSuchKey) return null;
+		if (isArchivedS3ObjectError(e)) throw createArchivedS3ObjectError({
+			bucket,
+			key,
+			error: e
+		});
 		throw e;
 	}
 }
@@ -1510,18 +1546,20 @@ async function invalidateCloudFront(client, distributionId, paths, options) {
 const s3Database = (0, _hot_updater_plugin_core.createBlobDatabasePlugin)({
 	name: "s3Database",
 	factory: (config) => {
-		const { bucketName, cloudfrontDistributionId, apiBasePath = "/api/check-update", shouldWaitForInvalidation = false, ...s3Config } = config;
+		const { basePath, bucketName, cloudfrontDistributionId, apiBasePath = "/api/check-update", shouldWaitForInvalidation = false, ...s3Config } = config;
 		const client = new _aws_sdk_client_s3.S3Client(applyS3RuntimeAwsConfig(s3Config));
+		const { fromStorageKey, toStorageKey } = createDatabaseKeyBuilder(basePath);
 		const cloudfrontClient = cloudfrontDistributionId ? new _aws_sdk_client_cloudfront.CloudFrontClient({
 			credentials: s3Config.credentials,
 			region: s3Config.region
 		}) : void 0;
 		return {
 			apiBasePath,
-			listObjects: (prefix) => listObjectsInS3(client, bucketName, prefix),
-			loadObject: (key) => loadJsonFromS3(client, bucketName, key),
-			uploadObject: (key, data) => uploadJsonToS3(client, bucketName, key, data),
-			deleteObject: (key) => deleteObjectInS3(client, bucketName, key),
+			listObjects: (prefix) => listObjectsInS3(client, bucketName, toStorageKey(prefix)).then((keys) => keys.map(fromStorageKey)),
+			loadObject: (key) => loadJsonFromS3(client, bucketName, toStorageKey(key)),
+			uploadObject: (key, data) => uploadJsonToS3(client, bucketName, toStorageKey(key), data),
+			deleteObject: (key) => deleteObjectInS3(client, bucketName, toStorageKey(key)),
+			shouldSkipLoadObjectError: (error) => error instanceof Error && error.name === "S3ArchivedObjectError",
 			invalidatePaths: (pathsToInvalidate) => {
 				if (cloudfrontClient && cloudfrontDistributionId && pathsToInvalidate.length > 0) return invalidateCloudFront(cloudfrontClient, cloudfrontDistributionId, pathsToInvalidate, { shouldWaitForInvalidation });
 				return Promise.resolve();

package/dist/index.d.cts

@@ -5,6 +5,10 @@ import { S3ClientConfig } from "@aws-sdk/client-s3";
 //#region src/s3Database.d.ts
 interface S3DatabaseConfig extends S3ClientConfig, BlobDatabasePluginConfig {
   bucketName: string;
+  /**
+   * Base path where database objects will be stored in the bucket.
+   */
+  basePath?: string;
   /**
    * CloudFront distribution ID used for cache invalidation.
    *

package/dist/index.d.mts

@@ -5,6 +5,10 @@ import { BlobDatabasePluginConfig, RuntimeStoragePlugin, StoragePluginHooks, Sto
 //#region src/s3Database.d.ts
 interface S3DatabaseConfig extends S3ClientConfig, BlobDatabasePluginConfig {
   bucketName: string;
+  /**
+   * Base path where database objects will be stored in the bucket.
+   */
+  basePath?: string;
   /**
    * CloudFront distribution ID used for cache invalidation.
    *

package/dist/index.mjs

@@ -1387,6 +1387,37 @@ const streamToString = (stream) => {
 const DEFAULT_INVALIDATION_POLL_INTERVAL_MS = 2e3;
 const DEFAULT_INVALIDATION_TIMEOUT_MS = 300 * 1e3;
 const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+const getS3ErrorProperty = (error, key) => {
+	if (typeof error !== "object" || error === null) return;
+	const value = error[key];
+	return typeof value === "string" ? value : void 0;
+};
+const isArchivedS3ObjectError = (error) => {
+	if (!(error instanceof Error)) return false;
+	return error.name === "InvalidObjectState" || getS3ErrorProperty(error, "Code") === "InvalidObjectState";
+};
+const createArchivedS3ObjectError = ({ bucket, key, error }) => {
+	const storageClass = getS3ErrorProperty(error, "StorageClass") ?? "archived storage";
+	const nextError = new Error(`S3 object "${key}" in bucket "${bucket}" is archived (${storageClass}) and cannot be read. Restore the object in S3 or exclude Hot Updater metadata from lifecycle archival: "_index/**", "**/target-app-versions.json", and "**/update.json".`, { cause: error });
+	nextError.name = "S3ArchivedObjectError";
+	return nextError;
+};
+function normalizeBasePath(basePath) {
+	return basePath?.replace(/^\/+|\/+$/g, "") ?? "";
+}
+function createDatabaseKeyBuilder(basePath) {
+	const normalizedBasePath = normalizeBasePath(basePath);
+	const toStorageKey = (key) => [normalizedBasePath, key].filter(Boolean).join("/");
+	const fromStorageKey = (key) => {
+		if (!normalizedBasePath) return key;
+		const prefix = `${normalizedBasePath}/`;
+		return key.startsWith(prefix) ? key.slice(prefix.length) : key;
+	};
+	return {
+		fromStorageKey,
+		toStorageKey
+	};
+}
 /**
 * Loads JSON data from S3.
 * Returns null if NoSuchKey error occurs.
@@ -1402,6 +1433,11 @@ async function loadJsonFromS3(client, bucket, key) {
 		return JSON.parse(bodyContents);
 	} catch (e) {
 		if (e instanceof NoSuchKey) return null;
+		if (isArchivedS3ObjectError(e)) throw createArchivedS3ObjectError({
+			bucket,
+			key,
+			error: e
+		});
 		throw e;
 	}
 }
@@ -1485,18 +1521,20 @@ async function invalidateCloudFront(client, distributionId, paths, options) {
 const s3Database = createBlobDatabasePlugin({
 	name: "s3Database",
 	factory: (config) => {
-		const { bucketName, cloudfrontDistributionId, apiBasePath = "/api/check-update", shouldWaitForInvalidation = false, ...s3Config } = config;
+		const { basePath, bucketName, cloudfrontDistributionId, apiBasePath = "/api/check-update", shouldWaitForInvalidation = false, ...s3Config } = config;
 		const client = new S3Client(applyS3RuntimeAwsConfig(s3Config));
+		const { fromStorageKey, toStorageKey } = createDatabaseKeyBuilder(basePath);
 		const cloudfrontClient = cloudfrontDistributionId ? new CloudFrontClient({
 			credentials: s3Config.credentials,
 			region: s3Config.region
 		}) : void 0;
 		return {
 			apiBasePath,
-			listObjects: (prefix) => listObjectsInS3(client, bucketName, prefix),
-			loadObject: (key) => loadJsonFromS3(client, bucketName, key),
-			uploadObject: (key, data) => uploadJsonToS3(client, bucketName, key, data),
-			deleteObject: (key) => deleteObjectInS3(client, bucketName, key),
+			listObjects: (prefix) => listObjectsInS3(client, bucketName, toStorageKey(prefix)).then((keys) => keys.map(fromStorageKey)),
+			loadObject: (key) => loadJsonFromS3(client, bucketName, toStorageKey(key)),
+			uploadObject: (key, data) => uploadJsonToS3(client, bucketName, toStorageKey(key), data),
+			deleteObject: (key) => deleteObjectInS3(client, bucketName, toStorageKey(key)),
+			shouldSkipLoadObjectError: (error) => error instanceof Error && error.name === "S3ArchivedObjectError",
 			invalidatePaths: (pathsToInvalidate) => {
 				if (cloudfrontClient && cloudfrontDistributionId && pathsToInvalidate.length > 0) return invalidateCloudFront(cloudfrontClient, cloudfrontDistributionId, pathsToInvalidate, { shouldWaitForInvalidation });
 				return Promise.resolve();

package/dist/lambda/index.cjs

@@ -3225,6 +3225,24 @@ function paginateBundles({ bundles, limit, offset, cursor, orderBy }) {
 	};
 }
 //#endregion
+//#region ../plugin-core/dist/requestUpdateBundleState.mjs
+const requestUpdateBundleSeeds = /* @__PURE__ */ new WeakMap();
+const isWeakMapKey = (value) => typeof value === "object" && value !== null || typeof value === "function";
+const toBundleSeeds = (seeds) => seeds.filter((seed) => !!seed);
+const seedRequestUpdateBundles = (context, seeds) => {
+	if (!isWeakMapKey(context)) return;
+	const nextSeeds = toBundleSeeds(seeds);
+	if (nextSeeds.length === 0) return;
+	const bundlesById = /* @__PURE__ */ new Map();
+	for (const seed of requestUpdateBundleSeeds.get(context) ?? []) bundlesById.set(seed.id, seed);
+	for (const seed of nextSeeds) bundlesById.set(seed.id, seed);
+	requestUpdateBundleSeeds.set(context, [...bundlesById.values()]);
+};
+const getRequestUpdateBundleSeeds = (context) => {
+	if (!isWeakMapKey(context)) return [];
+	return requestUpdateBundleSeeds.get(context) ?? [];
+};
+//#endregion
 //#region ../../packages/core/dist/index.mjs
 const getManifestStorageUri = (bundle) => bundle.manifestStorageUri ?? null;
 const getManifestFileHash = (bundle) => bundle.manifestFileHash ?? null;
@@ -4719,7 +4737,34 @@ const day = 3600 * 24;
 day * 7;
 day * 365.25;
 //#endregion
+//#region ../plugin-core/dist/resolveUpdateInfoFromBundles.mjs
+const findSeedBundle = (bundles, bundleId) => bundles.find((bundle) => bundle.id === bundleId);
+const resolveUpdateInfoFromBundles = async ({ args, bundles, context }) => {
+	const info = await getUpdateInfo(bundles, args);
+	if (!info) return null;
+	seedRequestUpdateBundles(context, [findSeedBundle(bundles, info.id), args.bundleId === "00000000-0000-0000-0000-000000000000" ? null : findSeedBundle(bundles, args.bundleId)]);
+	return info;
+};
+//#endregion
 //#region ../plugin-core/dist/createBlobDatabasePlugin.mjs
+const STORAGE_OPERATION_CONCURRENCY = 8;
+async function mapWithConcurrency(items, concurrency, mapper) {
+	const results = [];
+	let nextIndex = 0;
+	const workerCount = Math.min(concurrency, items.length);
+	await Promise.all(Array.from({ length: workerCount }, async () => {
+		while (true) {
+			const index = nextIndex;
+			nextIndex += 1;
+			if (index >= items.length) break;
+			results[index] = await mapper(items[index], index);
+		}
+	}));
+	return results;
+}
+async function forEachWithConcurrency(items, concurrency, mapper) {
+	await mapWithConcurrency(items, concurrency, mapper);
+}
 function removeBundleInternalKeys(bundle) {
 	const { _updateJsonKey, _oldUpdateJsonKey, ...pureBundle } = bundle;
 	return pureBundle;
@@ -4768,6 +4813,12 @@ const MANAGEMENT_INDEX_PREFIX = "_index";
 const MANAGEMENT_INDEX_VERSION = 1;
 const DEFAULT_MANAGEMENT_INDEX_PAGE_SIZE = 128;
 const ALL_SCOPE_CACHE_KEY = "*|*";
+function summarizeManagementIndexArtifacts(artifacts) {
+	return {
+		pagesWritten: artifacts.pages.size,
+		scopesWritten: artifacts.scopes.length
+	};
+}
 function resolveManagementIndexPageSize(config) {
 	const pageSize = config.managementIndexPageSize ?? DEFAULT_MANAGEMENT_INDEX_PAGE_SIZE;
 	if (!Number.isInteger(pageSize) || pageSize < 1) throw new Error("managementIndexPageSize must be a positive integer.");
@@ -4899,11 +4950,18 @@ function buildManagementIndexArtifacts(allBundles, pageSize) {
 const createBlobDatabasePlugin = ({ name, factory }) => {
 	return (config, hooks) => {
 		const managementIndexPageSize = resolveManagementIndexPageSize(config);
-		const { listObjects, loadObject, uploadObject, deleteObject, invalidatePaths, apiBasePath } = factory(config);
+		const { listObjects, loadObject, uploadObject, deleteObject, shouldSkipLoadObjectError, invalidatePaths, apiBasePath } = factory(config);
 		const bundlesMap = /* @__PURE__ */ new Map();
 		const pendingBundlesMap = /* @__PURE__ */ new Map();
 		const managementRootCache = /* @__PURE__ */ new Map();
-		const PLATFORMS = ["ios", "android"];
+		const loadOptionalObject = async (key) => {
+			try {
+				return await loadObject(key);
+			} catch (error) {
+				if (shouldSkipLoadObjectError?.(error, key)) return null;
+				throw error;
+			}
+		};
 		const getAllManagementArtifact = (artifacts) => {
 			const allArtifact = artifacts.scopes.find((scope) => scope.cacheKey === ALL_SCOPE_CACHE_KEY);
 			if (!allArtifact) throw new Error("all-bundles management index artifact not found");
@@ -4920,7 +4978,7 @@ const createBlobDatabasePlugin = ({ name, factory }) => {
 		};
 		const loadStoredManagementRoot = async (scope) => {
 			const cacheKey = getManagementScopeCacheKey(scope);
-			const storedRoot = await loadObject(getManagementRootKey(scope));
+			const storedRoot = await loadOptionalObject(getManagementRootKey(scope));
 			if (storedRoot) {
 				managementRootCache.set(cacheKey, storedRoot);
 				return storedRoot;
@@ -4930,7 +4988,7 @@ const createBlobDatabasePlugin = ({ name, factory }) => {
 		};
 		const loadManagementPage = async (descriptor, pageCache) => {
 			if (pageCache?.has(descriptor.key)) return pageCache.get(descriptor.key) ?? null;
-			const page = await loadObject(descriptor.key);
+			const page = await loadOptionalObject(descriptor.key);
 			pageCache?.set(descriptor.key, page);
 			return page;
 		};
@@ -4953,13 +5011,13 @@ const createBlobDatabasePlugin = ({ name, factory }) => {
 			return allBundles;
 		};
 		const persistManagementIndexArtifacts = async (nextArtifacts, previousArtifacts) => {
-			for (const [key, page] of nextArtifacts.pages.entries()) await uploadObject(key, page);
-			for (const scope of nextArtifacts.scopes) await uploadObject(scope.rootKey, scope.root);
+			await forEachWithConcurrency(Array.from(nextArtifacts.pages.entries()), STORAGE_OPERATION_CONCURRENCY, ([key, page]) => uploadObject(key, page));
+			await forEachWithConcurrency(nextArtifacts.scopes, STORAGE_OPERATION_CONCURRENCY, (scope) => uploadObject(scope.rootKey, scope.root));
 			if (!previousArtifacts) return;
 			const nextPageKeys = new Set(nextArtifacts.pages.keys());
 			const nextRootKeys = new Set(nextArtifacts.scopes.map((scope) => scope.rootKey));
-			for (const [key] of previousArtifacts.pages.entries()) if (!nextPageKeys.has(key)) await deleteObject(key).catch(() => {});
-			for (const scope of previousArtifacts.scopes) if (!nextRootKeys.has(scope.rootKey)) await deleteObject(scope.rootKey).catch(() => {});
+			await forEachWithConcurrency(Array.from(previousArtifacts.pages.keys()).filter((key) => !nextPageKeys.has(key)), STORAGE_OPERATION_CONCURRENCY, (key) => deleteObject(key).catch(() => {}));
+			await forEachWithConcurrency(previousArtifacts.scopes.filter((scope) => !nextRootKeys.has(scope.rootKey)), STORAGE_OPERATION_CONCURRENCY, (scope) => deleteObject(scope.rootKey).catch(() => {}));
 		};
 		const ensureAllManagementRoot = async () => {
 			const storedAllRoot = await loadStoredManagementRoot({});
@@ -4992,6 +5050,26 @@ const createBlobDatabasePlugin = ({ name, factory }) => {
 		const loadCurrentBundlesForIndexRebuild = async () => {
 			return loadAllBundlesForManagementFallback();
 		};
+		const loadBundlesFromCanonicalManifests = async () => {
+			return sortManagedBundles((await reloadBundles()).map((bundle) => removeBundleInternalKeys(bundle)));
+		};
+		const loadStoredBundlesForIndexRebuild = loadBundlesFromCanonicalManifests;
+		const loadCanonicalBundlesForIndexRepair = loadBundlesFromCanonicalManifests;
+		const compareBundleIndex = ({ canonicalBundles, indexedBundles, rootMissing }) => {
+			const canonicalIds = new Set(canonicalBundles.map((bundle) => bundle.id));
+			const indexedIds = new Set(indexedBundles?.map((bundle) => bundle.id) ?? []);
+			const missingBundleIds = Array.from(canonicalIds).filter((id) => !indexedIds.has(id)).sort((left, right) => right.localeCompare(left));
+			const extraBundleIds = Array.from(indexedIds).filter((id) => !canonicalIds.has(id)).sort((left, right) => right.localeCompare(left));
+			return {
+				status: missingBundleIds.length === 0 && extraBundleIds.length === 0 && !rootMissing ? "ok" : rootMissing ? "missing" : "stale",
+				canonicalBundles: canonicalBundles.length,
+				indexedBundles: indexedBundles?.length ?? 0,
+				missingBundles: missingBundleIds.length,
+				extraBundles: extraBundleIds.length,
+				missingBundleIds: missingBundleIds.slice(0, 20),
+				extraBundleIds: extraBundleIds.slice(0, 20)
+			};
+		};
 		const findPageIndexContainingId = (pages, id) => {
 			return pages.findIndex((page) => id.localeCompare(page.firstId) <= 0 && id.localeCompare(page.lastId) >= 0);
 		};
@@ -5167,16 +5245,15 @@ const createBlobDatabasePlugin = ({ name, factory }) => {
 		};
 		async function reloadBundles() {
 			bundlesMap.clear();
-			const filePromises = (await listObjects("")).filter((key) => /^[^/]+\/(?:ios|android)\/[^/]+\/update\.json$/.test(key)).map(async (key) => {
-				return (await loadObject(key) ?? []).map((bundle) => ({
+			const allBundles = (await mapWithConcurrency((await listObjects("")).filter((key) => /^[^/]+\/(?:ios|android)\/[^/]+\/update\.json$/.test(key)), STORAGE_OPERATION_CONCURRENCY, async (key) => {
+				return (await loadOptionalObject(key) ?? []).map((bundle) => ({
 					...bundle,
 					_updateJsonKey: key
 				}));
-			});
-			const allBundles = (await Promise.all(filePromises)).flat();
+			})).flat();
 			for (const bundle of allBundles) bundlesMap.set(bundle.id, bundle);
 			for (const [id, bundle] of pendingBundlesMap.entries()) bundlesMap.set(id, bundle);
-			return orderBy(allBundles, [(v) => v.id], ["desc"]);
+			return orderBy(Array.from(bundlesMap.values()), [(v) => v.id], ["desc"]);
 		}
 		/**
 		* Updates target-app-versions.json for each channel on the given platform.
@@ -5202,35 +5279,44 @@ const createBlobDatabasePlugin = ({ name, factory }) => {
 				const updateKeys = keysByChannel[channel];
 				const targetKey = `${channel}/${platform}/target-app-versions.json`;
 				const currentVersions = updateKeys.map((key) => key.split("/")[2]);
-				const oldTargetVersions = await loadObject(targetKey) ?? [];
+				const oldTargetVersions = await loadOptionalObject(targetKey) ?? [];
 				const newTargetVersions = oldTargetVersions.filter((v) => currentVersions.includes(v));
 				for (const v of currentVersions) if (!newTargetVersions.includes(v)) newTargetVersions.push(v);
 				if (JSON.stringify(oldTargetVersions) !== JSON.stringify(newTargetVersions)) await uploadObject(targetKey, newTargetVersions);
 			}
 		}
-		const getAppVersionUpdateInfo = async ({ appVersion, bundleId, channel = "production", cohort, minBundleId, platform }) => {
-			const matchingVersions = filterCompatibleAppVersions(await loadObject(`${channel}/${platform}/target-app-versions.json`) ?? [], appVersion);
-			return getUpdateInfo((await Promise.allSettled(matchingVersions.map(async (targetAppVersion) => {
-				return await loadObject(`${channel}/${platform}/${normalizeTargetAppVersion(targetAppVersion) ?? targetAppVersion}/update.json`) ?? [];
-			}))).filter((entry) => entry.status === "fulfilled").flatMap((entry) => entry.value), {
-				_updateStrategy: "appVersion",
-				appVersion,
-				bundleId,
-				channel,
-				cohort,
-				minBundleId,
-				platform
+		const getAppVersionUpdateInfo = async ({ appVersion, bundleId, channel = "production", cohort, minBundleId, platform }, context) => {
+			const bundles = (await mapWithConcurrency(filterCompatibleAppVersions(await loadOptionalObject(`${channel}/${platform}/target-app-versions.json`) ?? [], appVersion), STORAGE_OPERATION_CONCURRENCY, async (targetAppVersion) => {
+				return await loadOptionalObject(`${channel}/${platform}/${normalizeTargetAppVersion(targetAppVersion) ?? targetAppVersion}/update.json`) ?? [];
+			})).flat();
+			return resolveUpdateInfoFromBundles({
+				args: {
+					_updateStrategy: "appVersion",
+					appVersion,
+					bundleId,
+					channel,
+					cohort,
+					minBundleId,
+					platform
+				},
+				bundles,
+				context
 			});
 		};
-		const getFingerprintUpdateInfo = async ({ bundleId, channel = "production", cohort, fingerprintHash, minBundleId, platform }) => {
-			return getUpdateInfo(await loadObject(`${channel}/${platform}/${fingerprintHash}/update.json`) ?? [], {
-				_updateStrategy: "fingerprint",
-				bundleId,
-				channel,
-				cohort,
-				fingerprintHash,
-				minBundleId,
-				platform
+		const getFingerprintUpdateInfo = async ({ bundleId, channel = "production", cohort, fingerprintHash, minBundleId, platform }, context) => {
+			const bundles = await loadOptionalObject(`${channel}/${platform}/${fingerprintHash}/update.json`) ?? [];
+			return resolveUpdateInfoFromBundles({
+				args: {
+					_updateStrategy: "fingerprint",
+					bundleId,
+					channel,
+					cohort,
+					fingerprintHash,
+					minBundleId,
+					platform
+				},
+				bundles,
+				context
 			});
 		};
 		const addAppVersionInvalidationPaths = (pathsToInvalidate, { platform, channel, targetAppVersion }) => {
@@ -5252,7 +5338,35 @@ const createBlobDatabasePlugin = ({ name, factory }) => {
 				targetAppVersion
 			});
 		};
-		return createDatabasePlugin({
+		const bundleIndexDiagnostics = {
+			async check() {
+				const canonicalBundles = await loadCanonicalBundlesForIndexRepair();
+				const allRoot = await loadStoredManagementRoot({});
+				return compareBundleIndex({
+					canonicalBundles,
+					indexedBundles: allRoot ? await loadAllBundlesFromRoot(allRoot) : null,
+					rootMissing: !allRoot
+				});
+			},
+			async repair() {
+				const canonicalBundles = await loadCanonicalBundlesForIndexRepair();
+				const previousRoot = await loadStoredManagementRoot({});
+				const previousBundles = previousRoot ? await loadAllBundlesFromRoot(previousRoot) : null;
+				const previousArtifacts = previousRoot && previousBundles ? buildManagementIndexArtifacts(previousBundles, previousRoot.pageSize) : void 0;
+				const nextArtifacts = buildManagementIndexArtifacts(canonicalBundles, managementIndexPageSize);
+				const indexedObjectKeys = await listObjects(`${MANAGEMENT_INDEX_PREFIX}/`);
+				const nextObjectKeys = new Set([...nextArtifacts.pages.keys(), ...nextArtifacts.scopes.map((scope) => scope.rootKey)]);
+				await persistManagementIndexArtifacts(nextArtifacts, previousArtifacts);
+				await forEachWithConcurrency(indexedObjectKeys.filter((key) => !nextObjectKeys.has(key)), STORAGE_OPERATION_CONCURRENCY, (key) => deleteObject(key).catch(() => {}));
+				replaceManagementRootCache(nextArtifacts);
+				return {
+					scannedBundles: canonicalBundles.length,
+					indexedBundles: canonicalBundles.length,
+					...summarizeManagementIndexArtifacts(nextArtifacts)
+				};
+			}
+		};
+		const createPlugin = createDatabasePlugin({
 			name,
 			factory: () => ({
 				supportsCursorPagination: true,
@@ -5276,9 +5390,9 @@ const createBlobDatabasePlugin = ({ name, factory }) => {
 					if (!matchedBundle) return null;
 					return removeBundleInternalKeys(matchedBundle);
 				},
-				async getUpdateInfo(args) {
-					if (args._updateStrategy === "appVersion") return getAppVersionUpdateInfo(args);
-					return getFingerprintUpdateInfo(args);
+				async getUpdateInfo(args, context) {
+					if (args._updateStrategy === "appVersion") return getAppVersionUpdateInfo(args, context);
+					return getFingerprintUpdateInfo(args, context);
 				},
 				async getBundles(options) {
 					const { where, limit, offset, orderBy, cursor } = options;
@@ -5311,11 +5425,8 @@ const createBlobDatabasePlugin = ({ name, factory }) => {
 					const changedBundlesByKey = {};
 					const removalsByKey = {};
 					const pathsToInvalidate = /* @__PURE__ */ new Set();
-					let isTargetAppVersionChanged = false;
-					let isChannelChanged = false;
+					const targetVersionPlatforms = /* @__PURE__ */ new Set();
 					for (const { operation, data } of changedSets) {
-						if (data.targetAppVersion !== void 0) isTargetAppVersionChanged = true;
-						if (operation === "update" && data.channel !== void 0) isChannelChanged = true;
 						if (operation === "insert") {
 							const target = resolveStorageTarget(data);
 							const key = `${data.channel}/${data.platform}/${target}/update.json`;
@@ -5327,6 +5438,7 @@ const createBlobDatabasePlugin = ({ name, factory }) => {
 							pendingBundlesMap.set(data.id, bundleWithKey);
 							changedBundlesByKey[key] = changedBundlesByKey[key] || [];
 							changedBundlesByKey[key].push(removeBundleInternalKeys(bundleWithKey));
+							if (data.targetAppVersion !== void 0) targetVersionPlatforms.add(data.platform);
 							addLookupInvalidationPaths(pathsToInvalidate, data);
 							continue;
 						}
@@ -5339,6 +5451,7 @@ const createBlobDatabasePlugin = ({ name, factory }) => {
 							const key = bundle._updateJsonKey;
 							removalsByKey[key] = removalsByKey[key] || [];
 							removalsByKey[key].push(bundle.id);
+							if (bundle.targetAppVersion !== void 0) targetVersionPlatforms.add(bundle.platform);
 							addLookupInvalidationPaths(pathsToInvalidate, bundle);
 							continue;
 						}
@@ -5370,6 +5483,10 @@ const createBlobDatabasePlugin = ({ name, factory }) => {
 										channel: nextChannel
 									});
 								}
+								if (bundle.targetAppVersion !== void 0 || updatedBundle.targetAppVersion !== void 0) {
+									targetVersionPlatforms.add(bundle.platform);
+									targetVersionPlatforms.add(updatedBundle.platform);
+								}
 								addLookupInvalidationPaths(pathsToInvalidate, updatedBundle);
 								if (bundle.targetAppVersion && bundle.targetAppVersion !== updatedBundle.targetAppVersion) addLookupInvalidationPaths(pathsToInvalidate, bundle);
 								continue;
@@ -5383,14 +5500,14 @@ const createBlobDatabasePlugin = ({ name, factory }) => {
 							if (bundle.targetAppVersion && bundle.targetAppVersion !== updatedBundle.targetAppVersion) addLookupInvalidationPaths(pathsToInvalidate, bundle);
 						}
 					}
-					for (const oldKey of Object.keys(removalsByKey)) await (async () => {
-						const updatedBundles = (await loadObject(oldKey) ?? []).filter((b) => !removalsByKey[oldKey].includes(b.id));
+					await forEachWithConcurrency(Object.keys(removalsByKey), STORAGE_OPERATION_CONCURRENCY, async (oldKey) => {
+						const updatedBundles = (await loadOptionalObject(oldKey) ?? []).filter((b) => !removalsByKey[oldKey].includes(b.id));
 						updatedBundles.sort((a, b) => b.id.localeCompare(a.id));
 						if (updatedBundles.length === 0) await deleteObject(oldKey);
 						else await uploadObject(oldKey, updatedBundles);
-					})();
-					for (const key of Object.keys(changedBundlesByKey)) await (async () => {
-						const currentBundles = await loadObject(key) ?? [];
+					});
+					await forEachWithConcurrency(Object.keys(changedBundlesByKey), STORAGE_OPERATION_CONCURRENCY, async (key) => {
+						const currentBundles = await loadOptionalObject(key) ?? [];
 						const pureBundles = changedBundlesByKey[key].map((bundle) => bundle);
 						for (const changedBundle of pureBundles) {
 							const index = currentBundles.findIndex((b) => b.id === changedBundle.id);
@@ -5399,10 +5516,11 @@ const createBlobDatabasePlugin = ({ name, factory }) => {
 						}
 						currentBundles.sort((a, b) => b.id.localeCompare(a.id));
 						await uploadObject(key, currentBundles);
-					})();
-					if (isTargetAppVersionChanged || isChannelChanged) for (const platform of PLATFORMS) await updateTargetVersionsForPlatform(platform);
-					const currentIndexBundles = await loadCurrentBundlesForIndexRebuild();
-					const nextIndexMap = new Map(currentIndexBundles.map((bundle) => [bundle.id, bundle]));
+					});
+					if (targetVersionPlatforms.size > 0) await Promise.all(Array.from(targetVersionPlatforms).map((platform) => updateTargetVersionsForPlatform(platform)));
+					const previousIndexBundles = await loadCurrentBundlesForIndexRebuild();
+					const storedIndexBundles = await loadStoredBundlesForIndexRebuild();
+					const nextIndexMap = new Map(storedIndexBundles.map((bundle) => [bundle.id, bundle]));
 					for (const { operation, data } of changedSets) {
 						if (operation === "delete") {
 							nextIndexMap.delete(data.id);
@@ -5411,7 +5529,7 @@ const createBlobDatabasePlugin = ({ name, factory }) => {
 						nextIndexMap.set(data.id, data);
 					}
 					const nextIndexBundles = sortManagedBundles(Array.from(nextIndexMap.values()));
-					const previousArtifacts = buildManagementIndexArtifacts(currentIndexBundles, managementIndexPageSize);
+					const previousArtifacts = buildManagementIndexArtifacts(previousIndexBundles, managementIndexPageSize);
 					const nextArtifacts = buildManagementIndexArtifacts(nextIndexBundles, managementIndexPageSize);
 					await persistManagementIndexArtifacts(nextArtifacts, previousArtifacts);
 					replaceManagementRootCache(nextArtifacts);
@@ -5422,6 +5540,15 @@ const createBlobDatabasePlugin = ({ name, factory }) => {
 				}
 			})
 		})({}, hooks);
+		return () => {
+			const plugin = createPlugin();
+			Object.defineProperty(plugin, "diagnostics", {
+				configurable: true,
+				enumerable: true,
+				value: { bundleIndex: bundleIndexDiagnostics }
+			});
+			return plugin;
+		};
 	};
 };
 //#endregion
@@ -5563,6 +5690,34 @@ function assertRuntimeStoragePlugin(plugin) {
 	if (!isRuntimeStoragePlugin(plugin)) throw createMissingProfileError(plugin, "runtime");
 }
 //#endregion
+//#region ../../packages/server/src/db/requestBundleIdentityMap.ts
+const createRequestBundleIdentityMap = ({ context, loadBundleById, seeds }) => {
+	const bundles = /* @__PURE__ */ new Map();
+	const pendingBundles = /* @__PURE__ */ new Map();
+	for (const seed of seeds) if (seed) bundles.set(seed.id, seed);
+	const get = async (bundleId) => {
+		const cachedBundle = bundles.get(bundleId);
+		if (cachedBundle) return cachedBundle;
+		const pendingBundle = pendingBundles.get(bundleId);
+		if (pendingBundle) return pendingBundle;
+		const lookup = loadBundleById(bundleId, context).then((bundle) => {
+			pendingBundles.delete(bundleId);
+			if (bundle) bundles.set(bundle.id, bundle);
+			return bundle;
+		}, (error) => {
+			pendingBundles.delete(bundleId);
+			throw error;
+		});
+		pendingBundles.set(bundleId, lookup);
+		return lookup;
+	};
+	const peek = (bundleId) => bundles.get(bundleId) ?? null;
+	return {
+		get,
+		peek
+	};
+};
+//#endregion
 //#region ../../packages/server/src/db/schemaEnhancements.ts
 const normalizeNullableString = (value) => {
 	if (value === null || value === void 0) return null;
@@ -5799,109 +5954,148 @@ function createPluginDatabaseCore(getPlugin, resolveFileUrl, options) {
 		enabled: true,
 		id: { gte: minBundleId }
 	});
-	return {
-		api: {
-			async getBundleById(id, context) {
-				return getPlugin().getBundleById(id, context);
-			},
-			async getUpdateInfo(args, context) {
-				const directGetUpdateInfo = getPlugin().getUpdateInfo;
-				if (directGetUpdateInfo) return context === void 0 ? await directGetUpdateInfo(args) : await directGetUpdateInfo(args, context);
-				const channel = args.channel ?? "production";
-				const minBundleId = args.minBundleId ?? "00000000-0000-0000-0000-000000000000";
-				const baseWhere = getBaseWhere({
-					platform: args.platform,
-					channel,
-					minBundleId
-				});
-				if (args._updateStrategy === "fingerprint") return findUpdateInfoByScanning({
-					args,
-					queryWhere: {
-						...baseWhere,
-						fingerprintHash: args.fingerprintHash
-					},
-					context,
-					isCandidate: (bundle) => {
-						return bundle.enabled && bundle.platform === args.platform && bundle.channel === channel && bundle.id.localeCompare(minBundleId) >= 0 && bundle.fingerprintHash === args.fingerprintHash;
-					}
-				});
-				return findUpdateInfoByScanning({
-					args,
-					queryWhere: { ...baseWhere },
-					context,
-					isCandidate: (bundle) => {
-						return bundle.enabled && bundle.platform === args.platform && bundle.channel === channel && bundle.id.localeCompare(minBundleId) >= 0 && !!bundle.targetAppVersion && semverSatisfies$1(bundle.targetAppVersion, args.appVersion);
-					}
-				});
-			},
-			async getAppUpdateInfo(args, context) {
-				const info = await this.getUpdateInfo(args, context);
-				if (!info) return null;
-				const { storageUri, ...rest } = info;
-				const readStorageText = options?.readStorageText;
-				if (info.id === "00000000-0000-0000-0000-000000000000" || !readStorageText) {
-					const fileUrl = await resolveFileUrl(storageUri ?? null, context);
-					return {
-						...rest,
-						fileUrl
-					};
+	const api = {
+		async getBundleById(id, context) {
+			return getPlugin().getBundleById(id, context);
+		},
+		async getUpdateInfo(args, context) {
+			const directGetUpdateInfo = getPlugin().getUpdateInfo;
+			if (directGetUpdateInfo) return context === void 0 ? await directGetUpdateInfo(args) : await directGetUpdateInfo(args, context);
+			const channel = args.channel ?? "production";
+			const minBundleId = args.minBundleId ?? "00000000-0000-0000-0000-000000000000";
+			const baseWhere = getBaseWhere({
+				platform: args.platform,
+				channel,
+				minBundleId
+			});
+			if (args._updateStrategy === "fingerprint") return findUpdateInfoByScanning({
+				args,
+				queryWhere: {
+					...baseWhere,
+					fingerprintHash: args.fingerprintHash
+				},
+				context,
+				isCandidate: (bundle) => {
+					return bundle.enabled && bundle.platform === args.platform && bundle.channel === channel && bundle.id.localeCompare(minBundleId) >= 0 && bundle.fingerprintHash === args.fingerprintHash;
+				}
+			});
+			return findUpdateInfoByScanning({
+				args,
+				queryWhere: { ...baseWhere },
+				context,
+				isCandidate: (bundle) => {
+					return bundle.enabled && bundle.platform === args.platform && bundle.channel === channel && bundle.id.localeCompare(minBundleId) >= 0 && !!bundle.targetAppVersion && semverSatisfies$1(bundle.targetAppVersion, args.appVersion);
 				}
-				const [fileUrl, targetBundle, currentBundle] = await Promise.all([
-					resolveFileUrl(storageUri ?? null, context),
-					getPlugin().getBundleById(info.id, context),
-					args.bundleId !== "00000000-0000-0000-0000-000000000000" ? getPlugin().getBundleById(args.bundleId, context) : null
-				]);
-				const baseResponse = {
+			});
+		},
+		async getAppUpdateInfo(args, context) {
+			const info = await this.getUpdateInfo(args, context);
+			if (!info) return null;
+			const { storageUri, ...rest } = info;
+			const readStorageText = options?.readStorageText;
+			if (info.id === "00000000-0000-0000-0000-000000000000" || !readStorageText) {
+				const fileUrl = await resolveFileUrl(storageUri ?? null, context);
+				return {
 					...rest,
 					fileUrl
 				};
-				const manifestArtifacts = await resolveManifestArtifacts({
-					currentBundle,
-					resolveFileUrl,
-					readStorageText,
-					targetBundle,
-					context
-				});
-				if (!manifestArtifacts) return baseResponse;
-				return {
-					...baseResponse,
-					...manifestArtifacts
-				};
-			},
-			async getChannels(context) {
-				return getPlugin().getChannels(context);
-			},
-			async getBundles(options, context) {
-				return getPlugin().getBundles(options, context);
-			},
-			async insertBundle(bundle, context) {
-				assertBundlePersistenceConstraints(bundle);
-				await runWithMutationPlugin(async (plugin) => {
-					await plugin.appendBundle(bundle, context);
-					await plugin.commitBundle(context);
-				});
-			},
-			async updateBundleById(bundleId, newBundle, context) {
-				await runWithMutationPlugin(async (plugin) => {
-					const current = await plugin.getBundleById(bundleId, context);
-					if (!current) throw new Error("targetBundleId not found");
-					assertBundlePersistenceConstraints({
-						...current,
-						...newBundle
-					});
-					await plugin.updateBundle(bundleId, newBundle, context);
-					await plugin.commitBundle(context);
+			}
+			const requestBundleSeeds = getRequestUpdateBundleSeeds(context);
+			const requestBundles = createRequestBundleIdentityMap({
+				context,
+				loadBundleById: (bundleId, requestContext) => getPlugin().getBundleById(bundleId, requestContext),
+				seeds: requestBundleSeeds
+			});
+			const getCurrentBundle = () => {
+				if (args.bundleId === "00000000-0000-0000-0000-000000000000") return null;
+				const seededCurrentBundle = requestBundles.peek(args.bundleId);
+				if (seededCurrentBundle || requestBundleSeeds.length > 0) return seededCurrentBundle;
+				return requestBundles.get(args.bundleId);
+			};
+			const [fileUrl, targetBundle, currentBundle] = await Promise.all([
+				resolveFileUrl(storageUri ?? null, context),
+				requestBundles.get(info.id),
+				getCurrentBundle()
+			]);
+			const baseResponse = {
+				...rest,
+				fileUrl
+			};
+			const manifestArtifacts = await resolveManifestArtifacts({
+				currentBundle,
+				resolveFileUrl,
+				readStorageText,
+				targetBundle,
+				context
+			});
+			if (!manifestArtifacts) return baseResponse;
+			return {
+				...baseResponse,
+				...manifestArtifacts
+			};
+		},
+		async getChannels(context) {
+			return getPlugin().getChannels(context);
+		},
+		async getBundles(options, context) {
+			return getPlugin().getBundles(options, context);
+		},
+		async insertBundle(bundle, context) {
+			assertBundlePersistenceConstraints(bundle);
+			await runWithMutationPlugin(async (plugin) => {
+				await plugin.appendBundle(bundle, context);
+				await plugin.commitBundle(context);
+			});
+		},
+		async updateBundleById(bundleId, newBundle, context) {
+			await runWithMutationPlugin(async (plugin) => {
+				const current = await plugin.getBundleById(bundleId, context);
+				if (!current) throw new Error("targetBundleId not found");
+				assertBundlePersistenceConstraints({
+					...current,
+					...newBundle
 				});
-			},
-			async deleteBundleById(bundleId, context) {
-				await runWithMutationPlugin(async (plugin) => {
-					const bundle = await plugin.getBundleById(bundleId, context);
-					if (!bundle) return;
-					await plugin.deleteBundle(bundle, context);
-					await plugin.commitBundle(context);
+				await plugin.updateBundle(bundleId, newBundle, context);
+				await plugin.commitBundle(context);
+			});
+		},
+		async deleteBundleById(bundleId, context) {
+			await runWithMutationPlugin(async (plugin) => {
+				const bundle = await plugin.getBundleById(bundleId, context);
+				if (!bundle) return;
+				await plugin.deleteBundle(bundle, context);
+				await plugin.commitBundle(context);
+			});
+		}
+	};
+	Object.defineProperty(api, "diagnostics", {
+		configurable: true,
+		enumerable: true,
+		get() {
+			const diagnostics = getPlugin().diagnostics;
+			if (!diagnostics) {
+				Object.defineProperty(this, "diagnostics", {
+					configurable: true,
+					enumerable: true,
+					value: void 0
 				});
+				return;
 			}
-		},
+			const wrappedDiagnostics = {};
+			if (diagnostics.bundleIndex) wrappedDiagnostics.bundleIndex = {
+				check: (context) => getPlugin().diagnostics.bundleIndex.check(context),
+				...diagnostics.bundleIndex.repair ? { repair: (context) => getPlugin().diagnostics.bundleIndex.repair(context) } : {}
+			};
+			Object.defineProperty(this, "diagnostics", {
+				configurable: true,
+				enumerable: true,
+				value: wrappedDiagnostics
+			});
+			return wrappedDiagnostics;
+		}
+	});
+	return {
+		api,
 		adapterName: getPlugin().name,
 		createMigrator: () => {
 			throw new Error("createMigrator is only available for Kysely/Prisma/Drizzle database adapters.");
@@ -7316,7 +7510,7 @@ function findRoute(router, method, path) {
 }
 //#endregion
 //#region ../../packages/server/src/version.ts
-const HOT_UPDATER_SERVER_VERSION = "0.32.0";
+const HOT_UPDATER_SERVER_VERSION = "0.33.0";
 //#endregion
 //#region ../../packages/server/src/handler.ts
 var HandlerBadRequestError = class extends Error {
@@ -7608,7 +7802,7 @@ function createHandler(api, options = {}) {
 }
 //#endregion
 //#region ../../packages/server/src/route.ts
-const normalizeBasePath = (basePath) => {
+const normalizeBasePath$1 = (basePath) => {
 	if (!basePath || basePath === "/") return "/";
 	return basePath.endsWith("/") ? basePath.slice(0, -1) : basePath;
 };
@@ -7659,7 +7853,7 @@ const createStorageAccess = (storagePlugins) => {
 //#region ../../packages/server/src/runtime.ts
 function createHotUpdater(options) {
 	const database = options.database;
-	const basePath = normalizeBasePath(options.basePath ?? "/api");
+	const basePath = normalizeBasePath$1(options.basePath ?? "/api");
 	const { readStorageText, resolveFileUrl } = createStorageAccess((options.storages ?? options.storagePlugins ?? []).map((plugin) => {
 		const storagePlugin = typeof plugin === "function" ? plugin() : plugin;
 		assertRuntimeStoragePlugin(storagePlugin);
@@ -7671,23 +7865,21 @@ function createHotUpdater(options) {
 		createMutationPlugin: () => database(),
 		readStorageText
 	} : { readStorageText });
-	const api = {
-		...core.api,
-		handler: createHandler(core.api, {
-			basePath,
-			routes: options.routes
-		}),
-		adapterName: core.adapterName
-	};
+	const internalHandler = createHandler(core.api, {
+		basePath,
+		routes: options.routes
+	});
 	const handler = (request, context, ...extraArgs) => {
-		if (extraArgs.length > 0) return api.handler(request);
-		return api.handler(request, context);
+		if (extraArgs.length > 0) return internalHandler(request);
+		return internalHandler(request, context);
 	};
-	return {
-		...api,
+	const api = {
 		basePath,
+		adapterName: core.adapterName,
 		handler
 	};
+	Object.defineProperties(api, Object.getOwnPropertyDescriptors(core.api));
+	return api;
 }
 //#endregion
 //#region ../../node_modules/.pnpm/hono@4.12.9/node_modules/hono/dist/compose.js
@@ -9582,6 +9774,37 @@ const streamToString = (stream) => {
 const DEFAULT_INVALIDATION_POLL_INTERVAL_MS = 2e3;
 const DEFAULT_INVALIDATION_TIMEOUT_MS = 300 * 1e3;
 const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+const getS3ErrorProperty = (error, key) => {
+	if (typeof error !== "object" || error === null) return;
+	const value = error[key];
+	return typeof value === "string" ? value : void 0;
+};
+const isArchivedS3ObjectError = (error) => {
+	if (!(error instanceof Error)) return false;
+	return error.name === "InvalidObjectState" || getS3ErrorProperty(error, "Code") === "InvalidObjectState";
+};
+const createArchivedS3ObjectError = ({ bucket, key, error }) => {
+	const storageClass = getS3ErrorProperty(error, "StorageClass") ?? "archived storage";
+	const nextError = new Error(`S3 object "${key}" in bucket "${bucket}" is archived (${storageClass}) and cannot be read. Restore the object in S3 or exclude Hot Updater metadata from lifecycle archival: "_index/**", "**/target-app-versions.json", and "**/update.json".`, { cause: error });
+	nextError.name = "S3ArchivedObjectError";
+	return nextError;
+};
+function normalizeBasePath(basePath) {
+	return basePath?.replace(/^\/+|\/+$/g, "") ?? "";
+}
+function createDatabaseKeyBuilder(basePath) {
+	const normalizedBasePath = normalizeBasePath(basePath);
+	const toStorageKey = (key) => [normalizedBasePath, key].filter(Boolean).join("/");
+	const fromStorageKey = (key) => {
+		if (!normalizedBasePath) return key;
+		const prefix = `${normalizedBasePath}/`;
+		return key.startsWith(prefix) ? key.slice(prefix.length) : key;
+	};
+	return {
+		fromStorageKey,
+		toStorageKey
+	};
+}
 /**
 * Loads JSON data from S3.
 * Returns null if NoSuchKey error occurs.
@@ -9597,6 +9820,11 @@ async function loadJsonFromS3(client, bucket, key) {
 		return JSON.parse(bodyContents);
 	} catch (e) {
 		if (e instanceof _aws_sdk_client_s3.NoSuchKey) return null;
+		if (isArchivedS3ObjectError(e)) throw createArchivedS3ObjectError({
+			bucket,
+			key,
+			error: e
+		});
 		throw e;
 	}
 }
@@ -9680,18 +9908,20 @@ async function invalidateCloudFront(client, distributionId, paths, options) {
 const s3Database = createBlobDatabasePlugin({
 	name: "s3Database",
 	factory: (config) => {
-		const { bucketName, cloudfrontDistributionId, apiBasePath = "/api/check-update", shouldWaitForInvalidation = false, ...s3Config } = config;
+		const { basePath, bucketName, cloudfrontDistributionId, apiBasePath = "/api/check-update", shouldWaitForInvalidation = false, ...s3Config } = config;
 		const client = new _aws_sdk_client_s3.S3Client(applyS3RuntimeAwsConfig(s3Config));
+		const { fromStorageKey, toStorageKey } = createDatabaseKeyBuilder(basePath);
 		const cloudfrontClient = cloudfrontDistributionId ? new _aws_sdk_client_cloudfront.CloudFrontClient({
 			credentials: s3Config.credentials,
 			region: s3Config.region
 		}) : void 0;
 		return {
 			apiBasePath,
-			listObjects: (prefix) => listObjectsInS3(client, bucketName, prefix),
-			loadObject: (key) => loadJsonFromS3(client, bucketName, key),
-			uploadObject: (key, data) => uploadJsonToS3(client, bucketName, key, data),
-			deleteObject: (key) => deleteObjectInS3(client, bucketName, key),
+			listObjects: (prefix) => listObjectsInS3(client, bucketName, toStorageKey(prefix)).then((keys) => keys.map(fromStorageKey)),
+			loadObject: (key) => loadJsonFromS3(client, bucketName, toStorageKey(key)),
+			uploadObject: (key, data) => uploadJsonToS3(client, bucketName, toStorageKey(key), data),
+			deleteObject: (key) => deleteObjectInS3(client, bucketName, toStorageKey(key)),
+			shouldSkipLoadObjectError: (error) => error instanceof Error && error.name === "S3ArchivedObjectError",
 			invalidatePaths: (pathsToInvalidate) => {
 				if (cloudfrontClient && cloudfrontDistributionId && pathsToInvalidate.length > 0) return invalidateCloudFront(cloudfrontClient, cloudfrontDistributionId, pathsToInvalidate, { shouldWaitForInvalidation });
 				return Promise.resolve();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hot-updater/aws",
   "type": "module",
-  "version": "0.32.0",
+  "version": "0.33.0",
   "description": "React Native OTA solution for self-hosted",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -42,10 +42,10 @@
     "es-toolkit": "^1.32.0",
     "execa": "9.5.2",
     "mime": "^4.0.4",
-    "@hot-updater/core": "0.32.0",
-    "@hot-updater/js": "0.32.0",
-    "@hot-updater/mock": "0.32.0",
-    "@hot-updater/test-utils": "0.32.0"
+    "@hot-updater/core": "0.33.0",
+    "@hot-updater/js": "0.33.0",
+    "@hot-updater/test-utils": "0.33.0",
+    "@hot-updater/mock": "0.33.0"
   },
   "dependencies": {
     "@aws-sdk/client-cloudfront": "3.1008.0",
@@ -60,9 +60,9 @@
     "@aws-sdk/lib-storage": "3.1008.0",
     "hono": "4.12.9",
     "aws-lambda": "1.0.7",
-    "@hot-updater/cli-tools": "0.32.0",
-    "@hot-updater/server": "0.32.0",
-    "@hot-updater/plugin-core": "0.32.0"
+    "@hot-updater/cli-tools": "0.33.0",
+    "@hot-updater/plugin-core": "0.33.0",
+    "@hot-updater/server": "0.33.0"
   },
   "scripts": {
     "build": "tsdown",