@hot-updater/aws 0.35.12 → 0.36.1

package/dist/iac/index.cjs

@@ -7951,7 +7951,7 @@ const SOURCE_TEMPLATE = `// Add this to your App.tsx
 import { HotUpdater } from "@hot-updater/react-native";
 
 function App() {
-  return ...;
+  return null; // Replace with your app root
 }
 
 export default HotUpdater.wrap({

package/dist/iac/index.mjs

@@ -7946,7 +7946,7 @@ const SOURCE_TEMPLATE = `// Add this to your App.tsx
 import { HotUpdater } from "@hot-updater/react-native";
 
 function App() {
-  return ...;
+  return null; // Replace with your app root
 }
 
 export default HotUpdater.wrap({

package/dist/index.cjs

@@ -1515,9 +1515,17 @@ function isPlatformDirectoryPrefix(prefix) {
 	const lastSegment = getLastDirectorySegment(prefix);
 	return lastSegment === "ios" || lastSegment === "android";
 }
+function isLegacyBundleStorageDirectoryPrefix(prefix) {
+	const lastSegment = getLastDirectorySegment(prefix);
+	return lastSegment !== void 0 && /^[0-9a-f]{8}-[0-9a-f]{4}-7[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(lastSegment);
+}
 function isUpdateJsonKey(key) {
 	return key.endsWith(`${S3_DIRECTORY_DELIMITER}update.json`);
 }
+function isUuidChannelUpdateJsonKey(key, rootPrefix, uuidChannels) {
+	const [channel, platform, target, fileName, ...rest] = getRelativeDirectoryPrefix(key, rootPrefix).split(S3_DIRECTORY_DELIMITER);
+	return channel !== void 0 && uuidChannels.has(channel) && (platform === "ios" || platform === "android") && target !== void 0 && target.length > 0 && fileName === "update.json" && rest.length === 0;
+}
 async function mapWithConcurrency(items, concurrency, mapper) {
 	const results = [];
 	let nextIndex = 0;
@@ -1572,7 +1580,7 @@ async function uploadJsonToS3(client, bucket, key, data) {
 }
 async function listObjectsInS3(client, bucketName, prefix, rootPrefix = "") {
 	const normalizedRootPrefix = normalizeDirectoryPrefix(rootPrefix);
-	const listPrefix = async (currentPrefix) => {
+	const listPrefix = async (currentPrefix, delimiter = S3_DIRECTORY_DELIMITER) => {
 		let continuationToken;
 		const keys = [];
 		const commonPrefixes = /* @__PURE__ */ new Set();
@@ -1580,7 +1588,7 @@ async function listObjectsInS3(client, bucketName, prefix, rootPrefix = "") {
 			const response = await client.send(new _aws_sdk_client_s3.ListObjectsV2Command({
 				Bucket: bucketName,
 				Prefix: currentPrefix,
-				Delimiter: S3_DIRECTORY_DELIMITER,
+				Delimiter: delimiter ?? void 0,
 				ContinuationToken: continuationToken
 			}));
 			const found = (response.Contents ?? []).map((item) => item.Key).filter((key) => !!key);
@@ -1597,7 +1605,12 @@ async function listObjectsInS3(client, bucketName, prefix, rootPrefix = "") {
 		const { commonPrefixes, keys } = await listPrefix(currentPrefix);
 		const depth = getDirectoryDepth(currentPrefix, normalizedRootPrefix);
 		if (depth >= 2) return [...keys.filter(isUpdateJsonKey), ...commonPrefixes.map((commonPrefix) => `${commonPrefix}update.json`)];
-		return (await mapWithConcurrency(depth === 1 ? commonPrefixes.filter(isPlatformDirectoryPrefix) : commonPrefixes, S3_LIST_OBJECTS_CONCURRENCY, (nextPrefix) => collectUpdateJsonKeys(nextPrefix))).flat();
+		const uuidPrefixes = depth === 0 ? commonPrefixes.filter(isLegacyBundleStorageDirectoryPrefix) : [];
+		const uuidPrefixSet = new Set(uuidPrefixes);
+		const nestedKeys = await mapWithConcurrency(depth === 0 ? commonPrefixes.filter((commonPrefix) => !uuidPrefixSet.has(commonPrefix)) : depth === 1 ? commonPrefixes.filter(isPlatformDirectoryPrefix) : commonPrefixes, S3_LIST_OBJECTS_CONCURRENCY, (nextPrefix) => collectUpdateJsonKeys(nextPrefix));
+		const uuidChannels = new Set(uuidPrefixes.map(getLastDirectorySegment).filter((segment) => !!segment));
+		const uuidChannelKeys = (await mapWithConcurrency(Array.from(new Set(Array.from(uuidChannels, (channel) => `${normalizedRootPrefix}${channel[0]}`))), S3_LIST_OBJECTS_CONCURRENCY, async (scanPrefix) => (await listPrefix(scanPrefix, null)).keys)).flat().filter((key) => isUuidChannelUpdateJsonKey(key, normalizedRootPrefix, uuidChannels));
+		return [...nestedKeys.flat(), ...uuidChannelKeys];
 	};
 	const normalizedPrefix = normalizeDirectoryPrefix(prefix);
 	return Array.from(new Set(await collectUpdateJsonKeys(normalizedPrefix)));
@@ -1682,9 +1695,56 @@ const s3Storage = (0, _hot_updater_plugin_core.createUniversalStoragePlugin)({
 	factory: (config) => {
 		const { bucketName, ...s3Config } = config;
 		const client = new _aws_sdk_client_s3.S3Client(applyS3RuntimeAwsConfig(s3Config));
-		const getStorageKey = (0, _hot_updater_plugin_core.createStorageKeyBuilder)(config.basePath);
+		const normalizedBasePath = config.basePath?.replace(/^\/+|\/+$/g, "") ?? "";
+		const getStorageKey = (0, _hot_updater_plugin_core.createStorageKeyBuilder)(normalizedBasePath);
+		const getListPrefix = (prefix = "") => {
+			const value = [normalizedBasePath, prefix.replace(/^\/+|\/+$/g, "")].filter(Boolean).join("/");
+			return value ? `${value}/` : "";
+		};
+		const getRelativeKey = (key) => {
+			if (!normalizedBasePath) return key;
+			const basePrefix = `${normalizedBasePath}/`;
+			return key.startsWith(basePrefix) ? key.slice(basePrefix.length) : key;
+		};
 		return {
 			node: {
+				async listObjects(prefix) {
+					const objects = [];
+					let continuationToken;
+					do {
+						const response = await client.send(new _aws_sdk_client_s3.ListObjectsV2Command({
+							Bucket: bucketName,
+							ContinuationToken: continuationToken,
+							Prefix: getListPrefix(prefix)
+						}));
+						for (const object of response.Contents ?? []) {
+							if (!object.Key) continue;
+							objects.push({
+								key: getRelativeKey(object.Key),
+								lastModifiedAt: object.LastModified,
+								size: object.Size ?? 0,
+								storageUri: `s3://${bucketName}/${object.Key}`
+							});
+						}
+						continuationToken = response.NextContinuationToken;
+					} while (continuationToken);
+					return objects;
+				},
+				async deleteObjects(relativeKeys) {
+					const keys = relativeKeys.map((key) => getStorageKey(key));
+					for (let offset = 0; offset < keys.length; offset += 1e3) {
+						const batch = keys.slice(offset, offset + 1e3);
+						if (batch.length === 0) continue;
+						const response = await client.send(new _aws_sdk_client_s3.DeleteObjectsCommand({
+							Bucket: bucketName,
+							Delete: {
+								Objects: batch.map((Key) => ({ Key })),
+								Quiet: true
+							}
+						}));
+						if (response.Errors && response.Errors.length > 0) throw new Error(`Failed to delete ${response.Errors.length} S3 object(s).`);
+					}
+				},
 				async delete(storageUri) {
 					const { bucket, key } = (0, _hot_updater_plugin_core.parseStorageUri)(storageUri, "s3");
 					if (bucket !== bucketName) throw new Error(`Bucket name mismatch: expected "${bucketName}", but found "${bucket}".`);

package/dist/index.mjs

@@ -1490,9 +1490,17 @@ function isPlatformDirectoryPrefix(prefix) {
 	const lastSegment = getLastDirectorySegment(prefix);
 	return lastSegment === "ios" || lastSegment === "android";
 }
+function isLegacyBundleStorageDirectoryPrefix(prefix) {
+	const lastSegment = getLastDirectorySegment(prefix);
+	return lastSegment !== void 0 && /^[0-9a-f]{8}-[0-9a-f]{4}-7[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(lastSegment);
+}
 function isUpdateJsonKey(key) {
 	return key.endsWith(`${S3_DIRECTORY_DELIMITER}update.json`);
 }
+function isUuidChannelUpdateJsonKey(key, rootPrefix, uuidChannels) {
+	const [channel, platform, target, fileName, ...rest] = getRelativeDirectoryPrefix(key, rootPrefix).split(S3_DIRECTORY_DELIMITER);
+	return channel !== void 0 && uuidChannels.has(channel) && (platform === "ios" || platform === "android") && target !== void 0 && target.length > 0 && fileName === "update.json" && rest.length === 0;
+}
 async function mapWithConcurrency(items, concurrency, mapper) {
 	const results = [];
 	let nextIndex = 0;
@@ -1547,7 +1555,7 @@ async function uploadJsonToS3(client, bucket, key, data) {
 }
 async function listObjectsInS3(client, bucketName, prefix, rootPrefix = "") {
 	const normalizedRootPrefix = normalizeDirectoryPrefix(rootPrefix);
-	const listPrefix = async (currentPrefix) => {
+	const listPrefix = async (currentPrefix, delimiter = S3_DIRECTORY_DELIMITER) => {
 		let continuationToken;
 		const keys = [];
 		const commonPrefixes = /* @__PURE__ */ new Set();
@@ -1555,7 +1563,7 @@ async function listObjectsInS3(client, bucketName, prefix, rootPrefix = "") {
 			const response = await client.send(new ListObjectsV2Command({
 				Bucket: bucketName,
 				Prefix: currentPrefix,
-				Delimiter: S3_DIRECTORY_DELIMITER,
+				Delimiter: delimiter ?? void 0,
 				ContinuationToken: continuationToken
 			}));
 			const found = (response.Contents ?? []).map((item) => item.Key).filter((key) => !!key);
@@ -1572,7 +1580,12 @@ async function listObjectsInS3(client, bucketName, prefix, rootPrefix = "") {
 		const { commonPrefixes, keys } = await listPrefix(currentPrefix);
 		const depth = getDirectoryDepth(currentPrefix, normalizedRootPrefix);
 		if (depth >= 2) return [...keys.filter(isUpdateJsonKey), ...commonPrefixes.map((commonPrefix) => `${commonPrefix}update.json`)];
-		return (await mapWithConcurrency(depth === 1 ? commonPrefixes.filter(isPlatformDirectoryPrefix) : commonPrefixes, S3_LIST_OBJECTS_CONCURRENCY, (nextPrefix) => collectUpdateJsonKeys(nextPrefix))).flat();
+		const uuidPrefixes = depth === 0 ? commonPrefixes.filter(isLegacyBundleStorageDirectoryPrefix) : [];
+		const uuidPrefixSet = new Set(uuidPrefixes);
+		const nestedKeys = await mapWithConcurrency(depth === 0 ? commonPrefixes.filter((commonPrefix) => !uuidPrefixSet.has(commonPrefix)) : depth === 1 ? commonPrefixes.filter(isPlatformDirectoryPrefix) : commonPrefixes, S3_LIST_OBJECTS_CONCURRENCY, (nextPrefix) => collectUpdateJsonKeys(nextPrefix));
+		const uuidChannels = new Set(uuidPrefixes.map(getLastDirectorySegment).filter((segment) => !!segment));
+		const uuidChannelKeys = (await mapWithConcurrency(Array.from(new Set(Array.from(uuidChannels, (channel) => `${normalizedRootPrefix}${channel[0]}`))), S3_LIST_OBJECTS_CONCURRENCY, async (scanPrefix) => (await listPrefix(scanPrefix, null)).keys)).flat().filter((key) => isUuidChannelUpdateJsonKey(key, normalizedRootPrefix, uuidChannels));
+		return [...nestedKeys.flat(), ...uuidChannelKeys];
 	};
 	const normalizedPrefix = normalizeDirectoryPrefix(prefix);
 	return Array.from(new Set(await collectUpdateJsonKeys(normalizedPrefix)));
@@ -1657,9 +1670,56 @@ const s3Storage = createUniversalStoragePlugin({
 	factory: (config) => {
 		const { bucketName, ...s3Config } = config;
 		const client = new S3Client(applyS3RuntimeAwsConfig(s3Config));
-		const getStorageKey = createStorageKeyBuilder(config.basePath);
+		const normalizedBasePath = config.basePath?.replace(/^\/+|\/+$/g, "") ?? "";
+		const getStorageKey = createStorageKeyBuilder(normalizedBasePath);
+		const getListPrefix = (prefix = "") => {
+			const value = [normalizedBasePath, prefix.replace(/^\/+|\/+$/g, "")].filter(Boolean).join("/");
+			return value ? `${value}/` : "";
+		};
+		const getRelativeKey = (key) => {
+			if (!normalizedBasePath) return key;
+			const basePrefix = `${normalizedBasePath}/`;
+			return key.startsWith(basePrefix) ? key.slice(basePrefix.length) : key;
+		};
 		return {
 			node: {
+				async listObjects(prefix) {
+					const objects = [];
+					let continuationToken;
+					do {
+						const response = await client.send(new ListObjectsV2Command({
+							Bucket: bucketName,
+							ContinuationToken: continuationToken,
+							Prefix: getListPrefix(prefix)
+						}));
+						for (const object of response.Contents ?? []) {
+							if (!object.Key) continue;
+							objects.push({
+								key: getRelativeKey(object.Key),
+								lastModifiedAt: object.LastModified,
+								size: object.Size ?? 0,
+								storageUri: `s3://${bucketName}/${object.Key}`
+							});
+						}
+						continuationToken = response.NextContinuationToken;
+					} while (continuationToken);
+					return objects;
+				},
+				async deleteObjects(relativeKeys) {
+					const keys = relativeKeys.map((key) => getStorageKey(key));
+					for (let offset = 0; offset < keys.length; offset += 1e3) {
+						const batch = keys.slice(offset, offset + 1e3);
+						if (batch.length === 0) continue;
+						const response = await client.send(new DeleteObjectsCommand({
+							Bucket: bucketName,
+							Delete: {
+								Objects: batch.map((Key) => ({ Key })),
+								Quiet: true
+							}
+						}));
+						if (response.Errors && response.Errors.length > 0) throw new Error(`Failed to delete ${response.Errors.length} S3 object(s).`);
+					}
+				},
 				async delete(storageUri) {
 					const { bucket, key } = parseStorageUri(storageUri, "s3");
 					if (bucket !== bucketName) throw new Error(`Bucket name mismatch: expected "${bucketName}", but found "${bucket}".`);

package/dist/lambda/index.cjs

@@ -35,7 +35,7 @@ let _aws_sdk_client_ssm = require("@aws-sdk/client-ssm");
 let _aws_sdk_cloudfront_signer = require("@aws-sdk/cloudfront-signer");
 //#endregion
 //#region ../../packages/server/dist/version.mjs
-const HOT_UPDATER_SERVER_VERSION = "0.35.12";
+const HOT_UPDATER_SERVER_VERSION = "0.36.1";
 //#endregion
 //#region ../../packages/server/dist/internalRouter.mjs
 const normalizePath = (path) => {
@@ -2340,6 +2340,8 @@ const getContentAddressedAssetStoragePath = ({ assetPath, fileHash }) => {
 const getLegacyManifestAssetStoragePath = ({ assetPath }) => assetPath;
 //#endregion
 //#region ../plugin-core/dist/assetStorageLayout.mjs
+const isBrotliManifestAssetPath = (assetPath) => /(^|\/)index\.[^/]+\.bundle$/.test(assetPath.replace(/\\/g, "/"));
+const getManifestAssetDownloadPath = (assetPath) => isBrotliManifestAssetPath(assetPath) ? `${assetPath}.br` : assetPath;
 const createStorageUriWithRelativePath = ({ baseStorageUri, relativePath }) => {
 	const storageUrl = new URL(baseStorageUri);
 	storageUrl.pathname = `${storageUrl.pathname.replace(/\/+$/, "")}/${relativePath.replace(/\\/g, "/").split("/").filter(Boolean).map((segment) => encodeURIComponent(segment)).join("/")}`;
@@ -3681,10 +3683,17 @@ function addTargetVersionRemoval(mutations, bundle) {
 	getTargetVersionMutation(mutations, bundle).removals.add(targetAppVersion);
 }
 function getManagementListPrefixes(where) {
+	if (where?.channel && where.platform && typeof where.targetAppVersion === "string") {
+		const targetAppVersion = normalizeTargetAppVersion(where.targetAppVersion);
+		if (targetAppVersion) return [`${where.channel}/${where.platform}/${targetAppVersion}/`];
+	}
 	if (where?.channel && where.platform) return [`${where.channel}/${where.platform}/`];
 	if (where?.channel) return [`${where.channel}/`];
 	return [""];
 }
+function getChannelFromUpdateJsonKey(key) {
+	return key.match(/^([^/]+)\/(?:ios|android)\/[^/]+\/update\.json$/)?.[1] ?? null;
+}
 const DEFAULT_DESC_ORDER = {
 	field: "id",
 	direction: "desc"
@@ -3701,7 +3710,7 @@ function sortManagedBundles(bundles, orderBy = DEFAULT_DESC_ORDER) {
 */
 const createBlobDatabasePlugin = ({ name, factory }) => {
 	return (config, hooks) => {
-		const { listObjects, loadObject, uploadObject, deleteObject, shouldSkipLoadObjectError, invalidatePaths, apiBasePath } = factory(config);
+		const { listObjects, loadObject, uploadObject, deleteObject, shouldSkipLoadObjectError, validateChannel, invalidatePaths, apiBasePath } = factory(config);
 		const bundlesMap = /* @__PURE__ */ new Map();
 		const pendingBundlesMap = /* @__PURE__ */ new Map();
 		const locallyDeletedBundleIds = /* @__PURE__ */ new Set();
@@ -3837,10 +3846,12 @@ const createBlobDatabasePlugin = ({ name, factory }) => {
 					});
 				},
 				async getChannels() {
-					return [...new Set((await loadAllBundlesForManagementFallback()).map((bundle) => bundle.channel))].sort();
+					const channels = (await listObjects("")).map(getChannelFromUpdateJsonKey).filter((channel) => channel !== null);
+					return [...new Set(channels)].sort();
 				},
 				async commitBundle({ changedSets }) {
 					if (changedSets.length === 0) return;
+					for (const { operation, data } of changedSets) if (operation === "insert" || operation === "update" && data.channel !== void 0) validateChannel?.(data.channel);
 					const changedBundlesByKey = {};
 					const removalsByKey = {};
 					const targetVersionRemovalsByKey = {};
@@ -4003,21 +4014,39 @@ const createProfiledStoragePlugin = ({ createProfiles, name, profileShape, suppo
 		return runtime;
 	};
 	const profiles = {};
-	if (profileShape?.node) profiles.node = {
-		async delete(storageUri) {
-			return requireNodeProfile().delete(storageUri);
-		},
-		async downloadFile(storageUri, filePath) {
-			return requireNodeProfile().downloadFile(storageUri, filePath);
-		},
-		async exists(storageUri) {
-			return requireNodeProfile().exists(storageUri);
-		},
-		async upload(key, filePath) {
-			return requireNodeProfile().upload(key, filePath);
-		}
-	};
-	else if (profileShape?.node !== false) Object.defineProperty(profiles, "node", {
+	if (profileShape?.node) {
+		const nodeProfile = {
+			async delete(storageUri) {
+				return requireNodeProfile().delete(storageUri);
+			},
+			async downloadFile(storageUri, filePath) {
+				return requireNodeProfile().downloadFile(storageUri, filePath);
+			},
+			async exists(storageUri) {
+				return requireNodeProfile().exists(storageUri);
+			},
+			async upload(key, filePath) {
+				return requireNodeProfile().upload(key, filePath);
+			}
+		};
+		Object.defineProperties(nodeProfile, {
+			deleteObjects: {
+				enumerable: true,
+				get: () => {
+					const deleteObjects = requireNodeProfile().deleteObjects;
+					return deleteObjects ? (keys) => deleteObjects(keys) : void 0;
+				}
+			},
+			listObjects: {
+				enumerable: true,
+				get: () => {
+					const listObjects = requireNodeProfile().listObjects;
+					return listObjects ? (prefix) => listObjects(prefix) : void 0;
+				}
+			}
+		});
+		profiles.node = nodeProfile;
+	} else if (profileShape?.node !== false) Object.defineProperty(profiles, "node", {
 		enumerable: true,
 		get: getNodeProfile
 	});
@@ -4098,7 +4127,6 @@ function assertRuntimeStoragePlugin(plugin) {
 //#endregion
 //#region ../../packages/server/dist/db/updateArtifacts.mjs
 const HBC_ASSET_PATH_RE = /\.bundle$/;
-const BR_COMPRESSED_ASSET_PATH_RE = /(^|\/)index\.[^/]+\.bundle$/;
 const resolveUniqueHbcAssetPath = (manifest) => {
 	const candidates = Object.keys(manifest.assets).sort((left, right) => left.localeCompare(right)).filter((candidate) => HBC_ASSET_PATH_RE.test(candidate));
 	return candidates.length === 1 ? candidates[0] : null;
@@ -4140,10 +4168,11 @@ async function resolveChangedAssets({ assetBaseStorageUri, currentManifest, curr
 	});
 	const changedEntries = await Promise.all(Object.entries(targetManifest.assets).map(async ([assetPath, asset]) => {
 		if ((currentManifest?.assets[assetPath])?.fileHash === asset.fileHash) return null;
-		const usesBrotliAsset = BR_COMPRESSED_ASSET_PATH_RE.test(assetPath);
+		const downloadPath = getManifestAssetDownloadPath(assetPath);
+		const usesBrotliAsset = downloadPath !== assetPath;
 		const storageUri = resolveManifestAssetStorageUri({
 			assetBaseStorageUri,
-			assetPath: usesBrotliAsset ? `${assetPath}.br` : assetPath,
+			assetPath: downloadPath,
 			fileHash: asset.fileHash
 		});
 		const patch = patchDescriptor?.assetPath === assetPath ? patchDescriptor.patch : null;
@@ -6528,9 +6557,17 @@ function isPlatformDirectoryPrefix(prefix) {
 	const lastSegment = getLastDirectorySegment(prefix);
 	return lastSegment === "ios" || lastSegment === "android";
 }
+function isLegacyBundleStorageDirectoryPrefix(prefix) {
+	const lastSegment = getLastDirectorySegment(prefix);
+	return lastSegment !== void 0 && /^[0-9a-f]{8}-[0-9a-f]{4}-7[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(lastSegment);
+}
 function isUpdateJsonKey(key) {
 	return key.endsWith(`${S3_DIRECTORY_DELIMITER}update.json`);
 }
+function isUuidChannelUpdateJsonKey(key, rootPrefix, uuidChannels) {
+	const [channel, platform, target, fileName, ...rest] = getRelativeDirectoryPrefix(key, rootPrefix).split(S3_DIRECTORY_DELIMITER);
+	return channel !== void 0 && uuidChannels.has(channel) && (platform === "ios" || platform === "android") && target !== void 0 && target.length > 0 && fileName === "update.json" && rest.length === 0;
+}
 async function mapWithConcurrency(items, concurrency, mapper) {
 	const results = [];
 	let nextIndex = 0;
@@ -6585,7 +6622,7 @@ async function uploadJsonToS3(client, bucket, key, data) {
 }
 async function listObjectsInS3(client, bucketName, prefix, rootPrefix = "") {
 	const normalizedRootPrefix = normalizeDirectoryPrefix(rootPrefix);
-	const listPrefix = async (currentPrefix) => {
+	const listPrefix = async (currentPrefix, delimiter = S3_DIRECTORY_DELIMITER) => {
 		let continuationToken;
 		const keys = [];
 		const commonPrefixes = /* @__PURE__ */ new Set();
@@ -6593,7 +6630,7 @@ async function listObjectsInS3(client, bucketName, prefix, rootPrefix = "") {
 			const response = await client.send(new _aws_sdk_client_s3.ListObjectsV2Command({
 				Bucket: bucketName,
 				Prefix: currentPrefix,
-				Delimiter: S3_DIRECTORY_DELIMITER,
+				Delimiter: delimiter ?? void 0,
 				ContinuationToken: continuationToken
 			}));
 			const found = (response.Contents ?? []).map((item) => item.Key).filter((key) => !!key);
@@ -6610,7 +6647,12 @@ async function listObjectsInS3(client, bucketName, prefix, rootPrefix = "") {
 		const { commonPrefixes, keys } = await listPrefix(currentPrefix);
 		const depth = getDirectoryDepth(currentPrefix, normalizedRootPrefix);
 		if (depth >= 2) return [...keys.filter(isUpdateJsonKey), ...commonPrefixes.map((commonPrefix) => `${commonPrefix}update.json`)];
-		return (await mapWithConcurrency(depth === 1 ? commonPrefixes.filter(isPlatformDirectoryPrefix) : commonPrefixes, S3_LIST_OBJECTS_CONCURRENCY, (nextPrefix) => collectUpdateJsonKeys(nextPrefix))).flat();
+		const uuidPrefixes = depth === 0 ? commonPrefixes.filter(isLegacyBundleStorageDirectoryPrefix) : [];
+		const uuidPrefixSet = new Set(uuidPrefixes);
+		const nestedKeys = await mapWithConcurrency(depth === 0 ? commonPrefixes.filter((commonPrefix) => !uuidPrefixSet.has(commonPrefix)) : depth === 1 ? commonPrefixes.filter(isPlatformDirectoryPrefix) : commonPrefixes, S3_LIST_OBJECTS_CONCURRENCY, (nextPrefix) => collectUpdateJsonKeys(nextPrefix));
+		const uuidChannels = new Set(uuidPrefixes.map(getLastDirectorySegment).filter((segment) => !!segment));
+		const uuidChannelKeys = (await mapWithConcurrency(Array.from(new Set(Array.from(uuidChannels, (channel) => `${normalizedRootPrefix}${channel[0]}`))), S3_LIST_OBJECTS_CONCURRENCY, async (scanPrefix) => (await listPrefix(scanPrefix, null)).keys)).flat().filter((key) => isUuidChannelUpdateJsonKey(key, normalizedRootPrefix, uuidChannels));
+		return [...nestedKeys.flat(), ...uuidChannelKeys];
 	};
 	const normalizedPrefix = normalizeDirectoryPrefix(prefix);
 	return Array.from(new Set(await collectUpdateJsonKeys(normalizedPrefix)));
@@ -6695,9 +6737,56 @@ const s3Storage = createUniversalStoragePlugin({
 	factory: (config) => {
 		const { bucketName, ...s3Config } = config;
 		const client = new _aws_sdk_client_s3.S3Client(applyS3RuntimeAwsConfig(s3Config));
-		const getStorageKey = createStorageKeyBuilder(config.basePath);
+		const normalizedBasePath = config.basePath?.replace(/^\/+|\/+$/g, "") ?? "";
+		const getStorageKey = createStorageKeyBuilder(normalizedBasePath);
+		const getListPrefix = (prefix = "") => {
+			const value = [normalizedBasePath, prefix.replace(/^\/+|\/+$/g, "")].filter(Boolean).join("/");
+			return value ? `${value}/` : "";
+		};
+		const getRelativeKey = (key) => {
+			if (!normalizedBasePath) return key;
+			const basePrefix = `${normalizedBasePath}/`;
+			return key.startsWith(basePrefix) ? key.slice(basePrefix.length) : key;
+		};
 		return {
 			node: {
+				async listObjects(prefix) {
+					const objects = [];
+					let continuationToken;
+					do {
+						const response = await client.send(new _aws_sdk_client_s3.ListObjectsV2Command({
+							Bucket: bucketName,
+							ContinuationToken: continuationToken,
+							Prefix: getListPrefix(prefix)
+						}));
+						for (const object of response.Contents ?? []) {
+							if (!object.Key) continue;
+							objects.push({
+								key: getRelativeKey(object.Key),
+								lastModifiedAt: object.LastModified,
+								size: object.Size ?? 0,
+								storageUri: `s3://${bucketName}/${object.Key}`
+							});
+						}
+						continuationToken = response.NextContinuationToken;
+					} while (continuationToken);
+					return objects;
+				},
+				async deleteObjects(relativeKeys) {
+					const keys = relativeKeys.map((key) => getStorageKey(key));
+					for (let offset = 0; offset < keys.length; offset += 1e3) {
+						const batch = keys.slice(offset, offset + 1e3);
+						if (batch.length === 0) continue;
+						const response = await client.send(new _aws_sdk_client_s3.DeleteObjectsCommand({
+							Bucket: bucketName,
+							Delete: {
+								Objects: batch.map((Key) => ({ Key })),
+								Quiet: true
+							}
+						}));
+						if (response.Errors && response.Errors.length > 0) throw new Error(`Failed to delete ${response.Errors.length} S3 object(s).`);
+					}
+				},
 				async delete(storageUri) {
 					const { bucket, key } = parseStorageUri(storageUri, "s3");
 					if (bucket !== bucketName) throw new Error(`Bucket name mismatch: expected "${bucketName}", but found "${bucket}".`);

package/package.json

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