@hot-updater/aws 0.20.11 → 0.20.12

package/dist/index.cjs

@@ -29,10 +29,10 @@ let __aws_sdk_lib_storage = require("@aws-sdk/lib-storage");
 __aws_sdk_lib_storage = __toESM(__aws_sdk_lib_storage);
 let __hot_updater_plugin_core = require("@hot-updater/plugin-core");
 __hot_updater_plugin_core = __toESM(__hot_updater_plugin_core);
-let path = require("path");
-path = __toESM(path);
 let fs_promises = require("fs/promises");
 fs_promises = __toESM(fs_promises);
+let path = require("path");
+path = __toESM(path);
 
 //#region ../../node_modules/.pnpm/mime@4.0.4/node_modules/mime/dist/types/other.js
 const types$1 = {
@@ -1337,8 +1337,7 @@ var Mime = class {
 		const last = path$2.replace(/^.*[/\\]/, "").toLowerCase();
 		const ext = last.replace(/^.*\./, "").toLowerCase();
 		const hasPath = last.length < path$2.length;
-		const hasDot = ext.length < last.length - 1;
-		if (!hasDot && hasPath) return null;
+		if (!(ext.length < last.length - 1) && hasPath) return null;
 		return __classPrivateFieldGet(this, _Mime_extensionToType, "f").get(ext) ?? null;
 	}
 	getExtension(type) {
@@ -1407,19 +1406,16 @@ async function loadJsonFromS3(client, bucket, key) {
 * Converts data to JSON string and uploads to S3.
 */
 async function uploadJsonToS3(client, bucket, key, data) {
-	const Body = JSON.stringify(data);
-	const ContentType = src_default.getType(key) ?? "application/json";
-	const upload = new __aws_sdk_lib_storage.Upload({
+	await new __aws_sdk_lib_storage.Upload({
 		client,
 		params: {
 			Bucket: bucket,
 			Key: key,
-			Body,
-			ContentType,
+			Body: JSON.stringify(data),
+			ContentType: src_default.getType(key) ?? "application/json",
 			CacheControl: "max-age=31536000"
 		}
-	});
-	await upload.done();
+	}).done();
 }
 async function listObjectsInS3(client, bucketName, prefix) {
 	let continuationToken;
@@ -1447,7 +1443,7 @@ async function deleteObjectInS3(client, bucketName, key) {
 */
 async function invalidateCloudFront(client, distributionId, paths) {
 	if (paths.length === 0) return;
-	const timestamp = (/* @__PURE__ */ new Date()).getTime();
+	const timestamp = Date.now();
 	await client.send(new __aws_sdk_client_cloudfront.CreateInvalidationCommand({
 		DistributionId: distributionId,
 		InvalidationBatch: {
@@ -1500,15 +1496,13 @@ const s3Storage = (config, hooks) => (_) => {
 			});
 			const listResponse = await client.send(listCommand);
 			if (listResponse.Contents && listResponse.Contents.length > 0) {
-				const objectsToDelete = listResponse.Contents.map((obj) => ({ Key: obj.Key }));
-				const deleteParams = {
+				const deleteCommand = new __aws_sdk_client_s3.DeleteObjectsCommand({
 					Bucket: bucketName,
 					Delete: {
-						Objects: objectsToDelete,
+						Objects: listResponse.Contents.map((obj) => ({ Key: obj.Key })),
 						Quiet: true
 					}
-				};
-				const deleteCommand = new __aws_sdk_client_s3.DeleteObjectsCommand(deleteParams);
+				});
 				await client.send(deleteCommand);
 				return { storageUri: `s3://${bucketName}/${Key}` };
 			}
@@ -1517,9 +1511,8 @@ const s3Storage = (config, hooks) => (_) => {
 		async uploadBundle(bundleId, bundlePath) {
 			const Body = await fs_promises.default.readFile(bundlePath);
 			const ContentType = src_default.getType(bundlePath) ?? void 0;
-			const filename = path.default.basename(bundlePath);
-			const Key = getStorageKey(bundleId, filename);
-			const upload = new __aws_sdk_lib_storage.Upload({
+			const Key = getStorageKey(bundleId, path.default.basename(bundlePath));
+			const response = await new __aws_sdk_lib_storage.Upload({
 				client,
 				params: {
 					ContentType,
@@ -1528,8 +1521,7 @@ const s3Storage = (config, hooks) => (_) => {
 					Body,
 					CacheControl: "max-age=31536000"
 				}
-			});
-			const response = await upload.done();
+			}).done();
 			if (!response.Bucket || !response.Key) throw new Error("Upload Failed");
 			hooks?.onStorageUploaded?.();
 			return { storageUri: `s3://${bucketName}/${Key}` };

package/dist/index.js

@@ -2,8 +2,8 @@ import { CloudFrontClient, CreateInvalidationCommand } from "@aws-sdk/client-clo
 import { DeleteObjectCommand, DeleteObjectsCommand, GetObjectCommand, ListObjectsV2Command, NoSuchKey, S3Client } from "@aws-sdk/client-s3";
 import { Upload } from "@aws-sdk/lib-storage";
 import { createBlobDatabasePlugin, createStorageKeyBuilder } from "@hot-updater/plugin-core";
-import path from "path";
 import fs from "fs/promises";
+import path from "path";
 
 //#region ../../node_modules/.pnpm/mime@4.0.4/node_modules/mime/dist/types/other.js
 const types$1 = {
@@ -1308,8 +1308,7 @@ var Mime = class {
 		const last = path$1.replace(/^.*[/\\]/, "").toLowerCase();
 		const ext = last.replace(/^.*\./, "").toLowerCase();
 		const hasPath = last.length < path$1.length;
-		const hasDot = ext.length < last.length - 1;
-		if (!hasDot && hasPath) return null;
+		if (!(ext.length < last.length - 1) && hasPath) return null;
 		return __classPrivateFieldGet(this, _Mime_extensionToType, "f").get(ext) ?? null;
 	}
 	getExtension(type) {
@@ -1378,19 +1377,16 @@ async function loadJsonFromS3(client, bucket, key) {
 * Converts data to JSON string and uploads to S3.
 */
 async function uploadJsonToS3(client, bucket, key, data) {
-	const Body = JSON.stringify(data);
-	const ContentType = src_default.getType(key) ?? "application/json";
-	const upload = new Upload({
+	await new Upload({
 		client,
 		params: {
 			Bucket: bucket,
 			Key: key,
-			Body,
-			ContentType,
+			Body: JSON.stringify(data),
+			ContentType: src_default.getType(key) ?? "application/json",
 			CacheControl: "max-age=31536000"
 		}
-	});
-	await upload.done();
+	}).done();
 }
 async function listObjectsInS3(client, bucketName, prefix) {
 	let continuationToken;
@@ -1418,7 +1414,7 @@ async function deleteObjectInS3(client, bucketName, key) {
 */
 async function invalidateCloudFront(client, distributionId, paths) {
 	if (paths.length === 0) return;
-	const timestamp = (/* @__PURE__ */ new Date()).getTime();
+	const timestamp = Date.now();
 	await client.send(new CreateInvalidationCommand({
 		DistributionId: distributionId,
 		InvalidationBatch: {
@@ -1471,15 +1467,13 @@ const s3Storage = (config, hooks) => (_) => {
 			});
 			const listResponse = await client.send(listCommand);
 			if (listResponse.Contents && listResponse.Contents.length > 0) {
-				const objectsToDelete = listResponse.Contents.map((obj) => ({ Key: obj.Key }));
-				const deleteParams = {
+				const deleteCommand = new DeleteObjectsCommand({
 					Bucket: bucketName,
 					Delete: {
-						Objects: objectsToDelete,
+						Objects: listResponse.Contents.map((obj) => ({ Key: obj.Key })),
 						Quiet: true
 					}
-				};
-				const deleteCommand = new DeleteObjectsCommand(deleteParams);
+				});
 				await client.send(deleteCommand);
 				return { storageUri: `s3://${bucketName}/${Key}` };
 			}
@@ -1488,9 +1482,8 @@ const s3Storage = (config, hooks) => (_) => {
 		async uploadBundle(bundleId, bundlePath) {
 			const Body = await fs.readFile(bundlePath);
 			const ContentType = src_default.getType(bundlePath) ?? void 0;
-			const filename = path.basename(bundlePath);
-			const Key = getStorageKey(bundleId, filename);
-			const upload = new Upload({
+			const Key = getStorageKey(bundleId, path.basename(bundlePath));
+			const response = await new Upload({
 				client,
 				params: {
 					ContentType,
@@ -1499,8 +1492,7 @@ const s3Storage = (config, hooks) => (_) => {
 					Body,
 					CacheControl: "max-age=31536000"
 				}
-			});
-			const response = await upload.done();
+			}).done();
 			if (!response.Bucket || !response.Key) throw new Error("Upload Failed");
 			hooks?.onStorageUploaded?.();
 			return { storageUri: `s3://${bucketName}/${Key}` };