@better-auth/core 1.5.0-beta.5 → 1.5.0-beta.7

package/.turbo/turbo-build.log

@@ -1,20 +1,21 @@
 
-> @better-auth/core@1.5.0-beta.5 build /home/runner/work/better-auth/better-auth/packages/core
+> @better-auth/core@1.5.0-beta.7 build /home/runner/work/better-auth/better-auth/packages/core
 > tsdown
 
 ℹ tsdown v0.19.0 powered by rolldown v1.0.0-beta.59
 ℹ config file: /home/runner/work/better-auth/better-auth/packages/core/tsdown.config.ts 
-ℹ entry: src/index.ts, src/api/index.ts, src/async_hooks/index.ts, src/async_hooks/pure.index.ts, src/context/index.ts, src/db/index.ts, src/env/index.ts, src/error/index.ts, src/oauth2/index.ts, src/social-providers/index.ts, src/utils/deprecate.ts, src/utils/error-codes.ts, src/utils/id.ts, src/utils/json.ts, src/utils/string.ts, src/db/adapter/index.ts
+ℹ entry: src/index.ts, src/api/index.ts, src/async_hooks/index.ts, src/async_hooks/pure.index.ts, src/context/index.ts, src/db/index.ts, src/env/index.ts, src/error/index.ts, src/oauth2/index.ts, src/social-providers/index.ts, src/utils/deprecate.ts, src/utils/error-codes.ts, src/utils/id.ts, src/utils/json.ts, src/utils/string.ts, src/utils/url.ts, src/db/adapter/index.ts
 ℹ tsconfig: tsconfig.json
 ℹ Build start
 ℹ dist/social-providers/index.mjs                  2.32 kB │ gzip: 0.72 kB
-ℹ dist/context/index.mjs                           1.70 kB │ gzip: 0.68 kB
 ℹ dist/api/index.mjs                               1.27 kB │ gzip: 0.48 kB
+ℹ dist/utils/url.mjs                               1.14 kB │ gzip: 0.51 kB
 ℹ dist/async_hooks/index.mjs                       1.03 kB │ gzip: 0.54 kB
 ℹ dist/async_hooks/pure.index.mjs                  0.99 kB │ gzip: 0.49 kB
 ℹ dist/oauth2/index.mjs                            0.87 kB │ gzip: 0.27 kB
+ℹ dist/context/index.mjs                           0.79 kB │ gzip: 0.23 kB
 ℹ dist/db/adapter/index.mjs                        0.71 kB │ gzip: 0.22 kB
-ℹ dist/error/index.mjs                             0.70 kB │ gzip: 0.34 kB
+ℹ dist/error/index.mjs                             0.69 kB │ gzip: 0.33 kB
 ℹ dist/utils/json.mjs                              0.59 kB │ gzip: 0.35 kB
 ℹ dist/db/index.mjs                                0.50 kB │ gzip: 0.18 kB
 ℹ dist/env/index.mjs                               0.43 kB │ gzip: 0.21 kB
@@ -23,13 +24,13 @@
 ℹ dist/utils/id.mjs                                0.24 kB │ gzip: 0.18 kB
 ℹ dist/utils/string.mjs                            0.17 kB │ gzip: 0.14 kB
 ℹ dist/index.mjs                                   0.01 kB │ gzip: 0.03 kB
-ℹ dist/db/adapter/factory.mjs                     30.09 kB │ gzip: 6.00 kB
+ℹ dist/db/adapter/factory.mjs                     30.11 kB │ gzip: 5.99 kB
 ℹ dist/db/get-tables.mjs                           6.76 kB │ gzip: 1.29 kB
 ℹ dist/social-providers/cognito.mjs                5.90 kB │ gzip: 1.93 kB
 ℹ dist/social-providers/paypal.mjs                 5.03 kB │ gzip: 1.48 kB
+ℹ dist/social-providers/apple.mjs                  3.77 kB │ gzip: 1.36 kB
 ℹ dist/social-providers/google.mjs                 3.75 kB │ gzip: 1.38 kB
 ℹ dist/oauth2/verify.mjs                           3.74 kB │ gzip: 1.32 kB
-ℹ dist/social-providers/apple.mjs                  3.72 kB │ gzip: 1.34 kB
 ℹ dist/social-providers/facebook.mjs               3.57 kB │ gzip: 1.27 kB
 ℹ dist/social-providers/line.mjs                   3.57 kB │ gzip: 1.20 kB
 ℹ dist/social-providers/salesforce.mjs             3.50 kB │ gzip: 1.12 kB
@@ -40,7 +41,7 @@
 ℹ dist/env/color-depth.mjs                         2.72 kB │ gzip: 0.99 kB
 ℹ dist/social-providers/figma.mjs                  2.71 kB │ gzip: 0.98 kB
 ℹ dist/social-providers/paybin.mjs                 2.65 kB │ gzip: 0.97 kB
-ℹ dist/social-providers/gitlab.mjs                 2.64 kB │ gzip: 0.97 kB
+ℹ dist/social-providers/gitlab.mjs                 2.65 kB │ gzip: 0.96 kB
 ℹ dist/db/adapter/get-id-field.mjs                 2.63 kB │ gzip: 0.98 kB
 ℹ dist/social-providers/reddit.mjs                 2.63 kB │ gzip: 1.01 kB
 ℹ dist/social-providers/discord.mjs                2.62 kB │ gzip: 1.04 kB
