@onmax/nuxt-better-auth 0.0.2-alpha.10 → 0.0.2-alpha.11

package/dist/module.json

@@ -4,7 +4,7 @@
   "compatibility": {
     "nuxt": ">=3.0.0"
   },
-  "version": "0.0.2-alpha.10",
+  "version": "0.0.2-alpha.11",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/module.mjs

@@ -1,6 +1,6 @@
 import { existsSync } from 'node:fs';
 import { mkdir, writeFile } from 'node:fs/promises';
-import { defineNuxtModule, createResolver, hasNuxtModule, addTemplate, addTypeTemplate, updateTemplates, addServerImportsDir, addServerScanDir, addServerHandler, addImportsDir, addPlugin, addComponentsDir, extendPages } from '@nuxt/kit';
+import { defineNuxtModule, createResolver, hasNuxtModule, addTemplate, addTypeTemplate, updateTemplates, addServerImportsDir, addServerImports, addServerScanDir, addServerHandler, addImportsDir, addPlugin, addComponentsDir, extendPages } from '@nuxt/kit';
 import { consola as consola$1 } from 'consola';
 import { defu } from 'defu';
 import { join } from 'pathe';
@@ -162,7 +162,15 @@ function getMysqlType(type, fieldName) {
 }
 async function loadUserAuthConfig(configPath, throwOnError = false) {
   const { createJiti } = await import('jiti');
-  const jiti = createJiti(import.meta.url, { interopDefault: true });
+  const { defineServerAuth } = await import('../dist/runtime/config.js');
+  const jiti = createJiti(import.meta.url, { interopDefault: true, moduleCache: false });
+  const key = "defineServerAuth";
+  const g = globalThis;
+  if (!g[key]) {
+    defineServerAuth._count = 0;
+    g[key] = defineServerAuth;
+  }
+  g[key]._count++;
   try {
     const mod = await jiti.import(configPath);
     const configFn = typeof mod === "object" && mod !== null && "default" in mod ? mod.default : mod;
@@ -179,6 +187,11 @@ async function loadUserAuthConfig(configPath, throwOnError = false) {
     }
     consola$1.error("[@onmax/nuxt-better-auth] Failed to load auth config for schema generation. Schema may be incomplete:", error);
     return {};
+  } finally {
+    g[key]._count--;
+    if (!g[key]._count) {
+      delete g[key];
+    }
   }
 }
 
