Increment = index when parsing set-cookie

src/index.ts

@@ -120,7 +120,7 @@ export function parseCookie(str: string, options?: ParseOptions): Cookies {
 
   do {
     const eqIdx = eqIndex(str, index, len);
-    if (eqIdx === -1) break; // No more cookie pairs.
+    if (eqIdx === len) break; // No more cookie pairs.
 
     const endIdx = endIndex(str, index, len);
 
@@ -398,24 +398,25 @@ export function parseSetCookie(str: string, options?: ParseOptions): SetCookie {
   const dec = options?.decode || decode;
   const len = str.length;
   const endIdx = endIndex(str, 0, len);
-  const eqIdx = eqIndex(str, 0, endIdx);
+  let eqIdx = eqIndex(str, 0, len);
   const setCookie: SetCookie =
-    eqIdx === -1
-      ? { name: "", value: dec(valueSlice(str, 0, endIdx)) }
-      : {
+    eqIdx < endIdx
+      ? {
           name: valueSlice(str, 0, eqIdx),
           value: dec(valueSlice(str, eqIdx + 1, endIdx)),
-        };
+        }
+      : { name: "", value: dec(valueSlice(str, 0, endIdx)) };
 
   let index = endIdx + 1;
   while (index < len) {
     const endIdx = endIndex(str, index, len);
-    const eqIdx = eqIndex(str, index, endIdx);
+    if (eqIdx < index) eqIdx = eqIndex(str, index, len);
+
     const attr =
-      eqIdx === -1
-        ? valueSlice(str, index, endIdx)
-        : valueSlice(str, index, eqIdx);
-    const val = eqIdx === -1 ? undefined : valueSlice(str, eqIdx + 1, endIdx);
+      eqIdx < endIdx
+        ? valueSlice(str, index, eqIdx)
+        : valueSlice(str, index, endIdx);
+    const val = eqIdx < endIdx ? valueSlice(str, eqIdx + 1, endIdx) : undefined;
 
     switch (attr.toLowerCase()) {
       case "httponly":
@@ -472,19 +473,19 @@ export function parseSetCookie(str: string, options?: ParseOptions): SetCookie {
 }
 
 /**
- * Find the `;` character between `min` and `len` in str.
+ * Find the next `;` character, or return `len`.
  */
 function endIndex(str: string, min: number, len: number) {
   const index = str.indexOf(";", min);
   return index === -1 ? len : index;
 }
 
 /**
- * Find the `=` character between `min` and `max` in str.
+ * Find the next `=` character, or return `len`.
  */
-function eqIndex(str: string, min: number, max: number) {
+function eqIndex(str: string, min: number, len: number) {
   const index = str.indexOf("=", min);
-  return index < max ? index : -1;
+  return index === -1 ? len : index;
 }
 
 /**

src/parse-cookie.bench.ts

@@ -33,6 +33,11 @@ describe("cookie.parseCookie", () => {
   bench("100 cookies", () => {
     cookie.parseCookie(cookies100);
   });
+
+  const semicolons = ";".repeat(100_000);
+  bench("100k semicolons", () => {
+    cookie.parseCookie(semicolons);
+  });
 });
 
 describe("parse top-sites", () => {

src/parse-set-cookie.bench.ts

@@ -10,4 +10,9 @@ describe("parse top-sites", () => {
       }
     });
   });
+
+  const semicolons = ";".repeat(100_000);
+  bench("100k semicolons", () => {
+    cookie.parseSetCookie(semicolons);
+  });
 });