@better-auth/core 1.4.11 → 1.4.12-beta.1

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @better-auth/core@1.4.11 build /home/runner/work/better-auth/better-auth/packages/core
+> @better-auth/core@1.4.12-beta.1 build /home/runner/work/better-auth/better-auth/packages/core
 > tsdown
 
 ℹ tsdown v0.17.2 powered by rolldown v1.0.0-beta.53
@@ -10,7 +10,7 @@
 ℹ dist/social-providers/index.mjs     80.96 kB │ gzip: 10.43 kB
 ℹ dist/db/adapter/index.mjs           38.55 kB │ gzip:  7.86 kB
 ℹ dist/db/index.mjs                    1.66 kB │ gzip:  0.54 kB
-ℹ dist/api/index.mjs                   1.23 kB │ gzip:  0.48 kB
+ℹ dist/api/index.mjs                   1.23 kB │ gzip:  0.49 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.75 kB │ gzip:  0.28 kB
@@ -22,7 +22,7 @@
 ℹ dist/oauth2-BjWM15hm.mjs            12.82 kB │ gzip:  3.16 kB
 ℹ dist/env-DbssmzoK.mjs                7.67 kB │ gzip:  2.54 kB
 ℹ dist/get-tables-CMc_Emww.mjs         6.76 kB │ gzip:  1.30 kB
-ℹ dist/context-BBNwughv.mjs            4.87 kB │ gzip:  1.40 kB
+ℹ dist/context-BGZ8V6DD.mjs            4.46 kB │ gzip:  1.10 kB
 ℹ dist/error-DP1xOn7P.mjs              2.76 kB │ gzip:  1.16 kB
 ℹ dist/utils-U2L7n92V.mjs              1.46 kB │ gzip:  0.70 kB
 ℹ dist/social-providers/index.d.mts    3.89 kB │ gzip:  1.19 kB
@@ -39,5 +39,5 @@
 ℹ dist/async_hooks/pure.index.d.mts    0.22 kB │ gzip:  0.16 kB
 ℹ dist/index-BHaoMSKV.d.mts          227.72 kB │ gzip: 35.92 kB
 ℹ dist/index-BRBu0-5h.d.mts            3.31 kB │ gzip:  1.11 kB
-ℹ 32 files, total: 410.89 kB
-✔ Build complete in 5410ms
+ℹ 32 files, total: 410.48 kB
+✔ Build complete in 5348ms

package/dist/api/index.mjs

@@ -1,4 +1,4 @@
-import { f as runWithEndpointContext } from "../context-BBNwughv.mjs";
+import { f as runWithEndpointContext } from "../context-BGZ8V6DD.mjs";
 import { createEndpoint, createMiddleware } from "better-call";
 
 //#region src/api/index.ts

package/dist/context/index.mjs

@@ -1,3 +1,3 @@
-import { a as defineRequestState, c as hasRequestState, d as getCurrentAuthContextAsyncLocalStorage, f as runWithEndpointContext, i as runWithTransaction, l as runWithRequestState, n as getCurrentDBAdapterAsyncLocalStorage, o as getCurrentRequestState, r as runWithAdapter, s as getRequestStateAsyncLocalStorage, t as getCurrentAdapter, u as getCurrentAuthContext } from "../context-BBNwughv.mjs";
+import { a as defineRequestState, c as hasRequestState, d as getCurrentAuthContextAsyncLocalStorage, f as runWithEndpointContext, i as runWithTransaction, l as runWithRequestState, n as getCurrentDBAdapterAsyncLocalStorage, o as getCurrentRequestState, r as runWithAdapter, s as getRequestStateAsyncLocalStorage, t as getCurrentAdapter, u as getCurrentAuthContext } from "../context-BGZ8V6DD.mjs";
 
 export { defineRequestState, getCurrentAdapter, getCurrentAuthContext, getCurrentAuthContextAsyncLocalStorage, getCurrentDBAdapterAsyncLocalStorage, getCurrentRequestState, getRequestStateAsyncLocalStorage, hasRequestState, runWithAdapter, runWithEndpointContext, runWithRequestState, runWithTransaction };

package/dist/{context-BBNwughv.mjs → context-BGZ8V6DD.mjs}

@@ -1,10 +1,14 @@
 import { getAsyncLocalStorage } from "@better-auth/core/async_hooks";
 
 //#region src/context/endpoint-context.ts
