better-auth 1.6.26 → 1.6.27

package/dist/api/middlewares/authorization.d.mts

@@ -43,9 +43,9 @@ declare function requireResourceOwnership(config: {
    * @default "FORBIDDEN" (403)
    */
   forbiddenStatus?: "FORBIDDEN" | "UNAUTHORIZED";
-}): (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+}): import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
   verifiedResource: {};
-}>;
+}>>;
 /**
  * Middleware that verifies the authenticated user is a member of a
  * specific organization with one of the allowed roles.
@@ -66,8 +66,8 @@ declare function requireOrgRole(config: {
    * any org membership is sufficient.
    */
   allowedRoles?: string[];
-}): (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+}): import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
   verifiedMember: {};
-}>;
+}>>;
 //#endregion
 export { requireOrgRole, requireResourceOwnership };

package/dist/api/middlewares/origin-check.d.mts

@@ -4,12 +4,12 @@ import { GenericEndpointContext } from "@better-auth/core";
  * A middleware to validate callbackURL and origin against trustedOrigins.
  * Also handles CSRF protection using Fetch Metadata for first-login scenarios.
  */
-declare const originCheckMiddleware: (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>;
-declare const originCheck: (getValue: (ctx: GenericEndpointContext) => string | string[]) => (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>;
+declare const originCheckMiddleware: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>>;
+declare const originCheck: (getValue: (ctx: GenericEndpointContext) => string | string[]) => import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>>;
 /**
  * Middleware for CSRF protection using Fetch Metadata headers.
  * This prevents cross-site navigation login attacks while supporting progressive enhancement.
  */
-declare const formCsrfMiddleware: (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>;
+declare const formCsrfMiddleware: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>>;
 //#endregion
 export { formCsrfMiddleware, originCheck, originCheckMiddleware };

package/dist/api/routes/account.d.mts

@@ -2,7 +2,7 @@ import * as z from "zod";
 //#region src/api/routes/account.d.ts
 declare const listUserAccounts: import("better-call").StrictEndpoint<"/list-accounts", {
   method: "GET";
-  use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+  use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
     session: {
       session: Record<string, any> & {
         id: string;
@@ -24,7 +24,7 @@ declare const listUserAccounts: import("better-call").StrictEndpoint<"/list-acco
         image?: string | null | undefined;
       };
     };
-  }>)[];
+  }>>[];
   metadata: {
     openapi: {
       operationId: string;
@@ -103,7 +103,7 @@ declare const linkSocialAccount: import("better-call").StrictEndpoint<"/link-soc
     disableRedirect: z.ZodOptional<z.ZodBoolean>;
     additionalData: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
   }, z.core.$strip>;
-  use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+  use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
     session: {
       session: Record<string, any> & {
         id: string;
@@ -125,7 +125,7 @@ declare const linkSocialAccount: import("better-call").StrictEndpoint<"/link-soc
         image?: string | null | undefined;
       };
     };
-  }>)[];
+  }>>[];
   metadata: {
     openapi: {
       description: string;
@@ -168,7 +168,7 @@ declare const unlinkAccount: import("better-call").StrictEndpoint<"/unlink-accou
     providerId: z.ZodString;
     accountId: z.ZodOptional<z.ZodString>;
   }, z.core.$strip>;
-  use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+  use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
     session: {
       session: Record<string, any> & {
         id: string;
@@ -190,7 +190,7 @@ declare const unlinkAccount: import("better-call").StrictEndpoint<"/unlink-accou
         image?: string | null | undefined;
       };
     };
-  }>)[];
+  }>>[];
   metadata: {
     openapi: {
       description: string;

package/dist/api/routes/email-verification.d.mts

@@ -103,7 +103,7 @@ declare const verifyEmail: import("better-call").StrictEndpoint<"/verify-email",
     token: z.ZodString;
     callbackURL: z.ZodOptional<z.ZodString>;
   }, z.core.$strip>;
-  use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>)[];
+  use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>>[];
   metadata: {
     openapi: {
       description: string;

package/dist/api/routes/password.d.mts

@@ -32,7 +32,7 @@ declare const requestPasswordReset: import("better-call").StrictEndpoint<"/reque
       };
     };
   };
