@onmax/nuxt-better-auth 0.0.2-alpha.2 → 0.0.2-alpha.21

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

@@ -1,10 +1,7 @@
+import type { Auth } from 'better-auth';
 import type { H3Event } from 'h3';
-import { betterAuth } from 'better-auth';
-type AuthInstance = ReturnType<typeof betterAuth>;
-declare module 'h3' {
-    interface H3EventContext {
-        _betterAuth?: AuthInstance;
-    }
-}
-export declare function serverAuth(event: H3Event): Promise<AuthInstance>;
+import createServerAuth from '#auth/server';
+type AuthInstance = Auth<ReturnType<typeof createServerAuth>>;
+/** Returns Better Auth instance. Pass event for accurate URL detection on first call. */
+export declare function serverAuth(event?: H3Event): AuthInstance;
 export {};

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

@@ -2,31 +2,80 @@ 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 { getRequestHost, getRequestProtocol } 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;
+import { withoutProtocol } from "ufo";
+let _auth = null;
+function validateURL(url) {
+  try {
+    return new URL(url).origin;
+  } catch {
+    throw new Error(`Invalid siteUrl: "${url}". Must be a valid URL.`);
+  }
 }
-export async function serverAuth(event) {
-  if (event.context._betterAuth)
-    return event.context._betterAuth;
+function getNitroOrigin(e) {
+  const cert = process.env.NITRO_SSL_CERT;
+  const key = process.env.NITRO_SSL_KEY;
+  let host = process.env.NITRO_HOST || process.env.HOST;
+  let port;
+  if (import.meta.dev)
+    port = process.env.NITRO_PORT || process.env.PORT || "3000";
+  let protocol = cert && key || !import.meta.dev ? "https" : "http";
+  try {
+    if ((import.meta.dev || import.meta.prerender) && process.env.__NUXT_DEV__) {
+      const origin = JSON.parse(process.env.__NUXT_DEV__).proxy.url;
+      host = withoutProtocol(origin);
+      protocol = origin.includes("https") ? "https" : "http";
+    } else if ((import.meta.dev || import.meta.prerender) && process.env.NUXT_VITE_NODE_OPTIONS) {
+      const origin = JSON.parse(process.env.NUXT_VITE_NODE_OPTIONS).baseURL.replace("/__nuxt_vite_node__", "");
+      host = withoutProtocol(origin);
+      protocol = origin.includes("https") ? "https" : "http";
+    } else if (e) {
+      host = getRequestHost(e, { xForwardedHost: true }) || host;
+      protocol = getRequestProtocol(e, { xForwardedProto: true }) || protocol;
+    }
+  } catch {
+  }
+  if (!host)
+    return void 0;
+  if (host.includes(":") && !host.startsWith("[")) {
+    const hostParts = host.split(":");
+    port = hostParts.pop();
+    host = hostParts.join(":");
+  }
+  const portSuffix = port ? `:${port}` : "";
+  return `${protocol}://${host}${portSuffix}`;
+}
+function getBaseURL(event) {
+  const config = useRuntimeConfig();
+  if (config.public.siteUrl && typeof config.public.siteUrl === "string")
+    return validateURL(config.public.siteUrl);
+  const nitroOrigin = getNitroOrigin(event);
+  if (nitroOrigin)
+    return validateURL(nitroOrigin);
+  if (process.env.VERCEL_URL)
+    return validateURL(`https://${process.env.VERCEL_URL}`);
+  if (process.env.CF_PAGES_URL)
+    return validateURL(`https://${process.env.CF_PAGES_URL}`);
+  if (process.env.URL)
+    return validateURL(process.env.URL.startsWith("http") ? process.env.URL : `https://${process.env.URL}`);
+  if (import.meta.dev)
+    return "http://localhost:3000";
+  throw new Error("siteUrl required. Set NUXT_PUBLIC_SITE_URL.");
+}
+export function serverAuth(event) {
+  if (_auth)
+    return _auth;
   const runtimeConfig = useRuntimeConfig();
+  const siteUrl = getBaseURL(event);
   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

@@ -1,7 +1,8 @@
 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(event);
   const session = await auth.api.getSession({ headers: event.headers });
   return session;
 }

package/dist/runtime/types/augment.d.ts

@@ -37,6 +37,6 @@ export interface UserSessionComposable {
     waitForSession: () => Promise<void>;
     signOut: (options?: {
         onSuccess?: () => void | Promise<void>;
-    }) => Promise<unknown>;
+    }) => Promise<void>;
     updateUser: (updates: Partial<AuthUser>) => void;
 }

package/dist/runtime/types.d.ts

@@ -1,7 +1,7 @@
 import type { NitroRouteRules } from 'nitropack/types';
 import type { AuthSession, AuthUser } from './types/augment.js';
 export type { AuthSession, AuthUser, ServerAuthContext, UserSessionComposable } from './types/augment.js';
