From 3b56e7f1ce3a0650d9cd5f00a1b709131cfdb600 Mon Sep 17 00:00:00 2001
From: diced <git@diced.sh>
Date: Tue, 24 Mar 2026 15:52:20 -0700
Subject: [PATCH] fix: maybe fix #1021 again

---
 src/server/session.ts | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/server/session.ts b/src/server/session.ts
index 40988c6a..993412e7 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -28,23 +28,12 @@ export async function getSession(
 ) {
   cookieOptions.secure = config.core.returnHttpsUrls;
 
-  if (!(req as any).raw || !(req as any).raw) {
-    const session = await getIronSession<ZiplineSession>(
-      req as IncomingMessage,
-      reply as ServerResponse<IncomingMessage>,
-      {
-        password: config.core.secret,
-        cookieName: 'zipline_session',
-        cookieOptions,
-      },
-    );
-
-    return session;
-  }
+  const rawReq = (req as FastifyRequest).raw || req;
+  const rawRes = (reply as FastifyReply).raw || reply;
 
   const session = await getIronSession<ZiplineSession>(
-    (req as FastifyRequest).raw,
-    (reply as FastifyReply).raw,
+    rawReq as IncomingMessage,
+    rawRes as ServerResponse<IncomingMessage>,
     {
       password: config.core.secret,
       cookieName: 'zipline_session',
@@ -52,7 +41,8 @@ export async function getSession(
     },
   );
 
-  session.client = detectClient(<Record<string, string>>req.headers);
+  const headers = (req as FastifyRequest).headers || (req as IncomingMessage).headers;
+  session.client = detectClient(<Record<string, string>>headers);
 
   return session;
 }