@kumix/storage 0.1.0 → 0.1.2

package/dist/s3.js

@@ -1,12 +1,30 @@
-import { s as loadS3Config } from "./config-t-NVJICl.js";
+import { s as loadS3Config } from "./config-By5ib98s.js";
 import { buildPublicUrl, getMimeType } from "./helpers.js";
-import { CopyObjectCommand, DeleteObjectCommand, DeleteObjectsCommand, GetObjectCommand, HeadObjectCommand, ListObjectsV2Command, PutObjectCommand, S3Client } from "@aws-sdk/client-s3";
-import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
-//#region src/operations/file-operations.ts
+//#region src/operations/s3-sdk.ts
+let s3SdkPromise;
+let presignerPromise;
 /**
-* S3 file operations implementation
-* Provides comprehensive file management operations for S3-compatible storage providers
+* Dynamically import `@aws-sdk/client-s3`, throwing a clear error when the
+* optional peer dependency is not installed.
 */
+async function loadS3Sdk() {
+	if (!s3SdkPromise) s3SdkPromise = import("@aws-sdk/client-s3").catch(() => {
+		throw new Error("@aws-sdk/client-s3 is not available. Install it to use the S3 storage provider.");
+	});
+	return s3SdkPromise;
+}
+/**
+* Dynamically import `@aws-sdk/s3-request-presigner`, throwing a clear error
+* when the optional peer dependency is not installed.
+*/
+async function loadPresigner() {
+	if (!presignerPromise) presignerPromise = import("@aws-sdk/s3-request-presigner").catch(() => {
+		throw new Error("@aws-sdk/s3-request-presigner is not available. Install it to generate presigned URLs.");
+	});
+	return presignerPromise;
+}
+//#endregion
+//#region src/operations/file-operations.ts
 /**
 * S3 file operations implementation
 * Handles all file-related operations for S3-compatible storage providers
@@ -21,6 +39,7 @@ var FileOperations = class {
 	}
 	async upload(options) {
 		try {
+			const { PutObjectCommand } = await loadS3Sdk();
 			const contentType = options.contentType || getMimeType(options.key);
 			const command = new PutObjectCommand({
 				Bucket: this.config.bucket,
@@ -30,7 +49,7 @@ var FileOperations = class {
 				Metadata: options.metadata,
 				CacheControl: options.cacheControl,
 				ContentDisposition: options.contentDisposition,
-				ACL: options.acl,
+				...options.acl && (this.config.provider === "aws" || this.config.provider === "digitalocean") ? { ACL: options.acl } : {},
 				Expires: options.expires
 			});
 			const result = await this.client.send(command);
@@ -52,6 +71,7 @@ var FileOperations = class {
 	}
 	async download(options) {
 		try {
+			const { GetObjectCommand } = await loadS3Sdk();
 			const command = new GetObjectCommand({
 				Bucket: this.config.bucket,
 				Key: options.key,
@@ -89,6 +109,7 @@ var FileOperations = class {
 	}
 	async delete(options) {
 		try {
+			const { DeleteObjectCommand } = await loadS3Sdk();
 			const command = new DeleteObjectCommand({
 				Bucket: this.config.bucket,
 				Key: options.key
@@ -104,6 +125,7 @@ var FileOperations = class {
 	}
 	async batchDelete(options) {
 		try {
+			const { DeleteObjectsCommand } = await loadS3Sdk();
 			const command = new DeleteObjectsCommand({
 				Bucket: this.config.bucket,
 				Delete: {
@@ -118,7 +140,7 @@ var FileOperations = class {
 				error: err.Message || "Unknown error"
 			})) || [];
 			return {
-				success: true,
+				success: errors.length === 0,
 				deleted,
 				errors: errors.length > 0 ? errors : void 0
 			};
@@ -134,6 +156,7 @@ var FileOperations = class {
 	}
 	async list(options = {}) {
 		try {
+			const { ListObjectsV2Command } = await loadS3Sdk();
 			const command = new ListObjectsV2Command({
 				Bucket: this.config.bucket,
 				Prefix: options.prefix,
@@ -164,6 +187,7 @@ var FileOperations = class {
 	}
 	async exists(key) {
 		try {
+			const { HeadObjectCommand } = await loadS3Sdk();
 			const command = new HeadObjectCommand({
 				Bucket: this.config.bucket,
 				Key: key
@@ -190,9 +214,10 @@ var FileOperations = class {
 	}
 	async copy(options) {
 		try {
+			const { CopyObjectCommand } = await loadS3Sdk();
 			const command = new CopyObjectCommand({
 				Bucket: this.config.bucket,
-				CopySource: `${this.config.bucket}/${options.sourceKey}`,
+				CopySource: `${this.config.bucket}/${options.sourceKey.split("/").map(encodeURIComponent).join("/")}`,
 				Key: options.destinationKey,
 				Metadata: options.metadata,
 				MetadataDirective: options.metadataDirective || "COPY"
@@ -241,6 +266,8 @@ var FileOperations = class {
 	}
 	async getPresignedUrl(options) {
 		try {
+			const { GetObjectCommand, PutObjectCommand } = await loadS3Sdk();
+			const { getSignedUrl } = await loadPresigner();
 			const expiresIn = options.expiresIn || 3600;
 			let command;
 			if (options.operation === "get") command = new GetObjectCommand({
@@ -269,15 +296,53 @@ var FileOperations = class {
 		const isSupabase = this.config.provider === "supabase";
 		if (this.config.publicUrl) return buildPublicUrl(this.config.publicUrl, isCloudflare ? "" : this.config.bucket, key, isSupabase);
 		if (this.config.endpoint) return buildPublicUrl(this.config.endpoint, this.config.bucket, key, isSupabase);
-		return `https://${this.config.bucket}.s3.${this.config.region}.amazonaws.com/${key}`;
+		if (this.config.provider === "minio") throw new Error("MinIO public URL could not be built: set `publicUrl` (or `endpoint`) on the S3 config to a publicly reachable base, since MinIO has no default public host.");
+		const encodedKey = key.split("/").map(encodeURIComponent).join("/");
+		return `https://${this.config.bucket}.s3.${this.config.region}.amazonaws.com/${encodedKey}`;
 	}
 };
 //#endregion
 //#region src/operations/folder-operations.ts
+/** S3 DeleteObjectsCommand allows at most 1000 keys per request */
+const S3_DELETE_MAX_KEYS = 1e3;
 /**
-* S3 folder operations implementation
-* Provides comprehensive folder management operations for S3-compatible storage providers
+* List ALL objects under a prefix, following pagination (handles >1000 keys)
 */