-  use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>)[];
+  use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>>[];
 }, {
   status: boolean;
   message: string;
@@ -43,7 +43,7 @@ declare const requestPasswordResetCallback: import("better-call").StrictEndpoint
   query: z.ZodObject<{
     callbackURL: z.ZodString;
   }, z.core.$strip>;
-  use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>)[];
+  use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>>[];
   metadata: {
     openapi: {
       operationId: string;
@@ -150,7 +150,7 @@ declare const verifyPassword: import("better-call").StrictEndpoint<"/verify-pass
       };
     };
   };
-  use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+  use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
     session: {
       session: Record<string, any> & {
         id: string;
@@ -172,7 +172,7 @@ declare const verifyPassword: import("better-call").StrictEndpoint<"/verify-pass
         image?: string | null | undefined;
       };
     };
-  }>)[];
+  }>>[];
 }, {
   status: boolean;
 }>;

package/dist/api/routes/session.d.mts

@@ -92,7 +92,7 @@ declare const getAuthoritativeSessionFromCtx: <U extends Record<string, any> = R
 /**
  * The middleware forces the endpoint to require a valid session.
  */
-declare const sessionMiddleware: (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+declare const sessionMiddleware: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
   session: {
     session: Record<string, any> & {
       id: string;
@@ -114,12 +114,12 @@ declare const sessionMiddleware: (inputContext: import("better-call").Middleware
       image?: string | null | undefined;
     };
   };
-}>;
+}>>;
 /**
  * This middleware forces the endpoint to require a valid authoritative session.
  * This should be used for sensitive operations like password changes, account deletion, etc.
  */
-declare const sensitiveSessionMiddleware: (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+declare const sensitiveSessionMiddleware: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
   session: {
     session: Record<string, any> & {
       id: string;
@@ -141,12 +141,12 @@ declare const sensitiveSessionMiddleware: (inputContext: import("better-call").M
       image?: string | null | undefined;
     };
   };
-}>;
+}>>;
 /**
  * This middleware allows you to call the endpoint on the client if session is valid.
  * However, if called on the server, no session is required.
  */
-declare const requestOnlySessionMiddleware: (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+declare const requestOnlySessionMiddleware: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
   session: {
     session: Record<string, any> & {
       id: string;
@@ -168,7 +168,7 @@ declare const requestOnlySessionMiddleware: (inputContext: import("better-call")
       image?: string | null | undefined;
     };
   } | null;
-}>;
+}>>;
 /**
  * This middleware forces the endpoint to require a valid session,
  * as well as making sure the session is fresh before proceeding.
@@ -176,7 +176,7 @@ declare const requestOnlySessionMiddleware: (inputContext: import("better-call")
  * Session freshness check will be skipped if the session config's freshAge
  * is set to 0
  */
