h3 1.15.0 → 1.15.1

package/dist/index.cjs

@@ -2,7 +2,6 @@
 
 const ufo = require('ufo');
 const cookieEs = require('cookie-es');
-const ohash = require('ohash');
 const radix3 = require('radix3');
 const destr = require('destr');
 const defu = require('defu');
@@ -593,24 +592,46 @@ function sanitizeStatusCode(statusCode, defaultStatusCode = 200) {
   return statusCode;
 }
 
+function getDistinctCookieKey(name, opts) {
+  return [
+    name,
+    opts.domain || "",
+    opts.path || "/",
+    Boolean(opts.secure),
+    Boolean(opts.httpOnly),
+    Boolean(opts.sameSite)
+  ].join(";");
+}
+
 function parseCookies(event) {
   return cookieEs.parse(event.node.req.headers.cookie || "");
 }
 function getCookie(event, name) {
   return parseCookies(event)[name];
 }
-function setCookie(event, name, value, serializeOptions) {
-  serializeOptions = { path: "/", ...serializeOptions };
-  const cookieStr = cookieEs.serialize(name, value, serializeOptions);
-  let setCookies = event.node.res.getHeader("set-cookie");
-  if (!Array.isArray(setCookies)) {
-    setCookies = [setCookies];
+function setCookie(event, name, value, serializeOptions = {}) {
+  if (!serializeOptions.path) {
+    serializeOptions = { path: "/", ...serializeOptions };
   }
-  const _optionsHash = ohash.objectHash(serializeOptions);
-  setCookies = setCookies.filter((cookieValue) => {
-    return cookieValue && _optionsHash !== ohash.objectHash(cookieEs.parse(cookieValue));
-  });
-  event.node.res.setHeader("set-cookie", [...setCookies, cookieStr]);
+  const newCookie = cookieEs.serialize(name, value, serializeOptions);
+  const currentCookies = splitCookiesString(
+    event.node.res.getHeader("set-cookie")
+  );
+  if (currentCookies.length === 0) {
+    event.node.res.setHeader("set-cookie", newCookie);
+    return;
+  }
+  const newCookieKey = getDistinctCookieKey(name, serializeOptions);
+  event.node.res.removeHeader("set-cookie");
+  for (const cookie of currentCookies) {
+    const parsed = cookieEs.parseSetCookie(cookie);
+    const key = getDistinctCookieKey(parsed.name, parsed);
+    if (key === newCookieKey) {
+      continue;
+    }
+    event.node.res.appendHeader("set-cookie", cookie);
+  }
+  event.node.res.appendHeader("set-cookie", newCookie);
 }
 function deleteCookie(event, name, serializeOptions) {
   setCookie(event, name, "", {

package/dist/index.mjs

@@ -1,6 +1,5 @@
 import { withoutTrailingSlash, withoutBase, getQuery as getQuery$1, decode, decodePath, withLeadingSlash, parseURL, joinURL } from 'ufo';
-import { parse as parse$1, serialize } from 'cookie-es';
-import { objectHash } from 'ohash';
+import { parse as parse$1, serialize, parseSetCookie } from 'cookie-es';
 import { createRouter as createRouter$1, toRouteMatcher } from 'radix3';
 import destr from 'destr';
 import { defu } from 'defu';
@@ -586,24 +585,46 @@ function sanitizeStatusCode(statusCode, defaultStatusCode = 200) {
   return statusCode;
 }
 
+function getDistinctCookieKey(name, opts) {
+  return [
+    name,
+    opts.domain || "",
+    opts.path || "/",
+    Boolean(opts.secure),
+    Boolean(opts.httpOnly),
+    Boolean(opts.sameSite)
+  ].join(";");
+}
+
 function parseCookies(event) {
   return parse$1(event.node.req.headers.cookie || "");
 }
 function getCookie(event, name) {
   return parseCookies(event)[name];
 }
-function setCookie(event, name, value, serializeOptions) {
-  serializeOptions = { path: "/", ...serializeOptions };
-  const cookieStr = serialize(name, value, serializeOptions);
-  let setCookies = event.node.res.getHeader("set-cookie");
-  if (!Array.isArray(setCookies)) {
-    setCookies = [setCookies];
+function setCookie(event, name, value, serializeOptions = {}) {
+  if (!serializeOptions.path) {
+    serializeOptions = { path: "/", ...serializeOptions };
   }
-  const _optionsHash = objectHash(serializeOptions);
-  setCookies = setCookies.filter((cookieValue) => {
-    return cookieValue && _optionsHash !== objectHash(parse$1(cookieValue));
-  });
-  event.node.res.setHeader("set-cookie", [...setCookies, cookieStr]);
+  const newCookie = serialize(name, value, serializeOptions);
+  const currentCookies = splitCookiesString(
+    event.node.res.getHeader("set-cookie")
+  );
+  if (currentCookies.length === 0) {
+    event.node.res.setHeader("set-cookie", newCookie);
+    return;
+  }
+  const newCookieKey = getDistinctCookieKey(name, serializeOptions);
+  event.node.res.removeHeader("set-cookie");
+  for (const cookie of currentCookies) {
+    const parsed = parseSetCookie(cookie);
+    const key = getDistinctCookieKey(parsed.name, parsed);
+    if (key === newCookieKey) {
+      continue;
+    }
+    event.node.res.appendHeader("set-cookie", cookie);
+  }
+  event.node.res.appendHeader("set-cookie", newCookie);
 }
 function deleteCookie(event, name, serializeOptions) {
   setCookie(event, name, "", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "h3",
-  "version": "1.15.0",
+  "version": "1.15.1",
   "description": "Minimal H(TTP) framework built for high performance and portability.",
   "repository": "unjs/h3",
   "license": "MIT",
@@ -39,7 +39,6 @@
     "destr": "^2.0.3",
     "iron-webcrypto": "^1.2.1",
     "node-mock-http": "^1.0.0",
-    "ohash": "^1.1.4",
     "radix3": "^1.1.2",
     "ufo": "^1.5.4",
     "uncrypto": "^0.1.3"