@hot-updater/aws 0.35.11 → 0.36.0

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}".`);