unjwt 0.9.0 → 0.9.1

package/dist/session/index.d.mts

@@ -200,7 +200,7 @@ interface SessionRequestBase {
     readonly headers: Headers;
     readonly errHeaders?: Headers;
   };
-  /** Per-request state shared with the framework. Sessions are stored in its `sessions` member. Without it, state is keyed on `req`, else on the event. */
+  /** Per-request state shared with the framework. Sessions are stored in its `unjwt` member. Without it, state is keyed on `req`, else on the event. */
   readonly context?: Record<string, unknown>;
 }
 /** A request event, by its `Request` or by its `Headers` (a `Request` itself, a WebSocket upgrade request). `req` is read first. */
@@ -261,6 +261,91 @@ interface SessionDriver<TEvent> {
     token: string | undefined;
   } | undefined;
 }
+/** The `Set-Cookie` attributes of a session cookie (RFC 6265, RFC 6265bis, and CHIPS: Cookies Having Independent Partitioned State). */
+interface CookieAttributes {
+  /** `Domain`. A `__Host-` name refuses it. */
+  domain?: string;
+  /** `Expires`. An issued token with an `exp` sets it to that time. */
+  expires?: Date;
+  /** `HttpOnly`: page scripts cannot read the cookie. */
+  httpOnly?: boolean;
+  /** `Max-Age` in seconds. An issued token with an `exp` replaces it with `expires`. */
+  maxAge?: number;
+  /** `Path`. A `__Host-` name requires `"/"`. */
+  path?: string;
+  /** `Priority`. */
+  priority?: "low" | "medium" | "high";
+  /** `SameSite`. `true` is `Strict`, and `"none"` requires `secure`. */
+  sameSite?: boolean | "lax" | "strict" | "none";
+  /** `Secure`. A `__Host-` or `__Secure-` name requires it. */
+  secure?: boolean;
+  /** `Partitioned` (CHIPS). Requires `secure`. */
+  partitioned?: boolean;
+}
+/** The attributes a session cookie gets unless its config sets them: `path` `"/"`, `secure`, `httpOnly` and `sameSite` `"lax"`. */
+export declare const DEFAULT_SESSION_COOKIE: Readonly<CookieAttributes>;
+/** The token sources of one session, and the attributes its cookie is written with. */
+interface SessionTransportOptions {
+  /** Session name: the cookie name, and the base of the default session header. */
+  name: string;
+  /** Request header to read the token from, before the cookie: a name, or `true` for `x-<name>-session`. Unset or `false` reads no header. */
+  sessionHeader?: boolean | string;
+  /** The cookie's attributes and the chunk size its token is split at (`4000` when unset), or `false` for no cookie. */
+  cookie: false | {
+    attrs: CookieAttributes;
+    chunkMaxLength?: number;
+  };
+}
+/** How one session reads its token from the request and writes it to the response. */
+interface SessionTransport {
+  /** Where the token is read from: the driver's token in hand, the session header, or the cookie. Only a cookie is written back. */
+  source: SessionSource;
+  /** The token in hand, else the session header's, else the cookie this response wrote, else the request's. Absent without a token source. */
+  read?: () => string | undefined;
+  /** The session header the request sent, by its lowercase name, when it holds neither a bare token nor `Bearer <token>`. The session decides how to report it. */
+  malformed?: {
+    header: string;
+  };
+  /**
+   * Writes the token to the cookie, split into chunks past `chunkMaxLength`, and returns `true`. With `expiresAt` (ms), the cookie gets that `expires` and no
+   * `maxAge`, which would take precedence (RFC 6265 §5.3). Once the response was sent, writes nothing and returns `false`.
+   * Present when the session reads its token from a cookie the event can write.
+   * @throws `ERR_SESSION_CONFIG_INVALID` if the token needs more than 16 cookie chunks.
+   */
+  write?: (token: string, options?: {
+    expiresAt?: number;
+  }) => boolean;
+  /**
+   * Expires the cookie and every chunk, and returns `true`. Once the response was sent, writes nothing and returns `false`.
+   * Present when the session reads its token from a cookie the event can write.
+   */
+  drop?: () => boolean;
+  /** The session reads its token from a cookie, but the event cannot write one (a request without a response). */
+  readonly: boolean;
+  /** Whether the response can still change. `false` once it was sent. */
+  writable: () => boolean;
+}
+/**
+ * Resolves the transport of one request, before any token is opened: a token the driver hands in, else the session header the request sends, else the cookie.
+ * A header that holds the very token of the request's cookie is the cookie. Any other header is read alone, the cookie left as it is.
+ * A token in hand or a header token is reissued onto the session only. Only a cookie session writes back.
+ */
+export declare function resolveSessionTransport<TEvent>(driver: SessionDriver<TEvent>, event: TEvent, options: SessionTransportOptions): SessionTransport;
+/** Throws `ERR_SESSION_CONFIG_INVALID` for a transport without a reader: the session has no token source to read or clear. */
+export declare function assertSessionTokenSource(transport: SessionTransport, options: {
+  prefix: string;
+}): asserts transport is SessionTransport & {
+  read: () => string | undefined;
+};
+/** Throws `ERR_SESSION_READONLY_EVENT` on an update when a cookie session cannot write its cookie, and on an update or clear once the response was sent. */
+export declare function assertSessionWritable(transport: SessionTransport, options: {
+  operation: "update" | "clear";
+  prefix: string;
+}): void;
+/** Refuses a `sessionHeader` that is neither a boolean nor a header name (RFC 7230 §3.2). */
+export declare function assertSessionHeader(header: unknown, options: {
+  prefix: string;
+}): void;
 /**
  * JWS verify options a session accepts. `algorithms` names the `alg` values a key without its own `alg` (a `CryptoKey`, an `oct` or RSA JWK
  * without `alg`) verifies, and with `onKeyLookup` set, may also name those only the keys it returns serve. The session sets `typ`,
@@ -292,27 +377,6 @@ interface JWSSessionConfig<MaxAge extends ExpiresIn | undefined = ExpiresIn | un
    */
   jws?: JWSSessionOptions;
 }
