Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 35 additions & 0 deletions benchmark/url/url-searchparams-percent-scan.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
'use strict';

const common = require('../common.js');
const assert = require('node:assert');

const bench = common.createBenchmark(main, {
n: [1e5],
length: [32, 1024],
position: ['start', 'end'],
encoding: ['valid', 'invalid', 'unicode', 'plain'],
});

function main({ n, length, position, encoding }) {
const prefix = 'a'.repeat(length);
const [encoded, decoded] = {
valid: ['%20', ' '],
invalid: ['%zz', '%zz'],
unicode: ['%E2%82%AC', '\u20ac'],
plain: ['text', 'text'],
}[encoding];
const input = position === 'start' ? encoded + prefix : prefix + encoded;
const expected = position === 'start' ? decoded + prefix : prefix + decoded;
const query = `key=${input}`;
for (let index = 0; index < 1000; index++) {
new URLSearchParams(query);
}

let result;
bench.start();
for (let index = 0; index < n; index++) {
result = new URLSearchParams(query);
}
bench.end(n);
assert.deepStrictEqual([...result], [['key', expected]]);
}
10 changes: 5 additions & 5 deletions lib/internal/url.js
Original file line number Diff line number Diff line change
Expand Up @@ -1322,11 +1322,11 @@ function unescapeFormComponent(s) {
}
}

function hasPercentHex(s) {
function hasPercentHex(s, start) {
const end = s.length - 2;
for (let i = 0; i < end; i++) {
if (StringPrototypeCharCodeAt(s, i) === 37 && // '%'
isHexTable[StringPrototypeCharCodeAt(s, i + 1)] === 1 &&
for (let i = start; i !== -1 && i < end;
i = StringPrototypeIndexOf(s, '%', i + 1)) {
if (isHexTable[StringPrototypeCharCodeAt(s, i + 1)] === 1 &&
isHexTable[StringPrototypeCharCodeAt(s, i + 2)] === 1) {
return true;
}
Expand All @@ -1348,7 +1348,7 @@ function decodeFormComponent(qs, start, end) {
// Only percent-decode when a complete %HH sequence exists. A lone '%' or
// a '%' followed by a non-hex character must be left intact so later
// serialization can encode the raw bytes.
if (pct === -1 || !hasPercentHex(replaced)) {
if (pct === -1 || !hasPercentHex(replaced, pct)) {
return replaced;
}
return unescapeFormComponent(replaced);
Expand Down
31 changes: 31 additions & 0 deletions test/parallel/test-whatwg-url-searchparams-percent-scan.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
'use strict';

require('../common');
const assert = require('node:assert');

const cases = [
['%41', 'A'],
['%zz', '%zz'],
['%zz%41', '%zzA'],
['%', '%'],
['%A', '%A'],
['%C3%A9', '\u00e9'],
['%F0%9F%98%80', '\ud83d\ude00'],
['%FF', '\ufffd'],
['%E2%82', '\ufffd'],
];

for (const prefix of ['', 'k'.repeat(32), 'k'.repeat(1024), 'k+'.repeat(64)]) {
const decodedPrefix = prefix.replaceAll('+', ' ');
for (const [encoded, decoded] of cases) {
for (const position of ['start', 'end']) {
const input = position === 'start' ? encoded + prefix : prefix + encoded;
const expected = position === 'start' ?
decoded + decodedPrefix : decodedPrefix + decoded;
const query = `${input}=${input}`;
assert.deepStrictEqual([...new URLSearchParams(query)], [[expected, expected]]);
const url = new URL(`https://example.org/?${query}`);
assert.deepStrictEqual([...url.searchParams], [[expected, expected]]);
}
}
}
Loading