Commit f33dba7

Browse files
codebytereaduh95
codebytere
authored and
aduh95
committed
string_decoder: decode UTF-8 via StringBytes::Encode
StringDecoder used v8::String::NewFromUtf8() for UTF-8, while Buffer#toString() goes through StringBytes::Encode(), which has simdutf-backed ASCII, Latin-1 and UTF-16 paths and only falls back to NewFromUtf8() for input that contains invalid sequences. Route the decoder through the same function, so streams with setEncoding('utf8') and readline decode at the same speed as Buffer#toString(). U+FFFD replacement is unchanged because invalid input still ends up in NewFromUtf8(), and the ERR_STRING_TOO_LONG check is kept explicit so over-long input fails as before. benchmark/string_decoder/string-decoder.js (encoding=utf8) and a readline-over-pipe workload improve by 2-3x for chunks >= 1 KiB; 64 KiB newline-delimited JSON round trips over child stdio improve by ~30% on the reading side alone. Signed-off-by: Shelley Vohr <shelley.vohr@gmail.com> PR-URL: #65324 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day> Reviewed-By: Daniel Lemire <daniel@lemire.me> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 89aba0c commit f33dba7

2 files changed

Lines changed: 94 additions & 15 deletions

File tree

‎src/string_decoder.cc‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,21 @@ MaybeLocal<String> MakeString(Isolate* isolate,
2828
constchar* data,
2929
size_t length,
3030
enum encoding encoding) {
31-
MaybeLocal<Value> ret;
32-
if (encoding == UTF8) {
33-
MaybeLocal<String> utf8_string;
34-
if (length <= static_cast<size_t>(v8::String::kMaxLength)) {
35-
utf8_string = String::NewFromUtf8(
36-
isolate, data, v8::NewStringType::kNormal, length);
37-
}
38-
if (utf8_string.IsEmpty()) {
39-
isolate->ThrowException(node::ERR_STRING_TOO_LONG(isolate));
40-
return MaybeLocal<String>();
41-
} else {
42-
return utf8_string;
43-
}
44-
} else {
45-
ret = StringBytes::Encode(isolate, data, length, encoding);
31+
// StringBytes::Encode() would report an over-long UTF-8 input as
32+
// ERR_BUFFER_TOO_LARGE (or clamp it); keep reporting it the way this
33+
// decoder always has.
34+
if (encoding == UTF8 && length > static_cast<size_t>(v8::String::kMaxLength))
35+
[[unlikely]] {
36+
isolate->ThrowException(node::ERR_STRING_TOO_LONG(isolate));
37+
return MaybeLocal<String>();
4638
}
4739

40+
// For UTF-8 this takes the simdutf-backed ASCII / Latin-1 / UTF-16 paths and
41+
// only falls back to v8::String::NewFromUtf8() (the previous unconditional
42+
// path here) for input containing invalid sequences, so U+FFFD replacement
43+
// is unchanged.
44+
MaybeLocal<Value> ret = StringBytes::Encode(isolate, data, length, encoding);
45+
4846
if (ret.IsEmpty()) {
4947
return {};
5048
}

‎test/parallel/test-string-decoder-utf8-large.js‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
'use strict';
2+
// The UTF-8 StringDecoder shares its byte->string conversion with
3+
// Buffer#toString(): ASCII, Latin-1-representable and general inputs take
4+
// different (SIMD) paths depending on content and size, and invalid input
5+
// falls back to a replacing decoder. This test pins the decoder's output for
6+
// inputs that cross those size thresholds, for chunkings that split multibyte
7+
// sequences, and for invalid bytes embedded in otherwise large valid input.
8+
require('../common');
9+
constassert=require('assert');
10+
const{ StringDecoder }=require('string_decoder');
11+
12+
functiondecodeInChunks(buf,chunkSize){
13+
constdecoder=newStringDecoder('utf8');
14+
letout='';
15+
for(leti=0;i<buf.length;i+=chunkSize){
16+
out+=decoder.write(buf.subarray(i,i+chunkSize));
17+
}
18+
returnout+decoder.end();
19+
}
20+
21+
functioncheck(str,label){
22+
constbuf=Buffer.from(str,'utf8');
23+
// Sanity: the expectation itself round-trips.
24+
assert.strictEqual(buf.toString('utf8'),str,`${label}: toString`);
25+
for(constchunkSizeof[1,2,3,4,5,7,31,32,33,255,256,257,
26+
4095,4096,65536,buf.length]){
27+
if(chunkSize>buf.length)continue;
28+
// Keep the test fast: byte-sized chunks only for the smaller inputs.
29+
if(buf.length>100_000&&chunkSize<4095)continue;
30+
assert.strictEqual(decodeInChunks(buf,chunkSize),str,
31+
`${label}: chunkSize=${chunkSize}`);
32+
}
33+
}
34+
35+
constsizes=[31,32,33,255,256,257,4096,70000,(1<<20)+5];
36+
for(constsizeofsizes){
37+
check('a'.repeat(size),`ascii ${size}`);
38+
// Latin-1 range only (one-byte string in V8, two bytes each in UTF-8).
39+
check('é'.repeat(size),`latin1 ${size}`);
40+
// ASCII with a single Latin-1 character at the end / start.
41+
check('a'.repeat(size-1)+'ÿ',`ascii+latin1 tail ${size}`);
42+
check('Ä'+'a'.repeat(size-1),`latin1 head+ascii ${size}`);
43+
// BMP beyond Latin-1 (three-byte sequences).
44+
check('日'.repeat(size),`cjk ${size}`);
45+
// Mixed, including astral plane characters (surrogate pairs, 4 bytes).
46+
check(('abé日\u{1F600}').repeat(Math.ceil(size/6)),`mixed ${size}`);
47+
}
48+
49+
// Invalid bytes inside otherwise valid input of every size class must still be
50+
// replaced with U+FFFD exactly as before, regardless of chunking.
51+
for(constsizeof[8,40,300,5000,(1<<20)+5]){
52+
constvalid=Buffer.from('a'.repeat(size));
53+
for(constbadof[[0xff],[0xc0,0xaf],[0xe2,0x28,0xa1],
54+
[0xed,0xa0,0x80]/* encoded surrogate */,
55+
[0xf0,0x9f,0x98]/* truncated 4-byte */]){
56+
constbuf=Buffer.concat([valid,Buffer.from(bad),valid]);
57+
constexpected=buf.toString('utf8');
58+
assert.ok(expected.includes('�'),`size=${size} bad=${bad}`);
59+
for(constchunkSizeof[1,3,64,size,size+1,buf.length]){
60+
if(buf.length>100_000&&chunkSize<size)continue;
61+
assert.strictEqual(decodeInChunks(buf,chunkSize),expected,
62+
`invalid ${bad} in ${size}, chunkSize=${chunkSize}`);
63+
}
64+
}
65+
}
66+
67+
// A lone continuation / lead byte split across the size classes at the very
68+
// end is buffered by the decoder and flushed as U+FFFD by end().
69+
{
70+
constdecoder=newStringDecoder('utf8');
71+
constbig=Buffer.concat([Buffer.from('a'.repeat(300)),Buffer.from([0xe2,0x82])]);
72+
assert.strictEqual(decoder.write(big),'a'.repeat(300));
73+
assert.strictEqual(decoder.end(),'�');
74+
}
75+
{
76+
constdecoder=newStringDecoder('utf8');
77+
constbig=Buffer.concat([Buffer.from('é'.repeat(300)),Buffer.from([0xe2,0x82])]);
78+
assert.strictEqual(decoder.write(big),'é'.repeat(300));
79+
assert.strictEqual(decoder.write(Buffer.from([0xac])),'€');
80+
assert.strictEqual(decoder.end(),'');
81+
}

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Commit f33dba7
Browse files
codebytereaduh95
codebytere
authored and
aduh95
committed
string_decoder: decode UTF-8 via StringBytes::Encode
StringDecoder used v8::String::NewFromUtf8() for UTF-8, while
Buffer#toString() goes through StringBytes::Encode(), which has
simdutf-backed ASCII, Latin-1 and UTF-16 paths and only falls back
to NewFromUtf8() for input that contains invalid sequences. Route
the decoder through the same function, so streams with
setEncoding('utf8') and readline decode at the same speed as
Buffer#toString(). U+FFFD replacement is unchanged because invalid
input still ends up in NewFromUtf8(), and the ERR_STRING_TOO_LONG
check is kept explicit so over-long input fails as before.
benchmark/string_decoder/string-decoder.js (encoding=utf8) and a
readline-over-pipe workload improve by 2-3x for chunks >= 1 KiB;
64 KiB newline-delimited JSON round trips over child stdio improve
by ~30% on the reading side alone.
Signed-off-by: Shelley Vohr <shelley.vohr@gmail.com>
PR-URL: #65324
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day>
Reviewed-By: Daniel Lemire <daniel@lemire.me>
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 89aba0c commit f33dba7
2 files changed
Lines changed: 94 additions & 15 deletions
File tree
‎src/string_decoder.cc‎
Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,21 @@ MaybeLocal<String> MakeString(Isolate* isolate,
2828
constchar* data,
2929
size_t length,
3030
enum encoding encoding) {
31-
 MaybeLocal<Value> ret;
32-
if (encoding == UTF8) {
33-
 MaybeLocal<String> utf8_string;
34-
if (length <= static_cast<size_t>(v8::String::kMaxLength)) {
35-
 utf8_string = String::NewFromUtf8(
36-
 isolate, data, v8::NewStringType::kNormal, length);
37-
 }
38-
if (utf8_string.IsEmpty()) {
39-
 isolate->ThrowException(node::ERR_STRING_TOO_LONG(isolate));
40-
return MaybeLocal<String>();
41-
 } else {
42-
return utf8_string;
43-
 }
44-
 } else {
45-
 ret = StringBytes::Encode(isolate, data, length, encoding);
31+
// StringBytes::Encode() would report an over-long UTF-8 input as
32+
// ERR_BUFFER_TOO_LARGE (or clamp it); keep reporting it the way this
33+
// decoder always has.
34+
if (encoding == UTF8 && length > static_cast<size_t>(v8::String::kMaxLength))
35+
[[unlikely]] {
36+
 isolate->ThrowException(node::ERR_STRING_TOO_LONG(isolate));
37+
return MaybeLocal<String>();
4638
 }
4739

40+
// For UTF-8 this takes the simdutf-backed ASCII / Latin-1 / UTF-16 paths and
41+
// only falls back to v8::String::NewFromUtf8() (the previous unconditional
42+
// path here) for input containing invalid sequences, so U+FFFD replacement
43+
// is unchanged.
44+
 MaybeLocal<Value> ret = StringBytes::Encode(isolate, data, length, encoding);
45+
4846
if (ret.IsEmpty()) {
4947
return {};
5048
 }
‎test/parallel/test-string-decoder-utf8-large.js‎
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
'use strict';
2+
// The UTF-8 StringDecoder shares its byte->string conversion with
3+
// Buffer#toString(): ASCII, Latin-1-representable and general inputs take
4+
// different (SIMD) paths depending on content and size, and invalid input
5+
// falls back to a replacing decoder. This test pins the decoder's output for
6+
// inputs that cross those size thresholds, for chunkings that split multibyte
7+
// sequences, and for invalid bytes embedded in otherwise large valid input.
8+
require('../common');
9+
constassert=require('assert');
10+
const{ StringDecoder }=require('string_decoder');
11+
12+
functiondecodeInChunks(buf,chunkSize){
13+
constdecoder=newStringDecoder('utf8');
14+
letout='';
15+
for(leti=0;i<buf.length;i+=chunkSize){
16+
out+=decoder.write(buf.subarray(i,i+chunkSize));
17+
}
18+
returnout+decoder.end();
19+
}
20+
21+
functioncheck(str,label){
22+
constbuf=Buffer.from(str,'utf8');
23+
// Sanity: the expectation itself round-trips.
24+
assert.strictEqual(buf.toString('utf8'),str,`${label}: toString`);
25+
for(constchunkSizeof[1,2,3,4,5,7,31,32,33,255,256,257,
26+
4095,4096,65536,buf.length]){
27+
if(chunkSize>buf.length)continue;
28+
// Keep the test fast: byte-sized chunks only for the smaller inputs.
29+
if(buf.length>100_000&&chunkSize<4095)continue;
30+
assert.strictEqual(decodeInChunks(buf,chunkSize),str,
31+
`${label}: chunkSize=${chunkSize}`);
32+
}
33+
}
34+
35+
constsizes=[31,32,33,255,256,257,4096,70000,(1<<20)+5];
36+
for(constsizeofsizes){
37+
check('a'.repeat(size),`ascii ${size}`);
38+
// Latin-1 range only (one-byte string in V8, two bytes each in UTF-8).
39+
check('é'.repeat(size),`latin1 ${size}`);
40+
// ASCII with a single Latin-1 character at the end / start.
41+
check('a'.repeat(size-1)+'ÿ',`ascii+latin1 tail ${size}`);
42+
check('Ä'+'a'.repeat(size-1),`latin1 head+ascii ${size}`);
43+
// BMP beyond Latin-1 (three-byte sequences).
44+
check('日'.repeat(size),`cjk ${size}`);
45+
// Mixed, including astral plane characters (surrogate pairs, 4 bytes).
46+
check(('abé日\u{1F600}').repeat(Math.ceil(size/6)),`mixed ${size}`);
47+
}
48+
49+
// Invalid bytes inside otherwise valid input of every size class must still be
50+
// replaced with U+FFFD exactly as before, regardless of chunking.
51+
for(constsizeof[8,40,300,5000,(1<<20)+5]){
52+
constvalid=Buffer.from('a'.repeat(size));
53+
for(constbadof[[0xff],[0xc0,0xaf],[0xe2,0x28,0xa1],
54+
[0xed,0xa0,0x80]/* encoded surrogate */,
55+
[0xf0,0x9f,0x98]/* truncated 4-byte */]){
56+
constbuf=Buffer.concat([valid,Buffer.from(bad),valid]);
57+
constexpected=buf.toString('utf8');
58+
assert.ok(expected.includes('�'),`size=${size} bad=${bad}`);
59+
for(constchunkSizeof[1,3,64,size,size+1,buf.length]){
60+
if(buf.length>100_000&&chunkSize<size)continue;
61+
assert.strictEqual(decodeInChunks(buf,chunkSize),expected,
62+
`invalid ${bad} in ${size}, chunkSize=${chunkSize}`);
63+
}
64+
}
65+
}
66+
67+
// A lone continuation / lead byte split across the size classes at the very
68+
// end is buffered by the decoder and flushed as U+FFFD by end().
69+
{
70+
constdecoder=newStringDecoder('utf8');
71+
constbig=Buffer.concat([Buffer.from('a'.repeat(300)),Buffer.from([0xe2,0x82])]);
72+
assert.strictEqual(decoder.write(big),'a'.repeat(300));
73+
assert.strictEqual(decoder.end(),'�');
74+
}
75+
{
76+
constdecoder=newStringDecoder('utf8');
77+
constbig=Buffer.concat([Buffer.from('é'.repeat(300)),Buffer.from([0xe2,0x82])]);
78+
assert.strictEqual(decoder.write(big),'é'.repeat(300));
79+
assert.strictEqual(decoder.write(Buffer.from([0xac])),'€');
80+
assert.strictEqual(decoder.end(),'');
81+
}
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit f33dba7
Browse files
codebytereaduh95
codebytere
authored and
aduh95
committed
string_decoder: decode UTF-8 via StringBytes::Encode
StringDecoder used v8::String::NewFromUtf8() for UTF-8, while
Buffer#toString() goes through StringBytes::Encode(), which has
simdutf-backed ASCII, Latin-1 and UTF-16 paths and only falls back
to NewFromUtf8() for input that contains invalid sequences. Route
the decoder through the same function, so streams with
setEncoding('utf8') and readline decode at the same speed as
Buffer#toString(). U+FFFD replacement is unchanged because invalid
input still ends up in NewFromUtf8(), and the ERR_STRING_TOO_LONG
check is kept explicit so over-long input fails as before.
benchmark/string_decoder/string-decoder.js (encoding=utf8) and a
readline-over-pipe workload improve by 2-3x for chunks >= 1 KiB;
64 KiB newline-delimited JSON round trips over child stdio improve
by ~30% on the reading side alone.
Signed-off-by: Shelley Vohr <shelley.vohr@gmail.com>
PR-URL: #65324
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day>
Reviewed-By: Daniel Lemire <daniel@lemire.me>
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 89aba0c commit f33dba7
2 files changed
Lines changed: 94 additions & 15 deletions
File tree
‎src/string_decoder.cc‎
Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,21 @@ MaybeLocal<String> MakeString(Isolate* isolate,
2828
constchar* data,
2929
size_t length,
3030
enum encoding encoding) {
31-
 MaybeLocal<Value> ret;
32-
if (encoding == UTF8) {
33-
 MaybeLocal<String> utf8_string;
34-
if (length <= static_cast<size_t>(v8::String::kMaxLength)) {
35-
 utf8_string = String::NewFromUtf8(
36-
 isolate, data, v8::NewStringType::kNormal, length);
37-
 }
38-
if (utf8_string.IsEmpty()) {
39-
 isolate->ThrowException(node::ERR_STRING_TOO_LONG(isolate));
40-
return MaybeLocal<String>();
41-
 } else {
42-
return utf8_string;
43-
 }
44-
 } else {
45-
 ret = StringBytes::Encode(isolate, data, length, encoding);
31+
// StringBytes::Encode() would report an over-long UTF-8 input as
32+
// ERR_BUFFER_TOO_LARGE (or clamp it); keep reporting it the way this
33+
// decoder always has.
34+
if (encoding == UTF8 && length > static_cast<size_t>(v8::String::kMaxLength))
35+
[[unlikely]] {
36+
 isolate->ThrowException(node::ERR_STRING_TOO_LONG(isolate));
37+
return MaybeLocal<String>();
4638
 }
4739

40+
// For UTF-8 this takes the simdutf-backed ASCII / Latin-1 / UTF-16 paths and
41+
// only falls back to v8::String::NewFromUtf8() (the previous unconditional
42+
// path here) for input containing invalid sequences, so U+FFFD replacement
43+
// is unchanged.
44+
 MaybeLocal<Value> ret = StringBytes::Encode(isolate, data, length, encoding);
45+
4846
if (ret.IsEmpty()) {
4947
return {};
5048
 }
‎test/parallel/test-string-decoder-utf8-large.js‎
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
'use strict';
2+
// The UTF-8 StringDecoder shares its byte->string conversion with
3+
// Buffer#toString(): ASCII, Latin-1-representable and general inputs take
4+
// different (SIMD) paths depending on content and size, and invalid input
5+
// falls back to a replacing decoder. This test pins the decoder's output for
6+
// inputs that cross those size thresholds, for chunkings that split multibyte
7+
// sequences, and for invalid bytes embedded in otherwise large valid input.
8+
require('../common');
9+
constassert=require('assert');
10+
const{ StringDecoder }=require('string_decoder');
11+
12+
functiondecodeInChunks(buf,chunkSize){
13+
constdecoder=newStringDecoder('utf8');
14+
letout='';
15+
for(leti=0;i<buf.length;i+=chunkSize){
16+
out+=decoder.write(buf.subarray(i,i+chunkSize));
17+
}
18+
returnout+decoder.end();
19+
}
20+
21+
functioncheck(str,label){
22+
constbuf=Buffer.from(str,'utf8');
23+
// Sanity: the expectation itself round-trips.
24+
assert.strictEqual(buf.toString('utf8'),str,`${label}: toString`);
25+
for(constchunkSizeof[1,2,3,4,5,7,31,32,33,255,256,257,
26+
4095,4096,65536,buf.length]){
27+
if(chunkSize>buf.length)continue;
28+
// Keep the test fast: byte-sized chunks only for the smaller inputs.
29+
if(buf.length>100_000&&chunkSize<4095)continue;
30+
assert.strictEqual(decodeInChunks(buf,chunkSize),str,
31+
`${label}: chunkSize=${chunkSize}`);
32+
}
33+
}
34+
35+
constsizes=[31,32,33,255,256,257,4096,70000,(1<<20)+5];
36+
for(constsizeofsizes){
37+
check('a'.repeat(size),`ascii ${size}`);
38+
// Latin-1 range only (one-byte string in V8, two bytes each in UTF-8).
39+
check('é'.repeat(size),`latin1 ${size}`);
40+
// ASCII with a single Latin-1 character at the end / start.
41+
check('a'.repeat(size-1)+'ÿ',`ascii+latin1 tail ${size}`);
42+
check('Ä'+'a'.repeat(size-1),`latin1 head+ascii ${size}`);
43+
// BMP beyond Latin-1 (three-byte sequences).
44+
check('日'.repeat(size),`cjk ${size}`);
45+
// Mixed, including astral plane characters (surrogate pairs, 4 bytes).
46+
check(('abé日\u{1F600}').repeat(Math.ceil(size/6)),`mixed ${size}`);
47+
}
48+
49+
// Invalid bytes inside otherwise valid input of every size class must still be
50+
// replaced with U+FFFD exactly as before, regardless of chunking.
51+
for(constsizeof[8,40,300,5000,(1<<20)+5]){
52+
constvalid=Buffer.from('a'.repeat(size));
53+
for(constbadof[[0xff],[0xc0,0xaf],[0xe2,0x28,0xa1],
54+
[0xed,0xa0,0x80]/* encoded surrogate */,
55+
[0xf0,0x9f,0x98]/* truncated 4-byte */]){
56+
constbuf=Buffer.concat([valid,Buffer.from(bad),valid]);
57+
constexpected=buf.toString('utf8');
58+
assert.ok(expected.includes('�'),`size=${size} bad=${bad}`);
59+
for(constchunkSizeof[1,3,64,size,size+1,buf.length]){
60+
if(buf.length>100_000&&chunkSize<size)continue;
61+
assert.strictEqual(decodeInChunks(buf,chunkSize),expected,
62+
`invalid ${bad} in ${size}, chunkSize=${chunkSize}`);
63+
}
64+
}
65+
}
66+
67+
// A lone continuation / lead byte split across the size classes at the very
68+
// end is buffered by the decoder and flushed as U+FFFD by end().
69+
{
70+
constdecoder=newStringDecoder('utf8');
71+
constbig=Buffer.concat([Buffer.from('a'.repeat(300)),Buffer.from([0xe2,0x82])]);
72+
assert.strictEqual(decoder.write(big),'a'.repeat(300));
73+
assert.strictEqual(decoder.end(),'�');
74+
}
75+
{
76+
constdecoder=newStringDecoder('utf8');
77+
constbig=Buffer.concat([Buffer.from('é'.repeat(300)),Buffer.from([0xe2,0x82])]);
78+
assert.strictEqual(decoder.write(big),'é'.repeat(300));
79+
assert.strictEqual(decoder.write(Buffer.from([0xac])),'€');
80+
assert.strictEqual(decoder.end(),'');
81+
}
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit f33dba7
Browse files
codebytereaduh95
codebytere
authored and
aduh95
committed
string_decoder: decode UTF-8 via StringBytes::Encode
StringDecoder used v8::String::NewFromUtf8() for UTF-8, while
Buffer#toString() goes through StringBytes::Encode(), which has
simdutf-backed ASCII, Latin-1 and UTF-16 paths and only falls back
to NewFromUtf8() for input that contains invalid sequences. Route
the decoder through the same function, so streams with
setEncoding('utf8') and readline decode at the same speed as
Buffer#toString(). U+FFFD replacement is unchanged because invalid
input still ends up in NewFromUtf8(), and the ERR_STRING_TOO_LONG
check is kept explicit so over-long input fails as before.
benchmark/string_decoder/string-decoder.js (encoding=utf8) and a
readline-over-pipe workload improve by 2-3x for chunks >= 1 KiB;
64 KiB newline-delimited JSON round trips over child stdio improve
by ~30% on the reading side alone.
Signed-off-by: Shelley Vohr <shelley.vohr@gmail.com>
PR-URL: #65324
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day>
Reviewed-By: Daniel Lemire <daniel@lemire.me>
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 89aba0c commit f33dba7
2 files changed
Lines changed: 94 additions & 15 deletions
File tree
‎src/string_decoder.cc‎
Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,21 @@ MaybeLocal<String> MakeString(Isolate* isolate,
2828
constchar* data,
2929
size_t length,
3030
enum encoding encoding) {
31-
 MaybeLocal<Value> ret;
32-
if (encoding == UTF8) {
33-
 MaybeLocal<String> utf8_string;
34-
if (length <= static_cast<size_t>(v8::String::kMaxLength)) {
35-
 utf8_string = String::NewFromUtf8(
36-
 isolate, data, v8::NewStringType::kNormal, length);
37-
 }
38-
if (utf8_string.IsEmpty()) {
39-
 isolate->ThrowException(node::ERR_STRING_TOO_LONG(isolate));
40-
return MaybeLocal<String>();
41-
 } else {
42-
return utf8_string;
43-
 }
44-
 } else {
45-
 ret = StringBytes::Encode(isolate, data, length, encoding);
31+
// StringBytes::Encode() would report an over-long UTF-8 input as
32+
// ERR_BUFFER_TOO_LARGE (or clamp it); keep reporting it the way this
33+
// decoder always has.
34+
if (encoding == UTF8 && length > static_cast<size_t>(v8::String::kMaxLength))
35+
[[unlikely]] {
36+
 isolate->ThrowException(node::ERR_STRING_TOO_LONG(isolate));
37+
return MaybeLocal<String>();
4638
 }
4739

40+
// For UTF-8 this takes the simdutf-backed ASCII / Latin-1 / UTF-16 paths and
41+
// only falls back to v8::String::NewFromUtf8() (the previous unconditional
42+
// path here) for input containing invalid sequences, so U+FFFD replacement
43+
// is unchanged.
44+
 MaybeLocal<Value> ret = StringBytes::Encode(isolate, data, length, encoding);
45+
4846
if (ret.IsEmpty()) {
4947
return {};
5048
 }
‎test/parallel/test-string-decoder-utf8-large.js‎
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
'use strict';
2+
// The UTF-8 StringDecoder shares its byte->string conversion with
3+
// Buffer#toString(): ASCII, Latin-1-representable and general inputs take
4+
// different (SIMD) paths depending on content and size, and invalid input
5+
// falls back to a replacing decoder. This test pins the decoder's output for
6+
// inputs that cross those size thresholds, for chunkings that split multibyte
7+
// sequences, and for invalid bytes embedded in otherwise large valid input.
8+
require('../common');
9+
constassert=require('assert');
10+
const{ StringDecoder }=require('string_decoder');
11+
12+
functiondecodeInChunks(buf,chunkSize){
13+
constdecoder=newStringDecoder('utf8');
14+
letout='';
15+
for(leti=0;i<buf.length;i+=chunkSize){
16+
out+=decoder.write(buf.subarray(i,i+chunkSize));
17+
}
18+
returnout+decoder.end();
19+
}
20+
21+
functioncheck(str,label){
22+
constbuf=Buffer.from(str,'utf8');
23+
// Sanity: the expectation itself round-trips.
24+
assert.strictEqual(buf.toString('utf8'),str,`${label}: toString`);
25+
for(constchunkSizeof[1,2,3,4,5,7,31,32,33,255,256,257,
26+
4095,4096,65536,buf.length]){
27+
if(chunkSize>buf.length)continue;
28+
// Keep the test fast: byte-sized chunks only for the smaller inputs.
29+
if(buf.length>100_000&&chunkSize<4095)continue;
30+
assert.strictEqual(decodeInChunks(buf,chunkSize),str,
31+
`${label}: chunkSize=${chunkSize}`);
32+
}
33+
}
34+
35+
constsizes=[31,32,33,255,256,257,4096,70000,(1<<20)+5];
36+
for(constsizeofsizes){
37+
check('a'.repeat(size),`ascii ${size}`);
38+
// Latin-1 range only (one-byte string in V8, two bytes each in UTF-8).
39+
check('é'.repeat(size),`latin1 ${size}`);
40+
// ASCII with a single Latin-1 character at the end / start.
41+
check('a'.repeat(size-1)+'ÿ',`ascii+latin1 tail ${size}`);
42+
check('Ä'+'a'.repeat(size-1),`latin1 head+ascii ${size}`);
43+
// BMP beyond Latin-1 (three-byte sequences).
44+
check('日'.repeat(size),`cjk ${size}`);
45+
// Mixed, including astral plane characters (surrogate pairs, 4 bytes).
46+
check(('abé日\u{1F600}').repeat(Math.ceil(size/6)),`mixed ${size}`);
47+
}
48+
49+
// Invalid bytes inside otherwise valid input of every size class must still be
50+
// replaced with U+FFFD exactly as before, regardless of chunking.
51+
for(constsizeof[8,40,300,5000,(1<<20)+5]){
52+
constvalid=Buffer.from('a'.repeat(size));
53+
for(constbadof[[0xff],[0xc0,0xaf],[0xe2,0x28,0xa1],
54+
[0xed,0xa0,0x80]/* encoded surrogate */,
55+
[0xf0,0x9f,0x98]/* truncated 4-byte */]){
56+
constbuf=Buffer.concat([valid,Buffer.from(bad),valid]);
57+
constexpected=buf.toString('utf8');
58+
assert.ok(expected.includes('�'),`size=${size} bad=${bad}`);
59+
for(constchunkSizeof[1,3,64,size,size+1,buf.length]){
60+
if(buf.length>100_000&&chunkSize<size)continue;
61+
assert.strictEqual(decodeInChunks(buf,chunkSize),expected,
62+
`invalid ${bad} in ${size}, chunkSize=${chunkSize}`);
63+
}
64+
}
65+
}
66+
67+
// A lone continuation / lead byte split across the size classes at the very
68+
// end is buffered by the decoder and flushed as U+FFFD by end().
69+
{
70+
constdecoder=newStringDecoder('utf8');
71+
constbig=Buffer.concat([Buffer.from('a'.repeat(300)),Buffer.from([0xe2,0x82])]);
72+
assert.strictEqual(decoder.write(big),'a'.repeat(300));
73+
assert.strictEqual(decoder.end(),'�');
74+
}
75+
{
76+
constdecoder=newStringDecoder('utf8');
77+
constbig=Buffer.concat([Buffer.from('é'.repeat(300)),Buffer.from([0xe2,0x82])]);
78+
assert.strictEqual(decoder.write(big),'é'.repeat(300));
79+
assert.strictEqual(decoder.write(Buffer.from([0xac])),'€');
80+
assert.strictEqual(decoder.end(),'');
81+
}
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Commit f33dba7
Browse files
codebytereaduh95
codebytere
authored and
aduh95
committed
string_decoder: decode UTF-8 via StringBytes::Encode
StringDecoder used v8::String::NewFromUtf8() for UTF-8, while
Buffer#toString() goes through StringBytes::Encode(), which has
simdutf-backed ASCII, Latin-1 and UTF-16 paths and only falls back
to NewFromUtf8() for input that contains invalid sequences. Route
the decoder through the same function, so streams with
setEncoding('utf8') and readline decode at the same speed as
Buffer#toString(). U+FFFD replacement is unchanged because invalid
input still ends up in NewFromUtf8(), and the ERR_STRING_TOO_LONG
check is kept explicit so over-long input fails as before.
benchmark/string_decoder/string-decoder.js (encoding=utf8) and a
readline-over-pipe workload improve by 2-3x for chunks >= 1 KiB;
64 KiB newline-delimited JSON round trips over child stdio improve
by ~30% on the reading side alone.
Signed-off-by: Shelley Vohr <shelley.vohr@gmail.com>
PR-URL: #65324
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day>
Reviewed-By: Daniel Lemire <daniel@lemire.me>
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 89aba0c commit f33dba7
2 files changed
Lines changed: 94 additions & 15 deletions
File tree
‎src/string_decoder.cc‎
Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,21 @@ MaybeLocal<String> MakeString(Isolate* isolate,
2828
constchar* data,
2929
size_t length,
3030
enum encoding encoding) {
31-
 MaybeLocal<Value> ret;
32-
if (encoding == UTF8) {
33-
 MaybeLocal<String> utf8_string;
34-
if (length <= static_cast<size_t>(v8::String::kMaxLength)) {
35-
 utf8_string = String::NewFromUtf8(
36-
 isolate, data, v8::NewStringType::kNormal, length);
37-
 }
38-
if (utf8_string.IsEmpty()) {
39-
 isolate->ThrowException(node::ERR_STRING_TOO_LONG(isolate));
40-
return MaybeLocal<String>();
41-
 } else {
42-
return utf8_string;
43-
 }
44-
 } else {
45-
 ret = StringBytes::Encode(isolate, data, length, encoding);
31+
// StringBytes::Encode() would report an over-long UTF-8 input as
32+
// ERR_BUFFER_TOO_LARGE (or clamp it); keep reporting it the way this
33+
// decoder always has.
34+
if (encoding == UTF8 && length > static_cast<size_t>(v8::String::kMaxLength))
35+
[[unlikely]] {
36+
 isolate->ThrowException(node::ERR_STRING_TOO_LONG(isolate));
37+
return MaybeLocal<String>();
4638
 }
4739

40+
// For UTF-8 this takes the simdutf-backed ASCII / Latin-1 / UTF-16 paths and
41+
// only falls back to v8::String::NewFromUtf8() (the previous unconditional
42+
// path here) for input containing invalid sequences, so U+FFFD replacement
43+
// is unchanged.
44+
 MaybeLocal<Value> ret = StringBytes::Encode(isolate, data, length, encoding);
45+
4846
if (ret.IsEmpty()) {
4947
return {};
5048
 }
‎test/parallel/test-string-decoder-utf8-large.js‎
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
'use strict';
2+
// The UTF-8 StringDecoder shares its byte->string conversion with
3+
// Buffer#toString(): ASCII, Latin-1-representable and general inputs take
4+
// different (SIMD) paths depending on content and size, and invalid input
5+
// falls back to a replacing decoder. This test pins the decoder's output for
6+
// inputs that cross those size thresholds, for chunkings that split multibyte
7+
// sequences, and for invalid bytes embedded in otherwise large valid input.
8+
require('../common');
9+
constassert=require('assert');
10+
const{ StringDecoder }=require('string_decoder');
11+
12+
functiondecodeInChunks(buf,chunkSize){
13+
constdecoder=newStringDecoder('utf8');
14+
letout='';
15+
for(leti=0;i<buf.length;i+=chunkSize){
16+
out+=decoder.write(buf.subarray(i,i+chunkSize));
17+
}
18+
returnout+decoder.end();
19+
}
20+
21+
functioncheck(str,label){
22+
constbuf=Buffer.from(str,'utf8');
23+
// Sanity: the expectation itself round-trips.
24+
assert.strictEqual(buf.toString('utf8'),str,`${label}: toString`);
25+
for(constchunkSizeof[1,2,3,4,5,7,31,32,33,255,256,257,
26+
4095,4096,65536,buf.length]){
27+
if(chunkSize>buf.length)continue;
28+
// Keep the test fast: byte-sized chunks only for the smaller inputs.
29+
if(buf.length>100_000&&chunkSize<4095)continue;
30+
assert.strictEqual(decodeInChunks(buf,chunkSize),str,
31+
`${label}: chunkSize=${chunkSize}`);
32+
}
33+
}
34+
35+
constsizes=[31,32,33,255,256,257,4096,70000,(1<<20)+5];
36+
for(constsizeofsizes){
37+
check('a'.repeat(size),`ascii ${size}`);
38+
// Latin-1 range only (one-byte string in V8, two bytes each in UTF-8).
39+
check('é'.repeat(size),`latin1 ${size}`);
40+
// ASCII with a single Latin-1 character at the end / start.
41+
check('a'.repeat(size-1)+'ÿ',`ascii+latin1 tail ${size}`);
42+
check('Ä'+'a'.repeat(size-1),`latin1 head+ascii ${size}`);
43+
// BMP beyond Latin-1 (three-byte sequences).
44+
check('日'.repeat(size),`cjk ${size}`);
45+
// Mixed, including astral plane characters (surrogate pairs, 4 bytes).
46+
check(('abé日\u{1F600}').repeat(Math.ceil(size/6)),`mixed ${size}`);
47+
}
48+
49+
// Invalid bytes inside otherwise valid input of every size class must still be
50+
// replaced with U+FFFD exactly as before, regardless of chunking.
51+
for(constsizeof[8,40,300,5000,(1<<20)+5]){
52+
constvalid=Buffer.from('a'.repeat(size));
53+
for(constbadof[[0xff],[0xc0,0xaf],[0xe2,0x28,0xa1],
54+
[0xed,0xa0,0x80]/* encoded surrogate */,
55+
[0xf0,0x9f,0x98]/* truncated 4-byte */]){
56+
constbuf=Buffer.concat([valid,Buffer.from(bad),valid]);
57+
constexpected=buf.toString('utf8');
58+
assert.ok(expected.includes('�'),`size=${size} bad=${bad}`);
59+
for(constchunkSizeof[1,3,64,size,size+1,buf.length]){
60+
if(buf.length>100_000&&chunkSize<size)continue;
61+
assert.strictEqual(decodeInChunks(buf,chunkSize),expected,
62+
`invalid ${bad} in ${size}, chunkSize=${chunkSize}`);
63+
}
64+
}
65+
}
66+
67+
// A lone continuation / lead byte split across the size classes at the very
68+
// end is buffered by the decoder and flushed as U+FFFD by end().
69+
{
70+
constdecoder=newStringDecoder('utf8');
71+
constbig=Buffer.concat([Buffer.from('a'.repeat(300)),Buffer.from([0xe2,0x82])]);
72+
assert.strictEqual(decoder.write(big),'a'.repeat(300));
73+
assert.strictEqual(decoder.end(),'�');
74+
}
75+
{
76+
constdecoder=newStringDecoder('utf8');
77+
constbig=Buffer.concat([Buffer.from('é'.repeat(300)),Buffer.from([0xe2,0x82])]);
78+
assert.strictEqual(decoder.write(big),'é'.repeat(300));
79+
assert.strictEqual(decoder.write(Buffer.from([0xac])),'€');
80+
assert.strictEqual(decoder.end(),'');
81+
}
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit f33dba7
Browse files
codebytereaduh95
codebytere
authored and
aduh95
committed
string_decoder: decode UTF-8 via StringBytes::Encode
StringDecoder used v8::String::NewFromUtf8() for UTF-8, while
Buffer#toString() goes through StringBytes::Encode(), which has
simdutf-backed ASCII, Latin-1 and UTF-16 paths and only falls back
to NewFromUtf8() for input that contains invalid sequences. Route
the decoder through the same function, so streams with
setEncoding('utf8') and readline decode at the same speed as
Buffer#toString(). U+FFFD replacement is unchanged because invalid
input still ends up in NewFromUtf8(), and the ERR_STRING_TOO_LONG
check is kept explicit so over-long input fails as before.
benchmark/string_decoder/string-decoder.js (encoding=utf8) and a
readline-over-pipe workload improve by 2-3x for chunks >= 1 KiB;
64 KiB newline-delimited JSON round trips over child stdio improve
by ~30% on the reading side alone.
Signed-off-by: Shelley Vohr <shelley.vohr@gmail.com>
PR-URL: #65324
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day>
Reviewed-By: Daniel Lemire <daniel@lemire.me>
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 89aba0c commit f33dba7
2 files changed
Lines changed: 94 additions & 15 deletions
File tree
‎src/string_decoder.cc‎
Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,21 @@ MaybeLocal<String> MakeString(Isolate* isolate,
2828
constchar* data,
2929
size_t length,
3030
enum encoding encoding) {
31-
 MaybeLocal<Value> ret;
32-
if (encoding == UTF8) {
33-
 MaybeLocal<String> utf8_string;
34-
if (length <= static_cast<size_t>(v8::String::kMaxLength)) {
35-
 utf8_string = String::NewFromUtf8(
36-
 isolate, data, v8::NewStringType::kNormal, length);
37-
 }
38-
if (utf8_string.IsEmpty()) {
39-
 isolate->ThrowException(node::ERR_STRING_TOO_LONG(isolate));
40-
return MaybeLocal<String>();
41-
 } else {
42-
return utf8_string;
43-
 }
44-
 } else {
45-
 ret = StringBytes::Encode(isolate, data, length, encoding);
31+
// StringBytes::Encode() would report an over-long UTF-8 input as
32+
// ERR_BUFFER_TOO_LARGE (or clamp it); keep reporting it the way this
33+
// decoder always has.
34+
if (encoding == UTF8 && length > static_cast<size_t>(v8::String::kMaxLength))
35+
[[unlikely]] {
36+
 isolate->ThrowException(node::ERR_STRING_TOO_LONG(isolate));
37+
return MaybeLocal<String>();
4638
 }
4739

40+
// For UTF-8 this takes the simdutf-backed ASCII / Latin-1 / UTF-16 paths and
41+
// only falls back to v8::String::NewFromUtf8() (the previous unconditional
42+
// path here) for input containing invalid sequences, so U+FFFD replacement
43+
// is unchanged.
44+
 MaybeLocal<Value> ret = StringBytes::Encode(isolate, data, length, encoding);
45+
4846
if (ret.IsEmpty()) {
4947
return {};
5048
 }
‎test/parallel/test-string-decoder-utf8-large.js‎
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
'use strict';
2+
// The UTF-8 StringDecoder shares its byte->string conversion with
3+
// Buffer#toString(): ASCII, Latin-1-representable and general inputs take
4+
// different (SIMD) paths depending on content and size, and invalid input
5+
// falls back to a replacing decoder. This test pins the decoder's output for
6+
// inputs that cross those size thresholds, for chunkings that split multibyte
7+
// sequences, and for invalid bytes embedded in otherwise large valid input.
8+
require('../common');
9+
constassert=require('assert');
10+
const{ StringDecoder }=require('string_decoder');
11+
12+
functiondecodeInChunks(buf,chunkSize){
13+
constdecoder=newStringDecoder('utf8');
14+
letout='';
15+
for(leti=0;i<buf.length;i+=chunkSize){
16+
out+=decoder.write(buf.subarray(i,i+chunkSize));
17+
}
18+
returnout+decoder.end();
19+
}
20+
21+
functioncheck(str,label){
22+
constbuf=Buffer.from(str,'utf8');
23+
// Sanity: the expectation itself round-trips.
24+
assert.strictEqual(buf.toString('utf8'),str,`${label}: toString`);
25+
for(constchunkSizeof[1,2,3,4,5,7,31,32,33,255,256,257,
26+
4095,4096,65536,buf.length]){
27+
if(chunkSize>buf.length)continue;
28+
// Keep the test fast: byte-sized chunks only for the smaller inputs.
29+
if(buf.length>100_000&&chunkSize<4095)continue;
30+
assert.strictEqual(decodeInChunks(buf,chunkSize),str,
31+
`${label}: chunkSize=${chunkSize}`);
32+
}
33+
}
34+
35+
constsizes=[31,32,33,255,256,257,4096,70000,(1<<20)+5];
36+
for(constsizeofsizes){
37+
check('a'.repeat(size),`ascii ${size}`);
38+
// Latin-1 range only (one-byte string in V8, two bytes each in UTF-8).
39+
check('é'.repeat(size),`latin1 ${size}`);
40+
// ASCII with a single Latin-1 character at the end / start.
41+
check('a'.repeat(size-1)+'ÿ',`ascii+latin1 tail ${size}`);
42+
check('Ä'+'a'.repeat(size-1),`latin1 head+ascii ${size}`);
43+
// BMP beyond Latin-1 (three-byte sequences).
44+
check('日'.repeat(size),`cjk ${size}`);
45+
// Mixed, including astral plane characters (surrogate pairs, 4 bytes).
46+
check(('abé日\u{1F600}').repeat(Math.ceil(size/6)),`mixed ${size}`);
47+
}
48+
49+
// Invalid bytes inside otherwise valid input of every size class must still be
50+
// replaced with U+FFFD exactly as before, regardless of chunking.
51+
for(constsizeof[8,40,300,5000,(1<<20)+5]){
52+
constvalid=Buffer.from('a'.repeat(size));
53+
for(constbadof[[0xff],[0xc0,0xaf],[0xe2,0x28,0xa1],
54+
[0xed,0xa0,0x80]/* encoded surrogate */,
55+
[0xf0,0x9f,0x98]/* truncated 4-byte */]){
56+
constbuf=Buffer.concat([valid,Buffer.from(bad),valid]);
57+
constexpected=buf.toString('utf8');
58+
assert.ok(expected.includes('�'),`size=${size} bad=${bad}`);
59+
for(constchunkSizeof[1,3,64,size,size+1,buf.length]){
60+
if(buf.length>100_000&&chunkSize<size)continue;
61+
assert.strictEqual(decodeInChunks(buf,chunkSize),expected,
62+
`invalid ${bad} in ${size}, chunkSize=${chunkSize}`);
63+
}
64+
}
65+
}
66+
67+
// A lone continuation / lead byte split across the size classes at the very
68+
// end is buffered by the decoder and flushed as U+FFFD by end().
69+
{
70+
constdecoder=newStringDecoder('utf8');
71+
constbig=Buffer.concat([Buffer.from('a'.repeat(300)),Buffer.from([0xe2,0x82])]);
72+
assert.strictEqual(decoder.write(big),'a'.repeat(300));
73+
assert.strictEqual(decoder.end(),'�');
74+
}
75+
{
76+
constdecoder=newStringDecoder('utf8');
77+
constbig=Buffer.concat([Buffer.from('é'.repeat(300)),Buffer.from([0xe2,0x82])]);
78+
assert.strictEqual(decoder.write(big),'é'.repeat(300));
79+
assert.strictEqual(decoder.write(Buffer.from([0xac])),'€');
80+
assert.strictEqual(decoder.end(),'');
81+
}
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit f33dba7
Browse files
codebytereaduh95
codebytere
authored and
aduh95
committed
string_decoder: decode UTF-8 via StringBytes::Encode
StringDecoder used v8::String::NewFromUtf8() for UTF-8, while
Buffer#toString() goes through StringBytes::Encode(), which has
simdutf-backed ASCII, Latin-1 and UTF-16 paths and only falls back
to NewFromUtf8() for input that contains invalid sequences. Route
the decoder through the same function, so streams with
setEncoding('utf8') and readline decode at the same speed as
Buffer#toString(). U+FFFD replacement is unchanged because invalid
input still ends up in NewFromUtf8(), and the ERR_STRING_TOO_LONG
check is kept explicit so over-long input fails as before.
benchmark/string_decoder/string-decoder.js (encoding=utf8) and a
readline-over-pipe workload improve by 2-3x for chunks >= 1 KiB;
64 KiB newline-delimited JSON round trips over child stdio improve
by ~30% on the reading side alone.
Signed-off-by: Shelley Vohr <shelley.vohr@gmail.com>
PR-URL: #65324
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day>
Reviewed-By: Daniel Lemire <daniel@lemire.me>
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 89aba0c commit f33dba7
2 files changed
Lines changed: 94 additions & 15 deletions
File tree
‎src/string_decoder.cc‎
Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,21 @@ MaybeLocal<String> MakeString(Isolate* isolate,
2828
constchar* data,
2929
size_t length,
3030
enum encoding encoding) {
31-
 MaybeLocal<Value> ret;
32-
if (encoding == UTF8) {
33-
 MaybeLocal<String> utf8_string;
34-
if (length <= static_cast<size_t>(v8::String::kMaxLength)) {
35-
 utf8_string = String::NewFromUtf8(
36-
 isolate, data, v8::NewStringType::kNormal, length);
37-
 }
38-
if (utf8_string.IsEmpty()) {
39-
 isolate->ThrowException(node::ERR_STRING_TOO_LONG(isolate));
40-
return MaybeLocal<String>();
41-
 } else {
42-
return utf8_string;
43-
 }
44-
 } else {
45-
 ret = StringBytes::Encode(isolate, data, length, encoding);
31+
// StringBytes::Encode() would report an over-long UTF-8 input as
32+
// ERR_BUFFER_TOO_LARGE (or clamp it); keep reporting it the way this
33+
// decoder always has.
34+
if (encoding == UTF8 && length > static_cast<size_t>(v8::String::kMaxLength))
35+
[[unlikely]] {
36+
 isolate->ThrowException(node::ERR_STRING_TOO_LONG(isolate));
37+
return MaybeLocal<String>();
4638
 }
4739

40+
// For UTF-8 this takes the simdutf-backed ASCII / Latin-1 / UTF-16 paths and
41+
// only falls back to v8::String::NewFromUtf8() (the previous unconditional
42+
// path here) for input containing invalid sequences, so U+FFFD replacement
43+
// is unchanged.
44+
 MaybeLocal<Value> ret = StringBytes::Encode(isolate, data, length, encoding);
45+
4846
if (ret.IsEmpty()) {
4947
return {};
5048
 }
‎test/parallel/test-string-decoder-utf8-large.js‎
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
'use strict';
2+
// The UTF-8 StringDecoder shares its byte->string conversion with
3+
// Buffer#toString(): ASCII, Latin-1-representable and general inputs take
4+
// different (SIMD) paths depending on content and size, and invalid input
5+
// falls back to a replacing decoder. This test pins the decoder's output for
6+
// inputs that cross those size thresholds, for chunkings that split multibyte
7+
// sequences, and for invalid bytes embedded in otherwise large valid input.
8+
require('../common');
9+
constassert=require('assert');
10+
const{ StringDecoder }=require('string_decoder');
11+
12+
functiondecodeInChunks(buf,chunkSize){
13+
constdecoder=newStringDecoder('utf8');
14+
letout='';
15+
for(leti=0;i<buf.length;i+=chunkSize){
16+
out+=decoder.write(buf.subarray(i,i+chunkSize));
17+
}
18+
returnout+decoder.end();
19+
}
20+
21+
functioncheck(str,label){
22+
constbuf=Buffer.from(str,'utf8');
23+
// Sanity: the expectation itself round-trips.
24+
assert.strictEqual(buf.toString('utf8'),str,`${label}: toString`);
25+
for(constchunkSizeof[1,2,3,4,5,7,31,32,33,255,256,257,
26+
4095,4096,65536,buf.length]){
27+
if(chunkSize>buf.length)continue;
28+
// Keep the test fast: byte-sized chunks only for the smaller inputs.
29+
if(buf.length>100_000&&chunkSize<4095)continue;
30+
assert.strictEqual(decodeInChunks(buf,chunkSize),str,
31+
`${label}: chunkSize=${chunkSize}`);
32+
}
33+
}
34+
35+
constsizes=[31,32,33,255,256,257,4096,70000,(1<<20)+5];
36+
for(constsizeofsizes){
37+
check('a'.repeat(size),`ascii ${size}`);
38+
// Latin-1 range only (one-byte string in V8, two bytes each in UTF-8).
39+
check('é'.repeat(size),`latin1 ${size}`);
40+
// ASCII with a single Latin-1 character at the end / start.
41+
check('a'.repeat(size-1)+'ÿ',`ascii+latin1 tail ${size}`);
42+
check('Ä'+'a'.repeat(size-1),`latin1 head+ascii ${size}`);
43+
// BMP beyond Latin-1 (three-byte sequences).
44+
check('日'.repeat(size),`cjk ${size}`);
45+
// Mixed, including astral plane characters (surrogate pairs, 4 bytes).
46+
check(('abé日\u{1F600}').repeat(Math.ceil(size/6)),`mixed ${size}`);
47+
}
48+
49+
// Invalid bytes inside otherwise valid input of every size class must still be
50+
// replaced with U+FFFD exactly as before, regardless of chunking.
51+
for(constsizeof[8,40,300,5000,(1<<20)+5]){
52+
constvalid=Buffer.from('a'.repeat(size));
53+
for(constbadof[[0xff],[0xc0,0xaf],[0xe2,0x28,0xa1],
54+
[0xed,0xa0,0x80]/* encoded surrogate */,
55+
[0xf0,0x9f,0x98]/* truncated 4-byte */]){
56+
constbuf=Buffer.concat([valid,Buffer.from(bad),valid]);
57+
constexpected=buf.toString('utf8');
58+
assert.ok(expected.includes('�'),`size=${size} bad=${bad}`);
59+
for(constchunkSizeof[1,3,64,size,size+1,buf.length]){
60+
if(buf.length>100_000&&chunkSize<size)continue;
61+
assert.strictEqual(decodeInChunks(buf,chunkSize),expected,
62+
`invalid ${bad} in ${size}, chunkSize=${chunkSize}`);
63+
}
64+
}
65+
}
66+
67+
// A lone continuation / lead byte split across the size classes at the very
68+
// end is buffered by the decoder and flushed as U+FFFD by end().
69+
{
70+
constdecoder=newStringDecoder('utf8');
71+
constbig=Buffer.concat([Buffer.from('a'.repeat(300)),Buffer.from([0xe2,0x82])]);
72+
assert.strictEqual(decoder.write(big),'a'.repeat(300));
73+
assert.strictEqual(decoder.end(),'�');
74+
}
75+
{
76+
constdecoder=newStringDecoder('utf8');
77+
constbig=Buffer.concat([Buffer.from('é'.repeat(300)),Buffer.from([0xe2,0x82])]);
78+
assert.strictEqual(decoder.write(big),'é'.repeat(300));
79+
assert.strictEqual(decoder.write(Buffer.from([0xac])),'€');
80+
assert.strictEqual(decoder.end(),'');
81+
}
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Commit f33dba7
Browse files
codebytereaduh95
codebytere
authored and
aduh95
committed
string_decoder: decode UTF-8 via StringBytes::Encode
StringDecoder used v8::String::NewFromUtf8() for UTF-8, while
Buffer#toString() goes through StringBytes::Encode(), which has
simdutf-backed ASCII, Latin-1 and UTF-16 paths and only falls back
to NewFromUtf8() for input that contains invalid sequences. Route
the decoder through the same function, so streams with
setEncoding('utf8') and readline decode at the same speed as
Buffer#toString(). U+FFFD replacement is unchanged because invalid
input still ends up in NewFromUtf8(), and the ERR_STRING_TOO_LONG
check is kept explicit so over-long input fails as before.
benchmark/string_decoder/string-decoder.js (encoding=utf8) and a
readline-over-pipe workload improve by 2-3x for chunks >= 1 KiB;
64 KiB newline-delimited JSON round trips over child stdio improve
by ~30% on the reading side alone.
Signed-off-by: Shelley Vohr <shelley.vohr@gmail.com>
PR-URL: #65324
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day>
Reviewed-By: Daniel Lemire <daniel@lemire.me>
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 89aba0c commit f33dba7
2 files changed
Lines changed: 94 additions & 15 deletions
File tree
‎src/string_decoder.cc‎
Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,21 @@ MaybeLocal<String> MakeString(Isolate* isolate,
2828
constchar* data,
2929
size_t length,
3030
enum encoding encoding) {
31-
 MaybeLocal<Value> ret;
32-
if (encoding == UTF8) {
33-
 MaybeLocal<String> utf8_string;
34-
if (length <= static_cast<size_t>(v8::String::kMaxLength)) {
35-
 utf8_string = String::NewFromUtf8(
36-
 isolate, data, v8::NewStringType::kNormal, length);
37-
 }
38-
if (utf8_string.IsEmpty()) {
39-
 isolate->ThrowException(node::ERR_STRING_TOO_LONG(isolate));
40-
return MaybeLocal<String>();
41-
 } else {
42-
return utf8_string;
43-
 }
44-
 } else {
45-
 ret = StringBytes::Encode(isolate, data, length, encoding);
31+
// StringBytes::Encode() would report an over-long UTF-8 input as
32+
// ERR_BUFFER_TOO_LARGE (or clamp it); keep reporting it the way this
33+
// decoder always has.
34+
if (encoding == UTF8 && length > static_cast<size_t>(v8::String::kMaxLength))
35+
[[unlikely]] {
36+
 isolate->ThrowException(node::ERR_STRING_TOO_LONG(isolate));
37+
return MaybeLocal<String>();
4638
 }
4739

40+
// For UTF-8 this takes the simdutf-backed ASCII / Latin-1 / UTF-16 paths and
41+
// only falls back to v8::String::NewFromUtf8() (the previous unconditional
42+
// path here) for input containing invalid sequences, so U+FFFD replacement
43+
// is unchanged.
44+
 MaybeLocal<Value> ret = StringBytes::Encode(isolate, data, length, encoding);
45+
4846
if (ret.IsEmpty()) {
4947
return {};
5048
 }
‎test/parallel/test-string-decoder-utf8-large.js‎
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
'use strict';
2+
// The UTF-8 StringDecoder shares its byte->string conversion with
3+
// Buffer#toString(): ASCII, Latin-1-representable and general inputs take
4+
// different (SIMD) paths depending on content and size, and invalid input
5+
// falls back to a replacing decoder. This test pins the decoder's output for
6+
// inputs that cross those size thresholds, for chunkings that split multibyte
7+
// sequences, and for invalid bytes embedded in otherwise large valid input.
8+
require('../common');
9+
constassert=require('assert');
10+
const{ StringDecoder }=require('string_decoder');
11+
12+
functiondecodeInChunks(buf,chunkSize){
13+
constdecoder=newStringDecoder('utf8');
14+
letout='';
15+
for(leti=0;i<buf.length;i+=chunkSize){
16+
out+=decoder.write(buf.subarray(i,i+chunkSize));
17+
}
18+
returnout+decoder.end();
19+
}
20+
21+
functioncheck(str,label){
22+
constbuf=Buffer.from(str,'utf8');
23+
// Sanity: the expectation itself round-trips.
24+
assert.strictEqual(buf.toString('utf8'),str,`${label}: toString`);
25+
for(constchunkSizeof[1,2,3,4,5,7,31,32,33,255,256,257,
26+
4095,4096,65536,buf.length]){
27+
if(chunkSize>buf.length)continue;
28+
// Keep the test fast: byte-sized chunks only for the smaller inputs.
29+
if(buf.length>100_000&&chunkSize<4095)continue;
30+
assert.strictEqual(decodeInChunks(buf,chunkSize),str,
31+
`${label}: chunkSize=${chunkSize}`);
32+
}
33+
}
34+
35+
constsizes=[31,32,33,255,256,257,4096,70000,(1<<20)+5];
36+
for(constsizeofsizes){
37+
check('a'.repeat(size),`ascii ${size}`);
38+
// Latin-1 range only (one-byte string in V8, two bytes each in UTF-8).
39+
check('é'.repeat(size),`latin1 ${size}`);
40+
// ASCII with a single Latin-1 character at the end / start.
41+
check('a'.repeat(size-1)+'ÿ',`ascii+latin1 tail ${size}`);
42+
check('Ä'+'a'.repeat(size-1),`latin1 head+ascii ${size}`);
43+
// BMP beyond Latin-1 (three-byte sequences).
44+
check('日'.repeat(size),`cjk ${size}`);
45+
// Mixed, including astral plane characters (surrogate pairs, 4 bytes).
46+
check(('abé日\u{1F600}').repeat(Math.ceil(size/6)),`mixed ${size}`);
47+
}
48+
49+
// Invalid bytes inside otherwise valid input of every size class must still be
50+
// replaced with U+FFFD exactly as before, regardless of chunking.
51+
for(constsizeof[8,40,300,5000,(1<<20)+5]){
52+
constvalid=Buffer.from('a'.repeat(size));
53+
for(constbadof[[0xff],[0xc0,0xaf],[0xe2,0x28,0xa1],
54+
[0xed,0xa0,0x80]/* encoded surrogate */,
55+
[0xf0,0x9f,0x98]/* truncated 4-byte */]){
56+
constbuf=Buffer.concat([valid,Buffer.from(bad),valid]);
57+
constexpected=buf.toString('utf8');
58+
assert.ok(expected.includes('�'),`size=${size} bad=${bad}`);
59+
for(constchunkSizeof[1,3,64,size,size+1,buf.length]){
60+
if(buf.length>100_000&&chunkSize<size)continue;
61+
assert.strictEqual(decodeInChunks(buf,chunkSize),expected,
62+
`invalid ${bad} in ${size}, chunkSize=${chunkSize}`);
63+
}
64+
}
65+
}
66+
67+
// A lone continuation / lead byte split across the size classes at the very
68+
// end is buffered by the decoder and flushed as U+FFFD by end().
69+
{
70+
constdecoder=newStringDecoder('utf8');
71+
constbig=Buffer.concat([Buffer.from('a'.repeat(300)),Buffer.from([0xe2,0x82])]);
72+
assert.strictEqual(decoder.write(big),'a'.repeat(300));
73+
assert.strictEqual(decoder.end(),'�');
74+
}
75+
{
76+
constdecoder=newStringDecoder('utf8');
77+
constbig=Buffer.concat([Buffer.from('é'.repeat(300)),Buffer.from([0xe2,0x82])]);
78+
assert.strictEqual(decoder.write(big),'é'.repeat(300));
79+
assert.strictEqual(decoder.write(Buffer.from([0xac])),'€');
80+
assert.strictEqual(decoder.end(),'');
81+
}
0 commit comments
Comments
 (0)