@fluxmedia/s3 1.0.2 → 2.0.1

package/dist/index.cjs

@@ -113,7 +113,9 @@ var S3Provider = class {
         secretAccessKey: this.config.secretAccessKey
       },
       ...this.config.endpoint && { endpoint: this.config.endpoint },
-      ...this.config.forcePathStyle !== void 0 && { forcePathStyle: this.config.forcePathStyle }
+      ...this.config.forcePathStyle !== void 0 && {
+        forcePathStyle: this.config.forcePathStyle
+      }
     });
     this.client = client;
     return client;
@@ -123,7 +125,12 @@ var S3Provider = class {
     const Upload = await getUploadClass();
     try {
       const key = this.generateKey(options);
-      const { contentType, extension } = await this.getContentType(file);
+      const isStream = this.isStreamInput(file);
+      const { contentType, extension } = isStream ? {
+        contentType: options?.contentType ?? "application/octet-stream",
+        extension: options?.contentType ? this.extensionFromMime(options.contentType) : ""
+      } : await this.getContentType(file);
+      const hasRetryConfig = !!options?.metadata?._retry;
       const upload = new Upload({
         client,
         params: {
@@ -141,20 +148,29 @@ var S3Provider = class {
         // Upload 4 parts in parallel
         partSize: 5 * 1024 * 1024,
         // 5MB per part (S3 minimum)
-        leavePartsOnError: false
-        // Auto-cleanup failed uploads
+        leavePartsOnError: hasRetryConfig,
+        // Keep parts for resume when retry is configured
+        ...options?.signal && { abortController: new AbortController() }
       });
-      if (options?.onProgress) {
+      if (options?.onProgress || options?.onByteProgress) {
         upload.on("httpUploadProgress", (progress) => {
-          if (progress.total) {
+          if (options?.onByteProgress) {
+            options.onByteProgress(progress.loaded ?? 0, progress.total);
+          }
+          if (options?.onProgress && progress.total) {
             const percentComplete = progress.loaded / progress.total * 100;
             options.onProgress(percentComplete);
           }
         });
       }
       await upload.done();
-      const size = file instanceof Buffer ? file.byteLength : file.size;
-      return this.createResult(key, size, extension, options?.metadata);
+      const size = file instanceof Buffer ? file.byteLength : typeof File !== "undefined" && file instanceof File ? file.size : 0;
+      return this.createResult(
+        key,
+        size,
+        extension,
+        options?.metadata
+      );
     } catch (error) {
       throw this.mapS3Error(error, core.MediaErrorCode.UPLOAD_FAILED);
     }
@@ -291,13 +307,49 @@ var S3Provider = class {
   async getContentType(file) {
     if (file instanceof Buffer) {
       const detected = await core.getFileType(file);
-      return { contentType: detected?.mime ?? "application/octet-stream", extension: detected?.ext ?? "" };
+      return {
+        contentType: detected?.mime ?? "application/octet-stream",
+        extension: detected?.ext ?? ""
+      };
     }
-    return { contentType: file.type || "application/octet-stream", extension: file.name.split(".").pop() || "" };
+    return {
+      contentType: file.type || "application/octet-stream",
+      extension: file.name.split(".").pop() || ""
+    };
+  }
+  /**
+   * Check whether the given input is a stream (Node.js Readable or Web ReadableStream).
+   */
+  isStreamInput(file) {
+    if (file instanceof Buffer) return false;
+    if (typeof File !== "undefined" && file instanceof File) return false;
+    return typeof file.pipe === "function" || typeof file.getReader === "function";
+  }
+  /**
+   * Derive a file extension from a MIME type string.
+   */
+  extensionFromMime(mime) {
+    const map = {
+      "image/jpeg": "jpg",
+      "image/png": "png",
+      "image/gif": "gif",
+      "image/webp": "webp",
+      "image/avif": "avif",
+      "image/svg+xml": "svg",
+      "video/mp4": "mp4",
+      "video/webm": "webm",
+      "video/quicktime": "mov",
+      "audio/mpeg": "mp3",
+      "audio/wav": "wav",
+      "application/pdf": "pdf",
+      "application/octet-stream": ""
+    };
+    return map[mime] ?? mime.split("/").pop() ?? "";
   }
   createResult(key, size, extension, metadata) {
     return {
       id: key,
+      storageKey: key,
       url: this.getUrl(key),
       publicUrl: this.getUrl(key),
       size,

package/dist/index.js

@@ -111,7 +111,9 @@ var S3Provider = class {
         secretAccessKey: this.config.secretAccessKey
       },
       ...this.config.endpoint && { endpoint: this.config.endpoint },
-      ...this.config.forcePathStyle !== void 0 && { forcePathStyle: this.config.forcePathStyle }
+      ...this.config.forcePathStyle !== void 0 && {
+        forcePathStyle: this.config.forcePathStyle
+      }
     });
     this.client = client;
     return client;
@@ -121,7 +123,12 @@ var S3Provider = class {
     const Upload = await getUploadClass();
     try {
       const key = this.generateKey(options);
-      const { contentType, extension } = await this.getContentType(file);
+      const isStream = this.isStreamInput(file);
+      const { contentType, extension } = isStream ? {
+        contentType: options?.contentType ?? "application/octet-stream",
+        extension: options?.contentType ? this.extensionFromMime(options.contentType) : ""
+      } : await this.getContentType(file);
+      const hasRetryConfig = !!options?.metadata?._retry;
       const upload = new Upload({
         client,
         params: {
@@ -139,20 +146,29 @@ var S3Provider = class {
         // Upload 4 parts in parallel
         partSize: 5 * 1024 * 1024,
         // 5MB per part (S3 minimum)
-        leavePartsOnError: false
-        // Auto-cleanup failed uploads
+        leavePartsOnError: hasRetryConfig,
+        // Keep parts for resume when retry is configured
+        ...options?.signal && { abortController: new AbortController() }
       });
-      if (options?.onProgress) {
+      if (options?.onProgress || options?.onByteProgress) {
         upload.on("httpUploadProgress", (progress) => {
-          if (progress.total) {
+          if (options?.onByteProgress) {
+            options.onByteProgress(progress.loaded ?? 0, progress.total);
+          }
+          if (options?.onProgress && progress.total) {
             const percentComplete = progress.loaded / progress.total * 100;
             options.onProgress(percentComplete);
           }
         });
       }
       await upload.done();
-      const size = file instanceof Buffer ? file.byteLength : file.size;
-      return this.createResult(key, size, extension, options?.metadata);
+      const size = file instanceof Buffer ? file.byteLength : typeof File !== "undefined" && file instanceof File ? file.size : 0;
+      return this.createResult(
+        key,
+        size,
+        extension,
+        options?.metadata
+      );
     } catch (error) {
       throw this.mapS3Error(error, MediaErrorCode.UPLOAD_FAILED);
     }
@@ -289,13 +305,49 @@ var S3Provider = class {
   async getContentType(file) {
     if (file instanceof Buffer) {
       const detected = await getFileType(file);
-      return { contentType: detected?.mime ?? "application/octet-stream", extension: detected?.ext ?? "" };
+      return {
+        contentType: detected?.mime ?? "application/octet-stream",
+        extension: detected?.ext ?? ""
+      };
     }
-    return { contentType: file.type || "application/octet-stream", extension: file.name.split(".").pop() || "" };
+    return {
+      contentType: file.type || "application/octet-stream",
+      extension: file.name.split(".").pop() || ""
+    };
+  }
+  /**
+   * Check whether the given input is a stream (Node.js Readable or Web ReadableStream).
+   */
+  isStreamInput(file) {
+    if (file instanceof Buffer) return false;
+    if (typeof File !== "undefined" && file instanceof File) return false;
+    return typeof file.pipe === "function" || typeof file.getReader === "function";
+  }
+  /**
+   * Derive a file extension from a MIME type string.
+   */
+  extensionFromMime(mime) {
+    const map = {
+      "image/jpeg": "jpg",
+      "image/png": "png",
+      "image/gif": "gif",
+      "image/webp": "webp",
+      "image/avif": "avif",
+      "image/svg+xml": "svg",
+      "video/mp4": "mp4",
+      "video/webm": "webm",
+      "video/quicktime": "mov",
+      "audio/mpeg": "mp3",
+      "audio/wav": "wav",
+      "application/pdf": "pdf",
+      "application/octet-stream": ""
+    };
+    return map[mime] ?? mime.split("/").pop() ?? "";
   }
   createResult(key, size, extension, metadata) {
     return {
       id: key,
+      storageKey: key,
       url: this.getUrl(key),
       publicUrl: this.getUrl(key),
       size,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluxmedia/s3",
-  "version": "1.0.2",
+  "version": "2.0.1",
   "description": "AWS S3 provider for FluxMedia - unified media upload library",
   "keywords": [
     "fluxmedia",
@@ -41,7 +41,7 @@
     "!dist/**/*.map"
   ],
   "dependencies": {
-    "@fluxmedia/core": "1.0.2"
+    "@fluxmedia/core": "2.0.1"
   },
   "devDependencies": {
     "@aws-sdk/client-s3": "^3.980.0",