(or well modify node_modules -- no need to technically generate a patch)

WWalshy (or well modify node_modules -- no need to technically generate a patch)

C

chientrm.com•3/3/24, 3:11 AM

that's gonna be

npm install

npm install

on Pages Build tho

actually I don't need to touch

worktop

worktop

I guess

W

WalshyOP•3/3/24, 3:11 AM

can you not repo locally/

W

WalshyOP•3/3/24, 3:12 AM

if you need to run in build then yeah just patch-package it

W

WalshyOP•3/3/24, 3:12 AM

https://www.npmjs.com/package/patch-package

M

MattIPv4•3/3/24, 3:13 AM

I do think this might be cf_bm or similar

M

MattIPv4•3/3/24, 3:13 AM

But I can't see why it wouldn't show up in the headers you're seeing

WWalshy if you need to run in build then yeah just patch-package it

C

chientrm.com•3/3/24, 3:16 AM

hold on I'm deploying the patched logs

M

MattIPv4•3/3/24, 3:17 AM

Ohhhhh

M

MattIPv4•3/3/24, 3:19 AM

new Response('test', { headers: { 'x-test': 'test', 'Set-Cookie': 'test=1' } }).headers Headers { "content-type" → "text/plain;charset=UTF-8", "x-test" → "test" }
new Response('test', { headers: { 'x-test': 'test', 'Set-Cookie': 'test=1' } }).headers Headers { "content-type" → "text/plain;charset=UTF-8", "x-test" → "test" }
new Response('test', { headers: { 'x-test': 'test', 'Set-Cookie': 'test=1' } }).headers Headers { "content-type" → "text/plain;charset=UTF-8", "x-test" → "test" }
new Response('test', { headers: { 'x-test': 'test', 'Set-Cookie': 'test=1' } }).headers Headers { "content-type" → "text/plain;charset=UTF-8", "x-test" → "test" }

M

MattIPv4•3/3/24, 3:21 AM

~~I bet Workers follow the same header filtering rules as browsers, so you can't set set-cookie I think~~

M

MattIPv4•3/3/24, 3:21 AM

~~And that worktop code recreates the Response~~

MMattIPv4 ~~And that worktop code recreates the Response~~

C

chientrm.com•3/3/24, 3:22 AM

actually it check

if (isGET && isCacheable(res))

if (isGET && isCacheable(res))

before recreating the Response tho

C

chientrm.com•3/3/24, 3:22 AM

I

patch-package

patch-package

but console.log doesn't show nothing tho

M

MattIPv4•3/3/24, 3:23 AM

Yes, so the set-cookie exists on the original response, but then when the response is recreated it gets dropped

M

MattIPv4•3/3/24, 3:23 AM

Is what I think is happening

I

Isaac McFadyen•3/3/24, 3:23 AM

You could try to log the response headers before they're recreated.

I

Isaac McFadyen•3/3/24, 3:23 AM

That would show you whether there was a set-cookie header that's being stripped

C

chientrm.com•3/3/24, 3:25 AM

so I made this patch:

diff --git a/node_modules/@sveltejs/adapter-cloudflare/files/worker.js b/node_modules/@sveltejs/adapter-cloudflare/files/worker.js
index a0abb18..aa4de85 100644
--- a/node_modules/@sveltejs/adapter-cloudflare/files/worker.js
+++ b/node_modules/@sveltejs/adapter-cloudflare/files/worker.js
@@ -10,6 +10,11 @@ async function e(e3, t2) {
   return n2 && r3 && (r3 = new Response(null, r3)), r3;
 }
 function t(e3, t2, n2, o2) {
+  let tmp = '';
+    for (const [headerName, headerValue] of n2.headers.entries()) {
+        tmp += `${headerName}: ${headerValue}\n`;
+    }
+  console.log(tmp);
   return ("string" == typeof t2 || "GET" === t2.method) && r(n2) && (n2.headers.has("Set-Cookie") && (n2 = new Response(n2.body, n2)).headers.append("Cache-Control", "private=Set-Cookie"), o2.waitUntil(e3.put(t2, n2.clone()))), n2;
 }
 var n = /* @__PURE__ */ new Set([200, 203, 204, 300, 301, 404, 405, 410, 414, 501]);

