Skip to content
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

perf(parse): cache length, return early #144

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion benchmark/parse-top.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@
"support.google.com": "UUU=000=llU0lUlllUUlllUUll0U0UUll0UUlUUlU-lUUllU0UllUlUUlUlU0UlUUU_U-UlUU0lUUlUllUlUlUUl00llllUl0lUUUU00Ul0UUlUll0UUUU_UUlUlllUllllU0U0lllllUlU000UllUl--UUU_ll_lllU0UllUUlllU00UlU; UUU=000=llU0lUlllUUlllUUll0U0UUll0UUlUUlU-lUUllU0UllUlUUlUlU0UlUUU_U-UlUU0lUUlUllUlUlUUl00llllUl0lUUUU00Ul0UUlUll0UUUU_UUlUlllUllllU0U0lllllUlU000UllUl--UUU_ll_lllU0UllUUlllU00UlU",
"www.google.com": "0U_UUU=0000-00-00-00; UUU=UUUU_UUUlUUUUlUll_lllll0U00UUl0lllUUUUlUU_0_llUl0l0UUlU0_lU; UUU=000=lll0lUlUlllUll00U_lUlUUUUlll0lUlUU0lllUlllUllUUUll0U_U0llUU0UlU0Ull0U_l-_UUl00lUllUl0UUllUlUll0UUllUUUlU0UUlUllUlUUUlUllU-lUUlll0UlU0lUllUUUUlUUUlUlUU0llll_lU0lUlllll_UlUl",
"youtu.be": "UUU=0; UUU=UUUUUUUllUU; UUUUUUU_UUUU0_UUUU=00UlUU-UUU0",
"youtube.com": "UUU=0; UUU=lU0lUUUlUll; UUUUUUU_UUUU0_UUUU=0UUUlUllU0l"
"youtube.com": "UUU=0; UUU=lU0lUUUlUll; UUUUUUU_UUUU0_UUUU=0UUUlUllU0l",
"example.com": ""
}
29 changes: 20 additions & 9 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,33 +50,44 @@ function parse(str, options) {
}

var obj = {}
var opt = options || {};
var dec = opt.decode || decode;
var length = str.length

if (length < 2) {
// RFC 6265 sec 4.1.1, RFC 2616 2.2 defines a cookie name consists of one char minimum, plus '='.
return obj
}

var dec = (options && options.decode) || decode;

var index = 0
while (index < str.length) {
var eqIdx = str.indexOf('=', index)
var eqIdx = 0
var endIdx = 0
var key;
var val;

do {
eqIdx = str.indexOf('=', index)

// no more cookie pairs
if (eqIdx === -1) {
break
}

var endIdx = str.indexOf(';', index)
endIdx = str.indexOf(';', index)

if (endIdx === -1) {
endIdx = str.length
endIdx = length
} else if (endIdx < eqIdx) {
// backtrack on prior semicolon
index = str.lastIndexOf(';', eqIdx - 1) + 1
continue
}

var key = str.slice(index, eqIdx).trim()
key = str.slice(index, eqIdx).trim()

// only assign once
if (undefined === obj[key]) {
var val = str.slice(eqIdx + 1, endIdx).trim()
val = str.slice(eqIdx + 1, endIdx).trim()

// quoted values
if (val.charCodeAt(0) === 0x22) {
Expand All @@ -87,7 +98,7 @@ function parse(str, options) {
}

index = endIdx + 1
}
} while (index < length)

return obj;
}
Expand Down
4 changes: 4 additions & 0 deletions test/parse.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ describe('cookie.parse(str)', function () {
assert.deepEqual(cookie.parse('foo= ; bar='), { foo: '', bar: '' })
})

it('should parse cookie with minimum length', function () {
assert.deepEqual(cookie.parse('f='), { f: '' })
})

it('should URL-decode values', function () {
assert.deepEqual(cookie.parse('foo="bar=123456789&name=Magic+Mouse"'),
{ foo: 'bar=123456789&name=Magic+Mouse' })
Expand Down