Merge pull request #1567 from akim-bow/improve/remove-cookie-cache

improve: remove cookie cache

Author: SaltyAom

src/compose.ts

@@ -1,4 +1,4 @@
-import type { AnyElysia } from './index'
+import { AnyElysia, Cookie } from './index'
 
 import { Value, TransformDecodeError } from '@sinclair/typebox/value'
 import {
@@ -1573,7 +1573,7 @@ export const composeHandler = ({
 				if (validator.cookie.hasTransform)
 					fnLiteral += coerceTransformDecodeError(
 						`for(const [key,value] of Object.entries(validator.cookie.Decode(cookieValue))){` +
-							`c.cookie[key].value=value` +
+							`c.cookie[key].cookie.value = value` +
 							`}`,
 						'cookie',
 						allowUnsafeValidationDetails
@@ -2131,6 +2131,7 @@ export const composeHandler = ({
 			ERROR_CODE,
 			parseCookie: hasCookie ? parseCookie : undefined,
 			signCookie: hasCookie ? signCookie : undefined,
+			Cookie: hasCookie ? Cookie : undefined,
 			decodeURIComponent: hasQuery ? decode : undefined,
 			ElysiaCustomStatusResponse,
 			ELYSIA_TRACE: hasTrace ? ELYSIA_TRACE : undefined,

src/cookies.ts

@@ -142,7 +142,7 @@ export class Cookie<T> implements ElysiaCookie {
 	}
 
 	protected get setCookie() {
-		if (!(this.name in this.jar)) this.jar[this.name] = { ...this.initial }
+		if (!(this.name in this.jar)) this.jar[this.name] = this.initial
 
 		return this.jar[this.name]
 	}
@@ -156,93 +156,55 @@ export class Cookie<T> implements ElysiaCookie {
 	}
 
 	set value(value: T) {
-		// Check if value actually changed before creating entry in jar
-		const current = this.cookie.value
-
-		// Simple equality check
-		if (current === value) return
-
-		// For objects, do a deep equality check
-		if (
-			typeof current === 'object' &&
-			current !== null &&
-			typeof value === 'object' &&
-			value !== null
-		) {
-			try {
-				if (JSON.stringify(current) === JSON.stringify(value)) return
-			} catch {
-				// If stringify fails, proceed with setting the value
-			}
-		}
-
-		// Only create entry in jar if value actually changed
-		if (!(this.name in this.jar)) this.jar[this.name] = { ...this.initial }
-		this.jar[this.name].value = value
+		this.setCookie.value = value;
 	}
 
 	get expires() {
 		return this.cookie.expires
 	}
 
 	set expires(expires: Date | undefined) {
-		// Handle undefined values and compare timestamps instead of Date objects
-		const currentExpires = this.cookie.expires
-		if (currentExpires === undefined && expires === undefined) return
-		if (currentExpires?.getTime() === expires?.getTime()) return
-
-		if (!(this.name in this.jar)) this.jar[this.name] = { ...this.initial }
-		this.jar[this.name].expires = expires
+		this.setCookie.expires = expires
 	}
 
 	get maxAge() {
 		return this.cookie.maxAge
 	}
 
 	set maxAge(maxAge: number | undefined) {
-		if (this.cookie.maxAge === maxAge) return
-		if (!(this.name in this.jar)) this.jar[this.name] = { ...this.initial }
-		this.jar[this.name].maxAge = maxAge
+		this.setCookie.maxAge = maxAge;
 	}
 
 	get domain() {
 		return this.cookie.domain
 	}
 
 	set domain(domain: string | undefined) {
-		if (this.cookie.domain === domain) return
-		if (!(this.name in this.jar)) this.jar[this.name] = { ...this.initial }
-		this.jar[this.name].domain = domain
+		this.setCookie.domain = domain;
 	}
 
 	get path() {
 		return this.cookie.path
 	}
 
 	set path(path: string | undefined) {
-		if (this.cookie.path === path) return
-		if (!(this.name in this.jar)) this.jar[this.name] = { ...this.initial }
-		this.jar[this.name].path = path
+		this.setCookie.path = path
 	}
 
 	get secure() {
 		return this.cookie.secure
 	}
 
 	set secure(secure: boolean | undefined) {
-		if (this.cookie.secure === secure) return
-		if (!(this.name in this.jar)) this.jar[this.name] = { ...this.initial }
-		this.jar[this.name].secure = secure
+		this.setCookie.secure = secure
 	}
 
 	get httpOnly() {
 		return this.cookie.httpOnly
 	}
 
 	set httpOnly(httpOnly: boolean | undefined) {
-		if (this.cookie.httpOnly === httpOnly) return
-		if (!(this.name in this.jar)) this.jar[this.name] = { ...this.initial }
-		this.jar[this.name].httpOnly = httpOnly
+		this.setCookie.httpOnly = httpOnly
 	}
 
 	get sameSite() {
@@ -252,39 +214,31 @@ export class Cookie<T> implements ElysiaCookie {
 	set sameSite(
 		sameSite: true | false | 'lax' | 'strict' | 'none' | undefined
 	) {
-		if (this.cookie.sameSite === sameSite) return
-		if (!(this.name in this.jar)) this.jar[this.name] = { ...this.initial }
-		this.jar[this.name].sameSite = sameSite
+		this.setCookie.sameSite = sameSite
 	}
 
 	get priority() {
 		return this.cookie.priority
 	}
 
 	set priority(priority: 'low' | 'medium' | 'high' | undefined) {
-		if (this.cookie.priority === priority) return
-		if (!(this.name in this.jar)) this.jar[this.name] = { ...this.initial }
-		this.jar[this.name].priority = priority
+		this.setCookie.priority = priority
 	}
 
 	get partitioned() {
 		return this.cookie.partitioned
 	}
 
 	set partitioned(partitioned: boolean | undefined) {
-		if (this.cookie.partitioned === partitioned) return
-		if (!(this.name in this.jar)) this.jar[this.name] = { ...this.initial }
-		this.jar[this.name].partitioned = partitioned
+		this.setCookie.partitioned = partitioned
 	}
 
 	get secrets() {
 		return this.cookie.secrets
 	}
 
 	set secrets(secrets: string | string[] | undefined) {
-		if (this.cookie.secrets === secrets) return
-		if (!(this.name in this.jar)) this.jar[this.name] = { ...this.initial }
-		this.jar[this.name].secrets = secrets
+		this.setCookie.secrets = secrets
 	}
 
 	update(config: Updater<Partial<ElysiaCookie>>) {

test/cookie/unchanged.test.ts

@@ -72,7 +72,7 @@ describe('Cookie - Unchanged Values', () => {
 		).toBeGreaterThan(0)
 	})
 
-	it('should not send set-cookie header when setting same value', async () => {
+	it('should send set-cookie header when setting same value', async () => {
 		const app = new Elysia().get('/same', ({ cookie: { session } }) => {
 			// Setting the same value that came from request
 			session.value = 'existing'
@@ -87,7 +87,7 @@ describe('Cookie - Unchanged Values', () => {
 			})
 		)
 
-		expect(response.headers.getAll('set-cookie').length).toBe(0)
+		expect(response.headers.getAll('set-cookie').length).toBeGreaterThan(0)
 	})
 
 	it('should send set-cookie header when value actually changes', async () => {