diff --git a/node_modules/@sveltejs/adapter-cloudflare/files/worker.js b/node_modules/@sveltejs/adapter-cloudflare/files/worker.js
index a0abb18..aa4de85 100644
--- a/node_modules/@sveltejs/adapter-cloudflare/files/worker.js
+++ b/node_modules/@sveltejs/adapter-cloudflare/files/worker.js
@@ -10,6 +10,11 @@ async function e(e3, t2) {
   return n2 && r3 && (r3 = new Response(null, r3)), r3;
 }
 function t(e3, t2, n2, o2) {
+  let tmp = '';
+    for (const [headerName, headerValue] of n2.headers.entries()) {
+        tmp += `${headerName}: ${headerValue}\n`;
+    }
+  console.log(tmp);
   return ("string" == typeof t2 || "GET" === t2.method) && r(n2) && (n2.headers.has("Set-Cookie") && (n2 = new Response(n2.body, n2)).headers.append("Cache-Control", "private=Set-Cookie"), o2.waitUntil(e3.put(t2, n2.clone()))), n2;
 }
 var n = /* @__PURE__ */ new Set([200, 203, 204, 300, 301, 404, 405, 410, 414, 501]);

diff --git a/node_modules/@sveltejs/adapter-cloudflare/files/worker.js b/node_modules/@sveltejs/adapter-cloudflare/files/worker.js
index a0abb18..aa4de85 100644
--- a/node_modules/@sveltejs/adapter-cloudflare/files/worker.js
+++ b/node_modules/@sveltejs/adapter-cloudflare/files/worker.js
@@ -10,6 +10,11 @@ async function e(e3, t2) {
   return n2 && r3 && (r3 = new Response(null, r3)), r3;
 }
 function t(e3, t2, n2, o2) {
+  let tmp = '';
+    for (const [headerName, headerValue] of n2.headers.entries()) {
+        tmp += `${headerName}: ${headerValue}\n`;
+    }
+  console.log(tmp);
   return ("string" == typeof t2 || "GET" === t2.method) && r(n2) && (n2.headers.has("Set-Cookie") && (n2 = new Response(n2.body, n2)).headers.append("Cache-Control", "private=Set-Cookie"), o2.waitUntil(e3.put(t2, n2.clone()))), n2;
 }
 var n = /* @__PURE__ */ new Set([200, 203, 204, 300, 301, 404, 405, 410, 414, 501]);

diff --git a/node_modules/@sveltejs/adapter-cloudflare/files/worker.js b/node_modules/@sveltejs/adapter-cloudflare/files/worker.js
index a0abb18..aa4de85 100644
--- a/node_modules/@sveltejs/adapter-cloudflare/files/worker.js
+++ b/node_modules/@sveltejs/adapter-cloudflare/files/worker.js
@@ -10,6 +10,11 @@ async function e(e3, t2) {
   return n2 && r3 && (r3 = new Response(null, r3)), r3;
 }
 function t(e3, t2, n2, o2) {
+  let tmp = '';
+    for (const [headerName, headerValue] of n2.headers.entries()) {
+        tmp += `${headerName}: ${headerValue}\n`;
+    }
+  console.log(tmp);
   return ("string" == typeof t2 || "GET" === t2.method) && r(n2) && (n2.headers.has("Set-Cookie") && (n2 = new Response(n2.body, n2)).headers.append("Cache-Control", "private=Set-Cookie"), o2.waitUntil(e3.put(t2, n2.clone()))), n2;
 }
 var n = /* @__PURE__ */ new Set([200, 203, 204, 300, 301, 404, 405, 410, 414, 501]);

C

chientrm.com•3/3/24, 3:27 AM

but it doesn't logs on Dashboard Real-time logs

W

WalshyOP•3/3/24, 3:27 AM

pro tip, super easy way to log headers:

console.log(Object.fromEntries(res.headers))

console.log(Object.fromEntries(res.headers))

M

MattIPv4•3/3/24, 3:28 AM

How does fromEntries handle duplicate keys

M

