Merge pull request #86 from kitpdr/fix/convex-client-setup

fix(deploy): align convex setup with static env

commit: 818aa5467c93c2e442a8db63fc973e6fa6faa033
author: KiT · 9mo ago · 2026-01-24 09:00 UTC
committer: GitHub · 9mo ago · 2026-01-24 09:00 UTC
merge of: a47c61c + c844c36 · diff against the first parent
signature: GPG UnverifiedB5690EEEBB952194 The key is unknown

2 files · +25 -12

M src/lib/components/chat-room.svelte +25 -10


@@ -7,6 +7,7 @@
7	7		import { onMount, tick } from 'svelte';
8	8		import { SvelteSet, SvelteMap } from 'svelte/reactivity';
9	9		import { browser } from '$app/environment';
	10	+	import { env } from '$env/dynamic/public';
10	11		import { api } from '$lib/api/client';
11	12		import { draggable } from '$lib/actions/draggable';
12	13		import { resizable } from '$lib/actions/resizable';

@@ -39,27 +40,31 @@
39	40		initialTextStyle?: TextStyle;
40	41		}>();
41	42
	43	+	const isClient = browser && Boolean(env.PUBLIC_CONVEX_URL);
	44	+
42	45		// ============ CONVEX REAL-TIME SUBSCRIPTIONS ============
43	46
44	47		// Subscribe to default room (to get room ID)
45		-	const defaultRoomQuery = useQuery(convexApi.queries.getDefaultRoomPublic, {});
	48	+	const defaultRoomQuery = isClient ? useQuery(convexApi.queries.getDefaultRoomPublic, {}) : null;
46	49
47	50		// Subscribe to users (buddy list) - real-time updates
48		-	const usersQuery = useQuery(convexApi.queries.getUsersPublic, {});
	51	+	const usersQuery = isClient ? useQuery(convexApi.queries.getUsersPublic, {}) : null;
49	52
50	53		// Room ID from Convex query
51		-	const roomId = $derived(defaultRoomQuery.data?.id as Id<'chatRooms'> \| undefined);
	54	+	const roomId = $derived(defaultRoomQuery?.data?.id as Id<'chatRooms'> \| undefined);
52	55
53	56		// Subscribe to messages - only when room ID is available
54	57		const messagesQuery = $derived(
55		-	roomId ? useQuery(convexApi.queries.getMessagesPublic, () => ({ roomId: roomId! })) : null
	58	+	roomId && isClient
	59	+	? useQuery(convexApi.queries.getMessagesPublic, () => ({ roomId: roomId! }))
	60	+	: null
56	61		);
57	62
58		-	const convexClient = useConvexClient();
	63	+	const convexClient = isClient ? useConvexClient() : null;