@@ -68,15 +69,16 @@
 ℹ dist/social-providers/vercel.mjs                 1.91 kB │ gzip: 0.74 kB
 ℹ dist/oauth2/create-authorization-url.mjs         1.86 kB │ gzip: 0.73 kB
 ℹ dist/oauth2/client-credentials-token.mjs         1.83 kB │ gzip: 0.77 kB
-ℹ dist/context/request-state.mjs                   1.43 kB │ gzip: 0.54 kB
-ℹ dist/context/transaction.mjs                     1.43 kB │ gzip: 0.50 kB
+ℹ dist/context/request-state.mjs                   1.63 kB │ gzip: 0.59 kB
+ℹ dist/context/transaction.mjs                     1.60 kB │ gzip: 0.55 kB
 ℹ dist/db/adapter/get-default-field-name.mjs       1.41 kB │ gzip: 0.66 kB
-ℹ dist/db/adapter/get-default-model-name.mjs       1.39 kB │ gzip: 0.65 kB
+ℹ dist/db/adapter/get-default-model-name.mjs       1.40 kB │ gzip: 0.65 kB
+ℹ dist/context/endpoint-context.mjs                1.31 kB │ gzip: 0.53 kB
 ℹ dist/db/adapter/get-field-attributes.mjs         1.26 kB │ gzip: 0.46 kB
 ℹ dist/db/adapter/utils.mjs                        1.15 kB │ gzip: 0.46 kB
-ℹ dist/context/endpoint-context.mjs                1.11 kB │ gzip: 0.48 kB
 ℹ dist/db/adapter/get-field-name.mjs               1.07 kB │ gzip: 0.47 kB
 ℹ dist/oauth2/utils.mjs                            0.98 kB │ gzip: 0.50 kB
+ℹ dist/context/global.mjs                          0.96 kB │ gzip: 0.48 kB
 ℹ dist/db/adapter/get-model-name.mjs               0.89 kB │ gzip: 0.42 kB
 ℹ dist/db/schema/account.mjs                       0.52 kB │ gzip: 0.24 kB
 ℹ dist/db/schema/user.mjs                          0.33 kB │ gzip: 0.23 kB
@@ -86,13 +88,14 @@
 ℹ dist/db/schema/rate-limit.mjs                    0.21 kB │ gzip: 0.17 kB
 ℹ dist/social-providers/index.d.mts               45.59 kB │ gzip: 3.09 kB
 ℹ dist/db/adapter/index.d.mts                     15.17 kB │ gzip: 3.60 kB
-ℹ dist/api/index.d.mts                             7.57 kB │ gzip: 1.44 kB
-ℹ dist/index.d.mts                                 1.20 kB │ gzip: 0.36 kB
+ℹ dist/api/index.d.mts                             7.54 kB │ gzip: 1.45 kB
+ℹ dist/index.d.mts                                 1.36 kB │ gzip: 0.38 kB
 ℹ dist/oauth2/index.d.mts                          1.05 kB │ gzip: 0.32 kB
 ℹ dist/db/index.d.mts                              1.04 kB │ gzip: 0.34 kB
+ℹ dist/context/index.d.mts                         0.92 kB │ gzip: 0.27 kB
 ℹ dist/utils/error-codes.d.mts                     0.89 kB │ gzip: 0.45 kB
-ℹ dist/context/index.d.mts                         0.84 kB │ gzip: 0.24 kB
-ℹ dist/error/index.d.mts                           0.73 kB │ gzip: 0.33 kB
+ℹ dist/utils/url.d.mts                             0.84 kB │ gzip: 0.40 kB
+ℹ dist/error/index.d.mts                           0.75 kB │ gzip: 0.34 kB
 ℹ dist/env/index.d.mts                             0.58 kB │ gzip: 0.27 kB
 ℹ dist/utils/deprecate.d.mts                       0.30 kB │ gzip: 0.22 kB
 ℹ dist/async_hooks/index.d.mts                     0.24 kB │ gzip: 0.16 kB
@@ -100,8 +103,8 @@
 ℹ dist/utils/string.d.mts                          0.14 kB │ gzip: 0.12 kB
 ℹ dist/utils/json.d.mts                            0.13 kB │ gzip: 0.13 kB
 ℹ dist/utils/id.d.mts                              0.12 kB │ gzip: 0.12 kB
-ℹ dist/types/init-options.d.mts                   38.19 kB │ gzip: 8.46 kB
-ℹ dist/types/context.d.mts                         9.90 kB │ gzip: 2.83 kB
+ℹ dist/types/init-options.d.mts                   38.16 kB │ gzip: 8.49 kB
+ℹ dist/types/context.d.mts                        10.12 kB │ gzip: 2.96 kB
 ℹ dist/social-providers/zoom.d.mts                 6.71 kB │ gzip: 2.29 kB
 ℹ dist/oauth2/oauth-provider.d.mts                 5.92 kB │ gzip: 1.67 kB
 ℹ dist/social-providers/microsoft-entra-id.d.mts   5.59 kB │ gzip: 1.96 kB
