From e74174dea390688273ea2af6333d1b7abb9012aa Mon Sep 17 00:00:00 2001
From: fly_mc <me@flymc.cc>
Date: Sun, 10 Nov 2024 13:29:28 +0800
Subject: [PATCH 1/2] more stable ws stream

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
---
 packages/frontend/src/stream.ts | 88 ++++++++++++++++++++++++---------
 1 file changed, 64 insertions(+), 24 deletions(-)

diff --git a/packages/frontend/src/stream.ts b/packages/frontend/src/stream.ts
index e63dac951c..e23937e6b6 100644
--- a/packages/frontend/src/stream.ts
+++ b/packages/frontend/src/stream.ts
@@ -7,45 +7,85 @@ import * as Misskey from 'misskey-js';
 import { markRaw } from 'vue';
 import { $i } from '@/account.js';
 import { wsOrigin } from '@@/js/config.js';
+import { DEFAULT_DEVICE_KIND } from '@/scripts/device-kind.js';
 // TODO: No WebsocketモードでStreamMockが使えそう
 //import { StreamMock } from '@/scripts/stream-mock.js';
 
 // heart beat interval in ms
-const HEART_BEAT_INTERVAL = 1000 * 60;
+const HEART_BEAT_INTERVAL = DEFAULT_DEVICE_KIND === 'desktop' ? 1000 * 15 : 1000 * 30;
+
+const RECONNECT_MAX_ATTEMPTS = 10;
+const RECONNECT_INITIAL_DELAY = 1000;
+const RECONNECT_MAX_DELAY = 1000 * 30;
 
 let stream: Misskey.IStream | null = null;
 let timeoutHeartBeat: number | null = null;
 let lastHeartbeatCall = 0;
+let reconnectAttempts = 0;
+let reconnectTimeout: number | null = null;
+
+function getReconnectDelay(): number {
+    const delay = RECONNECT_INITIAL_DELAY * Math.pow(2, reconnectAttempts);
+    return Math.min(delay, RECONNECT_MAX_DELAY);
+}
+
+function createStream(): Misskey.IStream {
+    const newStream = markRaw(new Misskey.Stream(wsOrigin, $i ? {
+        token: $i.token,
+    } : null));
+
+    newStream.on('_disconnected_', () => {
+        console.log('Stream disconnected, attempting to reconnect...');
+        if (reconnectAttempts < RECONNECT_MAX_ATTEMPTS) {
+            const delay = getReconnectDelay();
+            reconnectTimeout = window.setTimeout(() => {
+                reconnectAttempts++;
+                stream = null;
+                useStream();
+            }, delay);
+        } else {
+            console.error('Max reconnection attempts reached');
+        }
+    });
+
+    newStream.on('_connected_', () => {
+        console.log('Stream connected successfully');
+        reconnectAttempts = 0;
+        if (reconnectTimeout) {
+            clearTimeout(reconnectTimeout);
+            reconnectTimeout = null;
+        }
+    });
+
+    return newStream;
+}
 
 export function useStream(): Misskey.IStream {
-	if (stream) return stream;
+    if (stream) return stream;
 
-	// TODO: No Websocketモードもここで判定
-	stream = markRaw(new Misskey.Stream(wsOrigin, $i ? {
-		token: $i.token,
-	} : null));
+    stream = createStream();
 
-	if (timeoutHeartBeat) window.clearTimeout(timeoutHeartBeat);
-	timeoutHeartBeat = window.setTimeout(heartbeat, HEART_BEAT_INTERVAL);
+    if (timeoutHeartBeat) window.clearTimeout(timeoutHeartBeat);
+    timeoutHeartBeat = window.setTimeout(heartbeat, HEART_BEAT_INTERVAL);
 
-	// send heartbeat right now when last send time is over HEART_BEAT_INTERVAL
-	document.addEventListener('visibilitychange', () => {
-		if (
-			!stream
-			|| document.visibilityState !== 'visible'
-			|| Date.now() - lastHeartbeatCall < HEART_BEAT_INTERVAL
-		) return;
-		heartbeat();
-	});
+    // send heartbeat right now when last send time is over HEART_BEAT_INTERVAL
+    document.addEventListener('visibilitychange', () => {
+        if (
+            !stream
+            || document.visibilityState !== 'visible'
+            || Date.now() - lastHeartbeatCall < HEART_BEAT_INTERVAL
+        ) return;
+        heartbeat();
+    });
 
-	return stream;
+    return stream;
 }
 
 function heartbeat(): void {
-	if (stream != null && document.visibilityState === 'visible') {
-		stream.heartbeat();
-	}
-	lastHeartbeatCall = Date.now();
-	if (timeoutHeartBeat) window.clearTimeout(timeoutHeartBeat);
-	timeoutHeartBeat = window.setTimeout(heartbeat, HEART_BEAT_INTERVAL);
+    if (stream != null && document.visibilityState === 'visible') {
+        stream.heartbeat();
+    }
+    lastHeartbeatCall = Date.now();
+    if (timeoutHeartBeat) window.clearTimeout(timeoutHeartBeat);
+    timeoutHeartBeat = window.setTimeout(heartbeat, HEART_BEAT_INTERVAL);
 }
-- 
2.45.2


From 997c5b3d35ce9b9862b33674eb932ba5cc9fcc54 Mon Sep 17 00:00:00 2001
From: eternal-flame-AD <yume@yumechi.jp>
Date: Sun, 10 Nov 2024 00:09:08 -0600
Subject: [PATCH 2/2] fix(frontend): eventListener leak

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
---
 packages/frontend/src/stream.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/stream.ts b/packages/frontend/src/stream.ts
index e23937e6b6..57fae49d4b 100644
--- a/packages/frontend/src/stream.ts
+++ b/packages/frontend/src/stream.ts
@@ -68,14 +68,20 @@ export function useStream(): Misskey.IStream {
     if (timeoutHeartBeat) window.clearTimeout(timeoutHeartBeat);
     timeoutHeartBeat = window.setTimeout(heartbeat, HEART_BEAT_INTERVAL);
 
-    // send heartbeat right now when last send time is over HEART_BEAT_INTERVAL
-    document.addEventListener('visibilitychange', () => {
+    const target = () => {
         if (
             !stream
             || document.visibilityState !== 'visible'
             || Date.now() - lastHeartbeatCall < HEART_BEAT_INTERVAL
         ) return;
         heartbeat();
+    };
+
+    // send heartbeat right now when last send time is over HEART_BEAT_INTERVAL
+    document.addEventListener('visibilitychange', target);
+
+    stream.on('_disconnected_', () => {
+        document.removeEventListener('visibilitychange', target);
     });
 
     return stream;
-- 
2.45.2