testing custom fetch

Author: Torwent

src/hooks.server.ts

@@ -1,7 +1,8 @@
 import { type Handle, redirect } from "@sveltejs/kit"
 import { createServerClient } from "@supabase/ssr"
 import { sequence } from "@sveltejs/kit/hooks"
-import { PUBLIC_LOCAL_SUPABASE_URL, PUBLIC_SUPABASE_ANON_KEY } from "$env/static/public"
+import { PUBLIC_SUPABASE_URL, PUBLIC_SUPABASE_ANON_KEY } from "$env/static/public"
+import type { Database } from "$lib/types/supabase"
 
 const redirects: Handle = async ({ event, resolve }) => {
 	if (event.url.pathname.startsWith("/refresh_token")) {
@@ -20,15 +21,20 @@ const redirects: Handle = async ({ event, resolve }) => {
 }
 
 const supabase: Handle = async ({ event, resolve }) => {
-	console.log("└⚡Server connecting to database: ", PUBLIC_LOCAL_SUPABASE_URL)
-	event.locals.supabaseServer = createServerClient(PUBLIC_LOCAL_SUPABASE_URL, PUBLIC_SUPABASE_ANON_KEY, {
+	event.locals.supabaseServer = createServerClient<Database>(PUBLIC_SUPABASE_URL, PUBLIC_SUPABASE_ANON_KEY, {
 		cookies: {
 			getAll: () => event.cookies.getAll(),
 			setAll: (cookiesToSet) => {
 				cookiesToSet.forEach(({ name, value, options }) => {
 					event.cookies.set(name, value, { ...options, path: "/" })
 				})
 			}
+		},
+		global: {
+			fetch: (input: string | URL | Request, init?: RequestInit) => {
+				console.log("Server hook: ", input)
+				return event.fetch(input, init)
+			}
 		}
 	})
 

src/lib/server/supabase.server.ts

@@ -1,12 +1,11 @@
 import { SUPABASE_SERVICE_KEY } from "$env/static/private"
-import { PUBLIC_LOCAL_SUPABASE_URL } from "$env/static/public"
+import { PUBLIC_SUPABASE_URL } from "$env/static/public"
 import type { Database } from "$lib/types/supabase"
 import { formatError } from "$lib/utils"
 import { type SupabaseClient, createClient, type Provider } from "@supabase/supabase-js"
 import { error, redirect } from "@sveltejs/kit"
 
-console.log("└⚡Server connecting to admin database: ", PUBLIC_LOCAL_SUPABASE_URL)
-export const supabaseAdmin = createClient<Database>(PUBLIC_LOCAL_SUPABASE_URL, SUPABASE_SERVICE_KEY, {
+export const supabaseAdmin = createClient<Database>(PUBLIC_SUPABASE_URL, SUPABASE_SERVICE_KEY, {
 	auth: { autoRefreshToken: true, persistSession: false }
 })
 

src/routes/+layout.ts

@@ -1,17 +1,27 @@
 import { createBrowserClient, createServerClient, isBrowser } from "@supabase/ssr"
-import { PUBLIC_LOCAL_SUPABASE_URL, PUBLIC_SUPABASE_ANON_KEY, PUBLIC_SUPABASE_URL } from "$env/static/public"
+import { PUBLIC_SUPABASE_URL, PUBLIC_SUPABASE_ANON_KEY } from "$env/static/public"
 import type { Session, User } from "@supabase/supabase-js"
 
 export const load = async ({ data, depends, fetch }) => {
 	depends("supabase:auth")
 	const isbrowser = isBrowser()
-	console.log("└⚡", isbrowser ? "Client" : "Server", " connecting to database: ", PUBLIC_SUPABASE_URL)
+
 	const supabaseClient = isbrowser
 		? createBrowserClient(PUBLIC_SUPABASE_URL, PUBLIC_SUPABASE_ANON_KEY, {
-				global: { fetch }
+				global: {
+					fetch: (input: string | URL | Request, init?: RequestInit) => {
+						console.log("Layout Client: ", input)
+						return fetch(input, init)
+					}
+				}
 			})
-		: createServerClient(PUBLIC_LOCAL_SUPABASE_URL, PUBLIC_SUPABASE_ANON_KEY, {
-				global: { fetch },
+		: createServerClient(PUBLIC_SUPABASE_URL, PUBLIC_SUPABASE_ANON_KEY, {
+				global: {
+					fetch: (input: string | URL | Request, init?: RequestInit) => {
+						console.log("Layout Server: ", input)
+						return fetch(input, init)
+					}
+				},
 				cookies: {
 					getAll() {
 						return data.cookies
@@ -21,7 +31,7 @@ export const load = async ({ data, depends, fetch }) => {
 
 	let session: Session | null
 	let user: User | null
-	if (isBrowser()) {
+	if (isbrowser) {
 		const promises = await Promise.all([supabaseClient.auth.getSession(), supabaseClient.auth.getUser()])
 		session = promises[0].data.session
 		user = promises[1].data.user