Merge remote-tracking branch 'upstream/dev' into fix/ui

surfsense_web/hooks/use-comments-electric.ts

@@ -393,11 +393,19 @@ export function useCommentsElectric(threadId: number | null) {
 			}
 
 			if (syncHandleRef.current) {
-				syncHandleRef.current.unsubscribe();
+				try {
+					syncHandleRef.current.unsubscribe();
+				} catch {
+					// PGlite may already be closed during cleanup
+				}
 				syncHandleRef.current = null;
 			}
 			if (liveQueryRef.current) {
-				liveQueryRef.current.unsubscribe();
+				try {
+					liveQueryRef.current.unsubscribe();
+				} catch {
+					// PGlite may already be closed during cleanup
+				}
 				liveQueryRef.current = null;
 			}
 		};

surfsense_web/hooks/use-connectors-electric.ts

@@ -180,11 +180,19 @@ export function useConnectorsElectric(searchSpaceId: number | string | null) {
 			syncKeyRef.current = null;
 
 			if (syncHandleRef.current) {
-				syncHandleRef.current.unsubscribe();
+				try {
+					syncHandleRef.current.unsubscribe();
+				} catch {
+					// PGlite may already be closed during cleanup
+				}
 				syncHandleRef.current = null;
 			}
 			if (liveQueryRef.current) {
-				liveQueryRef.current.unsubscribe();
+				try {
+					liveQueryRef.current.unsubscribe();
+				} catch {
+					// PGlite may already be closed during cleanup
+				}
 				liveQueryRef.current = null;
 			}
 		};

surfsense_web/hooks/use-documents.ts

@@ -230,11 +230,19 @@ export function useDocuments(
 		async function setupElectricRealtime() {
 			// Cleanup previous subscriptions
 			if (syncHandleRef.current) {
-				syncHandleRef.current.unsubscribe();
+				try {
+					syncHandleRef.current.unsubscribe();
+				} catch {
+					// PGlite may already be closed during cleanup
+				}
 				syncHandleRef.current = null;
 			}
 			if (liveQueryRef.current) {
-				liveQueryRef.current.unsubscribe?.();
+				try {
+					liveQueryRef.current.unsubscribe?.();
+				} catch {
+					// PGlite may already be closed during cleanup
+				}
 				liveQueryRef.current = null;
 			}
 
@@ -420,11 +428,19 @@ export function useDocuments(
 		return () => {
 			mounted = false;
 			if (syncHandleRef.current) {
-				syncHandleRef.current.unsubscribe();
+				try {
+					syncHandleRef.current.unsubscribe();
+				} catch {
+					// PGlite may already be closed during cleanup
+				}
 				syncHandleRef.current = null;
 			}
 			if (liveQueryRef.current) {
-				liveQueryRef.current.unsubscribe?.();
+				try {
+					liveQueryRef.current.unsubscribe?.();
+				} catch {
+					// PGlite may already be closed during cleanup
+				}
 				liveQueryRef.current = null;
 			}
 		};

surfsense_web/hooks/use-inbox.ts

@@ -131,7 +131,11 @@ export function useInbox(
 
 				// Clean up previous sync
 				if (syncHandleRef.current) {
-					syncHandleRef.current.unsubscribe();
+					try {
+						syncHandleRef.current.unsubscribe();
+					} catch {
+						// PGlite may already be closed during cleanup
+					}
 					syncHandleRef.current = null;
 				}
 
@@ -174,7 +178,11 @@ export function useInbox(
 			mounted = false;
 			userSyncKeyRef.current = null;
 			if (syncHandleRef.current) {
-				syncHandleRef.current.unsubscribe();
+				try {
+					syncHandleRef.current.unsubscribe();
+				} catch {
+					// PGlite may already be closed during cleanup
+				}
 				syncHandleRef.current = null;
 			}
 		};
@@ -199,7 +207,11 @@ export function useInbox(
 		async function setupLiveQuery() {
 			// Clean up previous live query
 			if (liveQueryRef.current) {
-				liveQueryRef.current.unsubscribe();
+				try {
+					liveQueryRef.current.unsubscribe();
+				} catch {
+					// PGlite may already be closed during cleanup
+				}
 				liveQueryRef.current = null;
 			}
 
@@ -297,7 +309,11 @@ export function useInbox(
 		return () => {
 			mounted = false;
 			if (liveQueryRef.current) {
-				liveQueryRef.current.unsubscribe();
+				try {
+					liveQueryRef.current.unsubscribe();
+				} catch {
+					// PGlite may already be closed during cleanup
+				}
 				liveQueryRef.current = null;
 			}
 		};

surfsense_web/hooks/use-messages-electric.ts

@@ -142,11 +142,19 @@ export function useMessagesElectric(
 			syncKeyRef.current = null;
 
 			if (syncHandleRef.current) {
-				syncHandleRef.current.unsubscribe();
+				try {
+					syncHandleRef.current.unsubscribe();
+				} catch {
+					// PGlite may already be closed during cleanup
+				}
 				syncHandleRef.current = null;
 			}
 			if (liveQueryRef.current) {
-				liveQueryRef.current.unsubscribe();
+				try {
+					liveQueryRef.current.unsubscribe();
+				} catch {
+					// PGlite may already be closed during cleanup
+				}
 				liveQueryRef.current = null;
 			}
 		};