@nuxtjs/better-auth 0.3.13 → 0.3.15

package/README.md

@@ -1,5 +1,10 @@
 # `@nuxtjs/better-auth`
 
+[![npm version](https://comark-ui.onmax.me/badge.svg?source=npm-version&package=%40nuxtjs%2Fbetter-auth&icon=npm)](https://www.npmjs.com/package/@nuxtjs/better-auth)
+[![npm downloads](https://comark-ui.onmax.me/badge.svg?source=npm-downloads&package=%40nuxtjs%2Fbetter-auth&period=month&icon=npm)](https://www.npmjs.com/package/@nuxtjs/better-auth)
+[![license](https://comark-ui.onmax.me/badge.svg?label=license&value=MIT)](https://github.com/nuxt-modules/better-auth/blob/main/LICENSE)
+[![docs](https://comark-ui.onmax.me/badge.svg?label=docs&value=better-auth.nuxt.dev)](https://better-auth.nuxt.dev)
+
 Nuxt module for [Better Auth](https://better-auth.com) with Nuxt-native route protection, SSR-safe session access, auto-imported helpers, and optional NuxtHub-backed schema generation.
 
 ## Who this is for

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxtjs/better-auth",
-  "version": "0.3.13",
+  "version": "0.3.15",
   "configKey": "auth",
   "compatibility": {
     "nuxt": ">=4.0.0"

package/dist/module.mjs

@@ -1,5 +1,5 @@
-import { existsSync, readFileSync, statSync, writeFileSync } from 'node:fs';
-import { mkdir, writeFile } from 'node:fs/promises';
+import { existsSync, readFileSync, statSync, readdirSync, writeFileSync } from 'node:fs';
+import { readFile, mkdir, writeFile, rename, rm } from 'node:fs/promises';
 import { getLayerDirectories, resolveServerVariant, hasNuxtCompatibility, hasNuxtModuleCompatibility, addTypeTemplate, updateTemplates, addServerImports, addServerHandler, addNitroPlugin, addImports, addPlugin, addComponentsDir, addRouteMiddleware, extendPages, addTemplate, hasNuxtModule, defineNuxtModule, createResolver, getNitroVersion } from '@nuxt/kit';
 import { consola as consola$1 } from 'consola';
 import { defineDiagnostics, Diagnostic, formatDiagnostic } from 'nostics';
@@ -8,12 +8,12 @@ import { createRequire } from 'node:module';
 import { join as join$1 } from 'node:path';
 import { defu } from 'defu';
 import { toRouteMatcher, createRouter } from 'radix3';
-import { randomBytes } from 'node:crypto';
+import { createHash, randomUUID, randomBytes } from 'node:crypto';
 import { isCI, isTest } from 'std-env';
 import { isInternalAssetPath } from '../dist/runtime/internal/auth-route-rules.js';
 export { defineClientAuth, defineServerAuth } from '../dist/runtime/config.js';
 
-const version = "0.3.13";
+const version = "0.3.15";
 
 const CONFIG_EXTENSIONS = [".ts", ".js", ".mts", ".cts", ".mjs", ".cjs"];
 const CONFIG_EXTENSION_RE = /\.[cm]?[jt]s$/;
@@ -488,10 +488,10 @@ function dialectToProvider(dialect) {
 }
 const EXACT_VERSION_RE = /^\d+\.\d+\.\d+(?:-[\w.]+)?$/;
 const LOCKFILES = [["pnpm-lock.yaml", "pnpm"], ["yarn.lock", "yarn"], ["bun.lock", "bun"], ["bun.lockb", "bun"], ["package-lock.json", "npm"]];
-function readInstalledPackage(name) {
+function findInstalledPackage(name, parent) {
   let entry;
   try {
-    entry = createRequire(import.meta.url).resolve(name === "auth" ? "auth/api" : name);
+    entry = createRequire(parent).resolve(name === "auth" ? "auth/api" : name);
   } catch {
     return void 0;
   }
@@ -501,9 +501,12 @@ function readInstalledPackage(name) {
       continue;
     const pkg = JSON.parse(readFileSync(file, "utf8"));
     if (pkg.name === name)
-      return pkg;
+      return { dir, pkg };
   }
 }
+function readInstalledPackage(name) {
+  return findInstalledPackage(name, import.meta.url)?.pkg;
+}
 function devInstallCommand(spec, rootDir) {
   const agent = process.env.npm_config_user_agent?.split("/")[0];
   const manager = LOCKFILES.find(([file]) => existsSync(join(rootDir, file)))?.[1] ?? LOCKFILES.find(([, name]) => name === agent)?.[1] ?? "npm";
@@ -520,8 +523,7 @@ function checkBetterAuthCli(rootDir, readPackage = readInstalledPackage) {
     return { warn: diagnostics.NUXT_AUTH_CLI_VERSION_MISMATCH({ cliVersion: cli.version ?? cliBetterAuthVersion, cliBetterAuthVersion, betterAuthVersion, command: devInstallCommand(spec, rootDir) }) };
   return {};
 }
-async function generateDrizzleSchema(authOptions, dialect, schemaOptions) {
-  const { generateDrizzleSchema: generateDrizzleSchema2 } = await import('auth/api');
+function resolveDrizzleSchemaInput(authOptions, dialect, schemaOptions) {
   const provider = dialectToProvider(dialect);
   const options = {
     ...authOptions,
@@ -542,6 +544,11 @@ async function generateDrizzleSchema(authOptions, dialect, schemaOptions) {
       adapterConfig: { usePlural: schemaOptions?.usePlural ?? false }
     }
   };
+  return { options, adapter };
+}
+async function generateDrizzleSchema(authOptions, dialect, schemaOptions) {
+  const { generateDrizzleSchema: generateDrizzleSchema2 } = await import('auth/api');
+  const { options, adapter } = resolveDrizzleSchemaInput(authOptions, dialect, schemaOptions);
   const result = await generateDrizzleSchema2({
     adapter,
     options
@@ -551,6 +558,94 @@ async function generateDrizzleSchema(authOptions, dialect, schemaOptions) {
   }
   return result.code;
 }
+const SCHEMA_CACHE_REVISION = 1;
+const SCHEMA_GENERATOR_PACKAGES = ["auth", "better-auth", "@better-auth/core", "prettier"];
+function hashPackageContents(dir) {
+  const hash = createHash("sha256");
+  function visit(relativeDir) {
+    const entries = readdirSync(join(dir, relativeDir), { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name));
+    for (const entry of entries) {
+      if (entry.name === "node_modules" || entry.name === ".git")
+        continue;
+      const relativePath = join(relativeDir, entry.name);
+      if (entry.isDirectory()) {
+        visit(relativePath);
+      } else {
+        hash.update(relativePath).update("\0");
+        hash.update(createHash("sha256").update(readFileSync(join(dir, relativePath))).digest());
+      }
+    }
+  }
+  visit("");
+  return hash.digest("hex");
+}
+function getSchemaGeneratorIdentity() {
+  const authApi = createRequire(import.meta.url).resolve("auth/api");
+  const generatorHash = createHash("sha256").update(readFileSync(authApi)).digest("hex");
+  const packages = SCHEMA_GENERATOR_PACKAGES.map((name) => {
+    const installed = findInstalledPackage(name, authApi);
+    const contentHash = installed && (name === "better-auth" || name === "@better-auth/core") ? hashPackageContents(installed.dir) : "";
+    return `${name}@${installed?.pkg.version} ${installed?.dir} ${contentHash}`;
+  });
+  return [`revision ${SCHEMA_CACHE_REVISION}`, generatorHash, ...packages];
+}
+function tagSchemaValue(_key, value) {
+  switch (typeof value) {
+    case "string":
+      return `s:${value}`;
+    case "number":
+      return Number.isFinite(value) ? value : `n:${value}`;
+    case "bigint":
+      return `b:${value}`;
+    case "function":
+      return `f:${String(value)}`;
+    case "symbol":
+      return `y:${String(value)}`;
+    case "undefined":
+      return "u:";
+    default:
+      return value;
+  }
+}
+async function getDrizzleSchemaKey(authOptions, dialect, schemaOptions) {
+  const { getAuthTables } = await import('better-auth/db');
+  const { options, adapter } = resolveDrizzleSchemaInput(authOptions, dialect, schemaOptions);
+  try {
+    const input = JSON.stringify([getAuthTables(options), options.advanced?.database?.generateId, adapter.options, getSchemaGeneratorIdentity()], tagSchemaValue);
+    return createHash("sha256").update(input).digest("hex");
+  } catch {
+    return void 0;
+  }
+}
+async function readCachedSchema(cacheFile, key) {
+  try {
+    const entry = JSON.parse(await readFile(cacheFile, "utf8"));
+    return entry.key === key && typeof entry.code === "string" ? entry.code : void 0;
+  } catch {
+    return void 0;
+  }
+}
+async function writeCachedSchema(cacheFile, key, code) {
+  const tempFile = `${cacheFile}.${randomUUID()}.tmp`;
+  try {
+    await mkdir(dirname(cacheFile), { recursive: true });
+    await writeFile(tempFile, JSON.stringify({ key, code }));
+    await rename(tempFile, cacheFile);
+  } catch {
+    await rm(tempFile, { force: true }).catch(() => {
+    });
+  }
+}
+async function generateCachedDrizzleSchema(authOptions, dialect, schemaOptions, cacheFile) {
+  const key = await getDrizzleSchemaKey(authOptions, dialect, schemaOptions);
+  const cached = key && await readCachedSchema(cacheFile, key);
+  if (cached)
+    return cached;
+  const code = await generateDrizzleSchema(authOptions, dialect, schemaOptions);
+  if (key)
+    await writeCachedSchema(cacheFile, key, code);
+  return code;
+}
 function loadLocalEnv(rootDir) {
   if (!rootDir)
     return;
@@ -713,7 +808,8 @@ async function setupBetterAuthSchema(nuxt, serverConfigPath, options, consola, h
     };
     const hubCasing = getHubCasing(hub);
     const schemaOptions = { ...options.schema, useUuid: userConfig.advanced?.database?.generateId === "uuid", casing: options.schema?.casing ?? hubCasing };
-    const schemaCode = await generateDrizzleSchema(authOptions, dialect, schemaOptions);
+    const schemaCacheFile = join(nuxt.options.buildDir, "cache", "better-auth", `schema.${dialect}.json`);
+    const schemaCode = await generateCachedDrizzleSchema(authOptions, dialect, schemaOptions, schemaCacheFile);
     const { getAuthTables } = await import('better-auth/db');
     const { initGetModelName } = await import('better-auth/adapters');
     const authTables = getAuthTables(authOptions);
@@ -966,7 +1062,8 @@ function getCloudflareContext(event) {
 
 function resolveHyperdrive(event) {
   const cloudflareEnv = getCloudflareContext(event)?.env
-  return cloudflareEnv?.POSTGRES || process.env.POSTGRES || globalThis.__env__?.POSTGRES || globalThis.POSTGRES
+  const runtimeEnv = event?.req?.runtime?.cloudflare?.env
+  return cloudflareEnv?.POSTGRES || runtimeEnv?.POSTGRES || process.env.POSTGRES || globalThis.__env__?.POSTGRES || globalThis.POSTGRES
 }
 
 function scheduleCleanup(event, cleanup) {
@@ -1008,6 +1105,11 @@ function registerClientCleanup(event, client) {
   response.once('close', cleanup)
 }
 
+// Hyperdrive clients belong to one request; any other database is shared by the whole process.
+export function isRequestScopedDatabase(event) {
+  return Boolean(resolveHyperdrive(event)?.connectionString)
+}
+
 export function createDatabase(event) {
   const hyperdrive = resolveHyperdrive(event)
   if (!hyperdrive?.connectionString)
@@ -1045,10 +1147,12 @@ import * as schema from './schema.${input.hubDialect}.mjs'
 import { drizzleAdapter } from 'better-auth/adapters/drizzle'
 const rawDialect = '${input.hubDialect}'
 const dialect = rawDialect === 'postgresql' ? 'pg' : rawDialect
+export function isRequestScopedDatabase() { return false }
 export function createDatabase() { return drizzleAdapter(db, { provider: dialect, schema, usePlural: ${input.usePlural}, camelCase: ${input.camelCase} }) }
 export { db }`;
   }
-  return `export function createDatabase() { return undefined }
+  return `export function isRequestScopedDatabase() { return false }
+export function createDatabase() { return undefined }
 export const db = undefined`;
 }
 function buildSchemaExportCode(hasHubDb, hubDialect, modelNames = {}) {
@@ -1330,6 +1434,7 @@ type AvailableRouterMethod<_ReqT extends NitroFetchRequest> = 'get' | 'head' | '
 declare module '#auth/database' {
   import type { BetterAuthOptions } from 'better-auth'
   export function createDatabase(event?: import('${h3TypesPath}').H3Event): BetterAuthOptions['database']
+  export function isRequestScopedDatabase(event?: import('${h3TypesPath}').H3Event): boolean
   export const db: ${hasHubDb ? `typeof import('@nuxthub/db')['db']` : "undefined"}
 }
 `

package/dist/runtime/app/components/BetterAuthState.d.vue.ts

@@ -1,14 +1,16 @@
-declare var __VLS_1: {
-    loggedIn: boolean;
-    user: import("../../types.js").AuthUser | null;
-    session: import("../../types.js").ClientAuthSession | null;
-    signOut: (options?: import("../composables/useUserSession.js").SignOutOptions) => Promise<void>;
-}, __VLS_3: {};
-type __VLS_Slots = {} & {
-    default?: (props: typeof __VLS_1) => any;
-} & {
-    placeholder?: (props: typeof __VLS_3) => any;
+declare const __VLS_template: () => {
+    __VLS_Slots: {
+        default?: (props: {
+            loggedIn: boolean;
+            user: import("../../types.js").AuthUser | null;
+            session: import("../../types.js").ClientAuthSession | null;
+            signOut: (options?: import("../composables/useUserSession.js").SignOutOptions) => Promise<void>;
+        }) => any;
+    } & {
+        placeholder?: (props: {}) => any;
+    };
 };
+type __VLS_Slots = ReturnType<typeof __VLS_template>['__VLS_Slots'];
 declare const __VLS_base: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
 declare const _default: typeof __VLS_export;

package/dist/runtime/app/components/BetterAuthState.vue.d.ts

@@ -1,14 +1,16 @@
-declare var __VLS_1: {
-    loggedIn: boolean;
-    user: import("../../types.js").AuthUser | null;
-    session: import("../../types.js").ClientAuthSession | null;
-    signOut: (options?: import("../composables/useUserSession.js").SignOutOptions) => Promise<void>;
-}, __VLS_3: {};
-type __VLS_Slots = {} & {
-    default?: (props: typeof __VLS_1) => any;
-} & {
-    placeholder?: (props: typeof __VLS_3) => any;
+declare const __VLS_template: () => {
+    __VLS_Slots: {
+        default?: (props: {
+            loggedIn: boolean;
+            user: import("../../types.js").AuthUser | null;
+            session: import("../../types.js").ClientAuthSession | null;
+            signOut: (options?: import("../composables/useUserSession.js").SignOutOptions) => Promise<void>;
+        }) => any;
+    } & {
+        placeholder?: (props: {}) => any;
+    };
 };
+type __VLS_Slots = ReturnType<typeof __VLS_template>['__VLS_Slots'];
 declare const __VLS_base: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
 declare const _default: typeof __VLS_export;

package/dist/runtime/server/utils/auth.js

@@ -1,5 +1,5 @@
 import { betterAuth, env } from "better-auth";
-import { createDatabase, db } from "#auth/database";
+import { createDatabase, db, isRequestScopedDatabase } from "#auth/database";
 import createServerAuth from "#auth/server";
 import { getConfiguredAuthSecret, getDerivedAuthSecret, hasExplicitAuthSecret, prepareAuthSecret } from "../internal/auth-secret.js";
 import { getRequestHost, getRequestProtocol, useRuntimeConfig } from "../internal/nitro-compat.js";
@@ -248,6 +248,15 @@ export function serverAuth(event) {
   const requestContext = event ? getRequestAuthContext(event) : void 0;
   if (requestContext?.[requestAuthKey])
     return requestContext[requestAuthKey];
+  const requestScopedDatabase = isRequestScopedDatabase(event);
+  if (!requestScopedDatabase) {
+    const cached = _authCache.get(cacheKey);
+    if (cached) {
+      if (requestContext)
+        requestContext[requestAuthKey] = cached;
+      return cached;
+    }
+  }
   userConfig ??= createServerAuth({ runtimeConfig, db, requestOrigin });
   const usesDerivedSecret = derived.available && userConfig.secrets === void 0 && !hasExplicitAuthSecret(runtimeConfig);
   const derivedSecretMissing = usesDerivedSecret && !derived.secret;
@@ -276,15 +285,7 @@ export function serverAuth(event) {
     console.warn('[nuxt-better-auth] rateLimit.storage: "secondary-storage" requires secondaryStorage. Falling back to process-local memory. Set rateLimit.storage to "database" or provide rateLimit.customStorage for shared limits.');
   }
   const rateLimit = useMemoryRateLimit ? { ...userConfig.rateLimit, storage: "memory" } : userConfig.rateLimit;
-  const cacheable = !database && !derivedSecretMissing;
-  if (cacheable) {
-    const cached = _authCache.get(cacheKey);
-    if (cached) {
-      if (requestContext)
-        requestContext[requestAuthKey] = cached;
-      return cached;
-    }
-  }
+  const cacheable = !requestScopedDatabase && !derivedSecretMissing;
   const authOptions = {
     ...userConfig,
     ...userConfig.plugins ? { plugins: [...userConfig.plugins] } : {},

package/dist/runtime/server/virtual-modules.d.ts

@@ -1,6 +1,7 @@
 declare module '#auth/database' {
   export const db: any
   export function createDatabase(...args: any[]): any
+  export function isRequestScopedDatabase(...args: any[]): boolean
 }
 
 declare module '#imports' {

package/dist/runtime/test-utils/server/handler.js

@@ -10,9 +10,10 @@ const requestSchema = z.discriminatedUnion("action", [
 const ownedUsers = /* @__PURE__ */ new Set();
 export default defineEventHandler(async (event) => {
   const token = useRuntimeConfig().betterAuthTestToken;
-  if (!token || toWebRequest(event).headers.get("x-nuxt-auth-test") !== token)
+  const request = toWebRequest(event);
+  if (!token || request.headers.get("x-nuxt-auth-test") !== token)
     throw createAuthError(404, "Not found");
-  const body = requestSchema.parse(parseJSON(await toWebRequest(event).text()));
+  const body = requestSchema.parse(parseJSON(await request.text()));
   const context = await serverAuth(event).$context;
   const test = context.test;
   if (body.action === "createUser") {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nuxtjs/better-auth",
   "type": "module",
-  "version": "0.3.13",
+  "version": "0.3.15",
   "description": "Nuxt module for Better Auth integration with NuxtHub, route protection, session management, and role-based access",
   "author": "onmax",
   "license": "MIT",
@@ -61,7 +61,7 @@
   "peerDependencies": {
     "@nuxt/test-utils": "^4.1.0",
     "@nuxthub/core": ">=0.10.5",
-    "auth": "1.7.12",
+    "auth": "1.7.18",
     "better-auth": ">=1.7.3 <2"
   },
   "peerDependenciesMeta": {
@@ -76,58 +76,58 @@
     }
   },
   "dependencies": {
-    "@nuxt/devtools-kit": "^3.4.1",
-    "@nuxt/kit": "^4.6.0",
-    "@types/node": "^24.13.3",
+    "@nuxt/devtools-kit": "^4.0.0",
+    "@nuxt/kit": "^4.6.2",
+    "@types/node": "^26.0.0",
     "consola": "^3.4.2",
     "cookie-es": "^3.1.1",
     "defu": "^6.1.7",
     "get-port-please": "^3.2.0",
-    "h3": "^2.0.0",
+    "h3": "^2.0.8",
     "jiti": "^2.7.0",
-    "nostics": "^1.2.0",
+    "nostics": "^1.3.0",
     "pathe": "^2.0.3",
     "radix3": "^1.1.2",
-    "std-env": "^4.2.0",
+    "std-env": "^4.3.0",
     "ufo": "^1.6.4",
-    "zod": "^4.4.3"
+    "zod": "^4.6.7"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^10.0.0",
     "@libsql/client": "^0.18.0",
     "@libsql/linux-x64-gnu": "0.5.29",
-    "@nuxt/devtools": "^3.4.1",
+    "@nuxt/devtools": "^4.0.0",
     "@nuxt/fonts": "1.2.0",
     "@nuxt/module-builder": "^1.0.3",
-    "@nuxt/schema": "^4.6.0",
-    "@nuxt/test-utils": "^4.3.3",
-    "@nuxthub/core": "^0.10.8",
-    "@pinia/nuxt": "^1.0.2",
+    "@nuxt/schema": "^4.6.2",
+    "@nuxt/test-utils": "^4.3.4",
+    "@nuxthub/core": "^0.10.11",
+    "@pinia/nuxt": "^1.0.3",
     "@types/better-sqlite3": "^9.6.0",
     "@typescript/typescript6": "6.0.2",
-    "@vue/test-utils": "^2.4.6",
-    "auth": "1.7.12",
-    "better-auth": "1.7.12",
-    "better-call": "1.4.4",
-    "better-sqlite3": "^13.0.0",
-    "drizzle-kit": "^0.31.10",
-    "drizzle-orm": "^0.45.2",
-    "eslint": "^10.8.1",
-    "happy-dom": "^21.0.0",
-    "nitropack": "2.13.5",
-    "nuxt": "^4.6.0",
-    "pinia": "^4.0.3",
-    "pkg-pr-new": "0.0.92",
-    "playwright-core": "1.64.1",
-    "postgres": "^3.4.9",
+    "@vue/test-utils": "^2.5.1",
+    "auth": "1.7.18",
+    "better-auth": "1.7.18",
+    "better-call": "1.4.5",
+    "better-sqlite3": "^13.0.3",
+    "drizzle-kit": "^0.31.11",
+    "drizzle-orm": "^0.45.4",
+    "eslint": "^10.13.0",
+    "happy-dom": "^21.0.4",
+    "nitropack": "2.13.6",
+    "nuxt": "^4.6.2",
+    "pinia": "^4.1.0",
+    "pkg-pr-new": "0.0.93",
+    "playwright-core": "1.65.0",
+    "postgres": "^4.0.0",
     "typescript": "~7.0.0",
     "typescript-next": "npm:typescript@~7.0.0",
     "unstorage": "^1.17.5",
-    "vitest": "^5.0.0",
-    "vue": "3.5.44",
-    "vue-tsc": "^3.3.10",
-    "wrangler": "4.152.0",
-    "yaml": "^2.9.0"
+    "vitest": "^5.0.5",
+    "vue": "3.5.45",
+    "vue-tsc": "^3.3.13",
+    "wrangler": "4.158.0",
+    "yaml": "^2.9.1"
   },
   "scripts": {
     "build": "pnpm build:docs",