MattIPv4•3/3/24, 3:29 AM

Ah last wins

M

MattIPv4•3/3/24, 3:30 AM

console.log([ ...res.headers ]);

console.log([ ...res.headers ]);

is safer

C

chientrm.com•3/3/24, 3:34 AM

uhm, I use

patch-package

patch-package

but can't get

adapter-cloudflare

adapter-cloudflare

to

console.log()

console.log()

things

C

chientrm.com•3/3/24, 3:35 AM

and the

private=Set-Cookie

private=Set-Cookie

is somehow dissapeared now

C

chientrm.com•3/3/24, 3:35 AM

C

chientrm.com•3/3/24, 3:37 AM

oh, maybe my

console.log

console.log

patch broke it

C

chientrm.com•3/3/24, 3:38 AM

diff --git a/node_modules/@sveltejs/adapter-cloudflare/files/worker.js b/node_modules/@sveltejs/adapter-cloudflare/files/worker.js
index a0abb18..2b73316 100644
--- a/node_modules/@sveltejs/adapter-cloudflare/files/worker.js
+++ b/node_modules/@sveltejs/adapter-cloudflare/files/worker.js
@@ -10,6 +10,8 @@ async function e(e3, t2) {
   return n2 && r3 && (r3 = new Response(null, r3)), r3;
 }
 function t(e3, t2, n2, o2) {
+  console.log('headers');
+  console.log([ ...n2.headers ]);
   return ("string" == typeof t2 || "GET" === t2.method) && r(n2) && (n2.headers.has("Set-Cookie") && (n2 = new Response(n2.body, n2)).headers.append("Cache-Control", "private=Set-Cookie"), o2.waitUntil(e3.put(t2, n2.clone()))), n2;
 }
 var n = /* @__PURE__ */ new Set([200, 203, 204, 300, 301, 404, 405, 410, 414, 501]);

diff --git a/node_modules/@sveltejs/adapter-cloudflare/files/worker.js b/node_modules/@sveltejs/adapter-cloudflare/files/worker.js
index a0abb18..2b73316 100644
--- a/node_modules/@sveltejs/adapter-cloudflare/files/worker.js
+++ b/node_modules/@sveltejs/adapter-cloudflare/files/worker.js
@@ -10,6 +10,8 @@ async function e(e3, t2) {
   return n2 && r3 && (r3 = new Response(null, r3)), r3;
 }
 function t(e3, t2, n2, o2) {
+  console.log('headers');
+  console.log([ ...n2.headers ]);
   return ("string" == typeof t2 || "GET" === t2.method) && r(n2) && (n2.headers.has("Set-Cookie") && (n2 = new Response(n2.body, n2)).headers.append("Cache-Control", "private=Set-Cookie"), o2.waitUntil(e3.put(t2, n2.clone()))), n2;
 }
 var n = /* @__PURE__ */ new Set([200, 203, 204, 300, 301, 404, 405, 410, 414, 501]);

diff --git a/node_modules/@sveltejs/adapter-cloudflare/files/worker.js b/node_modules/@sveltejs/adapter-cloudflare/files/worker.js
index a0abb18..2b73316 100644
--- a/node_modules/@sveltejs/adapter-cloudflare/files/worker.js
+++ b/node_modules/@sveltejs/adapter-cloudflare/files/worker.js
@@ -10,6 +10,8 @@ async function e(e3, t2) {
   return n2 && r3 && (r3 = new Response(null, r3)), r3;
 }
 function t(e3, t2, n2, o2) {
+  console.log('headers');
+  console.log([ ...n2.headers ]);
   return ("string" == typeof t2 || "GET" === t2.method) && r(n2) && (n2.headers.has("Set-Cookie") && (n2 = new Response(n2.body, n2)).headers.append("Cache-Control", "private=Set-Cookie"), o2.waitUntil(e3.put(t2, n2.clone()))), n2;
 }
 var n = /* @__PURE__ */ new Set([200, 203, 204, 300, 301, 404, 405, 410, 414, 501]);

