From d27630f2359041650e9dbef3b75fae1a532d03b7 Mon Sep 17 00:00:00 2001 From: Harshit Budhraja Date: Tue, 27 Aug 2024 14:20:11 +0530 Subject: [PATCH 1/2] fix: removed double queuing for remote uploads --- src/main.js | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main.js b/src/main.js index 7883da9..f49b31e 100644 --- a/src/main.js +++ b/src/main.js @@ -277,6 +277,8 @@ class ImageKitUppyPlugin extends Plugin { this.uploaderEvents[file.id].remove() this.uploaderEvents[file.id] = null } + + socket.close() return resolve(uploadResponse); }) @@ -286,6 +288,7 @@ class ImageKitUppyPlugin extends Plugin { this.uploaderEvents[file.id].remove() this.uploaderEvents[file.id] = null } + socket.close() try { var error = JSON.parse(errData.responseText); @@ -300,14 +303,10 @@ class ImageKitUppyPlugin extends Plugin { } }) - const queuedRequest = this.requests.run(() => { - socket.open() - if (file.isPaused) { - socket.send('pause', {}) - } - - return () => socket.close() - }) + socket.open() + if (file.isPaused) { + socket.send('pause', {}) + } }).catch((err) => { reject([err]); }) From 0c60b5b5fdf71daa90777de2321070232274a17d Mon Sep 17 00:00:00 2001 From: Harshit Budhraja Date: Tue, 27 Aug 2024 14:25:35 +0530 Subject: [PATCH 2/2] fix: removed undefined variable queuedRequest --- src/main.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main.js b/src/main.js index f49b31e..a6726aa 100644 --- a/src/main.js +++ b/src/main.js @@ -247,13 +247,11 @@ class ImageKitUppyPlugin extends Plugin { this.onFileRemove(file.id, () => { socket.send('pause', {}) - queuedRequest.abort() resolve(`upload ${file.id} was removed`) }) this.onCancelAll(file.id, () => { socket.send('pause', {}) - queuedRequest.abort() resolve(`upload ${file.id} was canceled`) }) @@ -270,9 +268,8 @@ class ImageKitUppyPlugin extends Plugin { socket.on('progress', (progressData) => emitSocketProgress(this, progressData, file)) socket.on('success', (data) => { - var uploadResponse = JSON.parse(data.response.responseText); + const uploadResponse = JSON.parse(data.response.responseText); - queuedRequest.done() if (this.uploaderEvents[file.id]) { this.uploaderEvents[file.id].remove() this.uploaderEvents[file.id] = null @@ -283,7 +280,6 @@ class ImageKitUppyPlugin extends Plugin { }) socket.on('error', (errData) => { - queuedRequest.done() if (this.uploaderEvents[file.id]) { this.uploaderEvents[file.id].remove() this.uploaderEvents[file.id] = null @@ -291,7 +287,7 @@ class ImageKitUppyPlugin extends Plugin { socket.close() try { - var error = JSON.parse(errData.responseText); + const error = JSON.parse(errData.responseText); if (error.message) { return reject([error.message]); }