-/** The `Set-Cookie` attributes of a session cookie (RFC 6265, RFC 6265bis, and CHIPS: Cookies Having Independent Partitioned State). */
-interface CookieAttributes {
-  /** `Domain`. A `__Host-` name refuses it. */
-  domain?: string;
-  /** `Expires`. An issued token with an `exp` sets it to that time. */
-  expires?: Date;
-  /** `HttpOnly`: page scripts cannot read the cookie. */
-  httpOnly?: boolean;
-  /** `Max-Age` in seconds. An issued token with an `exp` replaces it with `expires`. */
-  maxAge?: number;
-  /** `Path`. A `__Host-` name requires `"/"`. */
-  path?: string;
-  /** `Priority`. */
-  priority?: "low" | "medium" | "high";
-  /** `SameSite`. `true` is `Strict`, and `"none"` requires `secure`. */
-  sameSite?: boolean | "lax" | "strict" | "none";
-  /** `Secure`. A `__Host-` or `__Secure-` name requires it. */
-  secure?: boolean;
-  /** `Partitioned` (CHIPS). Requires `secure`. */
-  partitioned?: boolean;
-}
 /** Session state for the current request, from the claims of its JWS token. */
 interface SessionJWS<T extends SessionRecord = SessionClaims, MaxAge extends ExpiresIn | undefined = ExpiresIn | undefined> extends SessionState<T, MaxAge> {}
 /** JWS session hooks. `onRead`, `onExpire` and `onError` are mutually exclusive per token. */
@@ -452,6 +516,75 @@ export declare function defineJWESession<T extends SessionRecord = SessionClaims
 export declare function defineJWESession<T extends SessionRecord = SessionClaims, MaxAge extends ExpiresIn | undefined = ExpiresIn | undefined, TEvent = WebSessionEvent>(config: SessionConfigJWE<T, MaxAge, TEvent>, options: {
   driver: SessionDriver<TEvent>;
 }): SessionDefinition<T, MaxAge, TEvent>;
-/** Returns `driver` typed as a `SessionDriver`. Pass it to `defineJWSSession` or `defineJWESession` as `{ driver }`. */
+/**
+ * Returns `driver` typed as a `SessionDriver`. Pass it to `defineJWSSession` or `defineJWESession` as `{ driver }`.
+ * The Web driver, `webSessionDriver()`, is the reference implementation of the contract.
+ */
 export declare function defineSessionDriver<TEvent>(driver: SessionDriver<TEvent>): SessionDriver<TEvent>;