diff --git a/node_modules/@sveltejs/adapter-cloudflare/files/worker.js b/node_modules/@sveltejs/adapter-cloudflare/files/worker.js
index a0abb18..2b73316 100644
--- a/node_modules/@sveltejs/adapter-cloudflare/files/worker.js
+++ b/node_modules/@sveltejs/adapter-cloudflare/files/worker.js
@@ -10,6 +10,8 @@ async function e(e3, t2) {
   return n2 && r3 && (r3 = new Response(null, r3)), r3;
 }
 function t(e3, t2, n2, o2) {
+  console.log('headers');
+  console.log([ ...n2.headers ]);
   return ("string" == typeof t2 || "GET" === t2.method) && r(n2) && (n2.headers.has("Set-Cookie") && (n2 = new Response(n2.body, n2)).headers.append("Cache-Control", "private=Set-Cookie"), o2.waitUntil(e3.put(t2, n2.clone()))), n2;
 }
 var n = /* @__PURE__ */ new Set([200, 203, 204, 300, 301, 404, 405, 410, 414, 501]);

M

MattIPv4•3/3/24, 3:38 AM

Are you seeing them being logged?

MMattIPv4 Are you seeing them being logged?

C

chientrm.com•3/3/24, 3:38 AM

nope, the logs is from my

+page.server.ts

+page.server.ts

, can't see logs from the patch

W

WalshyOP•3/3/24, 3:39 AM

is it going down this code path?

W

WalshyOP•3/3/24, 3:39 AM

hard to tell which one this is with minified

WWalshy is it going down this code path?

C

chientrm.com•3/3/24, 3:39 AM

yes it's just before the part

if (isGET && isCacheable(res)) {
  if (res.headers.has('Set-Cookie')) {
    res = new Response(res.body, res);
    res.headers.append('Cache-Control', 'private=Set-Cookie');
  }
}

if (isGET && isCacheable(res)) {
  if (res.headers.has('Set-Cookie')) {
    res = new Response(res.body, res);
    res.headers.append('Cache-Control', 'private=Set-Cookie');
  }
}

if (isGET && isCacheable(res)) {
  if (res.headers.has('Set-Cookie')) {
    res = new Response(res.body, res);
    res.headers.append('Cache-Control', 'private=Set-Cookie');
  }
}

if (isGET && isCacheable(res)) {
  if (res.headers.has('Set-Cookie')) {
    res = new Response(res.body, res);
    res.headers.append('Cache-Control', 'private=Set-Cookie');
  }
}

W

WalshyOP•3/3/24, 3:40 AM

oh well actually, you're hitting cache

W

WalshyOP•3/3/24, 3:40 AM

you'll want that gone before you go down this cache path again

W

WalshyOP•3/3/24, 3:41 AM

right now you're in lookup - https://github.com/lukeed/worktop/blob/master/src/cache.ts#L6-L14

C

chientrm.com•3/3/24, 3:41 AM

oh so the adapter actively use Cache API

W

WalshyOP•3/3/24, 3:41 AM

i just hit a miss if you're still tailing

M

MattIPv4•3/3/24, 3:42 AM

did you get the private set-cookie walshy?

W

WalshyOP•3/3/24, 3:42 AM

< cache-control: public, max-age=31536000, immutable

W

WalshyOP•3/3/24, 3:42 AM

i did not

W

WalshyOP•3/3/24, 3:42 AM

< HTTP/2 200
< date: Sun, 03 Mar 2024 03:41:41 GMT
< content-type: application/json
< cache-control: public, max-age=31536000, immutable
< report-to: {"endpoints":[{"url":"https:\/\/a.nel.cloudflare.com\/report\/v3?s=t%2BfoDvO71BiiVtZ0j36SRGpkO%2B8mkMlbrhKhWBWp945SU%2FVMCnIQYGYSdPUuA2A1flAToLU3ds7A%2BPCMkX88Uam76vLwaV8v6zLWUBU%2BPPv5ry4lBIQv007fVOOtYw%3D%3D"}],"group":"cf-nel","max_age":604800}
< nel: {"success_fraction":0,"report_to":"cf-nel","max_age":604800}
< vary: Accept-Encoding
< cf-cache-status: MISS
< last-modified: Sun, 03 Mar 2024 03:41:41 GMT
< server: cloudflare
< cf-ray: 85e69cba6e6535de-LHR
< alt-svc: h3=":443"; ma=86400

