Merge pull request #932 from SnowCait/reconnect

Reconnect

web/src/lib/timelines/MainTimeline.ts

@@ -6,7 +6,8 @@ import {
 	createRxNostr,
 	filterByType,
 	latestEach,
-	uniq
+	uniq,
+	type ConnectionState
 } from 'rx-nostr';
 import { tap, bufferTime } from 'rxjs';
 import { timeout } from '$lib/Constants';
@@ -16,14 +17,16 @@ import { eventItemStore, metadataStore } from '../cache/Events';
 import { Content } from '$lib/Content';
 import { ToastNotification } from '$lib/ToastNotification';
 
-export const rxNostr = createRxNostr({ eoseTimeout: timeout }); // Based on NIP-65
+export const rxNostr = createRxNostr({
+	eoseTimeout: timeout,
+	keepAliveDefaultRelayConnections: false
+}); // Based on NIP-65
 
 rxNostr.createConnectionStateObservable().subscribe(({ from, state }) => {
 	switch (state) {
 		case 'error':
 		case 'rejected':
-		case 'terminated':
-		case 'initialized': {
+		case 'terminated': {
 			console.error('[rx-nostr connection]', from, state);
 			break;
 		}
@@ -33,6 +36,7 @@ rxNostr.createConnectionStateObservable().subscribe(({ from, state }) => {
 			console.warn('[rx-nostr connection]', from, state);
 			break;
 		}
+		case 'initialized':
 		case 'connecting':
 		case 'connected':
 		default: {
@@ -42,6 +46,30 @@ rxNostr.createConnectionStateObservable().subscribe(({ from, state }) => {
 	}
 });
 
+const recconectableStates: ConnectionState[] = [
+	'error',
+	'rejected',
+	'terminated',
+	'waiting-for-retrying',
+	'retrying',
+	'dormant'
+];
+
+export function reconnectIfConnectionsAreUnstable(): void {
+	const states = Object.entries(rxNostr.getAllRelayState());
+	console.log('[relay states]', states);
+	if (
+		states.filter(([, state]) => recconectableStates.includes(state)).length * 2 <
+		states.length
+	) {
+		return;
+	}
+
+	// TODO: Clear timeline and reconnect WebSocket without reload
+	console.log('[reload]', states);
+	location.reload();
+}
+
 const observable = rxNostr.createAllMessageObservable();
 observable.pipe(filterByType('NOTICE')).subscribe((packet) => {
 	console.warn('[rx-nostr notice]', packet);

web/src/routes/(app)/+layout.svelte

@@ -2,18 +2,16 @@
 	import { createRxOneshotReq, latest } from 'rx-nostr';
 	import { WebStorage } from '$lib/WebStorage';
 	import { notificationKinds } from '$lib/NotificationTimeline';
-	import { rxNostr } from '$lib/timelines/MainTimeline';
+	import { reconnectIfConnectionsAreUnstable, rxNostr } from '$lib/timelines/MainTimeline';
 	import Notice from '$lib/components/Notice.svelte';
 	import Header from './Header.svelte';
 	import NoteDialog from './NoteDialog.svelte';
 	import { openNoteDialog } from '../../stores/NoteDialog';
 	import { pubkey } from '../../stores/Author';
 	import { lastReadAt, lastNotifiedAt } from '../../stores/Notifications';
 	import { onMount } from 'svelte';
-	import ReloadDialog from './ReloadDialog.svelte';
 	import Gdpr from './parts/Gdpr.svelte';
 
-	let reloadDialogComponent: ReloadDialog;
 	const konamiCode = [
 		'ArrowUp',
 		'ArrowUp',
@@ -94,7 +92,7 @@
 				break;
 			}
 			case 'visible': {
-				setTimeout(() => reloadDialogComponent.tryOpen(), 1000);
+				setTimeout(() => reconnectIfConnectionsAreUnstable(), 1000);
 				break;
 			}
 		}
@@ -137,7 +135,6 @@
 
 <div class="app">
 	<NoteDialog />
-	<ReloadDialog bind:this={reloadDialogComponent} />
 
 	<header>
 		<div>