roboto-js 1.5.0 → 1.5.1

package/dist/cjs/rbt_file.cjs

@@ -163,61 +163,67 @@ var RbtFile = exports["default"] = /*#__PURE__*/function (_EventEmitter) {
     key: "uploadFile",
     value: function uploadFile(file) {
       var _this2 = this;
-      var upload = new _tusJsClient.Upload(file, {
-        endpoint: this._axios.defaults.baseURL + "/file_service/files",
-        retryDelays: [0, 1000, 3000, 5000],
-        metadata: {
-          rbtfileid: this.id,
-          filename: file.name,
-          filetype: file.type
-        },
-        onError: function onError(error) {
-          console.error("Failed because:", error);
-          _this2.emit('error', error);
-        },
-        onProgress: function onProgress(bytesUploaded, bytesTotal) {
-          console.log("File progress", bytesUploaded, bytesTotal);
-          var percentage = (bytesUploaded / bytesTotal * 100).toFixed(2);
-          _this2.setProgress(percentage / 100); // Update progress normalized between 0 and 1
-        },
-        onSuccess: function onSuccess() {
-          console.log("File uploaded to:", upload.url);
+      return new Promise(function (resolve, reject) {
+        var upload = new _tusJsClient.Upload(file, {
+          endpoint: _this2._axios.defaults.baseURL + "/file_service/files",
+          retryDelays: [0, 1000, 3000, 5000],
+          metadata: {
+            rbtfileid: _this2.id,
+            filename: file.name,
+            filetype: file.type
+          },
+          onError: function onError(error) {
+            console.error("Failed because:", error);
+            _this2.emit('error', error);
+            reject(error); // Reject the promise on error
+          },
+          onProgress: function onProgress(bytesUploaded, bytesTotal) {
+            var percentage = (bytesUploaded / bytesTotal * 100).toFixed(2);
+            _this2.emit('progress', percentage / 100); // Emit normalized progress
+          },
+          onSuccess: function onSuccess() {
+            //console.log("File uploaded to:", upload.url);
+            var m1 = upload.url.match(/\/([^\/]+)$/);
+            var remoteId = m1 ? m1[1] : null;
+            _this2.setData({
+              'remoteId': remoteId,
+              'remoteSrc': upload.url,
+              'sourceFile': {
+                name: upload.file.name,
+                size: upload.file.size,
+                type: upload.file.type,
+                lastModified: upload.file.lastModified
+              }
+            });
 
-          // Remove the `options.endpoint` from the start of the `url`
-          var m1 = upload.url.match(/\/([^\/]+)$/);
-          var remoteId = m1 ? m1[1] : null;
-          _this2.setData({
-            'remoteId': remoteId,
-            'sourceFile': {
-              name: upload.file.name,
-              size: upload.file.size,
-              type: upload.file.type,
-              lastModified: upload.file.lastModified
-            }
-          });
-          _this2.save().then(function () {
-            _this2.emit('success', upload.url);
-          });
-        }
-      });
+            // Ensure save is called and finished before resolving the promise
+            _this2.save().then(function () {
+              _this2.emit('success', upload.url);
+              resolve(); // Resolve the promise after save is complete
+            })["catch"](function (error) {
+              console.error("Save failed:", error);
+              reject(error); // Reject the promise if save fails
+            });
+          }
+        });
 
-      // Check if there are any previous uploads to continue.
-      // upload.findPreviousUploads().then(function (previousUploads) {
-      //     // Found previous uploads so we select the first one.
-      //     if (previousUploads.length) {
-      //       upload.resumeFromPreviousUpload(previousUploads[0])
-      //     }
+        // Check if there are any previous uploads to continue.
+        // upload.findPreviousUploads().then(function (previousUploads) {
+        //     // Found previous uploads so we select the first one.
+        //     if (previousUploads.length) {
+        //       upload.resumeFromPreviousUpload(previousUploads[0])
+        //     }
 
-      //     // Start the upload
-      //     upload.start();
-      // })
-      upload.start();
+        //     // Start the upload
+        //     upload.start();
+        // })
+        upload.start(); // Start the upload
+      });
     }
   }, {
     key: "setProgress",
     value: function setProgress(newProgress) {
       this.progress = newProgress;
-      console.log("Progress: ".concat(this.progress * 100, "%"));
       this.emit('progress', this.progress); // Emit a progress event
     }
   }]);