< HTTP/2 200
< date: Sun, 03 Mar 2024 03:41:41 GMT
< content-type: application/json
< cache-control: public, max-age=31536000, immutable
< report-to: {"endpoints":[{"url":"https:\/\/a.nel.cloudflare.com\/report\/v3?s=t%2BfoDvO71BiiVtZ0j36SRGpkO%2B8mkMlbrhKhWBWp945SU%2FVMCnIQYGYSdPUuA2A1flAToLU3ds7A%2BPCMkX88Uam76vLwaV8v6zLWUBU%2BPPv5ry4lBIQv007fVOOtYw%3D%3D"}],"group":"cf-nel","max_age":604800}
< nel: {"success_fraction":0,"report_to":"cf-nel","max_age":604800}
< vary: Accept-Encoding
< cf-cache-status: MISS
< last-modified: Sun, 03 Mar 2024 03:41:41 GMT
< server: cloudflare
< cf-ray: 85e69cba6e6535de-LHR
< alt-svc: h3=":443"; ma=86400

< HTTP/2 200
< date: Sun, 03 Mar 2024 03:41:41 GMT
< content-type: application/json
< cache-control: public, max-age=31536000, immutable
< report-to: {"endpoints":[{"url":"https:\/\/a.nel.cloudflare.com\/report\/v3?s=t%2BfoDvO71BiiVtZ0j36SRGpkO%2B8mkMlbrhKhWBWp945SU%2FVMCnIQYGYSdPUuA2A1flAToLU3ds7A%2BPCMkX88Uam76vLwaV8v6zLWUBU%2BPPv5ry4lBIQv007fVOOtYw%3D%3D"}],"group":"cf-nel","max_age":604800}
< nel: {"success_fraction":0,"report_to":"cf-nel","max_age":604800}
< vary: Accept-Encoding
< cf-cache-status: MISS
< last-modified: Sun, 03 Mar 2024 03:41:41 GMT
< server: cloudflare
< cf-ray: 85e69cba6e6535de-LHR
< alt-svc: h3=":443"; ma=86400

< HTTP/2 200
< date: Sun, 03 Mar 2024 03:41:41 GMT
< content-type: application/json
< cache-control: public, max-age=31536000, immutable
< report-to: {"endpoints":[{"url":"https:\/\/a.nel.cloudflare.com\/report\/v3?s=t%2BfoDvO71BiiVtZ0j36SRGpkO%2B8mkMlbrhKhWBWp945SU%2FVMCnIQYGYSdPUuA2A1flAToLU3ds7A%2BPCMkX88Uam76vLwaV8v6zLWUBU%2BPPv5ry4lBIQv007fVOOtYw%3D%3D"}],"group":"cf-nel","max_age":604800}
< nel: {"success_fraction":0,"report_to":"cf-nel","max_age":604800}
< vary: Accept-Encoding
< cf-cache-status: MISS
< last-modified: Sun, 03 Mar 2024 03:41:41 GMT
< server: cloudflare
< cf-ray: 85e69cba6e6535de-LHR
< alt-svc: h3=":443"; ma=86400

W

WalshyOP•3/3/24, 3:43 AM

so i guess we're just magically not getting cookies anymore

M

MattIPv4•3/3/24, 3:44 AM

Yeah I just got a miss w/o it as well

C

chientrm.com•3/3/24, 3:44 AM

Here's the log from the patch

C

chientrm.com•3/3/24, 3:45 AM

there was not

Set-Cookie

Set-Cookie

W

WalshyOP•3/3/24, 3:46 AM

which lines up with no private

W

WalshyOP•3/3/24, 3:46 AM

i love when issues no longer reproduce after adding debug logs

C

chientrm.com•3/3/24, 3:47 AM

I'm gonna remove the patch to see if it's back

M

MattIPv4•3/3/24, 3:48 AM

If it turns back up, that'd be interesting

(or well modify node_modules -- no need to technically generate a patch)

Similar Threads

Similar Threads

Similar Threads