better-convex 0.0.4 → 0.0.5

package/dist/auth/index.d.ts

@@ -1,4 +1,4 @@
-import * as better_auth_adapters0 from "better-auth/adapters";
+import * as better_auth_adapters1 from "better-auth/adapters";
 import { DBAdapterDebugLogOption } from "better-auth/adapters";
 import { BetterAuthDBSchema } from "better-auth/db";
 import * as convex_server24 from "convex/server";
@@ -44,20 +44,20 @@ declare const createClient: <DataModel extends GenericDataModel, Schema$1 extend
 }) => {
   authFunctions: AuthFunctions;
   triggers: Triggers<DataModel, Schema$1> | undefined;
-  adapter: (ctx: GenericCtx<DataModel>, createAuthOptions: (ctx: any) => BetterAuthOptions) => better_auth_adapters0.AdapterFactory;
-  httpAdapter: (ctx: GenericCtx<DataModel>) => better_auth_adapters0.AdapterFactory;
+  adapter: (ctx: GenericCtx<DataModel>, createAuthOptions: (ctx: any) => BetterAuthOptions) => better_auth_adapters1.AdapterFactory;
+  httpAdapter: (ctx: GenericCtx<DataModel>) => better_auth_adapters1.AdapterFactory;
   triggersApi: () => {
     beforeCreate: convex_server24.RegisteredMutation<"internal", {
-      model: string;
       data: any;
+      model: string;
     }, Promise<any>>;
     beforeDelete: convex_server24.RegisteredMutation<"internal", {
       model: string;
       doc: any;
     }, Promise<any>>;
     beforeUpdate: convex_server24.RegisteredMutation<"internal", {
-      model: string;
       update: any;
+      model: string;
       doc: any;
     }, Promise<any>>;
     onCreate: convex_server24.RegisteredMutation<"internal", {
@@ -148,7 +148,7 @@ declare const httpAdapter: <DataModel extends GenericDataModel, Schema$1 extends
   authFunctions: AuthFunctions;
   debugLogs?: DBAdapterDebugLogOption;
   triggers?: Triggers<DataModel, Schema$1>;
-}) => better_auth_adapters0.AdapterFactory;
+}) => better_auth_adapters1.AdapterFactory;
 declare const dbAdapter: <DataModel extends GenericDataModel, Schema$1 extends SchemaDefinition<any, any>>(ctx: GenericCtx<DataModel>, createAuthOptions: (ctx: any) => BetterAuthOptions, {
   authFunctions,
   debugLogs,
@@ -159,34 +159,34 @@ declare const dbAdapter: <DataModel extends GenericDataModel, Schema$1 extends S
   schema: Schema$1;
   debugLogs?: DBAdapterDebugLogOption;
   triggers?: Triggers<DataModel, Schema$1>;
-}) => better_auth_adapters0.AdapterFactory;
+}) => better_auth_adapters1.AdapterFactory;
 //#endregion
 //#region src/auth/adapter-utils.d.ts
 declare const adapterWhereValidator: convex_values0.VObject<{
+  operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
   connector?: "AND" | "OR" | undefined;
-  operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-  field: string;
   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<"eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "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", "field" | "connector" | "operator" | "value">;
+}, "required", "operator" | "value" | "field" | "connector">;
 declare const adapterArgsValidator: convex_values0.VObject<{
   limit?: number | undefined;
-  offset?: number | undefined;
-  select?: string[] | undefined;
-  sortBy?: {
-    direction: "asc" | "desc";
-    field: string;
-  } | undefined;
   where?: {
+    operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
     connector?: "AND" | "OR" | undefined;
-    operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-    field: string;
     value: string | number | boolean | string[] | number[] | null;
+    field: string;
   }[] | undefined;
+  select?: string[] | undefined;
+  offset?: number | undefined;
+  sortBy?: {
+    field: string;
+    direction: "asc" | "desc";
+  } | undefined;
   model: string;
 }, {
   limit: convex_values0.VFloat64<number | undefined, "optional">;
@@ -194,29 +194,29 @@ declare const adapterArgsValidator: convex_values0.VObject<{
   offset: convex_values0.VFloat64<number | undefined, "optional">;
   select: convex_values0.VArray<string[] | undefined, convex_values0.VString<string, "required">, "optional">;
   sortBy: convex_values0.VObject<{
-    direction: "asc" | "desc";
     field: string;
+    direction: "asc" | "desc";
   } | undefined, {
     direction: convex_values0.VUnion<"asc" | "desc", [convex_values0.VLiteral<"asc", "required">, convex_values0.VLiteral<"desc", "required">], "required", never>;
     field: convex_values0.VString<string, "required">;
-  }, "optional", "direction" | "field">;
+  }, "optional", "field" | "direction">;
   where: convex_values0.VArray<{
+    operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
     connector?: "AND" | "OR" | undefined;
-    operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-    field: string;
     value: string | number | boolean | string[] | number[] | null;
+    field: string;
   }[] | undefined, convex_values0.VObject<{
+    operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
     connector?: "AND" | "OR" | undefined;
-    operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-    field: string;
     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<"eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "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", "field" | "connector" | "operator" | "value">, "optional">;
-}, "required", "limit" | "model" | "offset" | "select" | "sortBy" | "where" | "sortBy.direction" | "sortBy.field">;
+  }, "required", "operator" | "value" | "field" | "connector">, "optional">;
+}, "required", "limit" | "where" | "model" | "select" | "offset" | "sortBy" | "sortBy.field" | "sortBy.direction">;
 declare const hasUniqueFields: (betterAuthSchema: BetterAuthDBSchema, model: string, input: Record<string, any>) => boolean;
 declare const checkUniqueFields: <Schema$1 extends SchemaDefinition<any, any>>(ctx: GenericQueryCtx<GenericDataModel>, schema: Schema$1, betterAuthSchema: BetterAuthDBSchema, table: string, input: Record<string, any>, doc?: Record<string, any>) => Promise<void>;
 declare const selectFields: <T extends TableNamesInDataModel<GenericDataModel>, D extends DocumentByName<GenericDataModel, T>>(doc: D | null, select?: string[]) => Promise<D | null>;
