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

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @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.6 build /home/runner/work/better-auth/better-auth/packages/core
 > tsdown
 
 ℹ tsdown v0.19.0 powered by rolldown v1.0.0-beta.59
@@ -8,11 +8,11 @@
 ℹ 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/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.72 kB │ gzip: 0.22 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/utils/json.mjs                              0.59 kB │ gzip: 0.35 kB
@@ -68,13 +68,13 @@
 ℹ 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.61 kB │ gzip: 0.60 kB
+ℹ dist/context/transaction.mjs                     1.61 kB │ gzip: 0.57 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/context/endpoint-context.mjs                1.30 kB │ gzip: 0.55 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/db/adapter/get-model-name.mjs               0.89 kB │ gzip: 0.42 kB
@@ -172,5 +172,5 @@
 ℹ 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/env/color-depth.d.mts                       0.12 kB │ gzip: 0.11 kB
-ℹ 165 files, total: 443.38 kB
-✔ Build complete in 5199ms
+ℹ 165 files, total: 442.95 kB
+✔ Build complete in 5309ms

package/dist/context/endpoint-context.mjs

@@ -1,10 +1,14 @@
 import { getAsyncLocalStorage } from "@better-auth/core/async_hooks";
 
 //#region src/context/endpoint-context.ts
+const symbol = Symbol.for("better-auth:endpoint-context-async-storage");
 let currentContextAsyncStorage = null;
 const ensureAsyncStorage = async () => {
-	if (!currentContextAsyncStorage) currentContextAsyncStorage = new (await (getAsyncLocalStorage()))();
-	return currentContextAsyncStorage;
+	if (!currentContextAsyncStorage || globalThis[symbol] === void 0) {
+		currentContextAsyncStorage = new (await (getAsyncLocalStorage()))();
+		globalThis[symbol] = currentContextAsyncStorage;
+	}
+	return currentContextAsyncStorage || globalThis[symbol];
 };
 /**
 * This is for internal use only. Most users should use `getCurrentAuthContext` instead.

package/dist/context/index.mjs

@@ -2,23 +2,4 @@ import { getCurrentAuthContext, getCurrentAuthContextAsyncLocalStorage, runWithE
 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 };

package/dist/context/request-state.mjs

@@ -1,10 +1,14 @@
 import { getAsyncLocalStorage } from "@better-auth/core/async_hooks";
 
 //#region src/context/request-state.ts
+const symbol = Symbol.for("better-auth:request-state-async-storage");
 let requestStateAsyncStorage = null;
 const ensureAsyncStorage = async () => {
-	if (!requestStateAsyncStorage) requestStateAsyncStorage = new (await (getAsyncLocalStorage()))();
-	return requestStateAsyncStorage;
+	if (!requestStateAsyncStorage || globalThis[symbol] === void 0) {
+		requestStateAsyncStorage = new (await (getAsyncLocalStorage()))();
+		globalThis[symbol] = requestStateAsyncStorage;
+	}
+	return requestStateAsyncStorage || globalThis[symbol];
 };
 async function getRequestStateAsyncLocalStorage() {
 	return ensureAsyncStorage();

package/dist/context/transaction.mjs

@@ -1,10 +1,14 @@
 import { getAsyncLocalStorage } from "@better-auth/core/async_hooks";
 
 //#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.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-auth/core",
-  "version": "1.5.0-beta.5",
+  "version": "1.5.0-beta.6",
   "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>)
+	);
 };
 
 /**