+async function listAllObjects(client, bucket, prefix) {
+	const { ListObjectsV2Command } = await loadS3Sdk();
+	const objects = [];
+	let continuationToken;
+	do {
+		const command = new ListObjectsV2Command({
+			Bucket: bucket,
+			Prefix: prefix,
+			ContinuationToken: continuationToken
+		});
+		const result = await client.send(command);
+		if (result.Contents) objects.push(...result.Contents);
+		continuationToken = result.IsTruncated ? result.NextContinuationToken : void 0;
+	} while (continuationToken);
+	return objects;
+}
+/** Delete objects in batches of 1000 (S3 hard limit per DeleteObjectsCommand) */
+async function deleteObjectsBatched(client, bucket, keys) {
+	const { DeleteObjectsCommand } = await loadS3Sdk();
+	const deleted = [];
+	for (let i = 0; i < keys.length; i += S3_DELETE_MAX_KEYS) {
+		const command = new DeleteObjectsCommand({
+			Bucket: bucket,
+			Delete: {
+				Objects: keys.slice(i, i + S3_DELETE_MAX_KEYS).map((key) => ({ Key: key })),
+				Quiet: true
+			}
+		});
+		const result = await client.send(command);
+		if (result.Deleted) {
+			for (const obj of result.Deleted) if (obj.Key) deleted.push(obj.Key);
+		}
+	}
+	return deleted;
+}
 /**
 * S3 folder operations implementation
 * Handles all folder-related operations for S3-compatible storage providers
@@ -292,6 +357,7 @@ var FolderOperations = class {
 	}
 	async createFolder(options) {
 		try {
+			const { PutObjectCommand } = await loadS3Sdk();
 			const folderPath = options.path.endsWith("/") ? options.path : `${options.path}/`;
 			const command = new PutObjectCommand({
 				Bucket: this.config.bucket,
@@ -313,27 +379,18 @@ var FolderOperations = class {
 	}
 	async deleteFolder(options) {
 		try {
+			const { DeleteObjectsCommand } = await loadS3Sdk();
 			const folderPath = options.path.endsWith("/") ? options.path : `${options.path}/`;
 			if (options.recursive) {
-				const listCommand = new ListObjectsV2Command({
-					Bucket: this.config.bucket,
-					Prefix: folderPath
-				});
-				const listResult = await this.client.send(listCommand);
-				if (!listResult.Contents || listResult.Contents.length === 0) return {
+				const allObjects = await listAllObjects(this.client, this.config.bucket, folderPath);
+				if (allObjects.length === 0) return {
 					success: true,
 					deletedFiles: []
 				};
-				const deleteCommand = new DeleteObjectsCommand({
-					Bucket: this.config.bucket,
-					Delete: {
-						Objects: listResult.Contents.map((obj) => ({ Key: obj.Key })),
-						Quiet: false
-					}
-				});
+				const keys = allObjects.map((obj) => obj.Key).filter(Boolean);
 				return {
 					success: true,
-					deletedFiles: (await this.client.send(deleteCommand)).Deleted?.map((obj) => obj.Key).filter(Boolean) || []
+					deletedFiles: await deleteObjectsBatched(this.client, this.config.bucket, keys)
 				};
 			} else {
 				const deleteCommand = new DeleteObjectsCommand({
@@ -358,6 +415,7 @@ var FolderOperations = class {
 	}
 	async listFolders(options = {}) {
 		try {
+			const { ListObjectsV2Command } = await loadS3Sdk();
 			const command = new ListObjectsV2Command({
 				Bucket: this.config.bucket,
 				Prefix: options.prefix,
@@ -372,10 +430,7 @@ var FolderOperations = class {
 					const path = cp.Prefix;
 					return {
 						name: path.split("/").filter(Boolean).pop() || "",
-						path,
-						size: 0,
-						fileCount: 0,
-						lastModified: /* @__PURE__ */ new Date()
+						path
 					};
 				}) || [],
 				files: result.Contents?.map((obj) => ({
@@ -397,6 +452,7 @@ var FolderOperations = class {
 	}
 	async folderExists(path) {
 		try {
+			const { ListObjectsV2Command } = await loadS3Sdk();
 			const folderPath = path.endsWith("/") ? path : `${path}/`;
 			const command = new ListObjectsV2Command({
 				Bucket: this.config.bucket,
@@ -408,10 +464,7 @@ var FolderOperations = class {
 				exists: true,
 				folderInfo: {
 					name: folderPath.split("/").filter(Boolean).pop() || "",
-					path: folderPath,
-					size: 0,
-					fileCount: 0,
-					lastModified: /* @__PURE__ */ new Date()
+					path: folderPath
 				}
 			};
 			return { exists: false };
@@ -424,37 +477,28 @@ var FolderOperations = class {
 	}
 	async renameFolder(options) {
 		try {
+			const { CopyObjectCommand } = await loadS3Sdk();
 			const oldPath = options.oldPath.endsWith("/") ? options.oldPath : `${options.oldPath}/`;
 			const newPath = options.newPath.endsWith("/") ? options.newPath : `${options.newPath}/`;
-			const listCommand = new ListObjectsV2Command({
-				Bucket: this.config.bucket,
-				Prefix: oldPath
-			});
-			const listResult = await this.client.send(listCommand);
-			if (!listResult.Contents || listResult.Contents.length === 0) return {
+			const allObjects = await listAllObjects(this.client, this.config.bucket, oldPath);
+			if (allObjects.length === 0) return {
 				success: true,
 				movedFiles: []
 			};
 			const movedFiles = [];
-			for (const obj of listResult.Contents) {
+			for (const obj of allObjects) {
 				const oldKey = obj.Key;
-				const newKey = oldKey.replace(oldPath, newPath);
+				const newKey = newPath + oldKey.slice(oldPath.length);
 				const copyCommand = new CopyObjectCommand({
 					Bucket: this.config.bucket,
 					Key: newKey,
-					CopySource: `${this.config.bucket}/${oldKey}`
+					CopySource: `${this.config.bucket}/${oldKey.split("/").map(encodeURIComponent).join("/")}`
 				});
 				await this.client.send(copyCommand);
 				movedFiles.push(newKey);
 			}
-			const deleteCommand = new DeleteObjectsCommand({
-				Bucket: this.config.bucket,
-				Delete: {
-					Objects: listResult.Contents.map((obj) => ({ Key: obj.Key })),
-					Quiet: true
-				}
-			});
-			await this.client.send(deleteCommand);
+			const oldKeys = allObjects.map((obj) => obj.Key).filter(Boolean);
+			await deleteObjectsBatched(this.client, this.config.bucket, oldKeys);
 			return {
 				success: true,
 				movedFiles
@@ -468,25 +512,26 @@ var FolderOperations = class {
 	}
 	async copyFolder(options) {
 		try {
+			const { CopyObjectCommand } = await loadS3Sdk();
+			const recursive = options.recursive ?? true;
 			const sourcePath = options.sourcePath.endsWith("/") ? options.sourcePath : `${options.sourcePath}/`;
 			const destPath = options.destinationPath.endsWith("/") ? options.destinationPath : `${options.destinationPath}/`;
-			const listCommand = new ListObjectsV2Command({
-				Bucket: this.config.bucket,
-				Prefix: sourcePath
-			});
-			const listResult = await this.client.send(listCommand);
-			if (!listResult.Contents || listResult.Contents.length === 0) return {
+			const allObjects = await listAllObjects(this.client, this.config.bucket, sourcePath);
+			if (allObjects.length === 0) return {
 				success: true,
 				copiedFiles: []
 			};
 			const copiedFiles = [];
-			for (const obj of listResult.Contents) {
+			for (const obj of allObjects) {
 				const sourceKey = obj.Key;
-				const destKey = sourceKey.replace(sourcePath, destPath);
+				if (!recursive) {
+					if (sourceKey.slice(sourcePath.length).includes("/")) continue;
+				}
+				const destKey = destPath + sourceKey.slice(sourcePath.length);
 				const copyCommand = new CopyObjectCommand({
 					Bucket: this.config.bucket,
 					Key: destKey,
-					CopySource: `${this.config.bucket}/${sourceKey}`
+					CopySource: `${this.config.bucket}/${sourceKey.split("/").map(encodeURIComponent).join("/")}`
 				});
 				await this.client.send(copyCommand);
 				copiedFiles.push(destKey);
@@ -506,83 +551,105 @@ var FolderOperations = class {
 //#endregion
 //#region src/providers/s3.ts
 /**
-* S3-compatible storage provider implementation
-* Provides cloud storage operations using AWS S3 SDK for S3-compatible services
-*/
-/**
 * S3-compatible storage provider
 * Implements StorageInterface for AWS S3 and S3-compatible services
 * @internal
 */
 var S3Provider = class {
-	client;
 	config;
-	fileOps;
-	folderOps;
+	_client = null;
+	_fileOps = null;
+	_folderOps = null;
 	constructor(config) {
 		this.config = config;
-		this.client = new S3Client({
-			region: config.region,
-			credentials: {
-				accessKeyId: config.accessKeyId,
-				secretAccessKey: config.secretAccessKey
-			},
-			endpoint: config.endpoint,
-			forcePathStyle: config.forcePathStyle || false
-		});
-		this.fileOps = new FileOperations(this.client, this.config);
-		this.folderOps = new FolderOperations(this.client, this.config);
+	}
+	/**
+	* Lazily construct the S3 client and operation helpers. The `@aws-sdk/client-s3`
+	* dependency is imported dynamically so the optional peer isn't required at
+	* module load — consumers using only Cloudinary can import the package without
+	* installing it.
+	*/
+	async getFileOps() {
+		if (!this._fileOps) {
+			const client = await this.getClient();
+			this._fileOps = new FileOperations(client, this.config);
+		}
+		return this._fileOps;
+	}
+	async getFolderOps() {
+		if (!this._folderOps) {
+			const client = await this.getClient();
+			this._folderOps = new FolderOperations(client, this.config);
+		}
+		return this._folderOps;
+	}
+	async getClient() {
+		if (!this._client) {
+			const { S3Client } = await loadS3Sdk();
+			this._client = new S3Client({
+				region: this.config.region,
+				credentials: {
+					accessKeyId: this.config.accessKeyId,
+					secretAccessKey: this.config.secretAccessKey,
+					...this.config.sessionToken ? { sessionToken: this.config.sessionToken } : {}
+				},
+				endpoint: this.config.endpoint,
+				forcePathStyle: this.config.forcePathStyle ?? false
+			});
+		}
+		return this._client;
 	}
 	async upload(options) {
-		return this.fileOps.upload(options);
+		return (await this.getFileOps()).upload(options);
 	}
 	async download(options) {
-		return this.fileOps.download(options);
+		return (await this.getFileOps()).download(options);
 	}
 	async delete(options) {
-		return this.fileOps.delete(options);
+		return (await this.getFileOps()).delete(options);
 	}
 	async batchDelete(options) {
-		return this.fileOps.batchDelete(options);
+		return (await this.getFileOps()).batchDelete(options);
 	}
 	async list(options) {
-		return this.fileOps.list(options);
+		return (await this.getFileOps()).list(options);
 	}
 	async exists(key) {
-		return this.fileOps.exists(key);
+		return (await this.getFileOps()).exists(key);
 	}
 	async copy(options) {
-		return this.fileOps.copy(options);
+		return (await this.getFileOps()).copy(options);
 	}
 	async move(options) {
-		return this.fileOps.move(options);
+		return (await this.getFileOps()).move(options);
 	}
 	async duplicate(options) {
-		return this.fileOps.duplicate(options);
+		return (await this.getFileOps()).duplicate(options);
 	}
 	async getPresignedUrl(options) {
-		return this.fileOps.getPresignedUrl(options);
+		return (await this.getFileOps()).getPresignedUrl(options);
 	}
 	getPublicUrl(key) {
-		return this.fileOps.getPublicUrl(key);
+		if (this._fileOps) return this._fileOps.getPublicUrl(key);
+		return new FileOperations(null, this.config).getPublicUrl(key);
 	}
 	async createFolder(options) {
-		return this.folderOps.createFolder(options);
+		return (await this.getFolderOps()).createFolder(options);
 	}
 	async deleteFolder(options) {
-		return this.folderOps.deleteFolder(options);
+		return (await this.getFolderOps()).deleteFolder(options);
 	}
 	async listFolders(options) {
-		return this.folderOps.listFolders(options);
+		return (await this.getFolderOps()).listFolders(options);
 	}
 	async folderExists(path) {
-		return this.folderOps.folderExists(path);
+		return (await this.getFolderOps()).folderExists(path);
 	}
 	async renameFolder(options) {
-		return this.folderOps.renameFolder(options);
+		return (await this.getFolderOps()).renameFolder(options);
 	}
 	async copyFolder(options) {
-		return this.folderOps.copyFolder(options);
+		return (await this.getFolderOps()).copyFolder(options);
 	}
 };
 //#endregion