@riducms/sveltekit 0.4.0 → 0.6.0

package/package.json

@@ -4,7 +4,7 @@
 	},
 	"description": "SvelteKit integration for Ridu: direct browser requests, server rendering, and one session owner.",
 	"devDependencies": {
-		"@riducms/sdk": "0.4.0",
+		"@riducms/sdk": "0.6.0",
 		"@sveltejs/kit": "^2.48.0"
 	},
 	"exports": {
@@ -27,7 +27,7 @@
 	"license": "MIT",
 	"name": "@riducms/sveltekit",
 	"peerDependencies": {
-		"@riducms/sdk": "0.4.0",
+		"@riducms/sdk": "0.6.0",
 		"@sveltejs/kit": "^2.20.0",
 		"svelte": "^5.29.0"
 	},
@@ -45,5 +45,5 @@
 		"test": "bun test"
 	},
 	"type": "module",
-	"version": "0.4.0"
+	"version": "0.6.0"
 }

package/src/definition.ts

@@ -28,7 +28,7 @@ export interface RiduDefinitionOptions<Factory extends ClientFactory, Slug exten
 	authCollection: Slug;
 	/** Frontend-domain cookie that stores the session token. Defaults to `ridu_token`. */
 	cookieName?: string;
-	/** Fetch used by server-side clients. Defaults to the platform fetch. */
+	/** Fetch used by server-side clients. Defaults to SvelteKit's `event.fetch`. */
 	fetch?: ClientOptions["fetch"];
 }
 
@@ -44,7 +44,12 @@ export interface RiduDefinition<
 	readonly cookieName: string;
 	client(
 		token: SessionTokenStore<SessionFor<Config, Slug>>,
-		options?: { fetch?: ClientOptions["fetch"]; memoizeSession?: boolean }
+		options?: {
+			fetch?: ClientOptions["fetch"];
+			/** Used when neither the call nor the definition supplies a fetch. */
+			fallbackFetch?: ClientOptions["fetch"];
+			memoizeSession?: boolean;
+		}
 	): RiduClient<Config, Slug>;
 }
 
@@ -62,7 +67,7 @@ export function createDefinition<
 		authCollection: options.authCollection,
 		cookieName,
 		client(token, clientOptions = {}) {
-			const fetch = clientOptions.fetch ?? options.fetch;
+			const fetch = clientOptions.fetch ?? options.fetch ?? clientOptions.fallbackFetch;
 			return options.createClient({
 				baseURL,
 				...(fetch === undefined ? {} : { fetch }),

package/src/server.ts

@@ -15,7 +15,11 @@ interface Binding<Config extends RiduConfigShape, Slug extends AuthCollectionSlu
 }
 
 export interface ServerClientOptions {
-	/** Fetch for server requests to Ridu. Defaults to the definition's fetch or the platform fetch. */
+	/**
+	 * Fetch for server requests to Ridu. Defaults to the definition's fetch, then to SvelteKit's
+	 * `event.fetch`. The client sends its token in a header with `credentials: "omit"`, so
+	 * `event.fetch` does not forward the web app's cookies to Ridu.
+	 */
 	fetch?: ClientOptions["fetch"];
 }
 
@@ -29,7 +33,7 @@ export function createServerClient<
 	Slug extends AuthCollectionSlug<Config>,
 >(
 	ridu: Binding<Config, Slug>,
-	event: Pick<RequestEvent, "cookies" | "url">,
+	event: Pick<RequestEvent, "cookies" | "url"> & Partial<Pick<RequestEvent, "fetch">>,
 	options: ServerClientOptions = {}
 ): RiduClient<Config, Slug> {
 	const definition = ridu[definitionKey];
@@ -40,6 +44,7 @@ export function createServerClient<
 	);
 	return definition.client(store, {
 		...(options.fetch === undefined ? {} : { fetch: options.fetch }),
+		...(event.fetch === undefined ? {} : { fallbackFetch: event.fetch }),
 		memoizeSession: true,
 	});
 }