@fluixi/oauth2 1.0.0-alpha.1 → 1.0.0-alpha.100

package/dist/{dpop-LVPWWADA.mjs → dpop-SGWG3K2I.mjs}

@@ -1,13 +1,13 @@
-/*! @fluixi/oauth2 v1.0.0-alpha.1 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
+/*! @fluixi/oauth2 v1.0.0-alpha.100 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
 import {
   OAuthError
-} from "./chunk-4NSOGPLM.mjs";
-import "./chunk-25WE6UWI.mjs";
+} from "./chunk-2B3I72DV.mjs";
+import "./chunk-KTGVSZE6.mjs";
 
 // src/dpop.ts
 async function loadJose() {
   try {
-    return await import("./browser-ONMHX3Z3.mjs");
+    return await import("./browser-TV25RBLT.mjs");
   } catch {
     throw new OAuthError(
       "DPoP needs `jose`. Install it: npm i jose. It is an optional peer, so a client not using DPoP does not carry it.",
@@ -15,9 +15,11 @@ async function loadJose() {
     );
   }
 }
-async function createDpopKey(alg = "ES256") {
+async function createDpopKey(alg = "ES256", options = {}) {
   const jose = await loadJose();
-  const { privateKey, publicKey } = await jose.generateKeyPair(alg, { extractable: false });
+  const { privateKey, publicKey } = await jose.generateKeyPair(alg, {
+    extractable: options.extractable ?? false
+  });
   const publicJwk = { ...await jose.exportJWK(publicKey) };
   return {
     privateKey,
@@ -26,6 +28,22 @@ async function createDpopKey(alg = "ES256") {
     alg
   };
 }
+async function exportDpopKey(key) {
+  const jose = await loadJose();
+  return { jwk: { ...await jose.exportJWK(key.privateKey) }, alg: key.alg };
+}
+var PRIVATE_MEMBERS = /* @__PURE__ */ new Set(["d", "p", "q", "dp", "dq", "qi", "oth"]);
+async function importDpopKey(stored) {
+  const jose = await loadJose();
+  const privateKey = await jose.importJWK(stored.jwk, stored.alg);
+  const publicJwk = Object.fromEntries(Object.entries(stored.jwk).filter(([k]) => !PRIVATE_MEMBERS.has(k)));
+  return {
+    privateKey,
+    publicJwk,
+    thumbprint: await jose.calculateJwkThumbprint(publicJwk, "sha256"),
+    alg: stored.alg
+  };
+}
 async function thumbprintOf(jwk) {
   const jose = await loadJose();
   return jose.calculateJwkThumbprint(jwk, "sha256");
@@ -73,6 +91,8 @@ function boundKeyOf(claims) {
 export {
   boundKeyOf,
   createDpopKey,
+  exportDpopKey,
+  importDpopKey,
   nonceFrom,
   proofFor,
   thumbprintOf,

package/dist/{dpop-NS7NKOWM.mjs → dpop-YPGCGL7S.mjs}

@@ -14,9 +14,11 @@ async function loadJose() {
     );
   }
 }
-async function createDpopKey(alg = "ES256") {
+async function createDpopKey(alg = "ES256", options = {}) {
   const jose = await loadJose();
-  const { privateKey, publicKey } = await jose.generateKeyPair(alg, { extractable: false });
+  const { privateKey, publicKey } = await jose.generateKeyPair(alg, {
+    extractable: options.extractable ?? false
+  });
   const publicJwk = { ...await jose.exportJWK(publicKey) };
   return {
     privateKey,
@@ -25,6 +27,22 @@ async function createDpopKey(alg = "ES256") {
     alg
   };
 }
+async function exportDpopKey(key) {
+  const jose = await loadJose();
+  return { jwk: { ...await jose.exportJWK(key.privateKey) }, alg: key.alg };
+}
+var PRIVATE_MEMBERS = /* @__PURE__ */ new Set(["d", "p", "q", "dp", "dq", "qi", "oth"]);
+async function importDpopKey(stored) {
+  const jose = await loadJose();
+  const privateKey = await jose.importJWK(stored.jwk, stored.alg);
+  const publicJwk = Object.fromEntries(Object.entries(stored.jwk).filter(([k]) => !PRIVATE_MEMBERS.has(k)));
+  return {
+    privateKey,
+    publicJwk,
+    thumbprint: await jose.calculateJwkThumbprint(publicJwk, "sha256"),
+    alg: stored.alg
+  };
+}
 async function thumbprintOf(jwk) {
   const jose = await loadJose();
   return jose.calculateJwkThumbprint(jwk, "sha256");
@@ -72,6 +90,8 @@ function boundKeyOf(claims) {
 export {
   boundKeyOf,
   createDpopKey,
+  exportDpopKey,
+  importDpopKey,
   nonceFrom,
   proofFor,
   thumbprintOf,

package/dist/dpop-store.cjs

@@ -56,9 +56,11 @@ async function loadJose() {
     );
   }
 }
-async function createDpopKey(alg = "ES256") {
+async function createDpopKey(alg = "ES256", options = {}) {
   const jose = await loadJose();
-  const { privateKey, publicKey } = await jose.generateKeyPair(alg, { extractable: false });
+  const { privateKey, publicKey } = await jose.generateKeyPair(alg, {
+    extractable: options.extractable ?? false
+  });
   const publicJwk = { ...await jose.exportJWK(publicKey) };
   return {
     privateKey,

package/dist/dpop-store.mjs

@@ -21,9 +21,11 @@ async function loadJose() {
     );
   }
 }
-async function createDpopKey(alg = "ES256") {
+async function createDpopKey(alg = "ES256", options = {}) {
   const jose = await loadJose();
-  const { privateKey, publicKey } = await jose.generateKeyPair(alg, { extractable: false });
+  const { privateKey, publicKey } = await jose.generateKeyPair(alg, {
+    extractable: options.extractable ?? false
+  });
   const publicJwk = { ...await jose.exportJWK(publicKey) };
   return {
     privateKey,

package/dist/dpop.cjs

@@ -32,6 +32,8 @@ var dpop_exports = {};
 __export(dpop_exports, {
   boundKeyOf: () => boundKeyOf,
   createDpopKey: () => createDpopKey,
+  exportDpopKey: () => exportDpopKey,
+  importDpopKey: () => importDpopKey,
   nonceFrom: () => nonceFrom,
   proofFor: () => proofFor,
   thumbprintOf: () => thumbprintOf,
@@ -60,9 +62,11 @@ async function loadJose() {
     );
   }
 }
-async function createDpopKey(alg = "ES256") {
+async function createDpopKey(alg = "ES256", options = {}) {
   const jose = await loadJose();
-  const { privateKey, publicKey } = await jose.generateKeyPair(alg, { extractable: false });
+  const { privateKey, publicKey } = await jose.generateKeyPair(alg, {
+    extractable: options.extractable ?? false
+  });
   const publicJwk = { ...await jose.exportJWK(publicKey) };
   return {
     privateKey,
@@ -71,6 +75,22 @@ async function createDpopKey(alg = "ES256") {
     alg
   };
 }
+async function exportDpopKey(key) {
+  const jose = await loadJose();
+  return { jwk: { ...await jose.exportJWK(key.privateKey) }, alg: key.alg };
+}
+var PRIVATE_MEMBERS = /* @__PURE__ */ new Set(["d", "p", "q", "dp", "dq", "qi", "oth"]);
+async function importDpopKey(stored) {
+  const jose = await loadJose();
+  const privateKey = await jose.importJWK(stored.jwk, stored.alg);
+  const publicJwk = Object.fromEntries(Object.entries(stored.jwk).filter(([k]) => !PRIVATE_MEMBERS.has(k)));
+  return {
+    privateKey,
+    publicJwk,
+    thumbprint: await jose.calculateJwkThumbprint(publicJwk, "sha256"),
+    alg: stored.alg
+  };
+}
 async function thumbprintOf(jwk) {
   const jose = await loadJose();
   return jose.calculateJwkThumbprint(jwk, "sha256");

package/dist/dpop.d.ts

@@ -25,7 +25,24 @@ export interface DpopKey {
  * attacker who can run script can use the key while they are there, and cannot take it
  * away to use later.
  */
-export declare function createDpopKey(alg?: string): Promise<DpopKey>;
+export declare function createDpopKey(alg?: string, options?: {
+    extractable?: boolean;
+}): Promise<DpopKey>;
+/**
+ * A key as a server session stores it: the private JWK and its algorithm.
+ *
+ * Only for a key held by a server, inside an encrypted httpOnly cookie. There it is bytes
+ * no page can read, and the session has nowhere else to keep it between requests. A
+ * browser key stays non-extractable in IndexedDB instead.
+ */
+export interface StoredDpopKey {
+    jwk: Record<string, unknown>;
+    alg: string;
+}
+/** Export a key made with `extractable: true`, for a server session to store. */
+export declare function exportDpopKey(key: DpopKey): Promise<StoredDpopKey>;
+/** Rebuild a key a server session stored. The thumbprint comes out the same, which is the point. */
+export declare function importDpopKey(stored: StoredDpopKey): Promise<DpopKey>;
 /** The thumbprint of a public JWK, for comparing against a token's `cnf.jkt`. */
 export declare function thumbprintOf(jwk: Record<string, unknown>): Promise<string>;
 export interface ProofOptions {

package/dist/dpop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dpop.d.ts","sourceRoot":"","sources":["../src/dpop.ts"],"names":[],"mappings":"AAkBA,6EAA6E;AAC7E,MAAM,WAAW,OAAO;IACtB,iEAAiE;IACjE,UAAU,EAAE,SAAS,CAAC;IACtB,2EAA2E;IAC3E,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB,gGAAgG;IAChG,GAAG,EAAE,MAAM,CAAC;CACb;AAcD;;;;;;;;;;GAUG;AACH,wBAAsB,aAAa,CAAC,GAAG,SAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAWnE;AAED,iFAAiF;AACjF,wBAAsB,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAGhF;AAED,MAAM,WAAW,YAAY;IAC3B,8CAA8C;IAC9C,MAAM,EAAE,MAAM,CAAC;IACf;;;;;OAKG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,mDAAmD;IACnD,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;GAMG;AACH,wBAAsB,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CAsCnF;AAED,mFAAmF;AACnF,wBAAgB,SAAS,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,GAAG,IAAI,CAE3D;AAED,0FAA0F;AAC1F,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,CAGvE;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,GAAG,IAAI,CAGzE"}
+{"version":3,"file":"dpop.d.ts","sourceRoot":"","sources":["../src/dpop.ts"],"names":[],"mappings":"AAkBA,6EAA6E;AAC7E,MAAM,WAAW,OAAO;IACtB,iEAAiE;IACjE,UAAU,EAAE,SAAS,CAAC;IACtB,2EAA2E;IAC3E,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB,gGAAgG;IAChG,GAAG,EAAE,MAAM,CAAC;CACb;AAcD;;;;;;;;;;GAUG;AACH,wBAAsB,aAAa,CACjC,GAAG,SAAU,EACb,OAAO,GAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAA;CAAO,GACtC,OAAO,CAAC,OAAO,CAAC,CAalB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7B,GAAG,EAAE,MAAM,CAAC;CACb;AAED,iFAAiF;AACjF,wBAAsB,aAAa,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,CAGxE;AAID,oGAAoG;AACpG,wBAAsB,aAAa,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAW3E;AAED,iFAAiF;AACjF,wBAAsB,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAGhF;AAED,MAAM,WAAW,YAAY;IAC3B,8CAA8C;IAC9C,MAAM,EAAE,MAAM,CAAC;IACf;;;;;OAKG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,mDAAmD;IACnD,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;GAMG;AACH,wBAAsB,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CAsCnF;AAED,mFAAmF;AACnF,wBAAgB,SAAS,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,GAAG,IAAI,CAE3D;AAED,0FAA0F;AAC1F,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,CAGvE;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,GAAG,IAAI,CAGzE"}

package/dist/dpop.js

@@ -35,9 +35,11 @@ async function loadJose() {
  * attacker who can run script can use the key while they are there, and cannot take it
  * away to use later.
  */
-export async function createDpopKey(alg = 'ES256') {
+export async function createDpopKey(alg = 'ES256', options = {}) {
     const jose = await loadJose();
-    const { privateKey, publicKey } = await jose.generateKeyPair(alg, { extractable: false });
+    const { privateKey, publicKey } = await jose.generateKeyPair(alg, {
+        extractable: options.extractable ?? false,
+    });
     const publicJwk = { ...(await jose.exportJWK(publicKey)) };
     return {
         privateKey: privateKey,
@@ -46,6 +48,25 @@ export async function createDpopKey(alg = 'ES256') {
         alg,
     };
 }
+/** Export a key made with `extractable: true`, for a server session to store. */
+export async function exportDpopKey(key) {
+    const jose = await loadJose();
+    return { jwk: { ...(await jose.exportJWK(key.privateKey)) }, alg: key.alg };
+}
+const PRIVATE_MEMBERS = new Set(['d', 'p', 'q', 'dp', 'dq', 'qi', 'oth']);
+/** Rebuild a key a server session stored. The thumbprint comes out the same, which is the point. */
+export async function importDpopKey(stored) {
+    const jose = await loadJose();
+    const privateKey = (await jose.importJWK(stored.jwk, stored.alg));
+    // The public half is the private JWK without its private members (RFC 7518 §6.2.2, §6.3.2).
+    const publicJwk = Object.fromEntries(Object.entries(stored.jwk).filter(([k]) => !PRIVATE_MEMBERS.has(k)));
+    return {
+        privateKey,
+        publicJwk,
+        thumbprint: await jose.calculateJwkThumbprint(publicJwk, 'sha256'),
+        alg: stored.alg,
+    };
+}
 /** The thumbprint of a public JWK, for comparing against a token's `cnf.jkt`. */
 export async function thumbprintOf(jwk) {
     const jose = await loadJose();

package/dist/dpop.mjs

@@ -21,9 +21,11 @@ async function loadJose() {
     );
   }
 }
-async function createDpopKey(alg = "ES256") {
+async function createDpopKey(alg = "ES256", options = {}) {
   const jose = await loadJose();
-  const { privateKey, publicKey } = await jose.generateKeyPair(alg, { extractable: false });
+  const { privateKey, publicKey } = await jose.generateKeyPair(alg, {
+    extractable: options.extractable ?? false
+  });
   const publicJwk = { ...await jose.exportJWK(publicKey) };
   return {
     privateKey,
@@ -32,6 +34,22 @@ async function createDpopKey(alg = "ES256") {
     alg
   };
 }
+async function exportDpopKey(key) {
+  const jose = await loadJose();
+  return { jwk: { ...await jose.exportJWK(key.privateKey) }, alg: key.alg };
+}
+var PRIVATE_MEMBERS = /* @__PURE__ */ new Set(["d", "p", "q", "dp", "dq", "qi", "oth"]);
+async function importDpopKey(stored) {
+  const jose = await loadJose();
+  const privateKey = await jose.importJWK(stored.jwk, stored.alg);
+  const publicJwk = Object.fromEntries(Object.entries(stored.jwk).filter(([k]) => !PRIVATE_MEMBERS.has(k)));
+  return {
+    privateKey,
+    publicJwk,
+    thumbprint: await jose.calculateJwkThumbprint(publicJwk, "sha256"),
+    alg: stored.alg
+  };
+}
 async function thumbprintOf(jwk) {
   const jose = await loadJose();
   return jose.calculateJwkThumbprint(jwk, "sha256");
@@ -79,6 +97,8 @@ function boundKeyOf(claims) {
 export {
   boundKeyOf,
   createDpopKey,
+  exportDpopKey,
+  importDpopKey,
   nonceFrom,
   proofFor,
   thumbprintOf,

package/dist/index.cjs

@@ -1,4 +1,4 @@
-/*! @fluixi/oauth2 v1.0.0-alpha.1 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
+/*! @fluixi/oauth2 v1.0.0-alpha.100 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
 "use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -35,6 +35,7 @@ __export(index_exports, {
   AuthServiceToken: () => AuthServiceToken,
   COOKIE_SESSION: () => COOKIE_SESSION,
   OAuthError: () => OAuthError,
+  authModule: () => authModule,
   boundKeyOf: () => boundKeyOf,
   clearDiscoveryCache: () => clearDiscoveryCache,
   createAuthService: () => createAuthService,
@@ -50,11 +51,13 @@ __export(index_exports, {
   paramsFromUrl: () => paramsFromUrl,
   proofFor: () => proofFor,
   safeReturnTo: () => safeReturnTo,
-  thumbprintOf: () => thumbprintOf
+  thumbprintOf: () => thumbprintOf,
+  watchProviderSession: () => watchProviderSession
 });
 module.exports = __toCommonJS(index_exports);
 
 // src/service.ts
+var import_signal = require("@fluixi/reactive/signal");
 var import_session = require("@fluixi/session");
 var import_client = require("@fluixi/auth/client");
 
@@ -212,9 +215,11 @@ async function loadJose2() {
     );
   }
 }
-async function createDpopKey(alg = "ES256") {
+async function createDpopKey(alg = "ES256", options = {}) {
   const jose = await loadJose2();
-  const { privateKey, publicKey } = await jose.generateKeyPair(alg, { extractable: false });
+  const { privateKey, publicKey } = await jose.generateKeyPair(alg, {
+    extractable: options.extractable ?? false
+  });
   const publicJwk = { ...await jose.exportJWK(publicKey) };
   return {
     privateKey,
@@ -360,8 +365,12 @@ async function discover(issuer, fetcher = fetch) {
     try {
       response = await fetcher(documentUrl(issuer));
     } catch (cause) {
+      const why = cause instanceof Error ? cause.message : String(cause);
       throw new OAuthError(
-        `Could not read the discovery document at ${documentUrl(issuer)}. In a browser this is usually the provider refusing a cross-origin read: give \`endpoints\` directly, or resolve them on a server. (${cause instanceof Error ? cause.message : String(cause)})`,
+        typeof window === "undefined" ? (
+          // On a server nothing blocks the read: the provider is down, or the address is wrong.
+          `Could not reach the provider at ${documentUrl(issuer)}: is it running, and is the issuer right? (${why})`
+        ) : `Could not read the discovery document at ${documentUrl(issuer)}. In a browser this is usually the provider refusing a cross-origin read: give \`endpoints\` directly, or resolve them on a server. (${why})`,
         "discovery_unreachable"
       );
     }
@@ -386,6 +395,7 @@ async function discover(issuer, fetcher = fetch) {
       jwks: doc.jwks_uri,
       introspection: doc.introspection_endpoint,
       revocation: doc.revocation_endpoint,
+      checkSession: doc.check_session_iframe,
       issuer: doc.issuer ?? issuer
     };
   })();
@@ -844,6 +854,81 @@ function createServerClient(config, fetcher = fetch) {
   };
 }
 
+// src/session-monitor.ts
+var SETTLE_MS = 15e3;
+var GUARD_KEY = "fx-session-check";
+function recentlyActed() {
+  try {
+    return Date.now() - Number(sessionStorage.getItem(GUARD_KEY) ?? 0) < SETTLE_MS;
+  } catch {
+    return false;
+  }
+}
+function markActed() {
+  try {
+    sessionStorage.setItem(GUARD_KEY, String(Date.now()));
+  } catch {
+  }
+}
+function watchProviderSession(options = {}) {
+  if (typeof window === "undefined" || typeof document === "undefined") return () => {
+  };
+  const base = (options.basePath ?? "/auth").replace(/\/$/, "");
+  const fetcher = options.fetcher ?? fetch;
+  const onChange = options.onChange ?? (() => {
+    const login = new URLSearchParams({ prompt: "none", returnTo: location.pathname + location.search });
+    location.assign(`${base}/login?${login}`);
+  });
+  let stopped = false;
+  const cleanups = [];
+  const stop = () => {
+    stopped = true;
+    for (const cleanup of cleanups.splice(0)) cleanup();
+  };
+  void (async () => {
+    const check = await fetcher(`${base}/session-check`, { credentials: "same-origin" }).then((response) => response.ok ? response.json() : null).catch(() => null);
+    if (stopped || !check?.frame || !check.state) return;
+    const origin = new URL(check.frame).origin;
+    const frame = document.createElement("iframe");
+    frame.src = check.frame;
+    frame.title = "session check";
+    frame.setAttribute("aria-hidden", "true");
+    frame.tabIndex = -1;
+    frame.style.cssText = "position:absolute;width:0;height:0;border:0;visibility:hidden";
+    const message = `${check.clientId} ${check.state}`;
+    const ask = () => {
+      if (!stopped && document.visibilityState === "visible") frame.contentWindow?.postMessage(message, origin);
+    };
+    let confirmed = false;
+    const answer = (event) => {
+      if (event.origin !== origin || event.source !== frame.contentWindow) return;
+      if (event.data === "unchanged") confirmed = true;
+      else if (event.data === "changed") {
+        stop();
+        if (!confirmed && recentlyActed()) return;
+        markActed();
+        onChange();
+      } else if (event.data === "error") {
+        stop();
+      }
+    };
+    window.addEventListener("message", answer);
+    frame.addEventListener("load", ask);
+    document.addEventListener("visibilitychange", ask);
+    window.addEventListener("focus", ask);
+    const timer = setInterval(ask, options.intervalMs ?? 3e3);
+    document.body.appendChild(frame);
+    cleanups.push(() => {
+      window.removeEventListener("message", answer);
+      document.removeEventListener("visibilitychange", ask);
+      window.removeEventListener("focus", ask);
+      clearInterval(timer);
+      frame.remove();
+    });
+  })();
+  return stop;
+}
+
 // src/service.ts
 function paramsFromUrl(url) {
   const href = url ?? (typeof location === "undefined" ? null : location.href);
@@ -861,18 +946,28 @@ function clientFor(options) {
   return options.config.tokens === "server" ? createServerClient(options.config) : createBrowserClient(options.config);
 }
 function createAuthService(options) {
+  const tokens = options.config.tokens;
+  const scope = (0, import_signal.openReactiveScope)({ kind: "service", name: "AuthService", ...tokens ? { detail: `tokens: ${tokens}` } : {} });
+  const service = (0, import_signal.withReactiveScope)(scope, () => buildAuthService(options));
+  (0, import_signal.markReactiveScope)(service, scope);
+  return service;
+}
+function buildAuthService(options) {
   const client = clientFor(options);
   let latest = null;
+  const fetchUserFor = async (token) => {
+    if (options.fetchUser) return options.fetchUser(token);
+    return client.fetchUser(token === COOKIE_SESSION ? void 0 : token);
+  };
+  const resumesFromCookie = options.config.tokens === "server" && typeof window !== "undefined";
+  const [ready, setReady] = (0, import_signal.createSignal)(!resumesFromCookie);
   const session = (0, import_session.createSession)({
     /** The credential is the callback, so this is the code exchange. */
     async login(params) {
       latest = await client.handleCallback(params);
       return { token: latest.accessToken, expiresAt: latest.expiresAt };
     },
-    async fetchUser(token) {
-      if (options.fetchUser) return options.fetchUser(token);
-      return client.fetchUser(token === COOKIE_SESSION ? void 0 : token);
-    },
+    fetchUser: fetchUserFor,
     async refresh() {
       latest = await client.refresh();
       return { token: latest.accessToken, expiresAt: latest.expiresAt };
@@ -895,11 +990,27 @@ function createAuthService(options) {
   });
   const hooks = (0, import_client.createAuthHooks)({
     session,
+    ready,
     navigate: options.navigate,
     loginPath: options.loginPath ?? "/login",
     homePath: options.homePath ?? "/",
     forbiddenPath: options.forbiddenPath ?? "/403"
   });
+  if (resumesFromCookie && options.config.tokens === "server" && options.config.watchSession !== false) {
+    watchProviderSession({ basePath: options.config.basePath });
+  }
+  const renderedSignedOut = hooks.store.seeded && hooks.store.value().user == null;
+  if (resumesFromCookie && renderedSignedOut) setReady(true);
+  else if (resumesFromCookie) {
+    void (async () => {
+      try {
+        await session.adopt(COOKIE_SESSION, await fetchUserFor(COOKIE_SESSION));
+      } catch {
+      } finally {
+        setReady(true);
+      }
+    })();
+  }
   return Object.assign(session, {
     client,
     protectedRoute: hooks.protectedRoute,
@@ -935,6 +1046,20 @@ function createAuthService(options) {
 }
 
 // src/tokens.ts
-var import_di = require("@fluixi/start/di");
+var import_di = require("@fluixi/di");
 var AuthServiceToken = (0, import_di.injectionToken)("AuthService");
 var AuthClientToken = (0, import_di.injectionToken)("AuthClient");
+
+// src/module.ts
+var import_app = require("@fluixi/start/app");
+function authModule(auth) {
+  return (0, import_app.defineModule)({
+    name: "oauth2",
+    providers: [
+      // One instance for every request on the server. It holds no per-visitor state there:
+      // the signed-in user comes from request locals, which `sessionLocals` fills per request.
+      { provide: AuthServiceToken, useValue: auth },
+      { provide: AuthClientToken, useValue: auth.client }
+    ]
+  });
+}

package/dist/index.d.ts

@@ -93,6 +93,8 @@ export type { AuthService, AuthServiceOptions, AuthCredentials } from './service
 export { createBrowserClient } from './browser.js';
 export { createServerClient, COOKIE_SESSION } from './server-client.js';
 export { discover, clearDiscoveryCache } from './discovery.js';
+export { watchProviderSession } from './session-monitor.js';
+export type { SessionCheck, WatchOptions } from './session-monitor.js';
 export { createPkcePair, createVerifier, createChallenge, createStateValue, expiryFromJwt, } from './pkce.js';
 export { createDpopKey, proofFor, thumbprintOf, boundKeyOf } from './dpop.js';
 export type { DpopKey, ProofOptions } from './dpop.js';
@@ -101,4 +103,5 @@ export type { ReturnToOptions } from './return-to.js';
 export { OAuthError } from './types.js';
 export type { AuthClient, AuthConfig, BaseConfig, BrowserConfig, CallbackParams, Endpoints, LoginOptions, ServerConfig, Tokens, } from './types.js';
 export { AuthServiceToken, AuthClientToken } from './tokens.js';
+export { authModule } from './module.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyFG;AACH,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAChE,YAAY,EAAE,WAAW,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAErF,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAExE,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EACL,cAAc,EACd,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,aAAa,GACd,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC9E,YAAY,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,YAAY,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEtD,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,YAAY,EACV,UAAU,EACV,UAAU,EACV,UAAU,EACV,aAAa,EACb,cAAc,EACd,SAAS,EACT,YAAY,EACZ,YAAY,EACZ,MAAM,GACP,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyFG;AACH,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAChE,YAAY,EAAE,WAAW,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAErF,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAExE,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EACL,cAAc,EACd,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,aAAa,GACd,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC9E,YAAY,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,YAAY,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEtD,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,YAAY,EACV,UAAU,EACV,UAAU,EACV,UAAU,EACV,aAAa,EACb,cAAc,EACd,SAAS,EACT,YAAY,EACZ,YAAY,EACZ,MAAM,GACP,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC"}

package/dist/index.js

@@ -92,10 +92,12 @@ export { createAuthService, paramsFromUrl } from './service.js';
 export { createBrowserClient } from './browser.js';
 export { createServerClient, COOKIE_SESSION } from './server-client.js';
 export { discover, clearDiscoveryCache } from './discovery.js';
+export { watchProviderSession } from './session-monitor.js';
 export { createPkcePair, createVerifier, createChallenge, createStateValue, expiryFromJwt, } from './pkce.js';
 export { createDpopKey, proofFor, thumbprintOf, boundKeyOf } from './dpop.js';
 export { safeReturnTo } from './return-to.js';
 export { OAuthError } from './types.js';
 export { AuthServiceToken, AuthClientToken } from './tokens.js';
+export { authModule } from './module.js';
 // Token verification lives on `@fluixi/oauth2/verify`, so a browser bundle never pulls in
 // `jose` just because the package was imported.