-
Notifications
You must be signed in to change notification settings - Fork 541
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
fallback to Buffer.isUtf8 on platforms without icu #3006
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
const { kReadyState, kController, kResponse, kBinaryType, kWebSocketURL } = require('./symbols') | ||
const { states, opcodes } = require('./constants') | ||
const { MessageEvent, ErrorEvent } = require('./events') | ||
const { isUtf8 } = require('node:buffer') | ||
|
||
/* globals Blob */ | ||
|
||
|
@@ -87,7 +88,7 @@ function websocketMessageReceived (ws, type, data) { | |
// -> type indicates that the data is Text | ||
// a new DOMString containing data | ||
try { | ||
dataForEvent = new TextDecoder('utf-8', { fatal: true }).decode(data) | ||
dataForEvent = utf8Decode(data) | ||
} catch { | ||
failWebsocketConnection(ws, 'Received invalid UTF-8 in text frame.') | ||
return | ||
|
@@ -200,6 +201,33 @@ function failWebsocketConnection (ws, reason) { | |
} | ||
} | ||
|
||
// https://nodejs.org/api/intl.html#detecting-internationalization-support | ||
const hasIntl = typeof process.versions.icu === 'string' | ||
const fatalDecoder = hasIntl ? new TextDecoder('utf-8', { fatal: true }) : undefined | ||
|
||
/** | ||
* Converts a Buffer to utf-8, even on platforms without icu. | ||
* @param {Buffer} buffer | ||
*/ | ||
function utf8Decode (buffer) { | ||
if (hasIntl) { | ||
return fatalDecoder.decode(buffer) | ||
} else { | ||
if (!isUtf8?.(buffer)) { | ||
// TODO: remove once node 18 or < node v18.14.0 is dropped | ||
if (!isUtf8) { | ||
process.emitWarning('ICU is not supported and no fallback exists. Please upgrade to at least Node v18.14.0.', { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Shall we reduce the emits to just |
||
code: 'UNDICI-WS-NO-ICU' | ||
}) | ||
} | ||
|
||
throw new TypeError('Invalid utf-8 received.') | ||
} | ||
|
||
return buffer.toString('utf-8') | ||
} | ||
} | ||
|
||
module.exports = { | ||
isConnecting, | ||
isEstablished, | ||
|
@@ -209,5 +237,6 @@ module.exports = { | |
isValidSubprotocol, | ||
isValidStatusCode, | ||
failWebsocketConnection, | ||
websocketMessageReceived | ||
websocketMessageReceived, | ||
utf8Decode | ||
} |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
const utf8Decode = hasIntl ? fatalDecode.decode
: etc.