handle ws error #5167
Merged
handle ws error #5167
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
to prevent companion from crashing with RangeError: Max payload size exceeded
Diff output filesdiff --git a/packages/@uppy/companion/lib/server/socket.js b/packages/@uppy/companion/lib/server/socket.js
index fdc9706..0ec77d2 100644
--- a/packages/@uppy/companion/lib/server/socket.js
+++ b/packages/@uppy/companion/lib/server/socket.js
@@ -47,6 +47,18 @@ module.exports = (server) => {
}
emitter().emit(`connection:${token}`);
emitter().on(token, send);
+ ws.on("error", (err) => {
+ // https://github.com/websockets/ws/issues/1543
+ // https://github.com/websockets/ws/blob/b73b11828d166e9692a9bffe9c01a7e93bab04a8/test/receiver.test.js#L936
+ if (
+ (err === null || err === void 0 ? void 0 : err.name) === "RangeError" && "code" in err
+ && err.code === "WS_ERR_UNSUPPORTED_MESSAGE_LENGTH"
+ ) {
+ logger.error("WebSocket message too large", "websocket.error", shortenToken(token));
+ } else {
+ logger.error(err, "websocket.error", shortenToken(token));
+ }
+ });
ws.on("message", (jsonData) => {
const data = JSON.parse(jsonData.toString());
// whitelist triggered actions |
aduh95
reviewed
May 15, 2024
aduh95
reviewed
May 15, 2024
Co-authored-by: Antoine du Hamel <antoine@transloadit.com>
aduh95
reviewed
May 15, 2024
| ws.on('error', (err) => { | ||
| // https://github.com/websockets/ws/issues/1543 | ||
| // https://github.com/websockets/ws/blob/b73b11828d166e9692a9bffe9c01a7e93bab04a8/test/receiver.test.js#L936 | ||
| if (err?.name === 'RangeError' && 'code' in err && err.code === 'WS_ERR_UNSUPPORTED_MESSAGE_LENGTH') { |
There was a problem hiding this comment.
Do we need to check for 'code' in err?
Suggested change
| if (err?.name === 'RangeError' && 'code' in err && err.code === 'WS_ERR_UNSUPPORTED_MESSAGE_LENGTH') { | |
| if (err?.name === 'RangeError' && err.code === 'WS_ERR_UNSUPPORTED_MESSAGE_LENGTH') { |
There was a problem hiding this comment.
yes or else we get a ts error
aduh95
approved these changes
May 15, 2024
Merged
github-actions bot
added a commit
that referenced
this pull request
May 22, 2024
| Package | Version | Package | Version | | --------------- | ------- | --------------- | ------- | | @uppy/companion | 4.13.3 | @uppy/tus | 3.5.5 | | @uppy/svelte | 3.1.5 | uppy | 3.25.4 | - @uppy/svelte: do not attempt removing plugin before it's created (Antoine du Hamel / #5186) - docs: Update `facebook.mdx` (Evgenia Karunus) - @uppy/tus: fix no headers passed to companion if argument is a function (netdown / #5182) - @uppy/companion: fix google drive gsuite export large size (Milan Nakum / #5144) - meta: Improve provider docs: Box & Zoom (Evgenia Karunus / #5166) - meta: add MDX file to `lint-staged` list (Antoine du Hamel / #5174) - @uppy/companion: handle ws `'error'` event (Mikael Finstad / #5167)
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.
to prevent companion from crashing with RangeError: Max payload size exceeded