@@ -318,15 +318,15 @@ declare const createApi: <Schema$1 extends SchemaDefinition<any, any>>(schema: S
     beforeCreateHandle?: string | undefined;
     onCreateHandle?: string | undefined;
     input: {
-      model: string;
       data: any;
-    } | {
       model: string;
+    } | {
       data: {
         [x: string]: unknown;
         [x: number]: unknown;
         [x: symbol]: unknown;
       };
+      model: string;
     };
   }, Promise<any>>;
   deleteMany: convex_server24.RegisteredMutation<"internal", {
@@ -345,10 +345,10 @@ declare const createApi: <Schema$1 extends SchemaDefinition<any, any>>(schema: S
       model: string;
     } | {
       where?: {
+        operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
         connector?: "AND" | "OR" | undefined;
-        operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-        field: string;
         value: string | number | boolean | string[] | number[] | null;
+        field: string;
       }[] | undefined;
       model: string;
     };
@@ -368,10 +368,10 @@ declare const createApi: <Schema$1 extends SchemaDefinition<any, any>>(schema: S
       model: string;
     } | {
       where?: {
+        operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
         connector?: "AND" | "OR" | undefined;
-        operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-        field: string;
         value: string | number | boolean | string[] | number[] | null;
+        field: string;
       }[] | undefined;
       model: string;
     };
@@ -379,18 +379,17 @@ declare const createApi: <Schema$1 extends SchemaDefinition<any, any>>(schema: S
   findMany: convex_server24.RegisteredQuery<"internal", {
     limit?: number | undefined;
     join?: any;
-    offset?: number | undefined;
-    sortBy?: {
-      direction: "asc" | "desc";
-      field: string;
-    } | undefined;
     where?: {
+      operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
       connector?: "AND" | "OR" | undefined;
-      operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-      field: string;
       value: string | number | boolean | string[] | number[] | null;
+      field: string;
     }[] | undefined;
-    model: string;
+    offset?: number | undefined;
+    sortBy?: {
+      field: string;
+      direction: "asc" | "desc";
+    } | undefined;
     paginationOpts: {
       id?: number;
       endCursor?: string | null;
@@ -399,16 +398,17 @@ declare const createApi: <Schema$1 extends SchemaDefinition<any, any>>(schema: S
       numItems: number;
       cursor: string | null;
     };
+    model: string;
   }, Promise<convex_server24.PaginationResult<convex_server24.GenericDocument>>>;
   findOne: convex_server24.RegisteredQuery<"internal", {
     join?: any;
-    select?: string[] | undefined;
     where?: {
+      operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
       connector?: "AND" | "OR" | undefined;
-      operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-      field: string;
       value: string | number | boolean | string[] | number[] | null;
+      field: string;
     }[] | undefined;
+    select?: string[] | undefined;
     model: string;
   }, Promise<convex_server24.GenericDocument | null>>;
   updateMany: convex_server24.RegisteredMutation<"internal", {
@@ -424,21 +424,21 @@ declare const createApi: <Schema$1 extends SchemaDefinition<any, any>>(schema: S
     };
     input: {
       where?: any[] | undefined;
-      model: string;
       update: any;
+      model: string;
     } | {
       where?: {
+        operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
         connector?: "AND" | "OR" | undefined;
-        operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-        field: string;
         value: string | number | boolean | string[] | number[] | null;
+        field: string;
       }[] | undefined;
-      model: string;
       update: {
         [x: string]: unknown;
         [x: number]: unknown;
         [x: symbol]: unknown;
       };
+      model: string;
     };
   }, Promise<{
     count: number;
@@ -453,21 +453,21 @@ declare const createApi: <Schema$1 extends SchemaDefinition<any, any>>(schema: S
     onUpdateHandle?: string | undefined;
     input: {
       where?: any[] | undefined;
-      model: string;
       update: any;
+      model: string;
     } | {
       where?: {
+        operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
         connector?: "AND" | "OR" | undefined;
-        operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-        field: string;
         value: string | number | boolean | string[] | number[] | null;
+        field: string;
       }[] | undefined;
-      model: string;
       update: {
         [x: string]: unknown;
         [x: number]: unknown;
         [x: symbol]: unknown;
       };
+      model: string;
     };
   }, Promise<any>>;
   getLatestJwks: convex_server24.RegisteredAction<"internal", {}, Promise<any>>;

package/dist/auth/index.js

@@ -630,7 +630,7 @@ const httpAdapter = (ctx, { authFunctions, debugLogs, triggers }) => {
 					});
 				},
 				createSchema: async ({ file, tables }) => {
-					const { createSchema } = await import("../create-schema-CiLdn4rr.js");
+					const { createSchema } = await import("../create-schema-DzQEFNJW.js");
 					return createSchema({
 						file,
 						tables
@@ -766,7 +766,7 @@ const dbAdapter = (ctx, createAuthOptions, { authFunctions, debugLogs, schema, t
 					}, schema, betterAuthSchema);
 				},
 				createSchema: async ({ file, tables }) => {
-					const { createSchema } = await import("../create-schema-CiLdn4rr.js");
+					const { createSchema } = await import("../create-schema-DzQEFNJW.js");
 					return createSchema({
 						file,
 						tables

package/dist/auth-client/index.d.ts

@@ -19,6 +19,8 @@ type ConvexAuthProviderProps = {
   onQueryUnauthorized?: (info: {
     queryName: string;
   }) => void;
+  /** Custom function to detect UNAUTHORIZED errors. Default checks code property. */
+  isUnauthorized?: (error: unknown) => boolean;
 };
 /**
  * Unified auth provider for Convex + Better Auth.
@@ -30,7 +32,8 @@ declare function ConvexAuthProvider({
   authClient,
   initialToken,
   onMutationUnauthorized,
-  onQueryUnauthorized
+  onQueryUnauthorized,
+  isUnauthorized
 }: ConvexAuthProviderProps): react_jsx_runtime0.JSX.Element;
 //#endregion
 export { type AuthClient, ConvexAuthProvider, ConvexAuthProviderProps };

package/dist/auth-client/index.js

@@ -1,5 +1,5 @@
 'use client';
-import { c as persistToken, f as useAuthStore, g as CRPCClientError, p as useAuthValue, s as getPersistedToken, t as AuthProvider } from "../auth-store-Bu8XzPRV.js";
+import { _ as defaultIsUnauthorized, c as persistToken, f as useAuthStore, g as CRPCClientError, p as useAuthValue, s as getPersistedToken, t as AuthProvider } from "../auth-store-DANFmEdk.js";
 import { c } from "react/compiler-runtime";
 import { ConvexProviderWithAuth } from "convex/react";
 import { useCallback, useEffect, useMemo } from "react";
@@ -20,8 +20,8 @@ const defaultMutationHandler = () => {
 * Handles token sync, HMR persistence, and auth callbacks.
 */
 function ConvexAuthProvider(t0) {
-	const $ = c(16);
-	const { children, client, authClient, initialToken, onMutationUnauthorized, onQueryUnauthorized } = t0;
+	const $ = c(17);
+	const { children, client, authClient, initialToken, onMutationUnauthorized, onQueryUnauthorized, isUnauthorized } = t0;
 	let t1;
 	if ($[0] !== initialToken) {
 		t1 = initialToken ?? getPersistedToken();
@@ -43,21 +43,23 @@ function ConvexAuthProvider(t0) {
 		$[2] = t3;
 		$[3] = t4;
 	} else t4 = $[3];
-	const t5 = onMutationUnauthorized ?? defaultMutationHandler;
-	const t6 = onQueryUnauthorized ?? _temp;
-	let t7;
+	const t5 = isUnauthorized ?? defaultIsUnauthorized;
+	const t6 = onMutationUnauthorized ?? defaultMutationHandler;
+	const t7 = onQueryUnauthorized ?? _temp;
+	let t8;
 	if ($[4] !== authClient) {
-		t7 = /* @__PURE__ */ jsx(AuthSyncEffect, { authClient });
+		t8 = /* @__PURE__ */ jsx(AuthSyncEffect, { authClient });
 		$[4] = authClient;
-		$[5] = t7;
-	} else t7 = $[5];
-	let t8;
-	if ($[6] !== children || $[7] !== t4 || $[8] !== t5 || $[9] !== t6 || $[10] !== t7) {
-		t8 = /* @__PURE__ */ jsxs(AuthProvider, {
+		$[5] = t8;
+	} else t8 = $[5];
+	let t9;
+	if ($[6] !== children || $[7] !== t4 || $[8] !== t5 || $[9] !== t6 || $[10] !== t7 || $[11] !== t8) {
+		t9 = /* @__PURE__ */ jsxs(AuthProvider, {
 			initialValues: t4,
-			onMutationUnauthorized: t5,
-			onQueryUnauthorized: t6,
-			children: [t7, children]
+			isUnauthorized: t5,
+			onMutationUnauthorized: t6,
+			onQueryUnauthorized: t7,
+			children: [t8, children]
 		});
 		$[6] = children;
 		$[7] = t4;
@@ -65,20 +67,21 @@ function ConvexAuthProvider(t0) {
 		$[9] = t6;
 		$[10] = t7;
 		$[11] = t8;
-	} else t8 = $[11];
-	let t9;
-	if ($[12] !== t2 || $[13] !== t8 || $[14] !== useAuth) {
-		t9 = /* @__PURE__ */ jsx(ConvexProviderWithAuth, {
+		$[12] = t9;
+	} else t9 = $[12];
+	let t10;
+	if ($[13] !== t2 || $[14] !== t9 || $[15] !== useAuth) {
+		t10 = /* @__PURE__ */ jsx(ConvexProviderWithAuth, {
 			client: t2,
 			useAuth,
-			children: t8
+			children: t9
 		});
-		$[12] = t2;
-		$[13] = t8;
-		$[14] = useAuth;
-		$[15] = t9;
-	} else t9 = $[15];
-	return t9;
+		$[13] = t2;
+		$[14] = t9;
+		$[15] = useAuth;
+		$[16] = t10;
+	} else t10 = $[16];
+	return t10;
 }
 /**
 * Syncs Better Auth session to auth-store.

package/dist/auth-nextjs/index.d.ts

@@ -3,20 +3,20 @@ import { GetTokenOptions } from "@convex-dev/better-auth/utils";
 
 //#region src/auth-nextjs/index.d.ts
 
-/** JWT cache options with optional isAuthError (has built-in default). */
-type JwtCacheOptions = {
-  /** Enable JWT caching with automatic refresh on auth errors. */
-  enabled: boolean;
+/** Auth options for server-side calls. */
+type AuthOptions = {
+  /** Enable/disable JWT caching. Default: true */
+  jwtCache?: boolean;
+  /** Custom function to detect UNAUTHORIZED errors. Default checks code property. */
+  isUnauthorized?: (error: unknown) => boolean;
   /** Expiration tolerance in seconds. */
   expirationToleranceSeconds?: number;
-  /** Custom function to detect auth errors. Default checks for "auth" in error message. */
-  isAuthError?: (error: unknown) => boolean;
 };
 type ConvexBetterAuthOptions<TApi> = Omit<GetTokenOptions, 'jwtCache'> & {
   api: TApi;
   convexSiteUrl: string;
-  /** JWT caching options for automatic token refresh. */
-  jwtCache?: JwtCacheOptions;
+  /** Auth options. JWT caching is enabled by default (set `auth.jwtCache: false` to disable). */
+  auth?: AuthOptions;
   meta: CallerMeta;
 };
 /**
@@ -28,8 +28,8 @@ type ConvexBetterAuthOptions<TApi> = Omit<GetTokenOptions, 'jwtCache'> & {
  * export const { createContext, createCaller, handler } = convexBetterAuth({
  *   api,
  *   convexSiteUrl: env.NEXT_PUBLIC_CONVEX_SITE_URL,
- *   jwtCache: { enabled: true, isAuthError },
- * });
+ *   meta,
+ * }); // JWT caching enabled by default
  *
  * // rsc.tsx
  * const createRSCContext = cache(async () => {

package/dist/auth-nextjs/index.js

@@ -1,4 +1,5 @@
-import { s as createCallerFactory, t as CRPCError } from "../error-DwOaXhPE.js";
+import { n as defaultIsUnauthorized } from "../error-CsSzFKod.js";
+import { t as createCallerFactory } from "../caller-factory-DxmuY355.js";
 import { getToken } from "@convex-dev/better-auth/utils";
 
 //#region src/auth-nextjs/index.ts
@@ -7,11 +8,6 @@ import { getToken } from "@convex-dev/better-auth/utils";
 * Next.js + Better Auth wrapper for Convex caller factory.
 * Uses @convex-dev/better-auth for token management.
 */
-const AUTH_ERROR_REGEX = /auth/i;
-const defaultIsAuthError = (error) => {
-	const message = error instanceof CRPCError && error.message || error instanceof Error && error.message || "";
-	return AUTH_ERROR_REGEX.test(String(message));
-};
 const handler = (request, siteUrl) => {
 	const requestUrl = new URL(request.url);
 	const nextUrl = `${siteUrl}${requestUrl.pathname}${requestUrl.search}`;
@@ -36,8 +32,8 @@ const nextJsHandler = (siteUrl) => ({
 * export const { createContext, createCaller, handler } = convexBetterAuth({
 *   api,
 *   convexSiteUrl: env.NEXT_PUBLIC_CONVEX_SITE_URL,
-*   jwtCache: { enabled: true, isAuthError },
-* });
+*   meta,
+* }); // JWT caching enabled by default
 *
 * // rsc.tsx
 * const createRSCContext = cache(async () => {
@@ -51,14 +47,22 @@ const nextJsHandler = (siteUrl) => ({
 * ```
 */
 function convexBetterAuth(opts) {
+	const auth = opts.auth ?? {};
+	const jwtCacheEnabled = auth.jwtCache !== false;
 	const { createContext, createCaller } = createCallerFactory({
 		api: opts.api,
 		convexSiteUrl: opts.convexSiteUrl,
-		getToken,
-		jwtCache: opts.jwtCache && {
-			...opts.jwtCache,
-			isAuthError: opts.jwtCache.isAuthError ?? defaultIsAuthError
-		},
+		auth: jwtCacheEnabled ? {
+			getToken: (siteUrl, headers, getTokenOpts) => getToken(siteUrl, headers, {
+				...getTokenOpts,
+				jwtCache: {
+					enabled: true,
+					expirationToleranceSeconds: auth.expirationToleranceSeconds,
+					isAuthError: auth.isUnauthorized ?? defaultIsUnauthorized
+				}
+			}),
+			isUnauthorized: auth.isUnauthorized ?? defaultIsUnauthorized
+		} : void 0,
 		meta: opts.meta
 	});
 	return {

package/dist/{auth-store-Bu8XzPRV.js → auth-store-DANFmEdk.js}

@@ -21,6 +21,16 @@ var CRPCClientError = class extends Error {
 };
 /** Type guard for CRPCClientError */
 const isCRPCClientError = (error) => error instanceof CRPCClientError;
+/** Default unauthorized detection - checks UNAUTHORIZED code */
+const defaultIsUnauthorized = (error) => {
+	if (!error || typeof error !== "object") return false;
+	if ("data" in error) {
+		const data = error.data;
+		if (data && typeof data === "object" && "code" in data) return data.code === "UNAUTHORIZED";
+	}
+	if ("code" in error) return error.code === "UNAUTHORIZED";
+	return false;
+};
 
 //#endregion
 //#region src/react/auth-store.tsx
@@ -90,6 +100,7 @@ const { authStore, AuthProvider, useAuthStore, useAuthState, useAuthValue } = cr
 		});
 	},
 	onQueryUnauthorized: () => {},
+	isUnauthorized: defaultIsUnauthorized,
 	token: getPersistedToken(),
 	enabled: false,
 	isLoading: false,
@@ -172,4 +183,4 @@ function Unauthenticated(t0) {
 }
 
 //#endregion
-export { isCRPCClientError as _, Unauthenticated as a, persistToken as c, useAuthState as d, useAuthStore as f, CRPCClientError as g, useMaybeAuth as h, MaybeUnauthenticated as i, useAuth as l, useIsAuth as m, Authenticated as n, authStore as o, useAuthValue as p, MaybeAuthenticated as r, getPersistedToken as s, AuthProvider as t, useAuthGuard as u };
+export { defaultIsUnauthorized as _, Unauthenticated as a, persistToken as c, useAuthState as d, useAuthStore as f, CRPCClientError as g, useMaybeAuth as h, MaybeUnauthenticated as i, useAuth as l, useIsAuth as m, Authenticated as n, authStore as o, useAuthValue as p, MaybeAuthenticated as r, getPersistedToken as s, AuthProvider as t, useAuthGuard as u, isCRPCClientError as v };

package/dist/{error-DwOaXhPE.js → caller-factory-DxmuY355.js}

@@ -1,4 +1,3 @@
-import { ConvexError } from "convex/values";
 import { fetchAction, fetchMutation, fetchQuery } from "convex/nextjs";
 
 //#region src/server/caller.ts
@@ -139,22 +138,22 @@ const parseConvexSiteUrl = (url) => {
 * const { createContext, createCaller } = createCallerFactory({
 *   api,
 *   convexSiteUrl: env.NEXT_PUBLIC_CONVEX_SITE_URL,
-*   getToken,
-*   jwtCache: { enabled: true, isAuthError },
+*   auth: { getToken },
+*   meta,
 * });
 * ```
 */
 const noAuthGetToken = () => Promise.resolve({ token: void 0 });
 function createCallerFactory(opts) {
 	const siteUrl = parseConvexSiteUrl(opts.convexSiteUrl);
-	const getToken = opts.getToken ?? noAuthGetToken;
-	const isAuthError = opts.jwtCache?.isAuthError;
+	const getToken = opts.auth?.getToken ?? noAuthGetToken;
+	const isUnauthorized = opts.auth?.isUnauthorized;
 	const callWithTokenAndRetry = async (fn, tokenResult, headers) => {
 		try {
 			return await fn(tokenResult.token);
 		} catch (error) {
-			if (isAuthError?.(error)) return null;
-			if (!opts.jwtCache?.enabled || tokenResult.isFresh) throw error;
+			if (isUnauthorized?.(error)) return null;
+			if (!opts.auth || tokenResult.isFresh) throw error;
 			const newToken = await getToken(siteUrl, headers, {
 				...opts,
 				forceRefresh: true
@@ -162,7 +161,7 @@ function createCallerFactory(opts) {
 			try {
 				return await fn(newToken.token);
 			} catch (retryError) {
-				if (isAuthError?.(retryError)) return null;
+				if (isUnauthorized?.(retryError)) return null;
 				throw retryError;
 			}
 		}
@@ -206,130 +205,4 @@ function createCallerFactory(opts) {
 }
 
 //#endregion
-//#region src/server/error.ts
-/**
-* CRPC Error - tRPC-style error handling for Convex
-*
-* Extends ConvexError with typed error codes and HTTP status mapping.
-*/
-/** JSON-RPC 2.0 error codes (tRPC-style) */
-const CRPC_ERROR_CODES_BY_KEY = {
-	PARSE_ERROR: -32700,
-	BAD_REQUEST: -32600,
-	INTERNAL_SERVER_ERROR: -32603,
-	NOT_IMPLEMENTED: -32603,
-	BAD_GATEWAY: -32603,
-	SERVICE_UNAVAILABLE: -32603,
-	GATEWAY_TIMEOUT: -32603,
-	UNAUTHORIZED: -32001,
-	PAYMENT_REQUIRED: -32002,
-	FORBIDDEN: -32003,
-	NOT_FOUND: -32004,
-	METHOD_NOT_SUPPORTED: -32005,
-	TIMEOUT: -32008,
-	CONFLICT: -32009,
-	PRECONDITION_FAILED: -32012,
-	PAYLOAD_TOO_LARGE: -32013,
-	UNSUPPORTED_MEDIA_TYPE: -32015,
-	UNPROCESSABLE_CONTENT: -32022,
-	PRECONDITION_REQUIRED: -32028,
-	TOO_MANY_REQUESTS: -32029,
-	CLIENT_CLOSED_REQUEST: -32099
-};
-/** Map error codes to HTTP status codes */
-const CRPC_ERROR_CODE_TO_HTTP = {
-	PARSE_ERROR: 400,
-	BAD_REQUEST: 400,
-	UNAUTHORIZED: 401,
-	PAYMENT_REQUIRED: 402,
-	FORBIDDEN: 403,
-	NOT_FOUND: 404,
-	METHOD_NOT_SUPPORTED: 405,
-	TIMEOUT: 408,
-	CONFLICT: 409,
-	PRECONDITION_FAILED: 412,
-	PAYLOAD_TOO_LARGE: 413,
-	UNSUPPORTED_MEDIA_TYPE: 415,
-	UNPROCESSABLE_CONTENT: 422,
-	PRECONDITION_REQUIRED: 428,
-	TOO_MANY_REQUESTS: 429,
-	CLIENT_CLOSED_REQUEST: 499,
-	INTERNAL_SERVER_ERROR: 500,
-	NOT_IMPLEMENTED: 501,
-	BAD_GATEWAY: 502,
-	SERVICE_UNAVAILABLE: 503,
-	GATEWAY_TIMEOUT: 504
-};
-/** Extract Error from unknown cause (from tRPC) */
-function getCauseFromUnknown(cause) {
-	if (cause instanceof Error) return cause;
-	if (typeof cause === "undefined" || typeof cause === "function" || cause === null) return;
-	if (typeof cause !== "object") return new Error(String(cause));
-}
-/**
-* tRPC-style error extending ConvexError
-*
-* @example
-* ```typescript
-* throw new CRPCError({
-*   code: 'BAD_REQUEST',
-*   message: 'Invalid input',
-*   cause: originalError,
-* });
-* ```
-*/
-var CRPCError = class extends ConvexError {
-	code;
-	cause;
-	constructor(opts) {
-		const cause = getCauseFromUnknown(opts.cause);
-		const message = opts.message ?? cause?.message ?? opts.code;
-		super({
-			code: opts.code,
-			message
-		});
-		this.name = "CRPCError";
-		this.code = opts.code;
-		this.cause = cause;
-	}
-};
-/**
-* Wrap unknown error in CRPCError (from tRPC)
-*
-* @example
-* ```typescript
-* try {
-*   await someOperation();
-* } catch (error) {
-*   throw getCRPCErrorFromUnknown(error);
-* }
-* ```
-*/
-function getCRPCErrorFromUnknown(cause) {
-	if (cause instanceof CRPCError) return cause;
-	if (cause instanceof Error && cause.name === "CRPCError") return cause;
-	const error = new CRPCError({
-		code: "INTERNAL_SERVER_ERROR",
-		cause
-	});
-	if (cause instanceof Error && cause.stack) error.stack = cause.stack;
-	return error;
-}
-/**
-* Get HTTP status code from CRPCError
-*
-* @example
-* ```typescript
-* const httpStatus = getHTTPStatusCodeFromError(error); // 400
-* ```
-*/
-function getHTTPStatusCodeFromError(error) {
-	return CRPC_ERROR_CODE_TO_HTTP[error.code] ?? 500;
-}
-/** Type guard for CRPCError */
-function isCRPCError(error) {
-	return error instanceof CRPCError;
-}
-
-//#endregion
-export { getHTTPStatusCodeFromError as a, createLazyCaller as c, getCRPCErrorFromUnknown as i, createServerCaller as l, CRPC_ERROR_CODES_BY_KEY as n, isCRPCError as o, CRPC_ERROR_CODE_TO_HTTP as r, createCallerFactory as s, CRPCError as t };
+export { createLazyCaller as n, createServerCaller as r, createCallerFactory as t };

package/dist/crpc/index.d.ts

@@ -1,4 +1,4 @@
-import { C as PaginatedFnMeta, S as Meta, _ as ExtractPaginatedItem, a as ConvexInfiniteQueryMeta, b as InfiniteQueryInput, c as ConvexMutationKey, d as ConvexQueryMeta, f as ConvexQueryOptions, g as DecorateQuery, h as DecorateMutation, i as ConvexActionOptions, l as ConvexQueryHookOptions, m as DecorateInfiniteQuery, n as CRPCClient, o as ConvexInfiniteQueryOptions, p as DecorateAction, r as ConvexActionKey, s as ConvexInfiniteQueryOptionsWithRef, t as AuthType, u as ConvexQueryKey, v as FUNC_REF_SYMBOL, w as PaginationOpts, x as InfiniteQueryOptsParam, y as FnMeta } from "../types-h8_JnBVZ.js";
+import { C as PaginatedFnMeta, S as Meta, _ as ExtractPaginatedItem, a as ConvexInfiniteQueryMeta, b as InfiniteQueryInput, c as ConvexMutationKey, d as ConvexQueryMeta, f as ConvexQueryOptions, g as DecorateQuery, h as DecorateMutation, i as ConvexActionOptions, l as ConvexQueryHookOptions, m as DecorateInfiniteQuery, n as CRPCClient, o as ConvexInfiniteQueryOptions, p as DecorateAction, r as ConvexActionKey, s as ConvexInfiniteQueryOptionsWithRef, t as AuthType, u as ConvexQueryKey, v as FUNC_REF_SYMBOL, w as PaginationOpts, x as InfiniteQueryOptsParam, y as FnMeta } from "../types-CotWvon8.js";
 import { FunctionArgs, FunctionReference } from "convex/server";
 
 //#region src/crpc/error.d.ts
@@ -24,6 +24,8 @@ declare class CRPCClientError extends Error {
 declare const isCRPCClientError: (error: unknown) => error is CRPCClientError;
 /** Type guard for specific error code */
 declare const isCRPCErrorCode: (error: unknown, code: ClientErrorCode) => error is CRPCClientError;
+/** Default unauthorized detection - checks UNAUTHORIZED code */
+declare const defaultIsUnauthorized: (error: unknown) => boolean;
 //#endregion
 //#region src/crpc/query-options.d.ts
 /**
@@ -65,4 +67,4 @@ declare function convexAction<T extends FunctionReference<'action'>>(funcRef: T,
  */
 declare function convexInfiniteQueryOptions<T extends FunctionReference<'query'>>(funcRef: T, args: Record<string, unknown> | 'skip', opts?: InfiniteQueryOptsParam<T>, meta?: Meta): ConvexInfiniteQueryOptions<T>;
 //#endregion
-export { AuthType, CRPCClient, CRPCClientError, ConvexActionKey, ConvexActionOptions, ConvexInfiniteQueryMeta, ConvexInfiniteQueryOptions, ConvexInfiniteQueryOptionsWithRef, ConvexMutationKey, ConvexQueryHookOptions, ConvexQueryKey, ConvexQueryMeta, ConvexQueryOptions, DecorateAction, DecorateInfiniteQuery, DecorateMutation, DecorateQuery, ExtractPaginatedItem, FUNC_REF_SYMBOL, FnMeta, InfiniteQueryInput, InfiniteQueryOptsParam, Meta, PaginatedFnMeta, PaginationOpts, convexAction, convexInfiniteQueryOptions, convexQuery, isCRPCClientError, isCRPCErrorCode };
+export { AuthType, CRPCClient, CRPCClientError, ConvexActionKey, ConvexActionOptions, ConvexInfiniteQueryMeta, ConvexInfiniteQueryOptions, ConvexInfiniteQueryOptionsWithRef, ConvexMutationKey, ConvexQueryHookOptions, ConvexQueryKey, ConvexQueryMeta, ConvexQueryOptions, DecorateAction, DecorateInfiniteQuery, DecorateMutation, DecorateQuery, ExtractPaginatedItem, FUNC_REF_SYMBOL, FnMeta, InfiniteQueryInput, InfiniteQueryOptsParam, Meta, PaginatedFnMeta, PaginationOpts, convexAction, convexInfiniteQueryOptions, convexQuery, defaultIsUnauthorized, isCRPCClientError, isCRPCErrorCode };

package/dist/crpc/index.js

@@ -1,29 +1,9 @@
-import { n as convexInfiniteQueryOptions, r as convexQuery, t as convexAction } from "../query-options-lmbltN6P.js";
+import { i as isCRPCErrorCode, n as defaultIsUnauthorized, r as isCRPCClientError, t as CRPCClientError } from "../error-CsSzFKod.js";
+import { n as convexInfiniteQueryOptions, r as convexQuery, t as convexAction } from "../query-options-sK2n1Ioe.js";
 
-//#region src/crpc/error.ts
-/**
-* Client-side CRPC error.
-* Mirrors backend CRPCError pattern with typed error codes.
-*/
-var CRPCClientError = class extends Error {
-	name = "CRPCClientError";
-	code;
-	functionName;
-	constructor(opts) {
-		super(opts.message ?? `${opts.code}: ${opts.functionName}`);
-		this.code = opts.code;
-		this.functionName = opts.functionName;
-	}
-};
-/** Type guard for CRPCClientError */
-const isCRPCClientError = (error) => error instanceof CRPCClientError;
-/** Type guard for specific error code */
-const isCRPCErrorCode = (error, code) => isCRPCClientError(error) && error.code === code;
-
-//#endregion
 //#region src/crpc/types.ts
 /** Symbol key for attaching FunctionReference to options (non-serializable) */
 const FUNC_REF_SYMBOL = Symbol.for("convex.funcRef");
 
 //#endregion
-export { CRPCClientError, FUNC_REF_SYMBOL, convexAction, convexInfiniteQueryOptions, convexQuery, isCRPCClientError, isCRPCErrorCode };
+export { CRPCClientError, FUNC_REF_SYMBOL, convexAction, convexInfiniteQueryOptions, convexQuery, defaultIsUnauthorized, isCRPCClientError, isCRPCErrorCode };

package/dist/error-CsSzFKod.js

@@ -0,0 +1,32 @@
+//#region src/crpc/error.ts
+/**
+* Client-side CRPC error.
+* Mirrors backend CRPCError pattern with typed error codes.
+*/
+var CRPCClientError = class extends Error {
+	name = "CRPCClientError";
+	code;
+	functionName;
+	constructor(opts) {
+		super(opts.message ?? `${opts.code}: ${opts.functionName}`);
+		this.code = opts.code;
+		this.functionName = opts.functionName;
+	}
+};
+/** Type guard for CRPCClientError */
+const isCRPCClientError = (error) => error instanceof CRPCClientError;
+/** Type guard for specific error code */
+const isCRPCErrorCode = (error, code) => isCRPCClientError(error) && error.code === code;
+/** Default unauthorized detection - checks UNAUTHORIZED code */
+const defaultIsUnauthorized = (error) => {
+	if (!error || typeof error !== "object") return false;
+	if ("data" in error) {
+		const data = error.data;
+		if (data && typeof data === "object" && "code" in data) return data.code === "UNAUTHORIZED";
+	}
+	if ("code" in error) return error.code === "UNAUTHORIZED";
+	return false;
+};
+
+//#endregion
+export { isCRPCErrorCode as i, defaultIsUnauthorized as n, isCRPCClientError as r, CRPCClientError as t };

package/dist/react/index.d.ts

@@ -22,7 +22,7 @@ type AuthClient = {
   };
 };
 type AuthMutationsResult<T extends AuthClient> = {
-  useSignOutMutationOptions: MutationOptionsHook<Awaited<ReturnType<T['signOut']>>, Parameters<T['signOut']>[0]>;
+  useSignOutMutationOptions: MutationOptionsHook<Awaited<ReturnType<T['signOut']>>, Parameters<T['signOut']>[0] | void>;
   useSignInSocialMutationOptions: MutationOptionsHook<Awaited<ReturnType<T['signIn']['social']>>, Parameters<T['signIn']['social']>[0]>;
   useSignInMutationOptions: MutationOptionsHook<Awaited<ReturnType<T['signIn']['email']>>, Parameters<T['signIn']['email']>[0]>;
   useSignUpMutationOptions: MutationOptionsHook<Awaited<ReturnType<T['signUp']['email']>>, Parameters<T['signUp']['email']>[0]>;
@@ -60,6 +60,8 @@ type AuthStoreState = {
   onQueryUnauthorized: (info: {
     queryName: string;
   }) => void;
+  /** Custom function to detect UNAUTHORIZED errors. Default checks code or "auth" in message. */
+  isUnauthorized: (error: unknown) => boolean;
   /** Current session token */
   token: string | null;
   /** Whether Convex auth is still loading (synced from useConvexAuth) */
@@ -78,6 +80,7 @@ declare const authStore$1: jotai_x0.StoreApi<AuthStoreState, object, "auth">, Au
     onQueryUnauthorized: (info: {
       queryName: string;
     }) => void;
+    isUnauthorized: (error: unknown) => boolean;
     token: string | null;
     isLoading: boolean;
     isAuthenticated: boolean;
@@ -87,6 +90,7 @@ declare const authStore$1: jotai_x0.StoreApi<AuthStoreState, object, "auth">, Au
     onQueryUnauthorized: jotai_x0.SimpleWritableAtom<(info: {
       queryName: string;
     }) => void>;
+    isUnauthorized: jotai_x0.SimpleWritableAtom<(error: unknown) => boolean>;
     token: jotai_x0.SimpleWritableAtom<string | null>;
     isLoading: jotai_x0.SimpleWritableAtom<boolean>;
     isAuthenticated: jotai_x0.SimpleWritableAtom<boolean>;
@@ -96,6 +100,7 @@ declare const authStore$1: jotai_x0.StoreApi<AuthStoreState, object, "auth">, Au
     onQueryUnauthorized: jotai_x0.SimpleWritableAtom<(info: {
       queryName: string;
     }) => void>;
+    isUnauthorized: jotai_x0.SimpleWritableAtom<(error: unknown) => boolean>;
     token: jotai_x0.SimpleWritableAtom<string | null>;
     isLoading: jotai_x0.SimpleWritableAtom<boolean>;
     isAuthenticated: jotai_x0.SimpleWritableAtom<boolean>;
@@ -106,6 +111,7 @@ declare const authStore$1: jotai_x0.StoreApi<AuthStoreState, object, "auth">, Au
       onQueryUnauthorized: jotai_x0.SimpleWritableAtom<(info: {
         queryName: string;
       }) => void>;
+      isUnauthorized: jotai_x0.SimpleWritableAtom<(error: unknown) => boolean>;
       token: jotai_x0.SimpleWritableAtom<string | null>;
       isLoading: jotai_x0.SimpleWritableAtom<boolean>;
       isAuthenticated: jotai_x0.SimpleWritableAtom<boolean>;

package/dist/react/index.js

@@ -1,5 +1,5 @@
 'use client';
-import { _ as isCRPCClientError, a as Unauthenticated, c as persistToken, d as useAuthState, f as useAuthStore, g as CRPCClientError, h as useMaybeAuth, i as MaybeUnauthenticated, l as useAuth, m as useIsAuth, n as Authenticated, o as authStore, p as useAuthValue, r as MaybeAuthenticated, s as getPersistedToken, t as AuthProvider, u as useAuthGuard } from "../auth-store-Bu8XzPRV.js";
+import { a as Unauthenticated, c as persistToken, d as useAuthState, f as useAuthStore, g as CRPCClientError, h as useMaybeAuth, i as MaybeUnauthenticated, l as useAuth, m as useIsAuth, n as Authenticated, o as authStore, p as useAuthValue, r as MaybeAuthenticated, s as getPersistedToken, t as AuthProvider, u as useAuthGuard, v as isCRPCClientError } from "../auth-store-DANFmEdk.js";
 import { c } from "react/compiler-runtime";
 import { ConvexProvider, ConvexReactClient, ConvexReactClient as ConvexReactClient$1, useAction, useMutation } from "convex/react";
 import { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
@@ -1177,7 +1177,8 @@ var ConvexQueryClient = class {
 		return {
 			isAuthenticated: !!this.authStore.get("token"),
 			isLoading: this.authStore.get("isLoading"),
-			onUnauthorized: this.authStore.get("onQueryUnauthorized")
+			onUnauthorized: this.authStore.get("onQueryUnauthorized"),
+			isUnauthorized: this.authStore.get("isUnauthorized")
 		};
 	}
 	/** Get QueryClient, throwing if not connected */
@@ -1282,6 +1283,11 @@ var ConvexQueryClient = class {
 				fetchStatus: "idle",
 				status: "error"
 			}, { meta: "set by ConvexQueryClient" });
+			const authState = this.getAuthState();
+			if (authState?.isUnauthorized(error)) {
+				const [, funcName] = queryKey;
+				authState.onUnauthorized({ queryName: funcName });
+			}
 		}
 	}
 	/**
@@ -1948,7 +1954,7 @@ function useInfiniteQuery(infiniteOptions) {
 		$[16] = result.error;
 		$[17] = t6;
 	} else t6 = $[17];
-	const isAuthError = t6;
+	const isClientError = t6;
 	const isSkippedUnauth = isUnauthorized && skipUnauthFinal;
 	let t7;
 	if ($[18] !== isSkippedUnauth || $[19] !== result.data) {
@@ -1979,7 +1985,7 @@ function useInfiniteQuery(infiniteOptions) {
 		$[26] = isSkippedUnauth;
 		$[27] = t10;
 	} else t10 = $[27];
-	const t11 = authLoadingApplies && isAuthLoading || !isAuthError && !authError && !isSkippedUnauth && result.isLoading;
+	const t11 = authLoadingApplies && isAuthLoading || !isClientError && !authError && !isSkippedUnauth && result.isLoading;
 	let t12;
 	if ($[28] !== result || $[29] !== t10 || $[30] !== t11 || $[31] !== t7 || $[32] !== t8 || $[33] !== t9) {
 		t12 = {

package/dist/rsc/index.d.ts

@@ -1,4 +1,4 @@
-import { S as Meta, n as CRPCClient } from "../types-h8_JnBVZ.js";
+import { S as Meta, n as CRPCClient } from "../types-CotWvon8.js";
 
 //#region src/rsc/proxy-server.d.ts
 

package/dist/rsc/index.js

@@ -1,4 +1,4 @@
-import { n as convexInfiniteQueryOptions, r as convexQuery } from "../query-options-lmbltN6P.js";
+import { n as convexInfiniteQueryOptions, r as convexQuery } from "../query-options-sK2n1Ioe.js";
 import { getFunctionName } from "convex/server";
 import { convexToJson } from "convex/values";
 import { fetchAction, fetchQuery } from "convex/nextjs";

package/dist/server/index.d.ts

@@ -450,22 +450,20 @@ type TokenResult = {
   isFresh?: boolean;
 };
 type GetTokenFn = (siteUrl: string, headers: Headers, opts?: unknown) => Promise<TokenResult>;
-/** JWT caching options for automatic token refresh on auth errors. */
-type JwtCacheOptions = {
-  /** Enable JWT caching with automatic refresh on auth errors. */
-  enabled?: boolean;
-  /** Custom function to detect auth errors. Default checks for "auth" in error message. */
-  isAuthError?: (error: unknown) => boolean;
+/** Auth options for server-side calls. */
+type AuthOptions = {
+  /** Function to extract auth token from request headers. */
+  getToken: GetTokenFn;
+  /** Custom function to detect UNAUTHORIZED errors. Default checks code property. */
+  isUnauthorized?: (error: unknown) => boolean;
 };
 type CreateCallerFactoryOptions<TApi> = {
   /** Your Convex API object. */
   api: TApi;
   /** Convex site URL (must end in `.convex.site`). */
   convexSiteUrl: string;
-  /** Function to extract auth token from request headers. Defaults to no auth. */
-  getToken?: GetTokenFn;
-  /** JWT caching options for automatic token refresh. */
-  jwtCache?: JwtCacheOptions;
+  /** Auth options. Pass to enable authenticated calls with JWT caching. */
+  auth?: AuthOptions;
   /** Procedure metadata. */
   meta: CallerMeta;
 };

package/dist/server/index.js

@@ -1,4 +1,5 @@
-import { a as getHTTPStatusCodeFromError, c as createLazyCaller, i as getCRPCErrorFromUnknown, l as createServerCaller, n as CRPC_ERROR_CODES_BY_KEY, o as isCRPCError, r as CRPC_ERROR_CODE_TO_HTTP, s as createCallerFactory, t as CRPCError } from "../error-DwOaXhPE.js";
+import { n as createLazyCaller, r as createServerCaller, t as createCallerFactory } from "../caller-factory-DxmuY355.js";
+import { ConvexError } from "convex/values";
 import { customCtx } from "convex-helpers/server/customFunctions";
 import { zCustomAction, zCustomMutation, zCustomQuery } from "convex-helpers/server/zod4";
 import { z } from "zod";
@@ -400,5 +401,131 @@ const initCRPC = {
 	}
 };
 
+//#endregion
+//#region src/server/error.ts
+/**
+* CRPC Error - tRPC-style error handling for Convex
+*
+* Extends ConvexError with typed error codes and HTTP status mapping.
+*/
+/** JSON-RPC 2.0 error codes (tRPC-style) */
+const CRPC_ERROR_CODES_BY_KEY = {
+	PARSE_ERROR: -32700,
+	BAD_REQUEST: -32600,
+	INTERNAL_SERVER_ERROR: -32603,
+	NOT_IMPLEMENTED: -32603,
+	BAD_GATEWAY: -32603,
+	SERVICE_UNAVAILABLE: -32603,
+	GATEWAY_TIMEOUT: -32603,
+	UNAUTHORIZED: -32001,
+	PAYMENT_REQUIRED: -32002,
+	FORBIDDEN: -32003,
+	NOT_FOUND: -32004,
+	METHOD_NOT_SUPPORTED: -32005,
+	TIMEOUT: -32008,
+	CONFLICT: -32009,
+	PRECONDITION_FAILED: -32012,
+	PAYLOAD_TOO_LARGE: -32013,
+	UNSUPPORTED_MEDIA_TYPE: -32015,
+	UNPROCESSABLE_CONTENT: -32022,
+	PRECONDITION_REQUIRED: -32028,
+	TOO_MANY_REQUESTS: -32029,
+	CLIENT_CLOSED_REQUEST: -32099
+};
+/** Map error codes to HTTP status codes */
+const CRPC_ERROR_CODE_TO_HTTP = {
+	PARSE_ERROR: 400,
+	BAD_REQUEST: 400,
+	UNAUTHORIZED: 401,
+	PAYMENT_REQUIRED: 402,
+	FORBIDDEN: 403,
+	NOT_FOUND: 404,
+	METHOD_NOT_SUPPORTED: 405,
+	TIMEOUT: 408,
+	CONFLICT: 409,
+	PRECONDITION_FAILED: 412,
+	PAYLOAD_TOO_LARGE: 413,
+	UNSUPPORTED_MEDIA_TYPE: 415,
+	UNPROCESSABLE_CONTENT: 422,
+	PRECONDITION_REQUIRED: 428,
+	TOO_MANY_REQUESTS: 429,
+	CLIENT_CLOSED_REQUEST: 499,
+	INTERNAL_SERVER_ERROR: 500,
+	NOT_IMPLEMENTED: 501,
+	BAD_GATEWAY: 502,
+	SERVICE_UNAVAILABLE: 503,
+	GATEWAY_TIMEOUT: 504
+};
+/** Extract Error from unknown cause (from tRPC) */
+function getCauseFromUnknown(cause) {
+	if (cause instanceof Error) return cause;
+	if (typeof cause === "undefined" || typeof cause === "function" || cause === null) return;
+	if (typeof cause !== "object") return new Error(String(cause));
+}
+/**
+* tRPC-style error extending ConvexError
+*
+* @example
+* ```typescript
+* throw new CRPCError({
+*   code: 'BAD_REQUEST',
+*   message: 'Invalid input',
+*   cause: originalError,
+* });
+* ```
+*/
+var CRPCError = class extends ConvexError {
+	code;
+	cause;
+	constructor(opts) {
+		const cause = getCauseFromUnknown(opts.cause);
+		const message = opts.message ?? cause?.message ?? opts.code;
+		super({
+			code: opts.code,
+			message
+		});
+		this.name = "CRPCError";
+		this.code = opts.code;
+		this.cause = cause;
+	}
+};
+/**
+* Wrap unknown error in CRPCError (from tRPC)
+*
+* @example
+* ```typescript
+* try {
+*   await someOperation();
+* } catch (error) {
+*   throw getCRPCErrorFromUnknown(error);
+* }
+* ```
+*/
+function getCRPCErrorFromUnknown(cause) {
+	if (cause instanceof CRPCError) return cause;
+	if (cause instanceof Error && cause.name === "CRPCError") return cause;
+	const error = new CRPCError({
+		code: "INTERNAL_SERVER_ERROR",
+		cause
+	});
+	if (cause instanceof Error && cause.stack) error.stack = cause.stack;
+	return error;
+}
+/**
+* Get HTTP status code from CRPCError
+*
+* @example
+* ```typescript
+* const httpStatus = getHTTPStatusCodeFromError(error); // 400
+* ```
+*/
+function getHTTPStatusCodeFromError(error) {
+	return CRPC_ERROR_CODE_TO_HTTP[error.code] ?? 500;
+}
+/** Type guard for CRPCError */
+function isCRPCError(error) {
+	return error instanceof CRPCError;
+}
+
 //#endregion
 export { ActionProcedureBuilder, CRPCError, CRPC_ERROR_CODES_BY_KEY, CRPC_ERROR_CODE_TO_HTTP, MutationProcedureBuilder, ProcedureBuilder, QueryProcedureBuilder, createCallerFactory, createLazyCaller, createMiddlewareFactory, createServerCaller, getCRPCErrorFromUnknown, getHTTPStatusCodeFromError, initCRPC, isCRPCError };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-convex",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "Better Convex - React Query integration and CLI tools for Convex",
   "keywords": [
     "convex",