package/dist/esm/rbt_file.js

@@ -71,59 +71,65 @@ export default class RbtFile extends EventEmitter {
     }
   }
   uploadFile(file) {
-    const upload = new Upload(file, {
-      endpoint: this._axios.defaults.baseURL + "/file_service/files",
-      retryDelays: [0, 1000, 3000, 5000],
-      metadata: {
-        rbtfileid: this.id,
-        filename: file.name,
-        filetype: file.type
-      },
-      onError: error => {
-        console.error("Failed because:", error);
-        this.emit('error', error);
-      },
-      onProgress: (bytesUploaded, bytesTotal) => {
-        console.log("File progress", bytesUploaded, bytesTotal);
-        const percentage = (bytesUploaded / bytesTotal * 100).toFixed(2);
-        this.setProgress(percentage / 100); // Update progress normalized between 0 and 1
-      },
-      onSuccess: () => {
-        console.log("File uploaded to:", upload.url);
+    return new Promise((resolve, reject) => {
+      const upload = new Upload(file, {
+        endpoint: this._axios.defaults.baseURL + "/file_service/files",
+        retryDelays: [0, 1000, 3000, 5000],
+        metadata: {
+          rbtfileid: this.id,
+          filename: file.name,
+          filetype: file.type
+        },
+        onError: error => {
+          console.error("Failed because:", error);
+          this.emit('error', error);
+          reject(error); // Reject the promise on error
+        },
+        onProgress: (bytesUploaded, bytesTotal) => {
+          const percentage = (bytesUploaded / bytesTotal * 100).toFixed(2);
+          this.emit('progress', percentage / 100); // Emit normalized progress
+        },
+        onSuccess: () => {
+          //console.log("File uploaded to:", upload.url);
+          const m1 = upload.url.match(/\/([^\/]+)$/);
+          const remoteId = m1 ? m1[1] : null;
+          this.setData({
+            'remoteId': remoteId,
+            'remoteSrc': upload.url,
+            'sourceFile': {
+              name: upload.file.name,
+              size: upload.file.size,
+              type: upload.file.type,
+              lastModified: upload.file.lastModified
+            }
+          });
 
-        // Remove the `options.endpoint` from the start of the `url`
-        const m1 = upload.url.match(/\/([^\/]+)$/);
-        const remoteId = m1 ? m1[1] : null;
-        this.setData({
-          'remoteId': remoteId,
-          'sourceFile': {
-            name: upload.file.name,
-            size: upload.file.size,
-            type: upload.file.type,
-            lastModified: upload.file.lastModified
-          }
-        });
-        this.save().then(() => {
-          this.emit('success', upload.url);
-        });
-      }
-    });
+          // Ensure save is called and finished before resolving the promise
+          this.save().then(() => {
+            this.emit('success', upload.url);
+            resolve(); // Resolve the promise after save is complete
+          }).catch(error => {
+            console.error("Save failed:", error);
+            reject(error); // Reject the promise if save fails
+          });
+        }
+      });
 
-    // Check if there are any previous uploads to continue.
-    // upload.findPreviousUploads().then(function (previousUploads) {
-    //     // Found previous uploads so we select the first one.
-    //     if (previousUploads.length) {
-    //       upload.resumeFromPreviousUpload(previousUploads[0])
-    //     }
+      // Check if there are any previous uploads to continue.
+      // upload.findPreviousUploads().then(function (previousUploads) {
+      //     // Found previous uploads so we select the first one.
+      //     if (previousUploads.length) {
+      //       upload.resumeFromPreviousUpload(previousUploads[0])
+      //     }
 
-    //     // Start the upload
-    //     upload.start();
-    // })
-    upload.start();
+      //     // Start the upload
+      //     upload.start();
+      // })
+      upload.start(); // Start the upload
+    });
   }
   setProgress(newProgress) {
     this.progress = newProgress;
-    console.log(`Progress: ${this.progress * 100}%`);
     this.emit('progress', this.progress); // Emit a progress event
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "roboto-js",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "type": "module",
   "description": "",
   "main": "dist/cjs/index.cjs",

package/src/rbt_file.js

@@ -85,45 +85,51 @@ export default class RbtFile extends EventEmitter {
     }
 
     uploadFile(file) {
+        return new Promise((resolve, reject) => {
+            const upload = new Upload(file, {
+                endpoint: this._axios.defaults.baseURL + "/file_service/files",
+                retryDelays: [0, 1000, 3000, 5000],
+                metadata: {
+                    rbtfileid: this.id,
+                    filename: file.name,
+                    filetype: file.type,
+                },
+                onError: error => {
+                    console.error("Failed because:", error);
+                    this.emit('error', error);
+                    reject(error); // Reject the promise on error
+                },
+                onProgress: (bytesUploaded, bytesTotal) => {
+                    const percentage = (bytesUploaded / bytesTotal * 100).toFixed(2);
+                    this.emit('progress', percentage / 100); // Emit normalized progress
+                },
+                onSuccess: () => {
+                    //console.log("File uploaded to:", upload.url);
+                    const m1 = upload.url.match(/\/([^\/]+)$/);
+                    const remoteId = m1 ? m1[1] : null;
+
+                    this.setData({
+                        'remoteId': remoteId,
+                        'remoteSrc': upload.url,
+                        'sourceFile': {
+                            name: upload.file.name,
+                            size: upload.file.size,
+                            type: upload.file.type,
+                            lastModified: upload.file.lastModified,
+                        }
+                    });
+                    
+                    // Ensure save is called and finished before resolving the promise
+                    this.save().then(() => {
+                        this.emit('success', upload.url);
+                        resolve(); // Resolve the promise after save is complete
+                    }).catch(error => {
+                        console.error("Save failed:", error);
+                        reject(error); // Reject the promise if save fails
+                    });
+                }
+            });
 
-        const upload = new Upload(file, {
-            endpoint: this._axios.defaults.baseURL+"/file_service/files",
-            retryDelays: [0, 1000, 3000, 5000],
-            metadata: {
-                rbtfileid: this.id,
-                filename: file.name,
-                filetype: file.type,
-            },
-            onError: error => {
-                console.error("Failed because:", error);
-                this.emit('error', error);
-            },
-            onProgress: (bytesUploaded, bytesTotal) => {
-                console.log("File progress", bytesUploaded, bytesTotal);
-                const percentage = (bytesUploaded / bytesTotal * 100).toFixed(2);
-                this.setProgress(percentage / 100); // Update progress normalized between 0 and 1
-            },
-            onSuccess: () => {
-                console.log("File uploaded to:", upload.url);
-                
-                // Remove the `options.endpoint` from the start of the `url`
-                const m1 = upload.url.match(/\/([^\/]+)$/);
-                const remoteId = m1 ? m1[1] : null;
-
-                this.setData({
-                    'remoteId': remoteId,
-                    'sourceFile': {
-                        name: upload.file.name,
-                        size: upload.file.size,
-                        type: upload.file.type,
-                        lastModified: upload.file.lastModified,
-                    }
-                });
-                this.save().then(() => {
-                    this.emit('success', upload.url);
-                });
-            }
-        });
 
         // Check if there are any previous uploads to continue.
       // upload.findPreviousUploads().then(function (previousUploads) {
@@ -135,12 +141,14 @@ export default class RbtFile extends EventEmitter {
       //     // Start the upload
       //     upload.start();
       // })
-        upload.start();
+            upload.start(); // Start the upload
+        });
     }
 
+
+
     setProgress(newProgress) {
         this.progress = newProgress;
-        console.log(`Progress: ${this.progress * 100}%`);
         this.emit('progress', this.progress); // Emit a progress event
     }
 }