stream-chat-react-native-core 5.15.0-beta.5 → 5.15.0-beta.7

package/src/components/ChannelList/hooks/usePaginatedChannels.ts

@@ -1,12 +1,6 @@
 import { useEffect, useMemo, useRef, useState } from 'react';
 
-import type {
-  Channel,
-  ChannelFilters,
-  ChannelOptions,
-  ChannelSort,
-  MessageResponse,
-} from 'stream-chat';
+import type { Channel, ChannelFilters, ChannelOptions, ChannelSort } from 'stream-chat';
 
 import { useActiveChannelsRefContext } from '../../../contexts/activeChannelsRefContext/ActiveChannelsRefContext';
 import { useChatContext } from '../../../contexts/chatContext/ChatContext';
@@ -16,7 +10,6 @@ import { getChannelsForFilterSort } from '../../../store/apis/getChannelsForFilt
 import type { DefaultStreamChatGenerics } from '../../../types/types';
 import { ONE_SECOND_IN_MS } from '../../../utils/date';
 import { DBSyncManager } from '../../../utils/DBSyncManager';
-import { MessageStatusTypes } from '../../../utils/utils';
 import { MAX_QUERY_CHANNELS_LIMIT } from '../utils';
 
 const waitSeconds = (seconds: number) =>
@@ -108,35 +101,18 @@ export const usePaginatedChannels = <
     };
 
     try {
-      // If failed messages were present in DB it would be in the channel state now and be overwritten by the queryChannels call
-      // So we store them in a separate object and add them back to the channel state after the queryChannels call
-      const failedMessagesInDb: Map<string, MessageResponse<StreamChatGenerics>[]> = new Map();
-      if (enableOfflineSupport) {
-        for (const cid in client.activeChannels) {
-          const failedMessages = getFailedMessages(client.activeChannels[cid]);
-          if (failedMessages) failedMessagesInDb.set(cid, failedMessages);
-        }
-      }
-
       /**
        * We skipInitialization here for handling race condition between ChannelList, Channel (and Thread)
        * when they all (may) update the channel state at the same time (when connection state recovers)
        * TODO: if we move the channel state to a single context and share it between ChannelList, Channel and Thread we can remove this
        */
       const channelQueryResponse = await client.queryChannels(filters, sort, newOptions, {
-        skipInitialization: activeChannels.current,
+        skipInitialization: enableOfflineSupport ? undefined : activeChannels.current,
       });
       if (isQueryStale() || !isMountedRef.current) {
         return;
       }
 
-      if (failedMessagesInDb.size) {
-        for (const cid in client.activeChannels) {
-          const msgsToAdd = failedMessagesInDb.get(cid);
-          if (msgsToAdd) client.activeChannels[cid].state.addMessagesSorted(msgsToAdd);
-        }
-      }
-
       const newChannels =
         queryType === 'loadChannels' && !staticChannelsActive && channels
           ? [...channels, ...channelQueryResponse]
@@ -224,11 +200,12 @@ export const usePaginatedChannels = <
         });
 
         if (channelsFromDB) {
-          setChannels(
-            client.hydrateActiveChannels(channelsFromDB, {
-              offlineMode: true,
-            }),
-          );
+          const offlineChannels = client.hydrateActiveChannels(channelsFromDB, {
+            offlineMode: true,
+            skipInitialization: [], // passing empty array will clear out the existing messages from channel state, this removes the possibility of duplicate messages
+          });
+
+          setChannels(offlineChannels);
           setStaticChannelsActive(true);
         }
       } catch (e) {
@@ -292,21 +269,3 @@ export const usePaginatedChannels = <
     staticChannelsActive,
   };
 };
-
-function getFailedMessages<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(channel: Channel<StreamChatGenerics>): MessageResponse<StreamChatGenerics>[] | undefined {
-  const failedMsgs = channel.state.messages.filter((m) => m.status === MessageStatusTypes.FAILED);
-  if (failedMsgs.length) {
-    return failedMsgs.map(
-      (m) =>
-        ({
-          ...m,
-          created_at: m.created_at.toISOString(),
-          pinned_at: m.pinned_at ? m.pinned_at.toISOString() : null,
-          updated_at: m.updated_at.toISOString(),
-        } as MessageResponse<StreamChatGenerics>),
-    );
-  }
-  return undefined;
-}

package/src/store/apis/index.ts

@@ -17,7 +17,7 @@ export * from './upsertAppSettings';
 export * from './upsertChannelData';
 export * from './upsertChannels';
 export * from './upsertCidsForQuery';
-export * from './upsertLastSyncedAt';
+export * from './upsertUserSyncStatus';
 export * from './upsertMembers';
 export * from './upsertMessages';
 export * from './upsertReads';

package/src/store/apis/{upsertLastSyncedAt.ts → upsertUserSyncStatus.ts}

@@ -1,7 +1,7 @@
 import { QuickSqliteClient } from '../QuickSqliteClient';
 import { createUpsertQuery } from '../sqlite-utils/createUpsertQuery';
 