@@ -153,14 +156,14 @@
 ℹ dist/oauth2/refresh-access-token.d.mts           1.01 kB │ gzip: 0.41 kB
 ℹ dist/context/endpoint-context.d.mts              0.99 kB │ gzip: 0.43 kB
 ℹ dist/oauth2/client-credentials-token.d.mts       0.91 kB │ gzip: 0.36 kB
-ℹ dist/context/transaction.d.mts                   0.88 kB │ gzip: 0.39 kB
-ℹ dist/types/index.d.mts                           0.77 kB │ gzip: 0.33 kB
+ℹ dist/context/transaction.d.mts                   0.86 kB │ gzip: 0.38 kB
+ℹ dist/types/index.d.mts                           0.86 kB │ gzip: 0.34 kB
 ℹ dist/db/schema/session.d.mts                     0.75 kB │ gzip: 0.40 kB
 ℹ dist/db/adapter/get-field-attributes.d.mts       0.72 kB │ gzip: 0.34 kB
 ℹ dist/db/schema/user.d.mts                        0.71 kB │ gzip: 0.40 kB
 ℹ dist/db/schema/verification.d.mts                0.66 kB │ gzip: 0.36 kB
 ℹ dist/types/helper.d.mts                          0.45 kB │ gzip: 0.27 kB
-ℹ dist/types/cookie.d.mts                          0.43 kB │ gzip: 0.19 kB
+ℹ dist/types/cookie.d.mts                          0.38 kB │ gzip: 0.20 kB
 ℹ dist/db/adapter/get-default-field-name.d.mts     0.38 kB │ gzip: 0.24 kB
 ℹ dist/db/schema/rate-limit.d.mts                  0.37 kB │ gzip: 0.25 kB
 ℹ dist/db/adapter/get-field-name.d.mts             0.36 kB │ gzip: 0.23 kB
@@ -171,6 +174,7 @@
 ℹ dist/db/adapter/get-model-name.d.mts             0.30 kB │ gzip: 0.21 kB
 ℹ dist/db/get-tables.d.mts                         0.29 kB │ gzip: 0.18 kB
 ℹ dist/db/schema/shared.d.mts                      0.25 kB │ gzip: 0.18 kB
+ℹ dist/context/global.d.mts                        0.20 kB │ gzip: 0.16 kB
 ℹ dist/env/color-depth.d.mts                       0.12 kB │ gzip: 0.11 kB
-ℹ 165 files, total: 443.38 kB
-✔ Build complete in 5199ms
+ℹ 169 files, total: 446.70 kB
+✔ Build complete in 5631ms

package/dist/api/index.d.mts

@@ -6,9 +6,9 @@ import { DBAdapter } from "../db/adapter/index.mjs";
 import { createLogger } from "../env/logger.mjs";
 import { OAuthProvider } from "../oauth2/oauth-provider.mjs";
 import "../oauth2/index.mjs";
-import { BetterAuthCookies } from "../types/cookie.mjs";
+import { BetterAuthCookie, BetterAuthCookies } from "../types/cookie.mjs";
 import { BetterAuthOptions, BetterAuthRateLimitOptions } from "../types/init-options.mjs";
-import { AuthContext, GenericEndpointContext, InternalAdapter, PluginContext } from "../types/context.mjs";
+import { AuthContext, GenericEndpointContext, InfoContext, InternalAdapter, PluginContext } from "../types/context.mjs";
 import "../types/index.mjs";
 import "../index.mjs";
 import * as better_call0 from "better-call";