-declare const freshSessionMiddleware: (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+declare const freshSessionMiddleware: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
   session: {
     session: Record<string, any> & {
       id: string;
@@ -198,14 +198,14 @@ declare const freshSessionMiddleware: (inputContext: import("better-call").Middl
       image?: string | null | undefined;
     };
   };
-}>;
+}>>;
 /**
  * user active sessions list
  */
 declare const listSessions: <Option extends BetterAuthOptions>() => import("better-call").StrictEndpoint<"/list-sessions", {
   method: "GET";
   operationId: string;
-  use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+  use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
     session: {
       session: Record<string, any> & {
         id: string;
@@ -227,7 +227,7 @@ declare const listSessions: <Option extends BetterAuthOptions>() => import("bett
         image?: string | null | undefined;
       };
     };
-  }>)[];
+  }>>[];
   requireHeaders: true;
   metadata: {
     openapi: {
@@ -268,7 +268,7 @@ declare const revokeSession: import("better-call").StrictEndpoint<"/revoke-sessi
   body: z.ZodObject<{
     token: z.ZodString;
   }, z.core.$strip>;
-  use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+  use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
     session: {
       session: Record<string, any> & {
         id: string;
@@ -290,7 +290,7 @@ declare const revokeSession: import("better-call").StrictEndpoint<"/revoke-sessi
         image?: string | null | undefined;
       };
     };
-  }>)[];
+  }>>[];
   requireHeaders: true;
   metadata: {
     openapi: {
@@ -340,7 +340,7 @@ declare const revokeSession: import("better-call").StrictEndpoint<"/revoke-sessi
  */
 declare const revokeSessions: import("better-call").StrictEndpoint<"/revoke-sessions", {
   method: "POST";
-  use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+  use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
     session: {
       session: Record<string, any> & {
         id: string;
@@ -362,7 +362,7 @@ declare const revokeSessions: import("better-call").StrictEndpoint<"/revoke-sess
         image?: string | null | undefined;
       };
     };
-  }>)[];
+  }>>[];
   requireHeaders: true;
   metadata: {
     openapi: {
@@ -394,7 +394,7 @@ declare const revokeSessions: import("better-call").StrictEndpoint<"/revoke-sess
 declare const revokeOtherSessions: import("better-call").StrictEndpoint<"/revoke-other-sessions", {
   method: "POST";
   requireHeaders: true;
-  use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+  use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
     session: {
       session: Record<string, any> & {
         id: string;
@@ -416,7 +416,7 @@ declare const revokeOtherSessions: import("better-call").StrictEndpoint<"/revoke
         image?: string | null | undefined;
       };
     };
-  }>)[];
+  }>>[];
   metadata: {
     openapi: {
       description: string;

package/dist/api/routes/session.mjs

@@ -295,9 +295,8 @@ const getSessionFromCtx = async (ctx, config) => {
 	if (session.headers) session.headers.forEach((value, key) => {
 		const lowerKey = key.toLowerCase();
 		if (lowerKey === "cache-control" || lowerKey === "pragma") return;
-		if (!ctx.context.responseHeaders) ctx.context.responseHeaders = new Headers({ [key]: value });
-		else if (lowerKey === "set-cookie") ctx.context.responseHeaders.append(key, value);
-		else ctx.context.responseHeaders.set(key, value);
+		if (lowerKey === "set-cookie") ctx.responseHeaders.append(key, value);
+		else ctx.responseHeaders.set(key, value);
 	});
 	ctx.context.session = session.response;
 	return session.response;

package/dist/api/routes/sign-in.d.mts

@@ -111,7 +111,7 @@ declare const signInSocial: <O extends BetterAuthOptions>() => import("better-ca
 declare const signInEmail: <O extends BetterAuthOptions>() => import("better-call").StrictEndpoint<"/sign-in/email", {
   method: "POST";
   operationId: string;
-  use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>)[];
+  use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>>[];
   cloneRequest: true;
   body: z.ZodObject<{
     email: z.ZodString;

package/dist/api/routes/sign-up.d.mts

@@ -6,7 +6,7 @@ import * as z from "zod";
 declare const signUpEmail: <O extends BetterAuthOptions>() => import("better-call").StrictEndpoint<"/sign-up/email", {
   method: "POST";
   operationId: string;
-  use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>)[];
+  use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>>[];
   body: z.ZodIntersection<z.ZodObject<{
     name: z.ZodString;
     email: z.ZodEmail;

package/dist/api/routes/update-session.d.mts

@@ -7,7 +7,7 @@ declare const updateSession: <O extends BetterAuthOptions>() => import("better-c
   method: "POST";
   operationId: string;
   body: z.ZodRecord<z.ZodString, z.ZodAny>;
-  use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+  use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
     session: {
       session: Record<string, any> & {
         id: string;
@@ -29,7 +29,7 @@ declare const updateSession: <O extends BetterAuthOptions>() => import("better-c
         image?: string | null | undefined;
       };
     };
-  }>)[];
+  }>>[];
   metadata: {
     $Infer: {
       body: Partial<AdditionalSessionFieldsInput<O>>;

package/dist/api/routes/update-user.d.mts

@@ -7,7 +7,7 @@ declare const updateUser: <O extends BetterAuthOptions>() => import("better-call
   method: "POST";
   operationId: string;
   body: z.ZodRecord<z.ZodString, z.ZodAny>;
-  use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+  use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
     session: {
       session: Record<string, any> & {
         id: string;
@@ -29,7 +29,7 @@ declare const updateUser: <O extends BetterAuthOptions>() => import("better-call
         image?: string | null | undefined;
       };
     };
-  }>)[];
+  }>>[];
   metadata: {
     $Infer: {
       body: Partial<AdditionalUserFieldsInput<O>> & {
@@ -91,7 +91,7 @@ declare const changePassword: import("better-call").StrictEndpoint<"/change-pass
     currentPassword: z.ZodString;
     revokeOtherSessions: z.ZodOptional<z.ZodBoolean>;
   }, z.core.$strip>;
-  use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+  use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
     session: {
       session: Record<string, any> & {
         id: string;
@@ -113,7 +113,7 @@ declare const changePassword: import("better-call").StrictEndpoint<"/change-pass
         image?: string | null | undefined;
       };
     };
-  }>)[];
+  }>>[];
   metadata: {
     openapi: {
       operationId: string;
@@ -204,7 +204,7 @@ declare const setPassword: import("better-call").StrictEndpoint<string, {
   body: z.ZodObject<{
     newPassword: z.ZodString;
   }, z.core.$strip>;
-  use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+  use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
     session: {
       session: Record<string, any> & {
         id: string;
@@ -226,13 +226,13 @@ declare const setPassword: import("better-call").StrictEndpoint<string, {
         image?: string | null | undefined;
       };
     };
-  }>)[];
+  }>>[];
 }, {
   status: boolean;
 }>;
 declare const deleteUser: import("better-call").StrictEndpoint<"/delete-user", {
   method: "POST";
-  use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+  use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
     session: {
       session: Record<string, any> & {
         id: string;
@@ -254,7 +254,7 @@ declare const deleteUser: import("better-call").StrictEndpoint<"/delete-user", {
         image?: string | null | undefined;
       };
     };
-  }>)[];
+  }>>[];
   body: z.ZodObject<{
     callbackURL: z.ZodOptional<z.ZodString>;
     password: z.ZodOptional<z.ZodString>;
@@ -323,7 +323,7 @@ declare const deleteUserCallback: import("better-call").StrictEndpoint<"/delete-
     token: z.ZodString;
     callbackURL: z.ZodOptional<z.ZodString>;
   }, z.core.$strip>;
-  use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>)[];
+  use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>>[];
   metadata: {
     openapi: {
       description: string;
@@ -363,7 +363,7 @@ declare const changeEmail: import("better-call").StrictEndpoint<"/change-email",
     newEmail: z.ZodEmail;
     callbackURL: z.ZodOptional<z.ZodString>;
   }, z.core.$strip>;
-  use: ((inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+  use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
     session: {
       session: Record<string, any> & {
         id: string;
@@ -385,7 +385,7 @@ declare const changeEmail: import("better-call").StrictEndpoint<"/change-email",
         image?: string | null | undefined;
       };
     };
-  }>)[];
+  }>>[];
   metadata: {
     openapi: {
       operationId: string;

package/dist/client/session-atom.mjs

@@ -24,7 +24,7 @@ function isSessionAtomEqual(a, b) {
 }
 function getSessionAtom($fetch, options) {
 	const $signal = atom(false);
-	let abortController;
+	let activeRequest;
 	const refetch = (queryParams) => fetchSession(queryParams);
 	const session = atom({
 		data: null,
@@ -34,23 +34,8 @@ function getSessionAtom($fetch, options) {
 		refetch
 	});
 	withEquality(session, isSessionAtomEqual);
-	const settleAbortedFetch = (controller) => {
-		if (abortController !== controller) return;
-		const current = session.get();
-		abortController = void 0;
-		if (!current.isPending && !current.isRefetching) return;
-		session.set({
-			...current,
-			isPending: false,
-			isRefetching: false,
-			refetch
-		});
-	};
-	const fetchSession = async (queryParams) => {
-		abortController?.abort();
-		const controller = new AbortController();
-		abortController = controller;
-		const current = session.get();
+	const executeSessionFetch = async (signal, queryParams) => {
+		const current = session.value;
 		session.set({
 			...current,
 			isPending: current.data === null,
@@ -58,35 +43,27 @@ function getSessionAtom($fetch, options) {
 			error: null,
 			refetch
 		});
+		if (signal.aborted) return;
 		try {
 			const res = await $fetch("/get-session", {
 				method: "GET",
 				query: queryParams?.query,
-				signal: controller.signal
+				signal
 			});
-			if (controller.signal.aborted) {
-				settleAbortedFetch(controller);
-				return;
-			}
+			if (signal.aborted) return;
 			let { data, error } = normalizeSessionResponse(res);
 			if (data?.needsRefresh) try {
 				const refreshRes = await $fetch("/get-session", {
 					method: "POST",
-					signal: controller.signal
+					signal
 				});
-				if (controller.signal.aborted) {
-					settleAbortedFetch(controller);
-					return;
-				}
+				if (signal.aborted) return;
 				({data, error} = normalizeSessionResponse(refreshRes));
 			} catch {
-				if (controller.signal.aborted) {
-					settleAbortedFetch(controller);
-					return;
-				}
+				if (signal.aborted) return;
 			}
 			if (error) {
-				const latest = session.get();
+				const latest = session.value;
 				const isUnauthorized = error?.status === 401;
 				session.set({
 					data: isUnauthorized ? null : latest.data,
@@ -98,7 +75,7 @@ function getSessionAtom($fetch, options) {
 				return;
 			}
 			const sessionData = normalizeSessionData(data);
-			const current = session.get();
+			const current = session.value;
 			const stableData = current.data != null && sessionData != null && isJsonEqual(current.data, sessionData) ? current.data : sessionData;
 			session.set({
 				data: stableData,
@@ -108,11 +85,8 @@ function getSessionAtom($fetch, options) {
 				refetch
 			});
 		} catch (fetchError) {
-			if (controller.signal.aborted) {
-				settleAbortedFetch(controller);
-				return;
-			}
-			const latest = session.get();
+			if (signal.aborted) return;
+			const latest = session.value;
 			session.set({
 				data: latest.data,
 				error: fetchError,
@@ -122,15 +96,33 @@ function getSessionAtom($fetch, options) {
 			});
 		}
 	};
+	const fetchSession = (queryParams) => {
+		activeRequest?.cancel();
+		const controller = new AbortController();
+		const request = {
+			cancel: () => controller.abort(),
+			promise: Promise.resolve().then(() => {
+				if (controller.signal.aborted) return;
+				return executeSessionFetch(controller.signal, queryParams);
+			})
+		};
+		activeRequest = request;
+		const clearActiveRequest = () => {
+			if (activeRequest === request) activeRequest = void 0;
+		};
+		request.promise.then(clearActiveRequest, clearActiveRequest);
+		return request.promise;
+	};
+	const fetchSessionOnMount = () => activeRequest?.promise ?? fetchSession();
 	let broadcastSessionUpdate = () => {};
 	onMount(session, () => {
 		let timeoutId;
 		if (!isServer()) timeoutId = setTimeout(() => {
-			fetchSession();
+			fetchSessionOnMount();
 		}, 0);
 		const refreshManager = createSessionRefreshManager({
 			fetchSession,
-			shouldPollSession: () => session.get().data != null,
+			shouldPollSession: () => session.value.data != null,
 			sessionSignal: $signal,
 			options
 		});
@@ -138,9 +130,6 @@ function getSessionAtom($fetch, options) {
 		broadcastSessionUpdate = refreshManager.broadcastSessionUpdate;
 		return () => {
 			if (timeoutId) clearTimeout(timeoutId);
-			const controller = abortController;
-			controller?.abort();
-			if (controller) settleAbortedFetch(controller);
 			refreshManager.cleanup();
 		};
 	});

package/dist/integrations/next-js.d.mts

@@ -14,11 +14,11 @@ declare const nextCookies: () => {
   hooks: {
     before: {
       matcher(ctx: import("@better-auth/core").HookEndpointContext): boolean;
-      handler: (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>;
+      handler: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>>;
     }[];
     after: {
       matcher(ctx: import("@better-auth/core").HookEndpointContext): true;
-      handler: (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>;
+      handler: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>>;
     }[];
   };
 };

package/dist/integrations/svelte-kit.d.mts

@@ -23,7 +23,7 @@ declare const sveltekitCookies: (getRequestEvent: () => RequestEvent<any, any>)
   hooks: {
     after: {
       matcher(): true;
-      handler: (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>;
+      handler: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>>;
     }[];
   };
 };

package/dist/integrations/tanstack-start-solid.d.mts

@@ -22,7 +22,7 @@ declare const tanstackStartCookies: () => {
   hooks: {
     after: {
       matcher(ctx: import("@better-auth/core").HookEndpointContext): true;
-      handler: (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>;
+      handler: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>>;
     }[];
   };
 };

package/dist/integrations/tanstack-start.d.mts

@@ -22,7 +22,7 @@ declare const tanstackStartCookies: () => {
   hooks: {
     after: {
       matcher(ctx: import("@better-auth/core").HookEndpointContext): true;
-      handler: (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>;
+      handler: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>>;
     }[];
   };
 };

package/dist/package.mjs

@@ -1,4 +1,4 @@
 //#region package.json
-var version = "1.6.26";
+var version = "1.6.27";
 //#endregion
 export { version };