better-convex 0.7.0 → 0.7.1

package/dist/aggregate/index.d.ts

@@ -1,4 +1,6 @@
 import { Ft as ConvexTableWithColumns, J as ConvexTextBuilderInitial, Z as ConvexNumberBuilderInitial, et as ConvexIdBuilderInitial, st as ConvexCustomBuilderInitial } from "../where-clause-compiler-CRP-i1Qa.js";
+import "../query-context-DGExXZIV.js";
+import "../orm/index.js";
 import * as convex_values0 from "convex/values";
 import { GenericId, Infer, Value } from "convex/values";
 import { DocumentByName, GenericDataModel, GenericDatabaseReader, GenericDatabaseWriter, TableNamesInDataModel } from "convex/server";

package/dist/auth/client/index.js

@@ -16,6 +16,10 @@ const defaultMutationHandler = () => {
 		functionName: "mutation"
 	});
 };
+const hasActiveSessionData = (session) => {
+	if (!session || typeof session !== "object") return false;
+	return Boolean(session.session);
+};
 /**
 * Unified auth provider for Convex + Better Auth.
 * Handles token sync, HMR persistence, and auth callbacks.
@@ -88,10 +92,11 @@ function ConvexAuthProviderInner({ children, client, authClient }) {
 	const { data: session, isPending } = authClient.useSession();
 	const sessionRef = useRef(session);
 	const isPendingRef = useRef(isPending);
+	const pendingTokenRef = useRef(null);
 	sessionRef.current = session;
 	isPendingRef.current = isPending;
 	useEffect(() => {
-		if (!session && !isPending) {
+		if (!hasActiveSessionData(session) && !isPending) {
 			authStore.set("token", null);
 			authStore.set("expiresAt", null);
 			authStore.set("isAuthenticated", false);
@@ -104,7 +109,7 @@ function ConvexAuthProviderInner({ children, client, authClient }) {
 	const fetchAccessToken = useCallback(async ({ forceRefreshToken = false } = {}) => {
 		const currentSession = sessionRef.current;
 		const currentIsPending = isPendingRef.current;
-		if (!currentSession) {
+		if (!hasActiveSessionData(currentSession)) {
 			if (!currentIsPending) {
 				authStore.set("token", null);
 				authStore.set("expiresAt", null);
@@ -115,27 +120,38 @@ function ConvexAuthProviderInner({ children, client, authClient }) {
 		const expiresAt = authStore.get("expiresAt");
 		const timeRemaining = expiresAt ? expiresAt - Date.now() : 0;
 		if (!forceRefreshToken && cachedToken && expiresAt && timeRemaining >= 6e4) return cachedToken;
-		try {
-			const { data } = await authClient.convex.token();
-			const jwt = data?.token || null;
+		if (!forceRefreshToken && pendingTokenRef.current) return pendingTokenRef.current;
+		pendingTokenRef.current = authClient.convex.token({ fetchOptions: { throw: false } }).then((result) => {
+			const jwt = result.data?.token || null;
 			if (jwt) {
 				const exp = decodeJwtExp(jwt);
 				authStore.set("token", jwt);
 				authStore.set("expiresAt", exp);
+				return jwt;
 			}
-			return jwt;
-		} catch (e) {
-			console.error("[fetchAccessToken] error", e);
+			authStore.set("token", null);
+			authStore.set("expiresAt", null);
 			return null;
-		}
+		}).catch((error) => {
+			authStore.set("token", null);
+			authStore.set("expiresAt", null);
+			console.error("[fetchAccessToken] error", error);
+			return null;
+		}).finally(() => {
+			pendingTokenRef.current = null;
+		});
+		return pendingTokenRef.current;
 	}, [authStore, authClient]);
 	const useAuth = useCallback(function useConvexAuthHook() {
+		const token = authStore.get("token");
+		const hasSession_0 = hasActiveSessionData(sessionRef.current);
+		const sessionMissing = !hasSession_0 && !isPendingRef.current;
 		return {
-			isLoading: isPendingRef.current,
-			isAuthenticated: sessionRef.current !== null,
+			isLoading: isPendingRef.current && !token,
+			isAuthenticated: sessionMissing ? false : hasSession_0 || token !== null,
 			fetchAccessToken
 		};
-	}, [fetchAccessToken]);
+	}, [fetchAccessToken, authStore]);
 	return /* @__PURE__ */ jsx(FetchAccessTokenContext.Provider, {
 		value: fetchAccessToken,
 		children: /* @__PURE__ */ jsx(ConvexProviderWithAuth, {
@@ -200,17 +216,18 @@ function useOTTHandler(authClient) {
 	if ($[0] !== authClient) {
 		t0 = () => {
 			(async () => {
-				const url = new URL(window.location?.href);
+				if (typeof window === "undefined" || !window.location?.href) return;
+				const url = new URL(window.location.href);
 				const token = url.searchParams.get("ott");
 				if (token) {
 					const authClientWithCrossDomain = authClient;
 					url.searchParams.delete("ott");
+					window.history.replaceState({}, "", url);
 					const session = (await authClientWithCrossDomain.crossDomain.oneTimeToken.verify({ token })).data?.session;
 					if (session) {
 						await authClient.getSession({ fetchOptions: { headers: { Authorization: `Bearer ${session.token}` } } });
 						authClientWithCrossDomain.updateSession();
 					}
-					window.history.replaceState({}, "", url);
 				}
 			})();
 		};

package/dist/auth/index.d.ts

@@ -11,8 +11,9 @@ import { convex } from "@convex-dev/better-auth/plugins";
 import * as better_auth_adapters0 from "better-auth/adapters";
 import { DBAdapterDebugLogOption } from "better-auth/adapters";
 import { BetterAuthDBSchema } from "better-auth/db";
+import { BetterAuthOptions, betterAuth } from "better-auth/minimal";
 import * as better_auth0 from "better-auth";
-import { BetterAuthOptions, Where, betterAuth } from "better-auth";
+import { Where } from "better-auth/types";
 import { SetOptional } from "type-fest";
 import * as bun_sqlite0 from "bun:sqlite";
 import * as node_sqlite0 from "node:sqlite";
@@ -181,15 +182,15 @@ type AdapterPaginationOptions = PaginationOptions & {
 };
 declare const adapterWhereValidator: convex_values0.VObject<{
   connector?: "AND" | "OR" | undefined;
-  operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-  field: string;
+  operator?: "in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
   value: string | number | boolean | string[] | number[] | null;
+  field: string;
 }, {
   connector: convex_values0.VUnion<"AND" | "OR" | undefined, [convex_values0.VLiteral<"AND", "required">, convex_values0.VLiteral<"OR", "required">], "optional", never>;
   field: convex_values0.VString<string, "required">;
-  operator: convex_values0.VUnion<"lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined, [convex_values0.VLiteral<"lt", "required">, convex_values0.VLiteral<"lte", "required">, convex_values0.VLiteral<"gt", "required">, convex_values0.VLiteral<"gte", "required">, convex_values0.VLiteral<"eq", "required">, convex_values0.VLiteral<"in", "required">, convex_values0.VLiteral<"not_in", "required">, convex_values0.VLiteral<"ne", "required">, convex_values0.VLiteral<"contains", "required">, convex_values0.VLiteral<"starts_with", "required">, convex_values0.VLiteral<"ends_with", "required">], "optional", never>;
+  operator: convex_values0.VUnion<"in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined, [convex_values0.VLiteral<"lt", "required">, convex_values0.VLiteral<"lte", "required">, convex_values0.VLiteral<"gt", "required">, convex_values0.VLiteral<"gte", "required">, convex_values0.VLiteral<"eq", "required">, convex_values0.VLiteral<"in", "required">, convex_values0.VLiteral<"not_in", "required">, convex_values0.VLiteral<"ne", "required">, convex_values0.VLiteral<"contains", "required">, convex_values0.VLiteral<"starts_with", "required">, convex_values0.VLiteral<"ends_with", "required">], "optional", never>;
   value: convex_values0.VUnion<string | number | boolean | string[] | number[] | null, [convex_values0.VString<string, "required">, convex_values0.VFloat64<number, "required">, convex_values0.VBoolean<boolean, "required">, convex_values0.VArray<string[], convex_values0.VString<string, "required">, "required">, convex_values0.VArray<number[], convex_values0.VFloat64<number, "required">, "required">, convex_values0.VNull<null, "required">], "required", never>;
-}, "required", "connector" | "field" | "operator" | "value">;
+}, "required", "value" | "connector" | "field" | "operator">;
 declare const adapterArgsValidator: convex_values0.VObject<{
   limit?: number | undefined;
   select?: string[] | undefined;
@@ -200,9 +201,9 @@ declare const adapterArgsValidator: convex_values0.VObject<{
   } | undefined;
   where?: {
     connector?: "AND" | "OR" | undefined;
-    operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-    field: string;
+    operator?: "in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
     value: string | number | boolean | string[] | number[] | null;
+    field: string;
   }[] | undefined;
   model: string;
 }, {
@@ -219,20 +220,20 @@ declare const adapterArgsValidator: convex_values0.VObject<{
   }, "optional", "field" | "direction">;
   where: convex_values0.VArray<{
     connector?: "AND" | "OR" | undefined;
-    operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-    field: string;
+    operator?: "in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
     value: string | number | boolean | string[] | number[] | null;
+    field: string;
   }[] | undefined, convex_values0.VObject<{
     connector?: "AND" | "OR" | undefined;
-    operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-    field: string;
+    operator?: "in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
     value: string | number | boolean | string[] | number[] | null;
+    field: string;
   }, {
     connector: convex_values0.VUnion<"AND" | "OR" | undefined, [convex_values0.VLiteral<"AND", "required">, convex_values0.VLiteral<"OR", "required">], "optional", never>;
     field: convex_values0.VString<string, "required">;
-    operator: convex_values0.VUnion<"lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined, [convex_values0.VLiteral<"lt", "required">, convex_values0.VLiteral<"lte", "required">, convex_values0.VLiteral<"gt", "required">, convex_values0.VLiteral<"gte", "required">, convex_values0.VLiteral<"eq", "required">, convex_values0.VLiteral<"in", "required">, convex_values0.VLiteral<"not_in", "required">, convex_values0.VLiteral<"ne", "required">, convex_values0.VLiteral<"contains", "required">, convex_values0.VLiteral<"starts_with", "required">, convex_values0.VLiteral<"ends_with", "required">], "optional", never>;
+    operator: convex_values0.VUnion<"in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined, [convex_values0.VLiteral<"lt", "required">, convex_values0.VLiteral<"lte", "required">, convex_values0.VLiteral<"gt", "required">, convex_values0.VLiteral<"gte", "required">, convex_values0.VLiteral<"eq", "required">, convex_values0.VLiteral<"in", "required">, convex_values0.VLiteral<"not_in", "required">, convex_values0.VLiteral<"ne", "required">, convex_values0.VLiteral<"contains", "required">, convex_values0.VLiteral<"starts_with", "required">, convex_values0.VLiteral<"ends_with", "required">], "optional", never>;
     value: convex_values0.VUnion<string | number | boolean | string[] | number[] | null, [convex_values0.VString<string, "required">, convex_values0.VFloat64<number, "required">, convex_values0.VBoolean<boolean, "required">, convex_values0.VArray<string[], convex_values0.VString<string, "required">, "required">, convex_values0.VArray<number[], convex_values0.VFloat64<number, "required">, "required">, convex_values0.VNull<null, "required">], "required", never>;
-  }, "required", "connector" | "field" | "operator" | "value">, "optional">;
+  }, "required", "value" | "connector" | "field" | "operator">, "optional">;
 }, "required", "limit" | "model" | "select" | "offset" | "sortBy" | "where" | "sortBy.field" | "sortBy.direction">;
 declare const hasUniqueFields: (betterAuthSchema: BetterAuthDBSchema, model: string, input: Record<string, any>) => boolean;
 declare const checkUniqueFields: <Schema extends SchemaDefinition<any, any>>(ctx: GenericQueryCtx<GenericDataModel>, schema: Schema, betterAuthSchema: BetterAuthDBSchema, table: string, input: Record<string, any>, doc?: Record<string, any>) => Promise<void>;
@@ -358,26 +359,26 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
     };
   }, Promise<any>>;
   deleteMany: convex_server0.RegisteredMutation<"internal", {
-    paginationOpts: {
-      id?: number;
-      endCursor?: string | null;
-      maximumRowsRead?: number;
-      maximumBytesRead?: number;
-      numItems: number;
-      cursor: string | null;
-    };
     input: {
       where?: {
         connector?: "AND" | "OR" | undefined;
-        operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-        field: string;
+        operator?: "in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
         value: string | number | boolean | string[] | number[] | null;
+        field: string;
       }[] | undefined;
       model: string;
     } | {
       where?: any[] | undefined;
       model: string;
     };
+    paginationOpts: {
+      id?: number;
+      endCursor?: string | null;
+      maximumRowsRead?: number;
+      maximumBytesRead?: number;
+      numItems: number;
+      cursor: string | null;
+    };
   }, Promise<{
     count: number;
     ids: any[];
@@ -390,9 +391,9 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
     input: {
       where?: {
         connector?: "AND" | "OR" | undefined;
-        operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-        field: string;
+        operator?: "in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
         value: string | number | boolean | string[] | number[] | null;
+        field: string;
       }[] | undefined;
       model: string;
     } | {
@@ -410,9 +411,9 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
     } | undefined;
     where?: {
       connector?: "AND" | "OR" | undefined;
-      operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-      field: string;
+      operator?: "in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
       value: string | number | boolean | string[] | number[] | null;
+      field: string;
     }[] | undefined;
     paginationOpts: {
       id?: number;
@@ -429,27 +430,19 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
     select?: string[] | undefined;
     where?: {
       connector?: "AND" | "OR" | undefined;
-      operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-      field: string;
+      operator?: "in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
       value: string | number | boolean | string[] | number[] | null;
+      field: string;
     }[] | undefined;
     model: string;
   }, Promise<convex_server0.GenericDocument | null>>;
   updateMany: convex_server0.RegisteredMutation<"internal", {
-    paginationOpts: {
-      id?: number;
-      endCursor?: string | null;
-      maximumRowsRead?: number;
-      maximumBytesRead?: number;
-      numItems: number;
-      cursor: string | null;
-    };
     input: {
       where?: {
         connector?: "AND" | "OR" | undefined;
-        operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-        field: string;
+        operator?: "in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
         value: string | number | boolean | string[] | number[] | null;
+        field: string;
       }[] | undefined;
       update: {
         [x: string]: unknown;
@@ -462,6 +455,14 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
       update: any;
       model: string;
     };
+    paginationOpts: {
+      id?: number;
+      endCursor?: string | null;
+      maximumRowsRead?: number;
+      maximumBytesRead?: number;
+      numItems: number;
+      cursor: string | null;
+    };
   }, Promise<{
     count: number;
     ids: any[];
@@ -474,9 +475,9 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
     input: {
       where?: {
         connector?: "AND" | "OR" | undefined;
-        operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-        field: string;
+        operator?: "in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
         value: string | number | boolean | string[] | number[] | null;
+        field: string;
       }[] | undefined;
       update: {
         [x: string]: unknown;
@@ -19154,26 +19155,26 @@ declare const createAuthRuntime: <DataModel extends GenericDataModel, Schema ext
     };
   }, Promise<any>>;
   deleteMany: convex_server0.RegisteredMutation<"internal", {
-    paginationOpts: {
-      id?: number;
-      endCursor?: string | null;
-      maximumRowsRead?: number;
-      maximumBytesRead?: number;
-      numItems: number;
-      cursor: string | null;
-    };
     input: {
       where?: {
         connector?: "AND" | "OR" | undefined;
-        operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-        field: string;
+        operator?: "in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
         value: string | number | boolean | string[] | number[] | null;
+        field: string;
       }[] | undefined;
       model: string;
     } | {
       where?: any[] | undefined;
       model: string;
     };
+    paginationOpts: {
+      id?: number;
+      endCursor?: string | null;
+      maximumRowsRead?: number;
+      maximumBytesRead?: number;
+      numItems: number;
+      cursor: string | null;
+    };
   }, Promise<{
     count: number;
     ids: any[];
@@ -19186,9 +19187,9 @@ declare const createAuthRuntime: <DataModel extends GenericDataModel, Schema ext
     input: {
       where?: {
         connector?: "AND" | "OR" | undefined;
-        operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-        field: string;
+        operator?: "in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
         value: string | number | boolean | string[] | number[] | null;
+        field: string;
       }[] | undefined;
       model: string;
     } | {
@@ -19206,9 +19207,9 @@ declare const createAuthRuntime: <DataModel extends GenericDataModel, Schema ext
     } | undefined;
     where?: {
       connector?: "AND" | "OR" | undefined;
-      operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-      field: string;
+      operator?: "in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
       value: string | number | boolean | string[] | number[] | null;
+      field: string;
     }[] | undefined;
     paginationOpts: {
       id?: number;
@@ -19225,27 +19226,19 @@ declare const createAuthRuntime: <DataModel extends GenericDataModel, Schema ext
     select?: string[] | undefined;
     where?: {
       connector?: "AND" | "OR" | undefined;
-      operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-      field: string;
+      operator?: "in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
       value: string | number | boolean | string[] | number[] | null;
+      field: string;
     }[] | undefined;
     model: string;
   }, Promise<convex_server0.GenericDocument | null>>;
   updateMany: convex_server0.RegisteredMutation<"internal", {
-    paginationOpts: {
-      id?: number;
-      endCursor?: string | null;
-      maximumRowsRead?: number;
-      maximumBytesRead?: number;
-      numItems: number;
-      cursor: string | null;
-    };
     input: {
       where?: {
         connector?: "AND" | "OR" | undefined;
-        operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-        field: string;
+        operator?: "in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
         value: string | number | boolean | string[] | number[] | null;
+        field: string;
       }[] | undefined;
       update: {
         [x: string]: unknown;
@@ -19258,6 +19251,14 @@ declare const createAuthRuntime: <DataModel extends GenericDataModel, Schema ext
       update: any;
       model: string;
     };
+    paginationOpts: {
+      id?: number;
+      endCursor?: string | null;
+      maximumRowsRead?: number;
+      maximumBytesRead?: number;
+      numItems: number;
+      cursor: string | null;
+    };
   }, Promise<{
     count: number;
     ids: any[];
@@ -19270,9 +19271,9 @@ declare const createAuthRuntime: <DataModel extends GenericDataModel, Schema ext
     input: {
       where?: {
         connector?: "AND" | "OR" | undefined;
-        operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-        field: string;
+        operator?: "in" | "lt" | "lte" | "gt" | "gte" | "eq" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
         value: string | number | boolean | string[] | number[] | null;
+        field: string;
       }[] | undefined;
       update: {
         [x: string]: unknown;

package/dist/auth/index.js

@@ -7,7 +7,7 @@ import { createAdapterFactory } from "better-auth/adapters";
 import { getAuthTables } from "better-auth/db";
 import { prop, sortBy, uniqueBy } from "remeda";
 import { stripIndent } from "common-tags";
-import { betterAuth } from "better-auth";
+import { betterAuth } from "better-auth/minimal";
 
 //#region src/auth/adapter-utils.ts
 const adapterWhereValidator = v.object({
@@ -764,7 +764,7 @@ const adapterConfig = {
 		return data;
 	},
 	customTransformOutput: ({ data, fieldAttributes }) => {
-		if (data && fieldAttributes.type === "date") return new Date(data).getTime();
+		if (data && fieldAttributes.type === "date") return new Date(data);
 		return data;
 	}
 };
@@ -1146,6 +1146,29 @@ const createDisabledAuthRuntime = (config) => {
 
 //#endregion
 //#region src/auth/helpers.ts
+const SESSION_TOKEN_COOKIE_NAME = "better-auth.session_token";
+const parseSessionTokenFromCookie = (cookieHeader) => {
+	if (!cookieHeader) return null;
+	const parts = cookieHeader.split(";");
+	for (const rawPart of parts) {
+		const part = rawPart.trim();
+		const equalsIndex = part.indexOf("=");
+		if (equalsIndex <= 0) continue;
+		const cookieName = part.slice(0, equalsIndex);
+		const normalizedCookieName = cookieName.startsWith("__Secure-") ? cookieName.slice(9) : cookieName;
+		if (!(normalizedCookieName === SESSION_TOKEN_COOKIE_NAME || normalizedCookieName.endsWith(".session_token") || normalizedCookieName === "session_token")) continue;
+		const value = part.slice(equalsIndex + 1);
+		return value ? decodeURIComponent(value) : null;
+	}
+	return null;
+};
+const getCookieHeaderFromCtx = (ctx) => {
+	const headers = (ctx?.req)?.headers;
+	if (!headers) return null;
+	if (headers instanceof Headers) return headers.get("cookie");
+	const cookie = headers.cookie ?? headers.Cookie ?? headers["set-cookie"] ?? headers["Set-Cookie"];
+	return typeof cookie === "string" ? cookie : null;
+};
 const getAuthUserIdentity = async (ctx) => {
 	const identity = await ctx.auth.getUserIdentity();
 	if (!identity) return null;
@@ -1172,7 +1195,11 @@ async function getSession(ctx, _sessionId) {
 }
 const getHeaders = async (ctx, session) => {
 	const resolvedSession = session ?? await getSession(ctx);
-	if (!resolvedSession) return new Headers();
+	if (!resolvedSession) {
+		const sessionToken = parseSessionTokenFromCookie(getCookieHeaderFromCtx(ctx));
+		if (sessionToken) return new Headers({ authorization: `Bearer ${sessionToken}` });
+		return new Headers();
+	}
 	return new Headers({
 		...resolvedSession?.token ? { authorization: `Bearer ${resolvedSession.token}` } : {},
 		...resolvedSession?.ipAddress ? { "x-forwarded-for": resolvedSession.ipAddress } : {}

package/dist/auth/nextjs/index.js

@@ -1,5 +1,5 @@
 import { n as defaultIsUnauthorized } from "../../error-Be4OcwwD.js";
-import { t as createCallerFactory } from "../../caller-factory-Dmgv8MLS.js";
+import { t as createCallerFactory } from "../../caller-factory-D3OuR1eI.js";
 import { getToken } from "@convex-dev/better-auth/utils";
 
 //#region src/auth-nextjs/index.ts
@@ -52,14 +52,19 @@ function convexBetterAuth(opts) {
 		api: opts.api,
 		convexSiteUrl: opts.convexSiteUrl,
 		auth: jwtCacheEnabled ? {
-			getToken: (siteUrl, headers, getTokenOpts) => getToken(siteUrl, headers, {
-				...getTokenOpts,
-				jwtCache: {
-					enabled: true,
-					expirationToleranceSeconds: auth.expirationToleranceSeconds,
-					isAuthError: auth.isUnauthorized ?? defaultIsUnauthorized
-				}
-			}),
+			getToken: (siteUrl, headers, getTokenOpts) => {
+				const mutableHeaders = new Headers(headers);
+				mutableHeaders.delete("content-length");
+				mutableHeaders.delete("transfer-encoding");
+				return getToken(siteUrl, mutableHeaders, {
+					...getTokenOpts,
+					jwtCache: {
+						enabled: true,
+						expirationToleranceSeconds: auth.expirationToleranceSeconds,
+						isAuthError: auth.isUnauthorized ?? defaultIsUnauthorized
+					}
+				});
+			},
 			isUnauthorized: auth.isUnauthorized ?? defaultIsUnauthorized
 		} : void 0
 	});

package/dist/{caller-factory-Dmgv8MLS.js → caller-factory-D3OuR1eI.js}

@@ -141,11 +141,14 @@ function createCallerFactory(opts) {
 	const isUnauthorized = opts.auth?.isUnauthorized;
 	const crpcMeta = buildMetaIndex(opts.api);
 	const callWithTokenAndRetry = async (fn, tokenResult, headers) => {
+		const shouldRetryWithFreshToken = !!opts.auth && !tokenResult.isFresh;
 		try {
 			return await fn(tokenResult.token);
 		} catch (error) {
-			if (isUnauthorized?.(error)) return null;
-			if (!opts.auth || tokenResult.isFresh) throw error;
+			if (!shouldRetryWithFreshToken) {
+				if (isUnauthorized?.(error)) return null;
+				throw error;
+			}
 			const newToken = await getToken(siteUrl, headers, {
 				...opts,
 				forceRefresh: true

package/dist/react/index.js

@@ -2103,6 +2103,12 @@ var ConvexQueryClient = class {
 		} else {
 			const { error } = result;
 			const authState = this.getAuthState();
+			const meta = query.meta;
+			const isUnauthorized = authState?.isUnauthorized(error) ?? false;
+			if (isUnauthorized && meta?.skipUnauth) {
+				this.queryClient.setQueryData(queryKey, this.transformer.output.deserialize(null));
+				return;
+			}
 			query.setState({
 				error,
 				errorUpdateCount: query.state.errorUpdateCount + 1,
@@ -2112,7 +2118,7 @@ var ConvexQueryClient = class {
 				fetchStatus: "idle",
 				status: "error"
 			}, { meta: "set by ConvexQueryClient" });
-			if (authState?.isUnauthorized(error)) {
+			if (isUnauthorized && authState?.isAuthenticated) {
 				const [, funcName] = queryKey;
 				authState.onUnauthorized({ queryName: funcName });
 			}

package/dist/server/index.js

@@ -1,6 +1,6 @@
 import { c as isMutationCtx, d as requireActionCtx, f as requireMutationCtx, g as pick, i as addFieldsToValidator, l as isQueryCtx, m as requireRunMutationCtx, n as customCtx, o as vRequired, p as requireQueryCtx, s as isActionCtx, t as NoOp, u as isRunMutationCtx } from "../customFunctions-CZnCwoR3.js";
 import { i as decodeWire, o as encodeWire, s as getTransformer } from "../transformer-Dh0w2py0.js";
-import { n as createLazyCaller, r as createServerCaller, t as createCallerFactory } from "../caller-factory-Dmgv8MLS.js";
+import { n as createLazyCaller, r as createServerCaller, t as createCallerFactory } from "../caller-factory-D3OuR1eI.js";
 import { ConvexError, v } from "convex/values";
 import { HttpRouter, actionGeneric, getFunctionName, httpActionGeneric, internalActionGeneric, internalMutationGeneric, internalQueryGeneric, makeFunctionReference, mutationGeneric, queryGeneric } from "convex/server";
 import * as z$1 from "zod/v4";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-convex",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Better Convex - React Query integration and CLI tools for Convex",
   "keywords": [
     "convex",
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@clack/prompts": "^0.11.0",
-    "@convex-dev/better-auth": "^0.10.10",
+    "@convex-dev/better-auth": "^0.10.11",
     "chokidar": "^5.0.0",
     "common-tags": "^1.8.2",
     "dotenv": "^17.3.1",