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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "better-call",
"version": "1.0.19",
"version": "1.0.20",
"packageManager": "[email protected]",
"type": "module",
"repository": {
Expand Down
15 changes: 15 additions & 0 deletions src/cookies.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,21 @@ describe("parseCookies", () => {
expect(cookies.get("test")).toBe("test");
expect(cookies.get("test2")).toBe("test 2");
});

it("should parse comma-separated cookies from browser environments", () => {
const cookies = parseCookies("test=test, test2=test 2");
expect(cookies.size).toBe(2);
expect(cookies.get("test")).toBe("test");
expect(cookies.get("test2")).toBe("test 2");
});

it("should parse mixed comma and semicolon separated cookies", () => {
const cookies = parseCookies("a=1; b=2, c=3,d=4; e=5");
expect(cookies.size).toBe(5);
expect(cookies.get("a")).toBe("1");
expect(cookies.get("b")).toBe("2");
expect(cookies.get("c")).toBe("3");
});
});

describe("get-cookies", () => {
Expand Down
29 changes: 13 additions & 16 deletions src/cookies.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,34 +118,31 @@ export function parseCookies(str: string) {
}

const cookies: Map<string, string> = new Map();
if (!str) {
return cookies;
}

let index = 0;
while (index < str.length) {
const eqIdx = str.indexOf("=", index);
const pairs = str.split(/[;,]\s*/);

if (eqIdx === -1) {
break;
}
for (const pair of pairs) {
const eqIdx = pair.indexOf("=");

let endIdx = str.indexOf(";", index);

if (endIdx === -1) {
endIdx = str.length;
} else if (endIdx < eqIdx) {
index = str.lastIndexOf(";", eqIdx - 1) + 1;
if (eqIdx === -1) {
continue;
}

const key = str.slice(index, eqIdx).trim();
const key = pair.slice(0, eqIdx).trim();

if (!cookies.has(key)) {
let val = str.slice(eqIdx + 1, endIdx).trim();
let val = pair.slice(eqIdx + 1).trim();

if (val.codePointAt(0) === 0x22) {
// 0x22 is the code for "
val = val.slice(1, -1);
}

cookies.set(key, tryDecode(val));
}

index = endIdx + 1;
}

return cookies;
Expand Down