-export { type CompositeKey, type ContentEncryptionAlgorithm, type CookieAttributes, type CookieJar, type DeriveJWKOptions, type DeriveJWKReturn, type DeriveKeyOptions, type DeriveKeyReturn, type Duration, type ECDHEphemeralKeyInput, type ExpiresIn, type GenerateJWKOptions, type GenerateJWKReturn, type GenerateKeyAlgorithm, type GenerateKeyOptions, type GenerateKeyReturn, type GeneratedJWKMap, type GeneratedKeyMap, type ImportedKey, type ImportedKeyMap, type ImportedPEMJWK, type JOSEConsumerOptions, type JOSELimits, type JOSEPayload, type JOSEPayloadMode, type JOSEPayloadTypeMap, type JWEAsymmetricPrivateJWK, type JWEAsymmetricPublicJWK, type JWEDecryptJWK, type JWEDecryptOptions, type JWEDecryptResult, type JWEEncryptJWK, type JWEEncryptOptions, type JWEFlattenedSerialization, type JWEGeneralRecipient, type JWEGeneralSerialization, type JWEHeaderParameters, type JWEKeyLookup, type JWEKeyManagementHeaderParameters, type JWELibraryHeaderName, type JWEMultiDecryptKey, type JWEMultiDecryptOptions, type JWEMultiDecryptResult, type JWEMultiEncryptOptions, type JWEMultiRecipient, type JWEProtectedHeader, type JWESessionKey, type JWESessionKeyLookup, type JWESessionOctJWK, type JWK, type JWKAlgorithm, type JWKCacheAdapter, type JWKLookupFunction, type JWKLookupFunctionHeader, type JWKMetadata, type JWKPEMAlgorithm, type JWKParameters, type JWKSet, type JWK_AES_Algorithm, type JWK_AES_CBC_HMAC, type JWK_AES_GCM, type JWK_AES_GCM_KW, type JWK_AES_KW, type JWK_Asymmetric, type JWK_Asymmetric_Algorithm, type JWK_EC, type JWK_ECDH_ES, type JWK_ECDSA, type JWK_EC_Private, type JWK_EC_Public, type JWK_HMAC, type JWK_OKP, type JWK_OKP_Private, type JWK_OKP_Public, type JWK_OKP_SIGN, type JWK_PBES2, type JWK_Pair, type JWK_Private, type JWK_Public, type JWK_RSA, type JWK_RSA_ENC, type JWK_RSA_PSS, type JWK_RSA_Private, type JWK_RSA_Public, type JWK_RSA_SIGN, type JWK_Symmetric, type JWK_Symmetric_Algorithm, type JWK_oct, type JWSAlgorithm, type JWSAsymmetricPrivateJWK, type JWSAsymmetricPublicJWK, type JWSFlattenedSerialization, type JWSGeneralSerialization, type JWSGeneralSignature, type JWSHashedAlgorithm, type JWSHeaderParameters, type JWSKeyLookup, type JWSMultiSignOptions, type JWSMultiSigner, type JWSMultiVerifyAllOptions, type JWSMultiVerifyOptions, type JWSMultiVerifyOutcome, type JWSMultiVerifyResult, type JWSProtectedHeader, type JWSSessionKey, type JWSSessionKeyLookup, type JWSSignJWK, type JWSSignOptions, type JWSVerifyJWK, type JWSVerifyOptions, type JWSVerifyResult, type JWT, type JWTClaimValidationOptions, type JWTClaims, type JWTConfirmation, type JWTTimeClaimOptions, type JoseHeaderParameters, type KeyManagementAlgorithm, type KeyWrapAlgorithmOf, type KeyWrappingAlgorithm, type MaxTokenAge, type NotBeforeIn, type OpenedSessionState, type PEMType, type PayloadOf, type SessionClaims, type SessionConfigJWE, type SessionConfigJWS, type SessionData, type SessionDecryptOptions, type SessionDefinition, type SessionDriver, type SessionEncryptOptions, type SessionHandedToken, type SessionHooksJWE, type SessionHooksJWS, type SessionIssueOptions, type SessionJWE, type SessionJWS, type SessionManager, type SessionRequestEvent, type SessionSignOptions, type SessionSource, type SessionUpdate, type SessionUpdateTrigger, type SessionVerifyOptions, type ToPublicJWKReturn, type UnwrapKeyOptions, type UnwrapKeyResult, type UnwrappingKeyFor, type WebSessionEvent, type WrapKeyOptions, type WrapKeyResult, type WrappingKeyFor, deriveJWKFromPassword, exportPEM, generateJWK, importPEM, thumbprint, toPublicJWK };
+/**
+ * The Web session driver: a request event by its `Request` or its `Headers`, or a token in hand.
+ * `prefix` (default `"[unjwt/session]"`) starts the message of every error a session over it throws, the driver's own included.
+ * Every driver it returns shares the state of a request with the others.
+ */
+export declare function webSessionDriver(options?: {
+  prefix?: string;
+}): SessionDriver<WebSessionEvent>;
+/**
+ * A cookie jar over a request's `Headers` and, when given, its response's: `read` parses the request's `Cookie` header,
+ * `write` sets a `Set-Cookie` line on `response.headers` through `serializeCookie`, replacing the line of the same cookie
+ * (name, domain, path, partition) instead of adding a second one, and `written` reads back what the response sets.
+ * Each write is copied to `errHeaders` too: h3 and Nitro send only these for a thrown handler.
+ * Without `response`, the jar only reads.
+ */
+export declare function webCookieJar(request: Headers, response?: {
+  headers: Headers;
+  errHeaders?: Headers;
+}): CookieJar<CookieAttributes>;
+/** The cookies of a `Cookie` header value, by name, values percent-decoded. The first of two cookies with one name wins. The record has no prototype. */
+export declare function parseCookie(header: string): Record<string, string | undefined>;
+/** One `Set-Cookie` line, the value percent-encoded and `path` `"/"` unless `attrs` sets one. Throws a `TypeError` for a name or attribute RFC 6265bis refuses. */
+export declare function serializeCookie(name: string, value: string, attrs?: CookieAttributes): string;
+/** The members of a session config that {@link assertSessionConfig} checks. */
+interface SessionConfigChecks {
+  /** Request header to read the token from: a name, or `true` for `x-<name>-session`. */
+  sessionHeader?: boolean | string;
+  /** Cookie attributes over the defaults, or `false` for no cookie. */
+  cookie?: false | (CookieAttributes & {
+    chunkMaxLength?: number;
+  });
+  /** Session lifetime. */
+  maxAge?: ExpiresIn;
+  /** Reissues a session read from its cookie: on every read with `true`, else once the token is that old. Requires `maxAge`, and is shorter than it. */
+  rolling?: true | ExpiresIn;
+}
+/**
+ * Checks what the config alone decides: its name, session header, cookie prefix over `defaultCookie`, and `rolling`.
+ * `defaultCookie` is {@link DEFAULT_SESSION_COOKIE} when unset.
+ * @throws `ERR_SESSION_CONFIG_INVALID` if `name` is not a cookie name or ends in a dot and digits, `sessionHeader` is not a header name,
+ * a `__Host-` or `__Secure-` cookie's attributes break its prefix rules, or `rolling` has no `maxAge` or is not shorter than it. The message starts with `prefix`.
+ * @throws `ERR_INVALID_OPTION` if `rolling` is neither `true` nor a duration.
+ */
+export declare function assertSessionConfig(config: SessionConfigChecks, options: {
+  name: string;
+  prefix: string;
+  defaultCookie?: CookieAttributes;
+}): void;
+/**
+ * The transport options of a session config: its session header, and its cookie attributes over `defaultCookie` with `chunkMaxLength` set apart.
+ * `defaultCookie` is {@link DEFAULT_SESSION_COOKIE} when unset. `cookie: false` is no cookie.
+ */
+export declare function sessionTransportOptions(config: Pick<SessionConfigChecks, "sessionHeader" | "cookie">, options: {
+  name: string;
+  defaultCookie?: CookieAttributes;
+}): SessionTransportOptions;
+/**
+ * Claims a session name on one request: one name is one cookie, so the first family to claim a name on a request keeps it.
+ * `state` is `driver.state(event)`. The same family may claim a name again on the same request.
+ * @throws `ERR_SESSION_CONFIG_INVALID` if another family already claimed `name` on this request. The message starts with `prefix`.
+ */
+export declare function claimSessionName(state: Record<string, unknown>, options: {
+  name: string;
+  family: string;
+  prefix: string;
+}): void;
+export { type CompositeKey, type ContentEncryptionAlgorithm, type CookieAttributes, type CookieJar, type DeriveJWKOptions, type DeriveJWKReturn, type DeriveKeyOptions, type DeriveKeyReturn, type Duration, type ECDHEphemeralKeyInput, type ExpiresIn, type GenerateJWKOptions, type GenerateJWKReturn, type GenerateKeyAlgorithm, type GenerateKeyOptions, type GenerateKeyReturn, type GeneratedJWKMap, type GeneratedKeyMap, type ImportedKey, type ImportedKeyMap, type ImportedPEMJWK, type JOSEConsumerOptions, type JOSELimits, type JOSEPayload, type JOSEPayloadMode, type JOSEPayloadTypeMap, type JWEAsymmetricPrivateJWK, type JWEAsymmetricPublicJWK, type JWEDecryptJWK, type JWEDecryptOptions, type JWEDecryptResult, type JWEEncryptJWK, type JWEEncryptOptions, type JWEFlattenedSerialization, type JWEGeneralRecipient, type JWEGeneralSerialization, type JWEHeaderParameters, type JWEKeyLookup, type JWEKeyManagementHeaderParameters, type JWELibraryHeaderName, type JWEMultiDecryptKey, type JWEMultiDecryptOptions, type JWEMultiDecryptResult, type JWEMultiEncryptOptions, type JWEMultiRecipient, type JWEProtectedHeader, type JWESessionKey, type JWESessionKeyLookup, type JWESessionOctJWK, type JWK, type JWKAlgorithm, type JWKCacheAdapter, type JWKLookupFunction, type JWKLookupFunctionHeader, type JWKMetadata, type JWKPEMAlgorithm, type JWKParameters, type JWKSet, type JWK_AES_Algorithm, type JWK_AES_CBC_HMAC, type JWK_AES_GCM, type JWK_AES_GCM_KW, type JWK_AES_KW, type JWK_Asymmetric, type JWK_Asymmetric_Algorithm, type JWK_EC, type JWK_ECDH_ES, type JWK_ECDSA, type JWK_EC_Private, type JWK_EC_Public, type JWK_HMAC, type JWK_OKP, type JWK_OKP_Private, type JWK_OKP_Public, type JWK_OKP_SIGN, type JWK_PBES2, type JWK_Pair, type JWK_Private, type JWK_Public, type JWK_RSA, type JWK_RSA_ENC, type JWK_RSA_PSS, type JWK_RSA_Private, type JWK_RSA_Public, type JWK_RSA_SIGN, type JWK_Symmetric, type JWK_Symmetric_Algorithm, type JWK_oct, type JWSAlgorithm, type JWSAsymmetricPrivateJWK, type JWSAsymmetricPublicJWK, type JWSFlattenedSerialization, type JWSGeneralSerialization, type JWSGeneralSignature, type JWSHashedAlgorithm, type JWSHeaderParameters, type JWSKeyLookup, type JWSMultiSignOptions, type JWSMultiSigner, type JWSMultiVerifyAllOptions, type JWSMultiVerifyOptions, type JWSMultiVerifyOutcome, type JWSMultiVerifyResult, type JWSProtectedHeader, type JWSSessionKey, type JWSSessionKeyLookup, type JWSSignJWK, type JWSSignOptions, type JWSVerifyJWK, type JWSVerifyOptions, type JWSVerifyResult, type JWT, type JWTClaimValidationOptions, type JWTClaims, type JWTConfirmation, type JWTTimeClaimOptions, type JoseHeaderParameters, type KeyManagementAlgorithm, type KeyWrapAlgorithmOf, type KeyWrappingAlgorithm, type MaxTokenAge, type NotBeforeIn, type OpenedSessionState, type PEMType, type PayloadOf, type SessionClaims, type SessionConfigChecks, type SessionConfigJWE, type SessionConfigJWS, type SessionData, type SessionDecryptOptions, type SessionDefinition, type SessionDriver, type SessionEncryptOptions, type SessionHandedToken, type SessionHooksJWE, type SessionHooksJWS, type SessionIssueOptions, type SessionJWE, type SessionJWS, type SessionManager, type SessionRequestEvent, type SessionSignOptions, type SessionSource, type SessionTransport, type SessionTransportOptions, type SessionUpdate, type SessionUpdateTrigger, type SessionVerifyOptions, type ToPublicJWKReturn, type UnwrapKeyOptions, type UnwrapKeyResult, type UnwrappingKeyFor, type WebSessionEvent, type WrapKeyOptions, type WrapKeyResult, type WrappingKeyFor, deriveJWKFromPassword, exportPEM, generateJWK, importPEM, thumbprint, toPublicJWK };

