🔧 fix: set-cookie resent without set

Author: SaltyAom

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.1.22 - 13 Oct 2024
+Bug fix:
+- Fix `set-cookie` to resent if value is accessed even without set
+
 # 1.1.21 - 13 Oct 2024
 Improvement:
 - infer 200 response from handle if not specified

example/a.ts

@@ -1,9 +1,21 @@
 import { Elysia, t } from '../src'
 
-const main = new Elysia().get('/', () => 'a', {
-	response: { 200: t.Number({
-		default: () => 'a'
-	}), 500: t.String() }
-})
+const app = new Elysia()
+	.derive(({ cookie: { test } }) => {
+		if (!test.value) {
+			test.value = 'Hello, world!'
+		}
 
-type A = (typeof main)['_routes']['index']['get']['response']
+		return {}
+	})
+	.get('/', () => 'Hello, world!')
+
+app.handle(
+	new Request('http://localhost:3000/', {
+		headers: {
+			cookie: 'test=Hello, world!'
+		}
+	})
+)
+	.then((x) => x.headers)
+	.then(console.log)

example/cookie.ts

@@ -14,7 +14,17 @@ const app = new Elysia({
 					name: 'Rin',
 					affilation: 'Administration'
 				}
-			])
+			]),
+		{
+			cookie: t.Cookie({
+				council: t.Array(
+					t.Object({
+						name: t.String(),
+						affilation: t.String()
+					})
+				)
+			})
+		}
 	)
 	.get('/create', ({ cookie: { name } }) => (name.value = 'Himari'))
 	.get(

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "elysia",
 	"description": "Ergonomic Framework for Human",
-	"version": "1.1.21",
+	"version": "1.1.22",
 	"author": {
 		"name": "saltyAom",
 		"url": "https://github.com/SaltyAom",

src/cookies.ts

@@ -133,9 +133,7 @@ export class Cookie<T> implements ElysiaCookie {
 	) {}
 
 	get cookie() {
-		if (!(this.name in this.jar)) this.jar[this.name] = this.initial
-
-		return this.jar[this.name]
+		return this.jar[this.name] ?? this.initial
 	}
 
 	set cookie(jar: ElysiaCookie) {
@@ -144,98 +142,106 @@ export class Cookie<T> implements ElysiaCookie {
 		this.jar[this.name] = jar
 	}
 
+	protected get setCookie() {
+		if (!(this.name in this.jar)) this.jar[this.name] = this.initial
+
+		return this.jar[this.name]
+	}
+
+	protected set setCookie(jar: ElysiaCookie) {
+		this.cookie = jar
+	}
+
 	get value(): T {
 		return this.cookie.value as T
 	}
 
 	set value(value: T) {
-		this.cookie.value = value
+		this.setCookie.value = value
 	}
 
 	get expires() {
 		return this.cookie.expires
 	}
 
 	set expires(expires) {
-		this.cookie.expires = expires
-
-		console.log(this.cookie)
+		this.setCookie.expires = expires
 	}
 
 	get maxAge() {
 		return this.cookie.maxAge
 	}
 
 	set maxAge(maxAge) {
-		this.cookie.maxAge = maxAge
+		this.setCookie.maxAge = maxAge
 	}
 
 	get domain() {
 		return this.cookie.domain
 	}
 
 	set domain(domain) {
-		this.cookie.domain = domain
+		this.setCookie.domain = domain
 	}
 
 	get path() {
 		return this.cookie.path
 	}
 
 	set path(path) {
-		this.cookie.path = path
+		this.setCookie.path = path
 	}
 
 	get secure() {
 		return this.cookie.secure
 	}
 
 	set secure(secure) {
-		this.cookie.secure = secure
+		this.setCookie.secure = secure
 	}
 
 	get httpOnly() {
 		return this.cookie.httpOnly
 	}
 
 	set httpOnly(httpOnly) {
-		this.cookie.httpOnly = httpOnly
+		this.setCookie.httpOnly = httpOnly
 	}
 
 	get sameSite() {
 		return this.cookie.sameSite
 	}
 
 	set sameSite(sameSite) {
-		this.cookie.sameSite = sameSite
+		this.setCookie.sameSite = sameSite
 	}
 
 	get priority() {
 		return this.cookie.priority
 	}
 
 	set priority(priority) {
-		this.cookie.priority = priority
+		this.setCookie.priority = priority
 	}
 
 	get partitioned() {
 		return this.cookie.partitioned
 	}
 
 	set partitioned(partitioned) {
-		this.cookie.partitioned = partitioned
+		this.setCookie.partitioned = partitioned
 	}
 
 	get secrets() {
 		return this.cookie.secrets
 	}
 
 	set secrets(secrets) {
-		this.cookie.secrets = secrets
+		this.setCookie.secrets = secrets
 	}
 
 	update(config: Updater<Partial<ElysiaCookie>>) {
-		this.cookie = Object.assign(
+		this.setCookie = Object.assign(
 			this.cookie,
 			typeof config === 'function' ? config(this.cookie) : config
 		)
@@ -244,7 +250,7 @@ export class Cookie<T> implements ElysiaCookie {
 	}
 
 	set(config: Updater<Partial<ElysiaCookie>>) {
-		this.cookie = Object.assign(
+		this.setCookie = Object.assign(
 			{
 				...this.initial,
 				value: this.value

test/cookie/response.test.ts

@@ -363,9 +363,7 @@ describe('Cookie Response', () => {
 	})
 
 	it('set cookie attribute before value', async () => {
-		const date = new Date(
-			Date.now() + 1000 * 60 * 60 * 24
-		)
+		const date = new Date(Date.now() + 1000 * 60 * 60 * 24)
 
 		const app = new Elysia().get('/', ({ cookie }) => {
 			cookie.my_cookie.expires = date
@@ -382,4 +380,27 @@ describe('Cookie Response', () => {
 			`my_cookie=my_cookie_value; Path=/; Expires=${date.toUTCString()}`
 		])
 	})
+
+	it('should not set if value is duplicated', async () => {
+		const app = new Elysia()
+			.derive(({ cookie: { test } }) => {
+				if (!test.value) {
+					test.value = 'Hello, world!'
+				}
+
+				return {}
+			})
+			.get('/', () => 'Hello, world!')
+
+		const res = await app.handle(
+			new Request('http://localhost:3000/', {
+				headers: {
+					cookie: 'test=Hello, world!'
+				}
+			})
+		)
+			.then((x) => x.headers)
+
+		expect(res.getSetCookie()).toEqual([])
+	})
 })