@tradly/asset 1.0.19 → 1.0.21

package/dist/core/MediaApiService.js

@@ -164,26 +164,123 @@ var MediaApiService = /*#__PURE__*/function () {
       return fetchMedia;
     }()
     /**
-     * Get S3 signed upload URLs from API
+     * Upload a single file to S3 using signed URL
+     * Handles both web File objects and React Native file URIs
      */
     )
   }, {
-    key: "getS3SignedUrls",
+    key: "uploadFileToS3",
     value: (function () {
-      var _getS3SignedUrls = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(files, authKey) {
-        var auth_key, fileData, headers, _response$data$data, response, _t2;
+      var _uploadFileToS = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(signedUrl, fileUriOrFile, mimeType) {
+        var blob, response, _response, uploadResponse, errorText, _t2;
         return _regenerator().w(function (_context3) {
           while (1) switch (_context3.p = _context3.n) {
+            case 0:
+              _context3.p = 0;
+              if (!(typeof fileUriOrFile === "string")) {
+                _context3.n = 4;
+                break;
+              }
+              _context3.n = 1;
+              return fetch(fileUriOrFile);
+            case 1:
+              response = _context3.v;
+              if (response.ok) {
+                _context3.n = 2;
+                break;
+              }
+              throw new Error("Failed to fetch file: ".concat(response.status, " ").concat(response.statusText));
+            case 2:
+              _context3.n = 3;
+              return response.blob();
+            case 3:
+              blob = _context3.v;
+              _context3.n = 9;
+              break;
+            case 4:
+              if (!(fileUriOrFile && fileUriOrFile.uri)) {
+                _context3.n = 8;
+                break;
+              }
+              _context3.n = 5;
+              return fetch(fileUriOrFile.uri);
+            case 5:
+              _response = _context3.v;
+              if (_response.ok) {
+                _context3.n = 6;
+                break;
+              }
+              throw new Error("Failed to fetch file: ".concat(_response.status, " ").concat(_response.statusText));
+            case 6:
+              _context3.n = 7;
+              return _response.blob();
+            case 7:
+              blob = _context3.v;
+              _context3.n = 9;
+              break;
+            case 8:
+              // Web: fileUriOrFile is already a File/Blob object
+              blob = fileUriOrFile;
+            case 9:
+              _context3.n = 10;
+              return fetch(signedUrl, {
+                method: "PUT",
+                body: blob,
+                headers: {
+                  "Content-Type": mimeType
+                }
+              });
+            case 10:
+              uploadResponse = _context3.v;
+              if (uploadResponse.ok) {
+                _context3.n = 12;
+                break;
+              }
+              _context3.n = 11;
+              return uploadResponse.text().catch(function () {
+                return "";
+              });
+            case 11:
+              errorText = _context3.v;
+              throw new Error("S3 upload failed: ".concat(uploadResponse.status, " ").concat(uploadResponse.statusText).concat(errorText ? " - ".concat(errorText) : ""));
+            case 12:
+              _context3.n = 14;
+              break;
+            case 13:
+              _context3.p = 13;
+              _t2 = _context3.v;
+              throw new Error(_t2.message || "Failed to upload file to S3");
+            case 14:
+              return _context3.a(2);
+          }
+        }, _callee3, null, [[0, 13]]);
+      }));
+      function uploadFileToS3(_x3, _x4, _x5) {
+        return _uploadFileToS.apply(this, arguments);
+      }
+      return uploadFileToS3;
+    }()
+    /**
+     * Get S3 signed upload URLs from API
+     */
+    )
+  }, {
+    key: "getS3SignedUrls",
+    value: (function () {
+      var _getS3SignedUrls = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(files, authKey) {
+        var auth_key, fileData, headers, _response$data$data, response, _t3;
+        return _regenerator().w(function (_context4) {
+          while (1) switch (_context4.p = _context4.n) {
             case 0:
               auth_key = authKey || this.authKey;
               if (auth_key) {
-                _context3.n = 1;
+                _context4.n = 1;
                 break;
               }
               throw new Error("Authentication key is required for upload");
             case 1:
               if (this.apiBaseUrl) {
-                _context3.n = 2;
+                _context4.n = 2;
                 break;
               }
               throw new Error('API base URL is required. The package automatically detects it from ENVIRONMENT, or you can set apiBaseUrl in config: new MediaApiService({ apiBaseUrl: "https://api.tradly.app" })');
@@ -203,8 +300,8 @@ var MediaApiService = /*#__PURE__*/function () {
               if (this.bearerToken) {
                 headers["Authorization"] = "Bearer ".concat(this.bearerToken);
               }
-              _context3.p = 3;
-              _context3.n = 4;
+              _context4.p = 3;
+              _context4.n = 4;
               return (0, _axios.default)({
                 method: "POST",
                 url: "".concat(this.apiBaseUrl, "/v1/utils/S3signedUploadURL"),
@@ -214,28 +311,28 @@ var MediaApiService = /*#__PURE__*/function () {
                 }
               });
             case 4:
-              response = _context3.v;
+              response = _context4.v;
               if (!response.data.error) {
-                _context3.n = 5;
+                _context4.n = 5;
                 break;
               }
               throw new Error(response.data.error);
             case 5:
-              return _context3.a(2, response.data.result || ((_response$data$data = response.data.data) === null || _response$data$data === void 0 ? void 0 : _response$data$data.result) || response.data);
+              return _context4.a(2, response.data.result || ((_response$data$data = response.data.data) === null || _response$data$data === void 0 ? void 0 : _response$data$data.result) || response.data);
             case 6:
-              _context3.p = 6;
-              _t2 = _context3.v;
-              console.error("Error getting S3 signed URLs:", _t2);
+              _context4.p = 6;
+              _t3 = _context4.v;
+              console.error("Error getting S3 signed URLs:", _t3);
               if (this.onError) {
-                this.onError(_t2);
+                this.onError(_t3);
               }
-              throw _t2;
+              throw _t3;
             case 7:
-              return _context3.a(2);
+              return _context4.a(2);
           }
-        }, _callee3, this, [[3, 6]]);
+        }, _callee4, this, [[3, 6]]);
       }));