-export const upsertLastSyncedAt = ({
+export const upsertUserSyncStatus = ({
   currentUserId,
   lastSyncedAt,
 }: {

package/src/utils/DBSyncManager.ts

@@ -2,7 +2,7 @@ import type { AxiosError } from 'axios';
 import type { APIErrorResponse, StreamChat } from 'stream-chat';
 
 import { handleEventToSyncDB } from '../components/Chat/hooks/handleEventToSyncDB';
-import { getAllChannelIds, getLastSyncedAt, upsertLastSyncedAt } from '../store/apis';
+import { getAllChannelIds, getLastSyncedAt, upsertUserSyncStatus } from '../store/apis';
 
 import { addPendingTask } from '../store/apis/addPendingTask';
 
@@ -11,6 +11,7 @@ import { getPendingTasks } from '../store/apis/getPendingTasks';
 import { QuickSqliteClient } from '../store/QuickSqliteClient';
 import type { PendingTask, PreparedQueries } from '../store/types';
 import type { DefaultStreamChatGenerics } from '../types/types';
+
 /**
  * DBSyncManager has the responsibility to sync the channel states
  * within local database whenever possible.
@@ -95,6 +96,8 @@ export class DBSyncManager {
       currentUserId: this.client.user.id,
     });
     const cids = getAllChannelIds();
+    // If there are no channels, then there is no need to sync.
+    if (cids.length === 0) return;
 
     if (lastSyncedAt) {
       try {
@@ -113,7 +116,7 @@ export class DBSyncManager {
         QuickSqliteClient.resetDB();
       }
     }
-    upsertLastSyncedAt({
+    upsertUserSyncStatus({
       currentUserId: this.client.user.id,
       lastSyncedAt: new Date().toString(),
     });

package/src/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "5.15.0-beta.5"
+  "version": "5.15.0-beta.7"
 }

package/lib/commonjs/store/apis/upsertLastSyncedAt.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_QuickSqliteClient","require","_createUpsertQuery","upsertLastSyncedAt","_ref","currentUserId","lastSyncedAt","query","createUpsertQuery","userId","QuickSqliteClient","executeSql","apply","exports"],"sources":["upsertLastSyncedAt.ts"],"sourcesContent":["import { QuickSqliteClient } from '../QuickSqliteClient';\nimport { createUpsertQuery } from '../sqlite-utils/createUpsertQuery';\n\nexport const upsertLastSyncedAt = ({\n  currentUserId,\n  lastSyncedAt,\n}: {\n  currentUserId: string;\n  lastSyncedAt: string;\n}) => {\n  const query = createUpsertQuery('userSyncStatus', {\n    lastSyncedAt,\n    userId: currentUserId,\n  });\n\n  QuickSqliteClient.executeSql.apply(null, query);\n};\n"],"mappings":";;;;AAAA,IAAAA,kBAAA,GAAAC,OAAA;AACA,IAAAC,kBAAA,GAAAD,OAAA;AAEO,IAAME,kBAAkB,GAAG,SAArBA,kBAAkBA,CAAAC,IAAA,EAMzB;EAAA,IALJC,aAAa,GAAAD,IAAA,CAAbC,aAAa;IACbC,YAAY,GAAAF,IAAA,CAAZE,YAAY;EAKZ,IAAMC,KAAK,GAAG,IAAAC,oCAAiB,EAAC,gBAAgB,EAAE;IAChDF,YAAY,EAAZA,YAAY;IACZG,MAAM,EAAEJ;EACV,CAAC,CAAC;EAEFK,oCAAiB,CAACC,UAAU,CAACC,KAAK,CAAC,IAAI,EAAEL,KAAK,CAAC;AACjD,CAAC;AAACM,OAAA,CAAAV,kBAAA,GAAAA,kBAAA"}

package/lib/module/store/apis/upsertLastSyncedAt.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_QuickSqliteClient","require","_createUpsertQuery","upsertLastSyncedAt","_ref","currentUserId","lastSyncedAt","query","createUpsertQuery","userId","QuickSqliteClient","executeSql","apply","exports"],"sources":["upsertLastSyncedAt.ts"],"sourcesContent":["import { QuickSqliteClient } from '../QuickSqliteClient';\nimport { createUpsertQuery } from '../sqlite-utils/createUpsertQuery';\n\nexport const upsertLastSyncedAt = ({\n  currentUserId,\n  lastSyncedAt,\n}: {\n  currentUserId: string;\n  lastSyncedAt: string;\n}) => {\n  const query = createUpsertQuery('userSyncStatus', {\n    lastSyncedAt,\n    userId: currentUserId,\n  });\n\n  QuickSqliteClient.executeSql.apply(null, query);\n};\n"],"mappings":";;;;AAAA,IAAAA,kBAAA,GAAAC,OAAA;AACA,IAAAC,kBAAA,GAAAD,OAAA;AAEO,IAAME,kBAAkB,GAAG,SAArBA,kBAAkBA,CAAAC,IAAA,EAMzB;EAAA,IALJC,aAAa,GAAAD,IAAA,CAAbC,aAAa;IACbC,YAAY,GAAAF,IAAA,CAAZE,YAAY;EAKZ,IAAMC,KAAK,GAAG,IAAAC,oCAAiB,EAAC,gBAAgB,EAAE;IAChDF,YAAY,EAAZA,YAAY;IACZG,MAAM,EAAEJ;EACV,CAAC,CAAC;EAEFK,oCAAiB,CAACC,UAAU,CAACC,KAAK,CAAC,IAAI,EAAEL,KAAK,CAAC;AACjD,CAAC;AAACM,OAAA,CAAAV,kBAAA,GAAAA,kBAAA"}

package/lib/typescript/store/apis/upsertLastSyncedAt.d.ts

@@ -1,4 +0,0 @@
-export declare const upsertLastSyncedAt: ({ currentUserId, lastSyncedAt, }: {
-    currentUserId: string;
-    lastSyncedAt: string;
-}) => void;