59	64
60	65		// Transform Convex users to SafeUser format
61	66		const onlineUsers = $derived.by<SafeUser[]>(() => {
62		-	if (!usersQuery.data) return [];
	67	+	if (!usersQuery?.data) return [];
63	68		return usersQuery.data
64	69		.map((u) => ({
65	70		id: u.id,

@@ -122,11 +127,13 @@
122	127
123	128		// Loading and error states from Convex
124	129		const isInitialLoading = $derived(
125		-	defaultRoomQuery.isLoading \|\| usersQuery.isLoading \|\| messagesQuery?.isLoading
	130	+	(defaultRoomQuery?.isLoading ?? false) \|\|
	131	+	(usersQuery?.isLoading ?? false) \|\|
	132	+	(messagesQuery?.isLoading ?? false)
126	133		);
127	134		const connectionError = $derived.by<string \| null>(() => {
128		-	if (defaultRoomQuery.error) return 'Erreur de connexion au salon';
129		-	if (usersQuery.error) return 'Erreur de chargement des utilisateurs';
	135	+	if (defaultRoomQuery?.error) return 'Erreur de connexion au salon';
	136	+	if (usersQuery?.error) return 'Erreur de chargement des utilisateurs';
130	137		if (messagesQuery?.error) return 'Erreur de chargement des messages';
131	138		return null;
132	139		});

@@ -950,7 +957,15 @@
950	957		const target = event.target as HTMLElement;
951	958		const { scrollTop } = target;
952	959
953		-	if (scrollTop < 100 && !isLoadingMore && hasMoreMessages && roomId && chatArea && currentUser) {
	960	+	if (
	961	+	scrollTop < 100 &&
	962	+	!isLoadingMore &&
	963	+	hasMoreMessages &&
	964	+	roomId &&
	965	+	chatArea &&
	966	+	currentUser &&
	967	+	convexClient
	968	+	) {
954	969		isLoadingMore = true;
955	970		const prevScrollHeight = chatArea.scrollHeight;
956	971		const prevScrollTop = chatArea.scrollTop;

 	import { onMount, tick } from 'svelte';
 	import { SvelteSet, SvelteMap } from 'svelte/reactivity';
 	import { browser } from '$app/environment';
+	import { env } from '$env/dynamic/public';
 	import { api } from '$lib/api/client';
 	import { draggable } from '$lib/actions/draggable';
 	import { resizable } from '$lib/actions/resizable';
 		initialTextStyle?: TextStyle;
 	}>();
+	const isClient = browser && Boolean(env.PUBLIC_CONVEX_URL);
 	// ============ CONVEX REAL-TIME SUBSCRIPTIONS ============
 	// Subscribe to default room (to get room ID)
-	const defaultRoomQuery = useQuery(convexApi.queries.getDefaultRoomPublic, {});
+	const defaultRoomQuery = isClient ? useQuery(convexApi.queries.getDefaultRoomPublic, {}) : null;
 	// Subscribe to users (buddy list) - real-time updates
-	const usersQuery = useQuery(convexApi.queries.getUsersPublic, {});
+	const usersQuery = isClient ? useQuery(convexApi.queries.getUsersPublic, {}) : null;
 	// Room ID from Convex query
-	const roomId = $derived(defaultRoomQuery.data?.id as Id<'chatRooms'> | undefined);
+	const roomId = $derived(defaultRoomQuery?.data?.id as Id<'chatRooms'> | undefined);
 	// Subscribe to messages - only when room ID is available
 	const messagesQuery = $derived(
-		roomId ? useQuery(convexApi.queries.getMessagesPublic, () => ({ roomId: roomId! })) : null
+		roomId && isClient
+			? useQuery(convexApi.queries.getMessagesPublic, () => ({ roomId: roomId! }))
+			: null
 	);
-	const convexClient = useConvexClient();
+	const convexClient = isClient ? useConvexClient() : null;
 	// Transform Convex users to SafeUser format
 	const onlineUsers = $derived.by<SafeUser[]>(() => {
-		if (!usersQuery.data) return [];
+		if (!usersQuery?.data) return [];
 		return usersQuery.data
 			.map((u) => ({
 				id: u.id,
 	// Loading and error states from Convex
 	const isInitialLoading = $derived(
-		defaultRoomQuery.isLoading || usersQuery.isLoading || messagesQuery?.isLoading
+		(defaultRoomQuery?.isLoading ?? false) ||
+			(usersQuery?.isLoading ?? false) ||
+			(messagesQuery?.isLoading ?? false)
 	);
 	const connectionError = $derived.by<string | null>(() => {
-		if (defaultRoomQuery.error) return 'Erreur de connexion au salon';
+		if (defaultRoomQuery?.error) return 'Erreur de connexion au salon';
-		if (usersQuery.error) return 'Erreur de chargement des utilisateurs';
+		if (usersQuery?.error) return 'Erreur de chargement des utilisateurs';
 		if (messagesQuery?.error) return 'Erreur de chargement des messages';
 		return null;
 	});
 		const target = event.target as HTMLElement;
 		const { scrollTop } = target;
-		if (scrollTop < 100 && !isLoadingMore && hasMoreMessages && roomId && chatArea && currentUser) {
+		if (
+			scrollTop < 100 &&
+			!isLoadingMore &&
+			hasMoreMessages &&
+			roomId &&
+			chatArea &&
+			currentUser &&
+			convexClient
+		) {
 			isLoadingMore = true;
 			const prevScrollHeight = chatArea.scrollHeight;
 			const prevScrollTop = chatArea.scrollTop;

M src/routes/+layout.svelte +0 -2


@@ -9,8 +9,6 @@
9	9		// Initialize Convex client for real-time subscriptions
10	10		if (browser && env.PUBLIC_CONVEX_URL) {
11	11		setupConvex(env.PUBLIC_CONVEX_URL);
12		-	} else if (browser && !env.PUBLIC_CONVEX_URL) {
13		-	console.error('Missing PUBLIC_CONVEX_URL for Convex client setup');
14	12		}
15	13
16	14		let { children, data } = $props();


@@ -9,8 +9,6 @@
9		// Initialize Convex client for real-time subscriptions	9	// Initialize Convex client for real-time subscriptions
10		if (browser && env.PUBLIC_CONVEX_URL) {	10	if (browser && env.PUBLIC_CONVEX_URL) {
11		setupConvex(env.PUBLIC_CONVEX_URL);	11	setupConvex(env.PUBLIC_CONVEX_URL);
12	-	} else if (browser && !env.PUBLIC_CONVEX_URL) {
13	-	console.error('Missing PUBLIC_CONVEX_URL for Convex client setup');
14		}	12	}
15			13
16		let { children, data } = $props();	14	let { children, data } = $props();