-
Notifications
You must be signed in to change notification settings - Fork 2k
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.
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
don't close socket when pausing #4821
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Should this target 4.0 and could be merged there already? Looks good to me. |
yes I think we can merge this (it's kind of a breaking change) |
because it prevented us from canceling an upload that is paused note that we here sacrifice the ability to pause uploads and have other uploads take over the paused upload's rate limit queue spot. this is sacrificed because we will soon remove the ability to pause/resume uploads anyways (cherry picked from commit e4dbe77)
aduh95
force-pushed
the
dont-close-socketg-when-pausing
branch
from
July 2, 2024 13:50
172469a
to
ef5a1c4
Compare
Diff output filesdiff --git a/packages/@uppy/companion-client/lib/RequestClient.js b/packages/@uppy/companion-client/lib/RequestClient.js
index ae14650..3ed53a4 100644
--- a/packages/@uppy/companion-client/lib/RequestClient.js
+++ b/packages/@uppy/companion-client/lib/RequestClient.js
@@ -416,29 +416,22 @@ async function _awaitRemoteFileUpload2(_ref4) {
if (!capabilities.resumableUploads) return;
isPaused = newPausedState;
if (socket) sendState();
- if (newPausedState) {
- var _socketAbortControlle3;
- (_socketAbortControlle3 = socketAbortController) == null || _socketAbortControlle3.abort == null
- || _socketAbortControlle3.abort();
- } else {
- createWebsocket();
- }
};
const onFileRemove = targetFile => {
- var _socketAbortControlle4;
+ var _socketAbortControlle3;
if (!capabilities.individualCancellation) return;
if (targetFile.id !== file.id) return;
socketSend("cancel");
- (_socketAbortControlle4 = socketAbortController) == null || _socketAbortControlle4.abort == null
- || _socketAbortControlle4.abort();
+ (_socketAbortControlle3 = socketAbortController) == null || _socketAbortControlle3.abort == null
+ || _socketAbortControlle3.abort();
this.uppy.log(`upload ${file.id} was removed`, "info");
resolve();
};
const onCancelAll = () => {
- var _socketAbortControlle5;
+ var _socketAbortControlle4;
socketSend("cancel");
- (_socketAbortControlle5 = socketAbortController) == null || _socketAbortControlle5.abort == null
- || _socketAbortControlle5.abort();
+ (_socketAbortControlle4 = socketAbortController) == null || _socketAbortControlle4.abort == null
+ || _socketAbortControlle4.abort();
this.uppy.log(`upload ${file.id} was canceled`, "info");
resolve();
};
@@ -461,8 +454,8 @@ async function _awaitRemoteFileUpload2(_ref4) {
this.uppy.off("resume-all", onResumeAll);
};
signal.addEventListener("abort", () => {
- var _socketAbortControlle6;
- (_socketAbortControlle6 = socketAbortController) == null || _socketAbortControlle6.abort();
+ var _socketAbortControlle5;
+ (_socketAbortControlle5 = socketAbortController) == null || _socketAbortControlle5.abort();
});
createWebsocket();
}); |
Murderlon
approved these changes
Jul 8, 2024
github-actions bot
added a commit
that referenced
this pull request
Jul 10, 2024
| Package | Version | Package | Version | | ------------------------- | ------- | ------------------------- | ------- | | @uppy/angular | 0.7.0 | @uppy/onedrive | 4.0.0 | | @uppy/audio | 2.0.0 | @uppy/progress-bar | 4.0.0 | | @uppy/aws-s3 | 4.0.0 | @uppy/provider-views | 4.0.0 | | @uppy/aws-s3-multipart | 4.0.0 | @uppy/react | 4.0.0 | | @uppy/box | 3.0.0 | @uppy/react-native | 0.6.0 | | @uppy/companion | 5.0.0 | @uppy/redux-dev-tools | 4.0.0 | | @uppy/companion-client | 4.0.0 | @uppy/remote-sources | 2.0.0 | | @uppy/compressor | 2.0.0 | @uppy/screen-capture | 4.0.0 | | @uppy/core | 4.0.0 | @uppy/status-bar | 4.0.0 | | @uppy/dashboard | 4.0.0 | @uppy/store-default | 4.0.0 | | @uppy/drag-drop | 4.0.0 | @uppy/store-redux | 4.0.0 | | @uppy/drop-target | 3.0.0 | @uppy/svelte | 4.0.0 | | @uppy/dropbox | 4.0.0 | @uppy/thumbnail-generator | 4.0.0 | | @uppy/facebook | 4.0.0 | @uppy/transloadit | 4.0.0 | | @uppy/file-input | 4.0.0 | @uppy/tus | 4.0.0 | | @uppy/form | 4.0.0 | @uppy/unsplash | 4.0.0 | | @uppy/golden-retriever | 4.0.0 | @uppy/url | 4.0.0 | | @uppy/google-drive | 4.0.0 | @uppy/utils | 6.0.0 | | @uppy/google-photos | 0.2.0 | @uppy/vue | 2.0.0 | | @uppy/image-editor | 3.0.0 | @uppy/webcam | 4.0.0 | | @uppy/informer | 4.0.0 | @uppy/xhr-upload | 4.0.0 | | @uppy/instagram | 4.0.0 | @uppy/zoom | 3.0.0 | | @uppy/locales | 4.0.0 | uppy | 4.0.0 | - meta: Bump docker/setup-qemu-action from 3.0.0 to 3.1.0 (dependabot[bot] / #5314) - meta: Bump docker/build-push-action from 6.2.0 to 6.3.0 (dependabot[bot] / #5313) - @uppy/core: bring back resetProgress (Merlijn Vos / #5320) - docs: add note regarding `COMPANION_CLIENT_ORIGINS_REGEX` (Antoine du Hamel / #5322) - @uppy/companion: make streaming upload default to `true` (Mikael Finstad / #5315) - docs: change slug for aws docs (Merlijn Vos / #5321) - @uppy/core: export UppyOptions, UppyFile, Meta, Body (Merlijn Vos / #5319) - meta: fix React linter rules (Antoine du Hamel / #5317) - meta: enforce use of extension in import type declarations (Antoine du Hamel / #5316) - @uppy/companion: remove `oauthOrigin` (Antoine du Hamel / #5311) - docs,@uppy/companion-client: don't close socket when pausing (Mikael Finstad / #4821) - @uppy/aws-s3: fix signing on client for bucket name with dots (Antoine du Hamel / #5312) - @uppy/react: introduce useUppyEvent (Merlijn Vos / #5264) - @uppy/companion: do not list Node.js 20.12 as compatible (Antoine du Hamel / #5309) - @uppy/provider-views: `.openFolder()` - return progress indication (Evgenia Karunus / #5306) - examples,@uppy/companion: Release: [email protected] (github-actions[bot] / #5304) - @uppy/companion: fix `TypeError` when parsing request (Antoine du Hamel / #5303)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
because it prevented us from canceling an upload that is paused. Note that we here sacrifice the ability to pause uploads and have other uploads take over the paused upload's rate limit queue spot. this is sacrificed because we will soon remove the ability to pause/resume uploads anyways
(cherry picked from commit e4dbe77)
this was cherrypicked from #4816 (comment)