@@ -244,6 +257,9 @@ const module$1 = defineNuxtModule({
     nuxt.options.alias["#nuxt-better-auth"] = resolver.resolve("./runtime/types/augment");
     nuxt.options.alias["#auth/server"] = serverConfigPath;
     nuxt.options.alias["#auth/client"] = clientConfigPath;
+    if (secondaryStorageEnabled && !nuxt.options.alias["hub:kv"]) {
+      throw new Error("[nuxt-better-auth] hub:kv not found. Ensure @nuxthub/core is loaded before this module and hub.kv is enabled.");
+    }
     const secondaryStorageCode = secondaryStorageEnabled ? `import { kv } from '../hub/kv.mjs'
 export function createSecondaryStorage() {
   return {
@@ -254,6 +270,9 @@ export function createSecondaryStorage() {
 }` : `export function createSecondaryStorage() { return undefined }`;
     const secondaryStorageTemplate = addTemplate({ filename: "better-auth/secondary-storage.mjs", getContents: () => secondaryStorageCode, write: true });
     nuxt.options.alias["#auth/secondary-storage"] = secondaryStorageTemplate.dst;
+    if (hasHubDb && !nuxt.options.alias["hub:db"]) {
+      throw new Error("[nuxt-better-auth] hub:db not found. Ensure @nuxthub/core is loaded before this module and hub.db is configured.");
+    }
     const hubDialect = getHubDialect(hub) ?? "sqlite";
     const databaseCode = hasHubDb ? `import { db, schema } from '../hub/db.mjs'
 import { drizzleAdapter } from 'better-auth/adapters/drizzle'
@@ -311,6 +330,18 @@ declare module '#nuxt-better-auth' {
     ${hasHubDb ? `db: typeof import('hub:db')['db']` : ""}
   }
 }
+
+// Augment the config module to use the extended ServerAuthContext
+interface _AugmentedServerAuthContext {
+  runtimeConfig: RuntimeConfig
+  ${hasHubDb ? `db: typeof import('hub:db')['db']` : "db: unknown"}
+}
+
+declare module '@onmax/nuxt-better-auth/config' {
+  import type { BetterAuthOptions } from 'better-auth'
+  type ServerAuthConfig = Omit<BetterAuthOptions, 'database' | 'secret' | 'baseURL'>
+  export function defineServerAuth<T extends ServerAuthConfig>(config: (ctx: _AugmentedServerAuthContext) => T): (ctx: _AugmentedServerAuthContext) => T
+}
 `
     });
     addTypeTemplate({
@@ -325,19 +356,32 @@ declare module '#nuxt-better-auth' {
     addTypeTemplate({
       filename: "types/nuxt-better-auth-nitro.d.ts",
       getContents: () => `
+declare module 'nitropack' {
+  interface NitroRouteRules {
+    auth?: import('${resolver.resolve("./runtime/types")}').AuthMeta
+  }
+  interface NitroRouteConfig {
+    auth?: import('${resolver.resolve("./runtime/types")}').AuthMeta
+  }
+}
 declare module 'nitropack/types' {
   interface NitroRouteRules {
     auth?: import('${resolver.resolve("./runtime/types")}').AuthMeta
   }
+  interface NitroRouteConfig {
+    auth?: import('${resolver.resolve("./runtime/types")}').AuthMeta
+  }
 }
+export {}
 `
-    });
+    }, { nuxt: true, nitro: true, node: true });
     nuxt.hook("builder:watch", async (_event, relativePath) => {
       if (relativePath.includes("auth.config")) {
         await updateTemplates({ filter: (t) => t.filename.includes("nuxt-better-auth") });
       }
     });
     addServerImportsDir(resolver.resolve("./runtime/server/utils"));
+    addServerImports([{ name: "defineServerAuth", from: resolver.resolve("./runtime/config") }]);
     addServerScanDir(resolver.resolve("./runtime/server/middleware"));
     addServerHandler({ route: "/api/auth/**", handler: resolver.resolve("./runtime/server/api/auth/[...all]") });
     addImportsDir(resolver.resolve("./runtime/app/composables"));

package/dist/runtime/server/api/_better-auth/config.get.js

@@ -1,9 +1,9 @@
 import { defineEventHandler } from "h3";
 import { useRuntimeConfig } from "nitropack/runtime";
 import { serverAuth } from "../../utils/auth.js";
-export default defineEventHandler(async (event) => {
+export default defineEventHandler(async () => {
   try {
-    const auth = await serverAuth(event);
+    const auth = serverAuth();
     const options = auth.options;
     const runtimeConfig = useRuntimeConfig();
     const publicAuth = runtimeConfig.public?.auth;

package/dist/runtime/server/api/auth/[...all].js

@@ -1,6 +1,6 @@
 import { defineEventHandler, toWebRequest } from "h3";
 import { serverAuth } from "../../utils/auth.js";
 export default defineEventHandler(async (event) => {
-  const auth = await serverAuth(event);
+  const auth = serverAuth();
   return auth.handler(toWebRequest(event));
 });

package/dist/runtime/server/utils/auth.d.ts

@@ -1,11 +1,5 @@
 import type { Auth } from 'better-auth';
-import type { H3Event } from 'h3';
 import createServerAuth from '#auth/server';
 type AuthInstance = Auth<ReturnType<typeof createServerAuth>>;
-declare module 'h3' {
-    interface H3EventContext {
-        _betterAuth?: AuthInstance;
-    }
-}
-export declare function serverAuth(event: H3Event): Promise<AuthInstance>;
+export declare function serverAuth(): AuthInstance;
 export {};

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

@@ -2,31 +2,23 @@ import { createDatabase, db } from "#auth/database";
 import { createSecondaryStorage } from "#auth/secondary-storage";
 import createServerAuth from "#auth/server";
 import { betterAuth } from "better-auth";
-import { consola } from "consola";
-import { getRequestURL } from "h3";
 import { useRuntimeConfig } from "nitropack/runtime";
-const logger = consola.withTag("nuxt-better-auth");
-function getBaseURL(event, siteUrl) {
-  if (siteUrl)
-    return siteUrl;
-  const origin = getRequestURL(event).origin;
-  if (process.env.NODE_ENV === "production")
-    throw new Error("siteUrl must be configured in production. Set NUXT_PUBLIC_SITE_URL or configure in nuxt.config.");
-  logger.warn("siteUrl not set, auto-detected:", origin);
-  return origin;
-}
-export async function serverAuth(event) {
-  if (event.context._betterAuth)
-    return event.context._betterAuth;
+let _auth = null;
+export function serverAuth() {
+  if (_auth)
+    return _auth;
   const runtimeConfig = useRuntimeConfig();
+  const siteUrl = runtimeConfig.public.siteUrl;
+  if (!siteUrl)
+    throw new Error("siteUrl must be configured. Set NUXT_PUBLIC_SITE_URL or configure in nuxt.config.");
   const database = createDatabase();
   const userConfig = createServerAuth({ runtimeConfig, db });
-  event.context._betterAuth = betterAuth({
+  _auth = betterAuth({
     ...userConfig,
     ...database && { database },
     secondaryStorage: createSecondaryStorage(),
     secret: runtimeConfig.betterAuthSecret,
-    baseURL: getBaseURL(event, runtimeConfig.public.siteUrl)
+    baseURL: siteUrl
   });
-  return event.context._betterAuth;
+  return _auth;
 }

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

@@ -2,7 +2,7 @@ import { createError } from "h3";
 import { matchesUser } from "../../utils/match-user.js";
 import { serverAuth } from "./auth.js";
 export async function getUserSession(event) {
-  const auth = await serverAuth(event);
+  const auth = serverAuth();
   const session = await auth.api.getSession({ headers: event.headers });
   return session;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@onmax/nuxt-better-auth",
   "type": "module",
-  "version": "0.0.2-alpha.10",
+  "version": "0.0.2-alpha.11",
   "packageManager": "pnpm@10.15.1",
   "description": "Nuxt module for Better Auth integration with NuxtHub, route protection, session management, and role-based access",
   "author": "onmax",