Trigger new reconnect if failure to connect in reconnect; (#538)

* Trigger new reconnect if failure to connect in reconnect; * More potential fixing; * Fix unrelated thread catchup; * Added same reconnect approach to the regular websocket; Added clearing of the reconnectCounter
homebase-id · Jan 22, 2025 · 68a36f0 · 68a36f0
1 parent 1dc4373
commit 68a36f0
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 13 deletions.
diff --git a/...ages/apps/community-app/src/components/Community/Message/detail/CommunityMediaGallery.tsx b/...ages/apps/community-app/src/components/Community/Message/detail/CommunityMediaGallery.tsx
@@ -14,7 +14,6 @@ import {
   useDotYouClientContext,
   useFile,
   bytesToSize,
-  formatDateExludingYearIfCurrent,
 } from '@homebase-id/common-app';
 import { ImageSource, OdinPayloadImage, OdinPreviewImage } from '@homebase-id/ui-lib';
 import { useNavigate, useParams } from 'react-router-dom';

diff --git a/packages/apps/community-app/src/components/Community/channel/CommunityHistory.tsx b/packages/apps/community-app/src/components/Community/channel/CommunityHistory.tsx
@@ -84,14 +84,16 @@ export const CommunityHistory = memo(
       });
 
       flat.sort((a, b) => b.fileMetadata.created - a.fileMetadata.created);
-      if (inAThread) flat.push(origin as HomebaseFile<CommunityMessage>);
+      if (inAThread) flat.push(origin);
       if (!maxShowOptions) return [flat, slicedCount];
 
       const maxShow = maxShowOptions.count;
-      return [
-        flat.slice(0, maxShow),
-        slicedCount + (flat.length > maxShow ? flat.length - maxShow : 0),
-      ];
+      const slicedMsgs = flat.slice(0, maxShow);
+      if (inAThread && slicedMsgs.indexOf(origin) === -1) {
+        slicedMsgs.push(origin);
+      }
+
+      return [slicedMsgs, slicedCount + (flat.length > maxShow ? flat.length - maxShow : 0)];
     }, [messages, origin, maxShowOptions, inAThread, maxAge]);
 
     useEffect(() => {

diff --git a/packages/libs/js-lib/src/core/WebsocketData/WebsocketProvider.ts b/packages/libs/js-lib/src/core/WebsocketData/WebsocketProvider.ts
@@ -58,8 +58,8 @@ const ConnectSocket = async (
         .post('/notify/preauth', undefined, {
           validateStatus: () => true,
         })
-        .catch((error) => {
-          console.error({ error });
+        .catch(() => {
+          reconnectPromise = undefined;
           reject('[WebsocketProvider] Preauth failed');
         });
     }
@@ -115,6 +115,7 @@ const ConnectSocket = async (
         if (notification.notificationType == 'deviceHandshakeSuccess') {
           if (isDebug) console.debug(`[WebsocketProvider] Device handshake success`);
           isHandshaked = true;
+          reconnectCounter = 0;
           setupPing();
           resolve();
           return;
@@ -146,6 +147,8 @@ const ConnectSocket = async (
       ReconnectSocket(dotYouClient, drives, args);
     };
   });
+
+  return connectPromise;
 };
 
 const ReconnectSocket = async (
@@ -155,7 +158,7 @@ const ReconnectSocket = async (
 ) => {
   if (reconnectPromise) return;
 
-  reconnectPromise = new Promise<void>((resolve) => {
+  reconnectPromise = new Promise<void>((resolve, reject) => {
     if (isDebug) console.debug('[WebsocketProvider] Reconnecting - Force disconnect');
     reconnectCounter++;
     subscribers.map((subscriber) => subscriber.onDisconnect && subscriber.onDisconnect());
@@ -170,7 +173,15 @@ const ReconnectSocket = async (
     setTimeout(async () => {
       if (isDebug) console.debug('[WebsocketProvider] Reconnecting - Delayed reconnect');
 
-      await ConnectSocket(dotYouClient, drives, args);
+      try {
+        await ConnectSocket(dotYouClient, drives, args);
+      } catch (e) {
+        console.error('[WebsocketProvider] Reconnect failed', e);
+        reject();
+
+        ReconnectSocket(dotYouClient, drives, args);
+        return;
+      }
       subscribers.map((subscriber) => subscriber.onReconnect && subscriber.onReconnect());
 
       resolve();

diff --git a/packages/libs/js-lib/src/peer/WebsocketData/WebsocketProviderOverPeer.ts b/packages/libs/js-lib/src/peer/WebsocketData/WebsocketProviderOverPeer.ts
@@ -79,6 +79,7 @@ const ConnectSocket = async (
       });
 
     if (!tokenToConnectOverPeer) {
+      reconnectPromise = undefined;
       reject('[WebsocketProviderOverPeer] Preauth failed');
       return;
     }
@@ -146,6 +147,7 @@ const ConnectSocket = async (
         if (notification.notificationType == 'deviceHandshakeSuccess') {
           if (isDebug) console.debug(`[WebsocketProviderOverPeer] Device handshake success`);
           isHandshaked = true;
+          reconnectCounter = 0;
           setupPing();
           resolve();
           return;
@@ -177,6 +179,8 @@ const ConnectSocket = async (
       ReconnectSocket(dotYouClient, odinId, drives, args);
     };
   });
+
+  return connectPromise;
 };
 
 const ReconnectSocket = async (
@@ -187,7 +191,7 @@ const ReconnectSocket = async (
 ) => {
   if (reconnectPromise) return;
 
-  reconnectPromise = new Promise<void>((resolve) => {
+  reconnectPromise = new Promise<void>((resolve, reject) => {
     if (isDebug) console.debug('[WebsocketProviderOverPeer] Reconnecting - Force disconnect');
     reconnectCounter++;
     subscribers.map((subscriber) => subscriber.onDisconnect && subscriber.onDisconnect());
@@ -201,8 +205,15 @@ const ReconnectSocket = async (
     // Delay the reconnect to avoid a tight loop on network issues
     setTimeout(async () => {
       if (isDebug) console.debug('[WebsocketProviderOverPeer] Reconnecting - Delayed reconnect');
-
-      await ConnectSocket(dotYouClient, odinId, drives, args);
+      try {
+        await ConnectSocket(dotYouClient, odinId, drives, args);
+      } catch (e) {
+        console.error('[WebsocketProviderOverPeer] Reconnect failed', e);
+        reject();
+
+        ReconnectSocket(dotYouClient, odinId, drives, args);
+        return;
+      }
       subscribers.map((subscriber) => subscriber.onReconnect && subscriber.onReconnect());
 
       resolve();