@@ -20,10 +20,8 @@ declare const createAuthMiddleware: {
   <Options extends better_call0.MiddlewareOptions, R>(options: Options, handler: (ctx: better_call0.MiddlewareContext<Options, {
     returned?: unknown | undefined;
     responseHeaders?: Headers | undefined;
-  } & PluginContext & {
+  } & PluginContext & InfoContext & {
     options: BetterAuthOptions;
-    appName: string;
-    baseURL: string;
     trustedOrigins: string[];
     isTrustedOrigin: (url: string, settings?: {
       allowRelativePaths: boolean;
@@ -52,13 +50,10 @@ declare const createAuthMiddleware: {
       window: number;
       max: number;
       storage: "memory" | "database" | "secondary-storage";
-    } & BetterAuthRateLimitOptions;
+    } & Omit<BetterAuthRateLimitOptions, "enabled" | "window" | "max" | "storage">;
     adapter: DBAdapter<BetterAuthOptions>;
     internalAdapter: InternalAdapter<BetterAuthOptions>;
-    createAuthCookie: (cookieName: string, overrideAttributes?: Partial<better_call0.CookieOptions> | undefined) => {
-      name: string;
-      attributes: better_call0.CookieOptions;
-    };
+    createAuthCookie: (cookieName: string, overrideAttributes?: Partial<better_call0.CookieOptions> | undefined) => BetterAuthCookie;
     secret: string;
     sessionConfig: {
       updateAge: number;
@@ -93,7 +88,7 @@ declare const createAuthMiddleware: {
       anonymousId?: string | undefined;
       payload: Record<string, any>;
     }) => Promise<void>;
-    skipOriginCheck: boolean;
+    skipOriginCheck: boolean | string[];
     skipCSRFCheck: boolean;
     runInBackground: (promise: Promise<void>) => void;
     runInBackgroundOrAwait: (promise: Promise<unknown> | Promise<void> | void | unknown) => Promise<unknown>;
@@ -101,10 +96,8 @@ declare const createAuthMiddleware: {
   <Options extends better_call0.MiddlewareOptions, R_1>(handler: (ctx: better_call0.MiddlewareContext<Options, {
     returned?: unknown | undefined;
     responseHeaders?: Headers | undefined;
-  } & PluginContext & {
+  } & PluginContext & InfoContext & {
     options: BetterAuthOptions;
-    appName: string;
-    baseURL: string;
     trustedOrigins: string[];
     isTrustedOrigin: (url: string, settings?: {
       allowRelativePaths: boolean;
@@ -133,13 +126,10 @@ declare const createAuthMiddleware: {
       window: number;
       max: number;
       storage: "memory" | "database" | "secondary-storage";
-    } & BetterAuthRateLimitOptions;
+    } & Omit<BetterAuthRateLimitOptions, "enabled" | "window" | "max" | "storage">;
     adapter: DBAdapter<BetterAuthOptions>;
     internalAdapter: InternalAdapter<BetterAuthOptions>;
-    createAuthCookie: (cookieName: string, overrideAttributes?: Partial<better_call0.CookieOptions> | undefined) => {
-      name: string;
-      attributes: better_call0.CookieOptions;
-    };
+    createAuthCookie: (cookieName: string, overrideAttributes?: Partial<better_call0.CookieOptions> | undefined) => BetterAuthCookie;
     secret: string;
     sessionConfig: {
       updateAge: number;
@@ -174,7 +164,7 @@ declare const createAuthMiddleware: {
       anonymousId?: string | undefined;
       payload: Record<string, any>;
     }) => Promise<void>;
-    skipOriginCheck: boolean;
+    skipOriginCheck: boolean | string[];
     skipCSRFCheck: boolean;
     runInBackground: (promise: Promise<void>) => void;
     runInBackgroundOrAwait: (promise: Promise<unknown> | Promise<void> | void | unknown) => Promise<unknown>;

package/dist/context/endpoint-context.mjs

@@ -1,10 +1,14 @@
+import { __getBetterAuthGlobal } from "./global.mjs";
 import { getAsyncLocalStorage } from "@better-auth/core/async_hooks";
 
 //#region src/context/endpoint-context.ts
-let currentContextAsyncStorage = null;
 const ensureAsyncStorage = async () => {
-	if (!currentContextAsyncStorage) currentContextAsyncStorage = new (await (getAsyncLocalStorage()))();
-	return currentContextAsyncStorage;
+	const betterAuthGlobal = __getBetterAuthGlobal();
+	if (!betterAuthGlobal.context.endpointContextAsyncStorage) {
+		const AsyncLocalStorage$1 = await getAsyncLocalStorage();
+		betterAuthGlobal.context.endpointContextAsyncStorage = new AsyncLocalStorage$1();
+	}
+	return betterAuthGlobal.context.endpointContextAsyncStorage;
 };
 /**
 * This is for internal use only. Most users should use `getCurrentAuthContext` instead.

package/dist/context/global.d.mts

@@ -0,0 +1,7 @@
+import { AsyncLocalStorage } from "@better-auth/core/async_hooks";
+
+//#region src/context/global.d.ts
+
+declare function getBetterAuthVersion(): string;
+//#endregion
+export { getBetterAuthVersion };

package/dist/context/global.mjs

@@ -0,0 +1,37 @@
+//#region src/context/global.ts
+const symbol = Symbol.for("better-auth:global");
+let bind = null;
+const __context = {};
+const __betterAuthVersion = "1.5.0-beta.7";
+/**
+* We store context instance in the globalThis.
+*
+* The reason we do this is that some bundlers, web framework, or package managers might
+* create multiple copies of BetterAuth in the same process intentionally or unintentionally.
+*
+* For example, yarn v1, Next.js, SSR, Vite...
+*
+* @internal
+*/
+function __getBetterAuthGlobal() {
+	if (!globalThis[symbol]) {
+		globalThis[symbol] = {
+			version: __betterAuthVersion,
+			epoch: 1,
+			context: __context
+		};
+		bind = globalThis[symbol];
+	}
+	bind = globalThis[symbol];
+	if (bind.version !== __betterAuthVersion) {
+		bind.version = __betterAuthVersion;
+		bind.epoch++;
+	}
+	return globalThis[symbol];
+}
+function getBetterAuthVersion() {
+	return __getBetterAuthGlobal().version;
+}
+
+//#endregion
+export { __getBetterAuthGlobal, getBetterAuthVersion };

package/dist/context/index.d.mts

@@ -1,4 +1,5 @@
 import { AuthEndpointContext, getCurrentAuthContext, getCurrentAuthContextAsyncLocalStorage, runWithEndpointContext } from "./endpoint-context.mjs";
+import { getBetterAuthVersion } from "./global.mjs";
 import { RequestState, RequestStateWeakMap, defineRequestState, getCurrentRequestState, getRequestStateAsyncLocalStorage, hasRequestState, runWithRequestState } from "./request-state.mjs";
 import { getCurrentAdapter, getCurrentDBAdapterAsyncLocalStorage, runWithAdapter, runWithTransaction } from "./transaction.mjs";
-export { type AuthEndpointContext, type RequestState, type RequestStateWeakMap, defineRequestState, getCurrentAdapter, getCurrentAuthContext, getCurrentAuthContextAsyncLocalStorage, getCurrentDBAdapterAsyncLocalStorage, getCurrentRequestState, getRequestStateAsyncLocalStorage, hasRequestState, runWithAdapter, runWithEndpointContext, runWithRequestState, runWithTransaction };
+export { type AuthEndpointContext, type RequestState, type RequestStateWeakMap, defineRequestState, getBetterAuthVersion, getCurrentAdapter, getCurrentAuthContext, getCurrentAuthContextAsyncLocalStorage, getCurrentDBAdapterAsyncLocalStorage, getCurrentRequestState, getRequestStateAsyncLocalStorage, hasRequestState, runWithAdapter, runWithEndpointContext, runWithRequestState, runWithTransaction };

package/dist/context/index.mjs

@@ -1,24 +1,6 @@
+import { getBetterAuthVersion } from "./global.mjs";
 import { getCurrentAuthContext, getCurrentAuthContextAsyncLocalStorage, runWithEndpointContext } from "./endpoint-context.mjs";
 import { defineRequestState, getCurrentRequestState, getRequestStateAsyncLocalStorage, hasRequestState, runWithRequestState } from "./request-state.mjs";
 import { getCurrentAdapter, getCurrentDBAdapterAsyncLocalStorage, runWithAdapter, runWithTransaction } from "./transaction.mjs";
 
-//#region src/context/index.ts
-const glo = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : {};
-const importIdentifier = "__ $BETTER_AUTH$ __";
-if (glo[importIdentifier] === true)
- /**
-* Dear reader of this message. Please take this seriously.
-*
-* If you see this message, make sure that you only import one version of Better Auth. In many cases,
-* your package manager installs two versions of Better Auth that are used by different packages within your project.
-*
-* This often leads to issues that are hard to debug. We often need to ensure async local storage instance,
-* If you imported different versions of Better Auth, it is impossible for us to
-* do status synchronization per request anymore - which might break the states.
-*
-*/
-console.error("Better Auth was already imported. This breaks async local storage instance and will lead to issues!");
-glo[importIdentifier] = true;
-
-//#endregion
-export { defineRequestState, getCurrentAdapter, getCurrentAuthContext, getCurrentAuthContextAsyncLocalStorage, getCurrentDBAdapterAsyncLocalStorage, getCurrentRequestState, getRequestStateAsyncLocalStorage, hasRequestState, runWithAdapter, runWithEndpointContext, runWithRequestState, runWithTransaction };
+export { defineRequestState, getBetterAuthVersion, getCurrentAdapter, getCurrentAuthContext, getCurrentAuthContextAsyncLocalStorage, getCurrentDBAdapterAsyncLocalStorage, getCurrentRequestState, getRequestStateAsyncLocalStorage, hasRequestState, runWithAdapter, runWithEndpointContext, runWithRequestState, runWithTransaction };

package/dist/context/request-state.mjs

@@ -1,10 +1,14 @@
+import { __getBetterAuthGlobal } from "./global.mjs";
 import { getAsyncLocalStorage } from "@better-auth/core/async_hooks";
 
 //#region src/context/request-state.ts
-let requestStateAsyncStorage = null;
 const ensureAsyncStorage = async () => {
-	if (!requestStateAsyncStorage) requestStateAsyncStorage = new (await (getAsyncLocalStorage()))();
-	return requestStateAsyncStorage;
+	const betterAuthGlobal = __getBetterAuthGlobal();
+	if (!betterAuthGlobal.context.requestStateAsyncStorage) {
+		const AsyncLocalStorage$1 = await getAsyncLocalStorage();
+		betterAuthGlobal.context.requestStateAsyncStorage = new AsyncLocalStorage$1();
+	}
+	return betterAuthGlobal.context.requestStateAsyncStorage;
 };
 async function getRequestStateAsyncLocalStorage() {
 	return ensureAsyncStorage();

package/dist/context/transaction.d.mts

@@ -1,5 +1,5 @@
 import { DBAdapter, DBTransactionAdapter } from "../db/adapter/index.mjs";
-import { AsyncLocalStorage } from "@better-auth/core/async_hooks";
+import { AsyncLocalStorage } from "node:async_hooks";
 
 //#region src/context/transaction.d.ts
 

package/dist/context/transaction.mjs

@@ -1,10 +1,14 @@
+import { __getBetterAuthGlobal } from "./global.mjs";
 import { getAsyncLocalStorage } from "@better-auth/core/async_hooks";
 
 //#region src/context/transaction.ts
-let currentAdapterAsyncStorage = null;
 const ensureAsyncStorage = async () => {
-	if (!currentAdapterAsyncStorage) currentAdapterAsyncStorage = new (await (getAsyncLocalStorage()))();
-	return currentAdapterAsyncStorage;
+	const betterAuthGlobal = __getBetterAuthGlobal();
+	if (!betterAuthGlobal.context.adapterAsyncStorage) {
+		const AsyncLocalStorage$1 = await getAsyncLocalStorage();
+		betterAuthGlobal.context.adapterAsyncStorage = new AsyncLocalStorage$1();
+	}
+	return betterAuthGlobal.context.adapterAsyncStorage;
 };
 /**
 * This is for internal use only. Most users should use `getCurrentAdapter` instead.

package/dist/db/adapter/factory.mjs

@@ -108,7 +108,7 @@ const createAdapterFactory = ({ adapter: customAdapter, config: cfg }) => (optio
 		for (const field in fields) {
 			let value = data[field];
 			const fieldAttributes = fields[field];
-			let newFieldName = newMappedKeys[field] || fields[field].fieldName || field;
+			const newFieldName = newMappedKeys[field] || fields[field].fieldName || field;
 			if (value === void 0 && (fieldAttributes.defaultValue === void 0 && !fieldAttributes.transform?.input && !(action === "update" && fieldAttributes.onUpdate) || action === "update" && !fieldAttributes.onUpdate)) continue;
 			if (fieldAttributes && fieldAttributes.type === "date" && !(value instanceof Date) && typeof value === "string") try {
 				value = new Date(value);
@@ -154,7 +154,7 @@ const createAdapterFactory = ({ adapter: customAdapter, config: cfg }) => (optio
 					const originalKey = field.fieldName || key;
 					let newValue = data$1[Object.entries(newMappedKeys).find(([_, v]) => v === originalKey)?.[0] || originalKey];
 					if (field.transform?.output) newValue = await field.transform.output(newValue);
-					let newFieldName = newMappedKeys[key] || key;
+					const newFieldName = newMappedKeys[key] || key;
 					if (originalKey === "id" || field.references?.field === "id") {
 						if (typeof newValue !== "undefined" && newValue !== null) newValue = String(newValue);
 					} else if (config.supportsJSON === false && typeof newValue === "string" && field.type === "json") newValue = safeJSONParse(newValue);
@@ -177,7 +177,7 @@ const createAdapterFactory = ({ adapter: customAdapter, config: cfg }) => (optio
 		};
 		if (!join || Object.keys(join).length === 0) return await transformSingleOutput(data, unsafe_model, select);
 		unsafe_model = getDefaultModelName(unsafe_model);
-		let transformedData = await transformSingleOutput(data, unsafe_model, select);
+		const transformedData = await transformSingleOutput(data, unsafe_model, select);
 		const requiredModels = Object.entries(join).map(([model, joinConfig]) => ({
 			modelName: getModelName(model),
 			defaultModelName: getDefaultModelName(model),
@@ -196,7 +196,7 @@ const createAdapterFactory = ({ adapter: customAdapter, config: cfg }) => (optio
 			})();
 			if (joinedData === void 0 || joinedData === null) joinedData = joinConfig.relation === "one-to-one" ? null : [];
 			if (joinConfig.relation === "one-to-many" && !Array.isArray(joinedData)) joinedData = [joinedData];
-			let transformed = [];
+			const transformed = [];
 			if (Array.isArray(joinedData)) for (const item of joinedData) {
 				const transformedItem = await transformSingleOutput(item, modelName, []);
 				transformed.push(transformedItem);
@@ -392,7 +392,7 @@ const createAdapterFactory = ({ adapter: customAdapter, config: cfg }) => (optio
 		},
 		create: async ({ data: unsafeData, model: unsafeModel, select, forceAllowId = false }) => {
 			transactionId++;
-			let thisTransactionId = transactionId;
+			const thisTransactionId = transactionId;
 			const model = getModelName(unsafeModel);
 			unsafeModel = getDefaultModelName(unsafeModel);
 			if ("id" in unsafeData && typeof unsafeData.id !== "undefined" && !forceAllowId) {
@@ -429,7 +429,7 @@ const createAdapterFactory = ({ adapter: customAdapter, config: cfg }) => (optio
 		},
 		update: async ({ model: unsafeModel, where: unsafeWhere, update: unsafeData }) => {
 			transactionId++;
-			let thisTransactionId = transactionId;
+			const thisTransactionId = transactionId;
 			unsafeModel = getDefaultModelName(unsafeModel);
 			const model = getModelName(unsafeModel);
 			const where = transformWhereClause({
@@ -466,7 +466,7 @@ const createAdapterFactory = ({ adapter: customAdapter, config: cfg }) => (optio
 		},
 		updateMany: async ({ model: unsafeModel, where: unsafeWhere, update: unsafeData }) => {
 			transactionId++;
-			let thisTransactionId = transactionId;
+			const thisTransactionId = transactionId;
 			const model = getModelName(unsafeModel);
 			const where = transformWhereClause({
 				model: unsafeModel,
@@ -501,7 +501,7 @@ const createAdapterFactory = ({ adapter: customAdapter, config: cfg }) => (optio
 		},
 		findOne: async ({ model: unsafeModel, where: unsafeWhere, select, join: unsafeJoin }) => {
 			transactionId++;
-			let thisTransactionId = transactionId;
+			const thisTransactionId = transactionId;
 			const model = getModelName(unsafeModel);
 			const where = transformWhereClause({
 				model: unsafeModel,
@@ -545,7 +545,7 @@ const createAdapterFactory = ({ adapter: customAdapter, config: cfg }) => (optio
 		},
 		findMany: async ({ model: unsafeModel, where: unsafeWhere, limit: unsafeLimit, sortBy, offset, join: unsafeJoin }) => {
 			transactionId++;
-			let thisTransactionId = transactionId;
+			const thisTransactionId = transactionId;
 			const limit = unsafeLimit ?? options.advanced?.database?.defaultFindManyLimit ?? 100;
 			const model = getModelName(unsafeModel);
 			const where = transformWhereClause({
@@ -593,7 +593,7 @@ const createAdapterFactory = ({ adapter: customAdapter, config: cfg }) => (optio
 		},
 		delete: async ({ model: unsafeModel, where: unsafeWhere }) => {
 			transactionId++;
-			let thisTransactionId = transactionId;
+			const thisTransactionId = transactionId;
 			const model = getModelName(unsafeModel);
 			const where = transformWhereClause({
 				model: unsafeModel,
@@ -613,7 +613,7 @@ const createAdapterFactory = ({ adapter: customAdapter, config: cfg }) => (optio
 		},
 		deleteMany: async ({ model: unsafeModel, where: unsafeWhere }) => {
 			transactionId++;
-			let thisTransactionId = transactionId;
+			const thisTransactionId = transactionId;
 			const model = getModelName(unsafeModel);
 			const where = transformWhereClause({
 				model: unsafeModel,
@@ -637,7 +637,7 @@ const createAdapterFactory = ({ adapter: customAdapter, config: cfg }) => (optio
 		},
 		count: async ({ model: unsafeModel, where: unsafeWhere }) => {
 			transactionId++;
-			let thisTransactionId = transactionId;
+			const thisTransactionId = transactionId;
 			const model = getModelName(unsafeModel);
 			const where = transformWhereClause({
 				model: unsafeModel,
@@ -703,7 +703,7 @@ const createAdapterFactory = ({ adapter: customAdapter, config: cfg }) => (optio
 				const separator = `─`.repeat(80);
 				const logs = debugLogs.filter((log$1) => log$1.instance === uniqueAdapterFactoryInstanceId);
 				if (logs.length === 0) return;
-				let log = logs.reverse().map((log$1) => {
+				const log = logs.reverse().map((log$1) => {
 					log$1.args[0] = `\n${log$1.args[0]}`;
 					return [...log$1.args, "\n"];
 				}).reduce((prev, curr) => {

package/dist/db/adapter/get-default-model-name.mjs

@@ -15,7 +15,7 @@ const initGetDefaultModelName = ({ usePlural, schema }) => {
 	*/
 	const getDefaultModelName = (model) => {
 		if (usePlural && model.charAt(model.length - 1) === "s") {
-			let pluralessModel = model.slice(0, -1);
+			const pluralessModel = model.slice(0, -1);
 			let m$1 = schema[pluralessModel] ? pluralessModel : void 0;
 			if (!m$1) m$1 = Object.entries(schema).find(([_, f]) => f.modelName === pluralessModel)?.[0];
 			if (m$1) return m$1;

package/dist/db/adapter/get-id-field.d.mts

@@ -28,7 +28,7 @@ declare const initGetIdField: ({
   forceAllowId?: boolean;
 }) => {
   transform: {
-    input: (value: DBPrimitive) => string | number | true | Date | Record<string, unknown> | unknown[] | undefined;
+    input: (value: DBPrimitive) => string | number | true | unknown[] | Date | Record<string, unknown> | undefined;
     output: (value: DBPrimitive) => string | undefined;
   };
   defaultValue?: (() => string | false | undefined) | undefined;

package/dist/db/adapter/get-id-field.mjs

@@ -12,7 +12,7 @@ const initGetIdField = ({ usePlural, schema, disableIdGeneration, options, custo
 	const idField = ({ customModelName, forceAllowId }) => {
 		const useNumberId = options.advanced?.database?.useNumberId || options.advanced?.database?.generateId === "serial";
 		const useUUIDs = options.advanced?.database?.generateId === "uuid";
-		let shouldGenerateId = (() => {
+		const shouldGenerateId = (() => {
 			if (disableIdGeneration) return false;
 			else if (useNumberId && !forceAllowId) return false;
 			else if (useUUIDs) return !supportsUUIDs;
@@ -24,7 +24,7 @@ const initGetIdField = ({ usePlural, schema, disableIdGeneration, options, custo
 			required: shouldGenerateId ? true : false,
 			...shouldGenerateId ? { defaultValue() {
 				if (disableIdGeneration) return void 0;
-				let generateId$1 = options.advanced?.database?.generateId;
+				const generateId$1 = options.advanced?.database?.generateId;
 				if (generateId$1 === false || useNumberId) return void 0;
 				if (typeof generateId$1 === "function") return generateId$1({ model });
 				if (customIdGenerator) return customIdGenerator({ model });

package/dist/error/index.d.mts

@@ -3,7 +3,9 @@ import { APIError as APIError$1 } from "better-call/error";
 
 //#region src/error/index.d.ts
 declare class BetterAuthError extends Error {
-  constructor(message: string, cause?: string | undefined);
+  constructor(message: string, options?: {
+    cause?: unknown | undefined;
+  });
 }
 declare class APIError extends APIError$1 {
   constructor(...args: ConstructorParameters<typeof APIError$1>);

package/dist/error/index.mjs

@@ -3,11 +3,10 @@ import { APIError as APIError$1 } from "better-call/error";
 
 //#region src/error/index.ts
 var BetterAuthError = class extends Error {
-	constructor(message, cause) {
-		super(message);
+	constructor(message, options) {
+		super(message, options);
 		this.name = "BetterAuthError";
 		this.message = message;
-		this.cause = cause;
 		this.stack = "";
 	}
 };

package/dist/index.d.mts

@@ -1,8 +1,8 @@
 import { Awaitable, LiteralString, LiteralUnion, Prettify, Primitive } from "./types/helper.mjs";
-import { BetterAuthCookies } from "./types/cookie.mjs";
+import { BetterAuthCookie, BetterAuthCookies } from "./types/cookie.mjs";
 import { BetterAuthPlugin, HookEndpointContext } from "./types/plugin.mjs";
-import { BetterAuthAdvancedOptions, BetterAuthOptions, BetterAuthRateLimitOptions, GenerateIdFn } from "./types/init-options.mjs";
-import { AuthContext, BetterAuthPluginRegistry, BetterAuthPluginRegistryIdentifier, GenericEndpointContext, InternalAdapter, PluginContext } from "./types/context.mjs";
+import { BetterAuthAdvancedOptions, BetterAuthOptions, BetterAuthRateLimitOptions, BetterAuthRateLimitRule, BetterAuthRateLimitStorage, GenerateIdFn } from "./types/init-options.mjs";
+import { AuthContext, BetterAuthPluginRegistry, BetterAuthPluginRegistryIdentifier, GenericEndpointContext, InfoContext, InternalAdapter, PluginContext } from "./types/context.mjs";
 import { BetterAuthClientOptions, BetterAuthClientPlugin, ClientAtomListener, ClientFetchOption, ClientStore } from "./types/plugin-client.mjs";
 import { StandardSchemaV1 } from "./types/index.mjs";
-export { AuthContext, Awaitable, BetterAuthAdvancedOptions, BetterAuthClientOptions, BetterAuthClientPlugin, BetterAuthCookies, BetterAuthOptions, BetterAuthPlugin, BetterAuthPluginRegistry, BetterAuthPluginRegistryIdentifier, BetterAuthRateLimitOptions, ClientAtomListener, ClientFetchOption, ClientStore, GenerateIdFn, GenericEndpointContext, HookEndpointContext, InternalAdapter, LiteralString, LiteralUnion, PluginContext, Prettify, Primitive, StandardSchemaV1 };
+export { AuthContext, Awaitable, BetterAuthAdvancedOptions, BetterAuthClientOptions, BetterAuthClientPlugin, BetterAuthCookie, BetterAuthCookies, BetterAuthOptions, BetterAuthPlugin, BetterAuthPluginRegistry, BetterAuthPluginRegistryIdentifier, BetterAuthRateLimitOptions, BetterAuthRateLimitRule, BetterAuthRateLimitStorage, ClientAtomListener, ClientFetchOption, ClientStore, GenerateIdFn, GenericEndpointContext, HookEndpointContext, InfoContext, InternalAdapter, LiteralString, LiteralUnion, PluginContext, Prettify, Primitive, StandardSchemaV1 };

package/dist/social-providers/apple.mjs

@@ -69,7 +69,9 @@ const apple = (options) => {
 			if (!token.idToken) return null;
 			const profile = decodeJwt(token.idToken);
 			if (!profile) return null;
-			const name = token.user ? `${token.user.name?.firstName} ${token.user.name?.lastName}` : profile.name || profile.email;
+			let name;
+			if (token.user?.name) name = `${token.user.name.firstName || ""} ${token.user.name.lastName || ""}`.trim() || " ";
+			else name = profile.name || " ";
 			const emailVerified = typeof profile.email_verified === "boolean" ? profile.email_verified : profile.email_verified === "true";
 			const enrichedProfile = {
 				...profile,

package/dist/social-providers/gitlab.mjs

@@ -9,7 +9,7 @@ const cleanDoubleSlashes = (input = "") => {
 	return input.split("://").map((str) => str.replace(/\/{2,}/g, "/")).join("://");
 };
 const issuerToEndpoints = (issuer) => {
-	let baseUrl = issuer || "https://gitlab.com";
+	const baseUrl = issuer || "https://gitlab.com";
 	return {
 		authorizationEndpoint: cleanDoubleSlashes(`${baseUrl}/oauth/authorize`),
 		tokenEndpoint: cleanDoubleSlashes(`${baseUrl}/oauth/token`),