Skip to content

fix: removed double queuing for remote uploads #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hrhv wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: removed double queuing for remote uploads #22

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d27630f
fix: removed double queuing for remote uploads
hrhv Aug 27, 2024
0c60b5b
fix: removed undefined variable queuedRequest
hrhv Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 9 additions & 14 deletions src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`)
})

Expand All @@ -270,25 +268,26 @@ 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
}

socket.close()
return resolve(uploadResponse);
})

socket.on('error', (errData) => {
queuedRequest.done()
if (this.uploaderEvents[file.id]) {
this.uploaderEvents[file.id].remove()
this.uploaderEvents[file.id] = null
}
socket.close()

try {
var error = JSON.parse(errData.responseText);
const error = JSON.parse(errData.responseText);
if (error.message) {
return reject([error.message]);
}
Expand All @@ -300,14 +299,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]);
})
Expand Down