+const symbol$2 = Symbol.for("better-auth:endpoint-context-async-storage");
 let currentContextAsyncStorage = null;
 const ensureAsyncStorage$2 = async () => {
-	if (!currentContextAsyncStorage) currentContextAsyncStorage = new (await (getAsyncLocalStorage()))();
-	return currentContextAsyncStorage;
+	if (!currentContextAsyncStorage || globalThis[symbol$2] === void 0) {
+		currentContextAsyncStorage = new (await (getAsyncLocalStorage()))();
+		globalThis[symbol$2] = currentContextAsyncStorage;
+	}
+	return currentContextAsyncStorage || globalThis[symbol$2];
 };
 /**
 * This is for internal use only. Most users should use `getCurrentAuthContext` instead.
@@ -25,10 +29,14 @@ async function runWithEndpointContext(context, fn) {
 
 //#endregion
 //#region src/context/request-state.ts
+const symbol$1 = Symbol.for("better-auth:request-state-async-storage");
 let requestStateAsyncStorage = null;
 const ensureAsyncStorage$1 = async () => {
-	if (!requestStateAsyncStorage) requestStateAsyncStorage = new (await (getAsyncLocalStorage()))();
-	return requestStateAsyncStorage;
+	if (!requestStateAsyncStorage || globalThis[symbol$1] === void 0) {
+		requestStateAsyncStorage = new (await (getAsyncLocalStorage()))();
+		globalThis[symbol$1] = requestStateAsyncStorage;
+	}
+	return requestStateAsyncStorage || globalThis[symbol$1];
 };
 async function getRequestStateAsyncLocalStorage() {
 	return ensureAsyncStorage$1();
@@ -67,10 +75,14 @@ function defineRequestState(initFn) {
 
 //#endregion
 //#region src/context/transaction.ts
+const symbol = Symbol.for("better-auth:transaction-adapter-async-storage");
 let currentAdapterAsyncStorage = null;
 const ensureAsyncStorage = async () => {
-	if (!currentAdapterAsyncStorage) currentAdapterAsyncStorage = new (await (getAsyncLocalStorage()))();
-	return currentAdapterAsyncStorage;
+	if (!currentAdapterAsyncStorage || globalThis[symbol] === void 0) {
+		currentAdapterAsyncStorage = new (await (getAsyncLocalStorage()))();
+		globalThis[symbol] = currentAdapterAsyncStorage;
+	}
+	return currentAdapterAsyncStorage || globalThis[symbol];
 };
 /**
 * This is for internal use only. Most users should use `getCurrentAdapter` instead.
@@ -110,24 +122,5 @@ const runWithTransaction = async (adapter, fn) => {
 	});
 };
 
-//#endregion
-//#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 as a, hasRequestState as c, getCurrentAuthContextAsyncLocalStorage as d, runWithEndpointContext as f, runWithTransaction as i, runWithRequestState as l, getCurrentDBAdapterAsyncLocalStorage as n, getCurrentRequestState as o, runWithAdapter as r, getRequestStateAsyncLocalStorage as s, getCurrentAdapter as t, getCurrentAuthContext as u };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-auth/core",
-  "version": "1.4.11",
+  "version": "1.4.12-beta.1",
   "description": "The most comprehensive authentication framework for TypeScript.",
   "type": "module",
   "repository": {

package/src/context/endpoint-context.ts

@@ -9,15 +9,24 @@ export type AuthEndpointContext = Partial<
 	context: AuthContext;
 };
 
+const symbol = Symbol.for("better-auth:endpoint-context-async-storage");
+
 let currentContextAsyncStorage: AsyncLocalStorage<AuthEndpointContext> | null =
 	null;
 
 const ensureAsyncStorage = async () => {
-	if (!currentContextAsyncStorage) {
+	if (
+		!currentContextAsyncStorage ||
+		(globalThis as any)[symbol] === undefined
+	) {
 		const AsyncLocalStorage = await getAsyncLocalStorage();
 		currentContextAsyncStorage = new AsyncLocalStorage();
+		(globalThis as any)[symbol] = currentContextAsyncStorage;
 	}
-	return currentContextAsyncStorage;
+	return (
+		currentContextAsyncStorage ||
+		((globalThis as any)[symbol] as AsyncLocalStorage<AuthEndpointContext>)
+	);
 };
 
 /**

package/src/context/index.ts

@@ -19,32 +19,3 @@ export {
 	runWithAdapter,
 	runWithTransaction,
 } from "./transaction";
-
-const glo: any =
-	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;

package/src/context/request-state.ts

@@ -3,15 +3,21 @@ import { getAsyncLocalStorage } from "@better-auth/core/async_hooks";
 
 export type RequestStateWeakMap = WeakMap<object, any>;
 
+const symbol = Symbol.for("better-auth:request-state-async-storage");
+
 let requestStateAsyncStorage: AsyncLocalStorage<RequestStateWeakMap> | null =
 	null;
 
 const ensureAsyncStorage = async () => {
-	if (!requestStateAsyncStorage) {
+	if (!requestStateAsyncStorage || (globalThis as any)[symbol] === undefined) {
 		const AsyncLocalStorage = await getAsyncLocalStorage();
 		requestStateAsyncStorage = new AsyncLocalStorage();
+		(globalThis as any)[symbol] = requestStateAsyncStorage;
 	}
-	return requestStateAsyncStorage;
+	return (
+		requestStateAsyncStorage ||
+		((globalThis as any)[symbol] as AsyncLocalStorage<RequestStateWeakMap>)
+	);
 };
 
 export async function getRequestStateAsyncLocalStorage() {

package/src/context/transaction.ts

@@ -2,15 +2,24 @@ import type { AsyncLocalStorage } from "@better-auth/core/async_hooks";
 import { getAsyncLocalStorage } from "@better-auth/core/async_hooks";
 import type { DBAdapter, DBTransactionAdapter } from "../db/adapter";
 
+const symbol = Symbol.for("better-auth:transaction-adapter-async-storage");
+
 let currentAdapterAsyncStorage: AsyncLocalStorage<DBTransactionAdapter> | null =
 	null;
 
 const ensureAsyncStorage = async () => {
-	if (!currentAdapterAsyncStorage) {
+	if (
+		!currentAdapterAsyncStorage ||
+		(globalThis as any)[symbol] === undefined
+	) {
 		const AsyncLocalStorage = await getAsyncLocalStorage();
 		currentAdapterAsyncStorage = new AsyncLocalStorage();
+		(globalThis as any)[symbol] = currentAdapterAsyncStorage;
 	}
-	return currentAdapterAsyncStorage;
+	return (
+		currentAdapterAsyncStorage ||
+		((globalThis as any)[symbol] as AsyncLocalStorage<DBTransactionAdapter>)
+	);
 };
 
 /**