-      function getS3SignedUrls(_x3, _x4) {
+      function getS3SignedUrls(_x6, _x7) {
         return _getS3SignedUrls.apply(this, arguments);
       }
       return getS3SignedUrls;
@@ -248,14 +345,14 @@ var MediaApiService = /*#__PURE__*/function () {
   }, {
     key: "uploadMedia",
     value: (function () {
-      var _uploadMedia = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(files, authKey) {
-        var auth_key, all_files_uri, upload_files, upload_full_files, i, element, file_data, responseFiles, index, path, fileURI, originalFile, fileBody, uri, fileResponse, arrayBuffer, res, errorText, mediaData, _t3, _t4, _t5;
-        return _regenerator().w(function (_context4) {
-          while (1) switch (_context4.p = _context4.n) {
+      var _uploadMedia = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(files, authKey) {
+        var auth_key, all_files_uri, upload_files, upload_full_files, i, element, cleanFileName, file_data, responseFiles, index, path, fileURI, originalFile, mimeType, fileInput, mediaData, _t4, _t5;
+        return _regenerator().w(function (_context5) {
+          while (1) switch (_context5.p = _context5.n) {
             case 0:
               auth_key = authKey || this.authKey;
               if (auth_key) {
-                _context4.n = 1;
+                _context5.n = 1;
                 break;
               }
               throw new Error("Authentication key is required for upload");
@@ -266,7 +363,7 @@ var MediaApiService = /*#__PURE__*/function () {
               i = 0;
             case 2:
               if (!(i < files.length)) {
-                _context4.n = 27;
+                _context5.n = 14;
                 break;
               }
               element = files[i]; // Check if file already has a path (from previous upload)
@@ -274,9 +371,11 @@ var MediaApiService = /*#__PURE__*/function () {
                 all_files_uri.push(element.path);
               } else {
                 // Prepare file data for upload
+                // Clean file name: remove spaces (following user's pattern: fileName.replace(/ /g, ""))
+                cleanFileName = element.name.replace(/\s/g, "");
                 file_data = {
-                  name: element.name.replace(/\s/g, "-"),
-                  type: element.type
+                  name: cleanFileName,
+                  type: element.type || "image/jpeg" // Default MIME type
                 };
                 upload_files.push(file_data);
                 upload_full_files.push(element);
@@ -284,138 +383,47 @@ var MediaApiService = /*#__PURE__*/function () {
 
               // Upload files when we've processed all files
               if (!(files.length === i + 1 && upload_files.length > 0)) {
-                _context4.n = 26;
+                _context5.n = 13;
                 break;
               }
-              _context4.p = 3;
-              _context4.n = 4;
+              _context5.p = 3;
+              _context5.n = 4;
               return this.getS3SignedUrls(upload_full_files, auth_key);
             case 4:
-              responseFiles = _context4.v;
+              responseFiles = _context5.v;
               index = 0;
             case 5:
               if (!(index < responseFiles.length)) {
-                _context4.n = 23;
+                _context5.n = 10;
                 break;
               }
               path = responseFiles[index].signedUrl;
               fileURI = responseFiles[index].fileUri;
               originalFile = upload_full_files[index];
-              _context4.p = 6;
-              fileBody = originalFile; // Handle React Native file URIs
-              // If file has a uri property, it's from React Native - fetch it first
-              if (!(originalFile.uri && typeof originalFile.uri === "string")) {
-                _context4.n = 16;
-                break;
-              }
-              // For React Native, handle file://, content://, or http:// URIs
-              uri = originalFile.uri;
-              _context4.p = 7;
-              // For React Native file:// URIs, fetch should work
-              // Convert file:// URI to blob for S3 upload
-              console.log("Fetching file from URI:", uri);
-              _context4.n = 8;
-              return fetch(uri);
-            case 8:
-              fileResponse = _context4.v;
-              if (fileResponse.ok) {
-                _context4.n = 9;
-                break;
-              }
-              throw new Error("Failed to fetch file: ".concat(fileResponse.status, " ").concat(fileResponse.statusText));
-            case 9:
-              if (!fileResponse.blob) {
-                _context4.n = 11;
-                break;
-              }
-              _context4.n = 10;
-              return fileResponse.blob();
-            case 10:
-              fileBody = _context4.v;
-              console.log("File converted to blob, size:", fileBody.size);
-              _context4.n = 14;
-              break;
-            case 11:
-              if (!fileResponse.arrayBuffer) {
-                _context4.n = 13;
-                break;
-              }
-              _context4.n = 12;
-              return fileResponse.arrayBuffer();
-            case 12:
-              arrayBuffer = _context4.v;
-              // Check if Blob constructor is available
-              if (typeof Blob !== "undefined") {
-                fileBody = new Blob([arrayBuffer], {
-                  type: upload_files[index].type
-                });
-              } else {
-                // If Blob is not available, use arrayBuffer directly
-                fileBody = arrayBuffer;
-              }
-              _context4.n = 14;
-              break;
-            case 13:
-              // Last resort: use response directly (might not work for all cases)
-              fileBody = fileResponse;
-            case 14:
-              _context4.n = 16;
-              break;
-            case 15:
-              _context4.p = 15;
-              _t3 = _context4.v;
-              console.error("Error fetching file from URI:", _t3);
-              console.error("URI was:", uri);
-              console.error("File details:", {
-                name: originalFile.name,
-                type: originalFile.type
-              });
-              throw new Error("Failed to read file from URI: ".concat(uri, ". Error: ").concat(_t3.message, ". Make sure the file URI is accessible."));
-            case 16:
-              // Upload to S3 using PUT request
-              console.log("Uploading to S3:", path);
-              console.log("File type:", upload_files[index].type);
-              _context4.n = 17;
-              return fetch(path, {
-                method: "PUT",
-                headers: {
-                  "Content-Type": upload_files[index].type
-                },
-                body: fileBody
-              });
-            case 17:
-              res = _context4.v;
-              if (!res.ok) {
-                _context4.n = 18;
-                break;
-              }
-              console.log("File ".concat(index + 1, " uploaded successfully"));
+              mimeType = upload_files[index].type;
+              _context5.p = 6;
+              // Upload file to S3 using the signed URL
+              // uploadFileToS3 handles both web File objects and React Native URIs
+              fileInput = originalFile.uri || originalFile;
+              _context5.n = 7;
+              return this.uploadFileToS3(path, fileInput, mimeType);
+            case 7:
               all_files_uri.push(fileURI);
-              _context4.n = 20;
+              _context5.n = 9;
               break;
-            case 18:
-              _context4.n = 19;
-              return res.text().catch(function () {
-                return "";
-              });
-            case 19:
-              errorText = _context4.v;
-              console.error("Failed to upload file ".concat(index + 1, ":"), res.status, res.statusText, errorText);
-              throw new Error("S3 upload failed: ".concat(res.status, " ").concat(res.statusText));
-            case 20:
-              _context4.n = 22;
-              break;
-            case 21:
-              _context4.p = 21;
-              _t4 = _context4.v;
+            case 8:
+              _context5.p = 8;
+              _t4 = _context5.v;
               console.error("Error uploading file ".concat(index + 1, ":"), _t4);
-            case 22:
+              // Re-throw to stop the upload process
+              throw _t4;
+            case 9:
               index++;
-              _context4.n = 5;
+              _context5.n = 5;
               break;
-            case 23:
+            case 10:
               if (!(all_files_uri.length > 0)) {
-                _context4.n = 24;
+                _context5.n = 11;
                 break;
               }
               mediaData = all_files_uri.map(function (url, index) {
@@ -424,11 +432,11 @@ var MediaApiService = /*#__PURE__*/function () {
                   type: 1,
                   parent: 0,
                   url: url,
-                  name: originalFile.name.replace(/\s/g, "-"),
+                  name: originalFile.name.replace(/\s/g, ""),
                   mime_type: originalFile.type
                 };
               }); // Save to media API - POST /v1/media with { media: [...] }
-              _context4.n = 24;
+              _context5.n = 11;
               return this.apiCall({
                 method: "POST",
                 path: "/v1/media",
@@ -436,27 +444,27 @@ var MediaApiService = /*#__PURE__*/function () {
                   media: mediaData
                 }
               });
-            case 24:
-              _context4.n = 26;
+            case 11:
+              _context5.n = 13;
               break;
-            case 25:
-              _context4.p = 25;
-              _t5 = _context4.v;
+            case 12:
+              _context5.p = 12;
+              _t5 = _context5.v;
               console.error("Upload error:", _t5);
               if (this.onError) {
                 this.onError(_t5);
               }
               throw _t5;
-            case 26:
+            case 13:
               i++;
-              _context4.n = 2;
+              _context5.n = 2;
               break;
-            case 27:
-              return _context4.a(2, all_files_uri);
+            case 14:
+              return _context5.a(2, all_files_uri);
           }
-        }, _callee4, this, [[7, 15], [6, 21], [3, 25]]);
+        }, _callee5, this, [[6, 8], [3, 12]]);
       }));
-      function uploadMedia(_x5, _x6) {
+      function uploadMedia(_x8, _x9) {
         return _uploadMedia.apply(this, arguments);
       }
       return uploadMedia;