package/dist/session/index.mjs

@@ -47,6 +47,9 @@ function expiredSessionError(options) {
 function readFailedError(cause, options) {
 	return new JWTError(`${options.prefix} Session could not be read: ${messageOf(cause)}`, "ERR_SESSION_READ_FAILED", cause);
 }
+function malformedHeaderError(header, options) {
+	return invalidTokenError(`${options.prefix} Invalid session token: the "${header}" header holds neither a token nor "Bearer <token>".`);
+}
 function rethrowAsInvalidToken(error, options) {
 	if (isJWTError(error, "ERR_JWT_EXPIRED") || isJWTError(error, "ERR_SESSION_READ_FAILED")) throw error;
 	throw invalidTokenError(`${options.prefix} Invalid session token: ${messageOf(error)}`, error);
@@ -65,7 +68,7 @@ function assertCookiePrefix(name, attrs, options) {
 	const host = lower.startsWith("__host-");
 	if (!host && !lower.startsWith("__secure-")) return;
 	const rule = host ? "\"__Host-\" cookie must be Secure, with Path=/ and no Domain" : "\"__Secure-\" cookie must be Secure";
-	if (attrs.secure === false || host && (attrs.domain !== void 0 || attrs.path !== void 0 && attrs.path !== "/")) throw invalidConfigError(`${options.prefix} Session ${quoteTokenValue(name)}: a ${rule}.`);
+	if (!attrs.secure || host && (attrs.domain !== void 0 || attrs.path !== void 0 && attrs.path !== "/")) throw invalidConfigError(`${options.prefix} Session ${quoteTokenValue(name)}: a ${rule}.`);
 }
 function assertRolling(config, options) {
 	const { rolling } = config;
@@ -161,7 +164,6 @@ function createSessionCodec(spec) {
 	return {
 		family: spec.family,
 		defaultName: spec.defaultName,
-		defaultCookie: spec.defaultCookie,
 		now,
 		keys: (config) => {
 			const { issueKey, issueAlg, key, algorithms } = spec.resolveKeys(config);
@@ -503,19 +505,12 @@ const RSA_SIGNATURES = [
 	"PS384",
 	"PS512"
 ];
-const JWS_DEFAULT_COOKIE = {
-	path: "/",
-	secure: true,
-	httpOnly: true,
-	sameSite: "lax"
-};
 function createJWSCodec(options) {
 	const { prefix, defaultName } = options;
 	return createSessionCodec({
 		family: "jws",
 		prefix,
 		defaultName,
-		defaultCookie: JWS_DEFAULT_COOKIE,
 		issueOptions: (config) => config.jws?.signOptions,
 		openOptions: (config) => config.jws?.verifyOptions,
 		resolveKeys: (config) => resolveSessionKeys$1(config.key, {
@@ -543,6 +538,12 @@ function createJWSCodec(options) {
 		}
 	});
 }
+const DEFAULT_SESSION_COOKIE = /* @__PURE__ */ Object.freeze({
+	path: "/",
+	secure: true,
+	httpOnly: true,
+	sameSite: "lax"
+});
 const kSessionPending = Symbol("unjwt_session_pending");
 function sessionInstant(source) {
 	const now = source.codec.now(source.config);
@@ -674,7 +675,7 @@ function decodeValue(value) {
 		return value;
 	}
 }
-function resolveTransport(driver, event, options) {
+function resolveSessionTransport(driver, event, options) {
 	const handed = driver.handed?.(event);
 	if (handed) return {
 		source: "token",
@@ -682,11 +683,11 @@ function resolveTransport(driver, event, options) {
 		readonly: false,
 		writable: () => true
 	};
-	const { config, name } = options;
+	const { name, cookie } = options;
 	const header = presentedHeader(driver, event, options);
-	if (config.cookie === false) return headerTransport(config, header);
+	if (cookie === false) return headerTransport(options, header);
 	const jar = driver.cookies(event);
-	if (header && (header.token === void 0 || header.token !== readChunked(jar, name))) return headerTransport(config, header);
+	if (header && (header.token === void 0 || header.token !== readChunked(jar, name))) return headerTransport(options, header);
 	const store = responseStore(jar);
 	const transport = {
 		source: "cookie",
@@ -695,22 +696,32 @@ function resolveTransport(driver, event, options) {
 		writable: () => driver.writable?.(event) ?? true
 	};
 	if (!store) return transport;
-	transport.write = (token, { attrs, chunkMaxLength }) => {
+	const { attrs, chunkMaxLength } = cookie;
+	transport.write = (token, { expiresAt } = {}) => {
+		if (!transport.writable()) return false;
+		const written = expiresAt === void 0 ? { ...attrs } : {
+			...attrs,
+			expires: new Date(expiresAt),
+			maxAge: void 0
+		};
 		writeChunked(store, name, token, {
-			attrs,
+			attrs: written,
 			chunkMaxLength,
 			prefix: driver.prefix
 		});
+		return true;
 	};
-	transport.drop = ({ attrs }) => {
+	transport.drop = () => {
+		if (!transport.writable()) return false;
 		removeChunked(store, name, { attrs });
+		return true;
 	};
 	return transport;
 }
-function assertTokenSource(transport, options) {
+function assertSessionTokenSource(transport, options) {
 	if (!transport.read) throw invalidConfigError(`${options.prefix} Session has no token source, enable "cookie" or "sessionHeader".`);
 }
-function assertWritable(transport, options) {
+function assertSessionWritable(transport, options) {
 	const { operation, prefix } = options;
 	if (operation === "update" && transport.readonly) throw readOnlyEventError(`${prefix} Cannot update session on read-only event.`);
 	if (!transport.writable()) throw readOnlyEventError(`${prefix} Cannot update/clear session: the response was already sent.`);
@@ -732,29 +743,29 @@ function headerToken(value) {
 	return words.length === 1 && first ? first : void 0;
 }
 function presentedHeader(driver, event, options) {
-	const { config, name } = options;
-	if (!readsHeader(config)) return void 0;
-	const header = sessionHeaderName(name, config.sessionHeader);
+	const { name, sessionHeader } = options;
+	if (!readsHeader(options)) return void 0;
+	const header = sessionHeaderName(name, sessionHeader);
 	const value = driver.header(event, header);
 	if (typeof value !== "string") return void 0;
 	const token = headerToken(value);
 	if (token) return { token };
 	return {
 		token: void 0,
-		malformed: invalidTokenError(`${driver.prefix} Invalid session token: the "${header}" header holds neither a token nor "Bearer <token>".`)
+		malformed: { header }
 	};
 }
-function headerTransport(config, header) {
+function headerTransport(options, header) {
 	return {
 		source: "header",
-		read: readsHeader(config) ? () => header?.token : void 0,
+		read: readsHeader(options) ? () => header?.token : void 0,
 		malformed: header?.malformed,
 		readonly: false,
 		writable: () => true
 	};
 }
-function readsHeader(config) {
-	return config.sessionHeader !== void 0 && config.sessionHeader !== false;
+function readsHeader(options) {
+	return options.sessionHeader !== void 0 && options.sessionHeader !== false;
 }
 function cookieToken(jar, name) {
 	const written = jar.written ? readChunked({ read: (key) => jar.written?.(key) }, name) : void 0;
@@ -772,15 +783,48 @@ function responseStore(jar) {
 const kSessionNames = Symbol("unjwt_session_names");
 const kHeldTokens = Symbol("unjwt_session_held_tokens");
 function assertSessionConfig(config, options) {
-	const { name, prefix } = options;
+	const { name, prefix, defaultCookie = DEFAULT_SESSION_COOKIE } = options;
 	assertSessionName(name, { prefix });
 	assertSessionHeader(config.sessionHeader, { prefix });
 	if (config.cookie !== false) assertCookiePrefix(name, {
-		...options.defaultCookie,
+		...defaultCookie,
 		...config.cookie
 	}, { prefix });
 	assertRolling(config, { prefix });
 }
+function sessionTransportOptions(config, options) {
+	const { name, defaultCookie = DEFAULT_SESSION_COOKIE } = options;
+	const { sessionHeader } = config;
+	if (config.cookie === false) return {
+		name,
+		sessionHeader,
+		cookie: false
+	};
+	const { chunkMaxLength, ...configured } = config.cookie || {};
+	return {
+		name,
+		sessionHeader,
+		cookie: {
+			attrs: {
+				...defaultCookie,
+				...configured
+			},
+			chunkMaxLength
+		}
+	};
+}
+function claimSessionName(state, options) {
+	const { name, family, prefix } = options;
+	const holder = state;
+	const registry = holder[kSessionNames] ||= /* @__PURE__ */ new Map();
+	const held = registry.get(name);
+	if (held === void 0) {
+		registry.set(name, family);
+		return;
+	}
+	if (held === family) return;
+	throw invalidConfigError(`${prefix} Session name "${name}" is already used by a ${held.toUpperCase()} session on this request.`);
+}
 function bindSession(event, options) {
 	const { config, name, driver, codec, keys, actions } = options;
 	const record = driver.state(event);
@@ -801,21 +845,18 @@ function bindSession(event, options) {
 		args: { event },
 		store: recordSlotStore(record, slot),
 		held: heldTokenSlot(record, slot),
-		transport: resolveTransport(driver, event, {
-			config,
-			name
-		})
+		transport: resolveSessionTransport(driver, event, sessionTransportOptions(config, { name }))
 	};
 }
 function sessionToken(binding) {
 	const { transport } = binding;
-	assertTokenSource(transport, { prefix: binding.driver.prefix });
+	assertSessionTokenSource(transport, { prefix: binding.driver.prefix });
 	const session = storedSession(binding.store);
 	return session ? session.token : transport.read();
 }
 function transportToken(binding) {
 	const { transport } = binding;
-	assertTokenSource(transport, { prefix: binding.driver.prefix });
+	assertSessionTokenSource(transport, { prefix: binding.driver.prefix });
 	const held = binding.held.get();
 	return held ? held.token : transport.read();
 }
@@ -827,38 +868,6 @@ function recordSlotStore(record, slot) {
 		}
 	};
 }
-function sessionCookie(binding, options = {}) {
-	const { chunkMaxLength, ...configured } = binding.config.cookie || {};
-	const attrs = {
-		...binding.codec.defaultCookie,
-		...configured
-	};
-	if (options.expiresAt !== void 0) {
-		attrs.expires = new Date(options.expiresAt);
-		attrs.maxAge = void 0;
-	}
-	return {
-		attrs,
-		chunkMaxLength
-	};
-}
-function dropSessionCookie(binding) {
-	const { transport } = binding;
-	if (!transport.drop || !transport.writable()) return;
-	transport.drop(sessionCookie(binding));
-}
-function claimSessionName(record, options) {
-	const { name, family, prefix } = options;
-	const holder = record;
-	const registry = holder[kSessionNames] ||= /* @__PURE__ */ new Map();
-	const held = registry.get(name);
-	if (held === void 0) {
-		registry.set(name, family);
-		return;
-	}
-	if (held === family) return;
-	throw invalidConfigError(`${prefix} Session name "${name}" is already used by a ${held.toUpperCase()} session on this request.`);
-}
 function heldTokenSlot(record, slot) {
 	const holder = record;
 	const held = holder[kHeldTokens] ||= /* @__PURE__ */ new Map();
@@ -873,12 +882,12 @@ async function loadSession(binding) {
 	const { config, codec, keys, store, args, transport } = binding;
 	await keys.assertKeys();
 	const open = keys.opener(args);
-	assertTokenSource(transport, { prefix: binding.driver.prefix });
+	assertSessionTokenSource(transport, { prefix: binding.driver.prefix });
 	const existing = storedSession(store);
 	if (existing) {
 		const session = existing[kSessionPending] ? await existing[kSessionPending] : existing;
-		if (session.token !== void 0 && session.expiresAt !== void 0 && session.expiresAt < codec.now(config)) {
-			dropSessionCookie(binding);
+		if (session.token !== void 0 && session.expiresAt !== void 0 && session.expiresAt <= codec.now(config)) {
+			transport.drop?.();
 			const error = expiredSessionError({
 				id: session.id,
 				createdAt: session.createdAt,
@@ -903,8 +912,9 @@ async function loadSession(binding) {
 	const session = emptySession(binding);
 	store.set(session);
 	if (transport.malformed) {
-		session.error = transport.malformed;
-		await fireError(binding, transport.malformed);
+		const error = malformedHeaderError(transport.malformed.header, { prefix: binding.driver.prefix });
+		session.error = error;
+		await fireError(binding, error);
 		return session;
 	}
 	const token = transport.read();
@@ -927,7 +937,7 @@ async function loadSession(binding) {
 		if (isJWTError(failure.error)) session.error = failure.error;
 		if (isJWTError(failure.error, "ERR_JWT_EXPIRED")) {
 			const { jti, iat, exp } = failure.error.cause;
-			dropSessionCookie(binding);
+			transport.drop?.();
 			await fireExpire(binding, {
 				session: {
 					id: jti,
@@ -938,7 +948,7 @@ async function loadSession(binding) {
 				error: failure.error
 			});
 		} else {
-			if (isJWTError(failure.error, "ERR_SESSION_TOKEN_INVALID")) dropSessionCookie(binding);
+			if (isJWTError(failure.error, "ERR_SESSION_TOKEN_INVALID")) transport.drop?.();
 			await fireError(binding, failure.error);
 		}
 		return session;
@@ -992,7 +1002,7 @@ async function fireExpire(binding, expired) {
 }
 async function issueSession(binding, update, options, trigger = "update") {
 	const { config, keys, driver, store, args, transport } = binding;
-	assertWritable(transport, {
+	assertSessionWritable(transport, {
 		operation: "update",
 		prefix: driver.prefix
 	});
@@ -1013,7 +1023,7 @@ async function issueSession(binding, update, options, trigger = "update") {
 	try {
 		await keys.assertKeys();
 		const token = await keys.issue(session);
-		transport.write?.(token, sessionCookie(binding, { expiresAt: session.expiresAt }));
+		transport.write?.(token, { expiresAt: session.expiresAt });
 		binding.held.set(token);
 		issued = Object.assign(session, {
 			id,
@@ -1047,8 +1057,8 @@ async function issueSession(binding, update, options, trigger = "update") {
 }
 async function dropSession(binding) {
 	const { config, driver, store, args, transport } = binding;
-	assertTokenSource(transport, { prefix: driver.prefix });
-	assertWritable(transport, {
+	assertSessionTokenSource(transport, { prefix: driver.prefix });
+	assertSessionWritable(transport, {
 		operation: "clear",
 		prefix: driver.prefix
 	});
@@ -1057,7 +1067,7 @@ async function dropSession(binding) {
 	const oldSession = session && (session.id !== void 0 || session.token !== void 0 || session.error !== void 0) ? snapshotSession(session) : void 0;
 	store.set(emptySession(binding));
 	binding.held.set(void 0);
-	transport.drop?.(sessionCookie(binding));
+	transport.drop?.();
 	await config.hooks?.onClear?.({
 		oldSession,
 		...args,
@@ -1119,8 +1129,7 @@ function defineSession(config, options) {
 	const name = config.name || codec.defaultName;
 	assertSessionConfig(config, {
 		name,
-		prefix: driver.prefix,
-		defaultCookie: codec.defaultCookie
+		prefix: driver.prefix
 	});
 	const keys = codec.keys(config);
 	const actions = sessionActions();
@@ -1163,15 +1172,15 @@ function defineSession(config, options) {
 }
 function webCookieJar(request, response) {
 	let cookies;
-	const jar = { read: (name) => (cookies ||= requestCookies(request))[name] };
+	const jar = { read: (name) => (cookies ||= parseCookie(request.get("cookie") ?? ""))[name] };
 	if (response) {
 		const { headers, errHeaders } = response;
 		jar.written = (name) => setCookieValues(headers.getSetCookie())[name];
 		jar.write = (name, value, attrs) => {
 			setCookie(headers, {
+				...attrs,
 				name,
-				value,
-				...attrs
+				value
 			});
 			if (errHeaders) mirrorSetCookie(name, {
 				from: headers,
@@ -1181,19 +1190,24 @@ function webCookieJar(request, response) {
 	}
 	return jar;
 }
-function requestCookies(request) {
-	const header = request.get("cookie");
-	return header ? parse(header) : Object.create(null);
+function parseCookie(header) {
+	return parse(header);
 }
-function setCookie(headers, cookie) {
-	const line = serialize({
+function serializeCookie(name, value, attrs) {
+	return serialize({
 		path: "/",
-		...cookie
+		...attrs,
+		name,
+		value
 	});
+}
+function setCookie(headers, cookie) {
+	const { name, value, ...attrs } = cookie;
+	const line = serializeCookie(name, value, attrs);
 	const key = cookieKey(cookie);
 	const kept = headers.getSetCookie().filter((existing) => {
 		const parsed = parseSetCookie(existing);
-		return parsed ? cookieKey(parsed) !== key : setCookieName(existing) !== cookie.name;
+		return parsed ? cookieKey(parsed) !== key : setCookieName(existing) !== name;
 	});
 	headers.delete("set-cookie");
 	for (const existing of kept) headers.append("set-cookie", existing);
@@ -1208,33 +1222,36 @@ function cookieKey(cookie) {
 		cookie.partitioned ? "1" : "0"
 	].join(";");
 }
-const PREFIX = "[unjwt/session]";
 const requestStates = /* @__PURE__ */ new WeakMap();
-const webSessionDriver = {
-	prefix: PREFIX,
-	state: (event) => {
-		if (isHanded(event)) return sessionsOf(event);
-		if (event.context) return contextState(event.context);
-		return sessionsOf(event.req ? webRequest(event.req) : event);
-	},
-	header: (event, name) => isHanded(event) ? void 0 : requestHeaders(event).get(name),
-	cookies: (event) => isHanded(event) ? { read: () => void 0 } : webCookieJar(requestHeaders(event), event.res),
-	handed: (event) => isHanded(event) ? { token: event.token } : void 0
-};
-function isHanded(event) {
+function webSessionDriver(options) {
+	const prefix = options?.prefix ?? "[unjwt/session]";
+	return {
+		prefix,
+		state: (event) => {
+			if (isHanded(event, prefix)) return sessionsOf(event);
+			if (event.context) return contextState(event.context);
+			return sessionsOf(event.req ? webRequest(event.req, prefix) : event);
+		},
+		header: (event, name) => isHanded(event, prefix) ? void 0 : requestHeaders(event, prefix).get(name),
+		cookies: (event) => isHanded(event, prefix) ? { read: () => void 0 } : webCookieJar(requestHeaders(event, prefix), event.res),
+		handed: (event) => isHanded(event, prefix) ? { token: event.token } : void 0
+	};
+}
+const defaultWebSessionDriver = /* @__PURE__ */ webSessionDriver();
+function isHanded(event, prefix) {
 	if ("req" in event || "headers" in event) return false;
 	if ("token" in event) return true;
-	throw invalidConfigError(`${PREFIX} use() got neither a request event nor a token.`);
+	throw invalidConfigError(`${prefix} use() got neither a request event nor a token.`);
 }
-function requestHeaders(event) {
-	if (event.req) return webRequest(event.req).headers;
+function requestHeaders(event, prefix) {
+	if (event.req) return webRequest(event.req, prefix).headers;
 	if (event.headers) return event.headers;
-	throw invalidConfigError(`${PREFIX} use() got a request event with neither "req" nor "headers".`);
+	throw invalidConfigError(`${prefix} use() got a request event with neither "req" nor "headers".`);
 }
-function webRequest(req) {
+function webRequest(req, prefix) {
 	const headers = req.headers;
 	if (typeof headers === "object" && headers !== null && "get" in headers) return req;
-	throw invalidConfigError(`${PREFIX} use() got an event whose "req" is not a web Request.`);
+	throw invalidConfigError(`${prefix} use() got an event whose "req" is not a web Request.`);
 }
 function contextState(context) {
 	const existing = context.unjwt;
@@ -1251,7 +1268,7 @@ function sessionsOf(request) {
 	return created;
 }
 function defineJWSSession(config, options) {
-	const driver = options?.driver ?? webSessionDriver;
+	const driver = options?.driver ?? defaultWebSessionDriver;
 	return defineSession(config, {
 		driver,
 		codec: createJWSCodec({
@@ -1357,19 +1374,12 @@ function encryptionBits(enc) {
 	const bits = Number(enc.slice(1, 4));
 	return enc.includes("CBC") ? bits * 2 : bits;
 }
-const JWE_DEFAULT_COOKIE = {
-	path: "/",
-	secure: true,
-	httpOnly: true,
-	sameSite: "lax"
-};
 function createJWECodec(options) {
 	const { prefix, defaultName } = options;
 	return createSessionCodec({
 		family: "jwe",
 		prefix,
 		defaultName,
-		defaultCookie: JWE_DEFAULT_COOKIE,
 		issueOptions: (config) => config.jwe?.encryptOptions,
 		openOptions: (config) => config.jwe?.decryptOptions,
 		resolveKeys: (config) => resolveSessionKeys(config.key, {
@@ -1400,7 +1410,7 @@ function sessionMaxIterations(config) {
 	return typeof alg === "string" && alg.startsWith("PBES2") ? config.jwe?.encryptOptions?.p2c ?? 6e5 : void 0;
 }
 function defineJWESession(config, options) {
-	const driver = options?.driver ?? webSessionDriver;
+	const driver = options?.driver ?? defaultWebSessionDriver;
 	return defineSession(config, {
 		driver,
 		codec: createJWECodec({
@@ -1412,4 +1422,4 @@ function defineJWESession(config, options) {
 function defineSessionDriver(driver) {
 	return driver;
 }
-export { defineJWESession, defineJWSSession, defineSessionDriver, deriveJWKFromPassword, exportPEM, generateJWK, importPEM, thumbprint, toPublicJWK };
+export { DEFAULT_SESSION_COOKIE, assertSessionConfig, assertSessionHeader, assertSessionTokenSource, assertSessionWritable, claimSessionName, defineJWESession, defineJWSSession, defineSessionDriver, deriveJWKFromPassword, exportPEM, generateJWK, importPEM, parseCookie, resolveSessionTransport, serializeCookie, sessionTransportOptions, thumbprint, toPublicJWK, webCookieJar, webSessionDriver };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unjwt",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "A collection of JWT utilities based on the Web Crypto API.",
   "keywords": [
     "auth",