-export type { Auth, InferSession, InferUser } from 'better-auth';
+export type { Auth, InferPluginTypes, InferSession, InferUser } from 'better-auth';
 export type AuthMode = 'guest' | 'user';
 export type UserMatch<T> = {
     [K in keyof T]?: T[K] | T[K][];

package/package.json

@@ -1,14 +1,22 @@
 {
   "name": "@onmax/nuxt-better-auth",
   "type": "module",
-  "version": "0.0.2-alpha.2",
+  "version": "0.0.2-alpha.21",
   "packageManager": "pnpm@10.15.1",
   "description": "Nuxt module for Better Auth integration with NuxtHub, route protection, session management, and role-based access",
   "author": "onmax",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/onmax/nuxt-better-auth"
+    "url": "https://github.com/nuxt-modules/better-auth"
+  },
+  "agents": {
+    "skills": [
+      {
+        "name": "nuxt-better-auth",
+        "path": "./skills/nuxt-better-auth"
+      }
+    ]
   },
   "exports": {
     ".": {
@@ -18,6 +26,10 @@
     "./config": {
       "types": "./dist/runtime/config.d.ts",
       "import": "./dist/runtime/config.js"
+    },
+    "./adapters/convex": {
+      "types": "./dist/runtime/adapters/convex.d.ts",
+      "import": "./dist/runtime/adapters/convex.js"
     }
   },
   "main": "./dist/module.mjs",
@@ -28,11 +40,15 @@
       ],
       "config": [
         "./dist/runtime/config.d.ts"
+      ],
+      "adapters/convex": [
+        "./dist/runtime/adapters/convex.d.ts"
       ]
     }
   },
   "files": [
-    "dist"
+    "dist",
+    "skills"
   ],
   "scripts": {
     "prepack": "nuxt-module-build build",
@@ -41,7 +57,7 @@
     "dev:prepare": "nuxt-module-build build --stub && nuxi prepare playground",
     "dev:docs": "nuxi dev docs",
     "build:docs": "nuxi build docs",
-    "release": "bumpp && git push --follow-tags",
+    "release": "bumpp --push --no-push-all",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "typecheck": "vue-tsc --noEmit",
@@ -50,34 +66,40 @@
     "test:watch": "vitest watch"
   },
   "peerDependencies": {
-    "@nuxthub/core": ">=0.10.0",
-    "better-auth": ">=1.0.0"
+    "@nuxthub/core": ">=0.10.5",
+    "better-auth": ">=1.0.0",
+    "convex": ">=1.25.0"
   },
   "peerDependenciesMeta": {
     "@nuxthub/core": {
       "optional": true
+    },
+    "convex": {
+      "optional": true
     }
   },
   "dependencies": {
+    "@better-auth/cli": "^1.5.0-beta.3",
     "@nuxt/kit": "^4.2.2",
+    "@nuxt/ui": "^4.2.1",
     "defu": "^6.1.4",
     "jiti": "^2.4.2",
     "pathe": "^2.0.3",
-    "radix3": "^1.1.2"
+    "radix3": "^1.1.2",
+    "std-env": "^3.10.0"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^4.12.0",
-    "@better-auth/cli": "^1.4.6",
     "@libsql/client": "^0.15.15",
     "@nuxt/devtools": "^3.1.1",
     "@nuxt/devtools-kit": "^3.1.1",
     "@nuxt/module-builder": "^1.0.2",
     "@nuxt/schema": "^4.2.2",
     "@nuxt/test-utils": "^3.21.0",
-    "@nuxthub/core": "^0.10.3",
+    "@nuxthub/core": "^0.10.5",
     "@types/better-sqlite3": "^7.6.13",
     "@types/node": "latest",
-    "better-auth": "^1.4.7",
+    "better-auth": "^1.5.0-beta.3",
     "better-sqlite3": "^11.9.1",
     "bumpp": "^10.3.2",
     "changelogen": "^0.6.2",
@@ -85,6 +107,7 @@
     "drizzle-kit": "^0.31.8",
     "drizzle-orm": "^0.38.4",
     "eslint": "^9.39.1",
+    "npm-agentskills": "https://pkg.pr.new/onmax/npm-agentskills@394499e",
     "nuxt": "^4.2.2",
     "tinyexec": "^1.0.2",
     "typescript": "~5.9.3",
@@ -95,9 +118,11 @@
   },
   "pnpm": {
     "onlyBuiltDependencies": [
+      "@parcel/watcher",
       "better-sqlite3",
       "esbuild",
-      "@parcel/watcher"
+      "sharp",
+      "workerd"
     ],
     "patchedDependencies": {
       "@peculiar/x509@1.14.2": "patches/@peculiar__x509@1.14.2.patch",