@amityco/ts-sdk 7.1.1-1d526d8.0 → 7.1.1-207e990f.0

package/dist/index.esm.js

@@ -501,6 +501,7 @@ const idResolvers = {
     messagePreviewSubChannel: ({ subChannelId }) => `${subChannelId}`,
     channelUnreadInfo: ({ channelId }) => channelId,
     subChannelUnreadInfo: ({ subChannelId }) => subChannelId,
+    channelUnread: ({ channelId }) => channelId,
     channelMarker: ({ entityId, userId }) => `${entityId}#${userId}`,
     subChannelMarker: ({ entityId, feedId, userId }) => `${entityId}#${feedId}#${userId}`,
     messageMarker: ({ feedId, contentId, creatorId }) => `${feedId}#${contentId}#${creatorId}`,
@@ -1594,13 +1595,13 @@ class NetworkActivitiesWatcher {
         this._listener.clear();
     }
 }
-let instance$5;
+let instance$6;
 var NetworkActivitiesWatcher$1 = {
     getInstance: () => {
-        if (!instance$5) {
-            instance$5 = new NetworkActivitiesWatcher();
+        if (!instance$6) {
+            instance$6 = new NetworkActivitiesWatcher();
         }
-        return instance$5;
+        return instance$6;
     },
 };
 
@@ -21240,13 +21241,13 @@ class AnalyticsEngine {
         this._eventCapturer.resetAllBuckets();
     }
 }
-let instance$4;
+let instance$5;
 var AnalyticsEngine$1 = {
     getInstance: () => {
-        if (!instance$4) {
-            instance$4 = new AnalyticsEngine();
+        if (!instance$5) {
+            instance$5 = new AnalyticsEngine();
         }
-        return instance$4;
+        return instance$5;
     },
 };
 
@@ -21672,6 +21673,221 @@ const getMessageReadCount = (message, marker) => {
     getCachedMarker$2(message)) !== null && _a !== void 0 ? _a : { readCount: 0, deliveredCount: 0 };
 }; // and if not found in cache use default value `0`
 
+/**
+ *
+ * Mark subChannel as read by readToSegment
+ *
+ * @param subChannelIds the IDs of the {@link Amity.SubChannel} to update
+ * @param readToSegment the segment to mark as read
+ * @returns a success boolean if the {@link Amity.SubChannel} was updated
+ *
+ * @category Channel API
+ * @async
+ */
+const markChannelsAsReadBySegment = async (readings) => {
+    const client = getActiveClient();
+    try {
+        await client.http.post('api/v3/channels/seen', { channels: readings });
+        return true;
+    }
+    catch (e) {
+        return false;
+    }
+};
+
+class MessageReadReceiptSyncEngine {
+    constructor() {
+        this.isActive = true;
+        this.MAX_RETRY = 3;
+        this.JOB_QUEUE_SIZE = 120;
+        this.jobQueue = [];
+        // Interval for message read receipt sync in seconds
+        this.RECEIPT_SYNC_INTERVAL = 1;
+        this.client = getActiveClient();
+        // Get remaining unsync read receipts from cache
+        this.getUnsyncJobs();
+    }
+    //  Call this when client call client.login
+    startSyncReadReceipt() {
+        // Start timer when start receipt sync
+        this.timer = setInterval(() => {
+            this.syncReadReceipts();
+        }, this.RECEIPT_SYNC_INTERVAL * 1000);
+    }
+    // Read receipt observer handling
+    syncReadReceipts() {
+        if (this.jobQueue.length === 0 || this.isActive === false)
+            return;
+        const readReceipts = this.getReadReceipts();
+        if (readReceipts) {
+            this.markReadApi(readReceipts);
+        }
+    }
+    getUnsyncJobs() {
+        var _a;
+        // Get all read receipts that has latestSyncSegment < latestSegment
+        const readReceipts = (_a = queryCache(['readReceipt'])) === null || _a === void 0 ? void 0 : _a.filter(({ data }) => {
+            return data.latestSyncSegment < data.latestSegment;
+        });
+        // Enqueue unsync read receipts to the job queue
+        readReceipts === null || readReceipts === void 0 ? void 0 : readReceipts.forEach(({ data: readReceipt }) => {
+            this.enqueueReadReceipt(readReceipt.channelId, readReceipt.latestSegment);
+        });
+    }
+    getReadReceipts() {
+        // get all read receipts from queue, now the queue is empty
+        const syncJob = this.jobQueue.splice(0, this.jobQueue.length);
+        if (syncJob.length === 0)
+            return;
+        return syncJob.filter(job => {
+            var _a;
+            const readReceipt = (_a = pullFromCache(['readReceipt', job.channelId])) === null || _a === void 0 ? void 0 : _a.data;
+            if (!readReceipt)
+                return false;
+            if (readReceipt.latestSegment > readReceipt.latestSyncSegment)
+                return true;
+            return false;
+        });
+    }
+    async markReadApi(syncJobs) {
+        var _a;
+        // constuct payload
+        // example: [{ channelId: 'channelId', readToSegment: 2 }]
+        const syncJobsPayload = syncJobs.map(job => {
+            return {
+                channelId: job.channelId,
+                readToSegment: job.segment,
+            };
+        });
+        const response = await markChannelsAsReadBySegment(syncJobsPayload);
+        if (response) {
+            for (let i = 0; i < syncJobs.length; i += 1) {
+                // update lastestSyncSegment in read receipt cache
+                const cacheKey = ['readReceipt', syncJobs[i].channelId];
+                const readReceiptCache = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+                pushToCache(cacheKey, Object.assign(Object.assign({}, readReceiptCache), { latestSyncSegment: syncJobs[i].segment }));
+            }
+        }
+        else {
+            for (let i = 0; i < syncJobs.length; i += 1) {
+                // push them back to queue if the syncing is failed and retry count is less than max retry
+                if (syncJobs[i].retryCount >= this.MAX_RETRY)
+                    return;
+                const updatedJob = Object.assign(Object.assign({}, syncJobs[i]), { syncState: "create" /* Amity.ReadReceiptSyncState.CREATED */, retryCount: syncJobs[i].retryCount + 1 });
+                this.enqueueJob(updatedJob);
+            }
+        }
+    }
+    startObservingReadReceiptQueue() {
+        if (this.client.useLegacyUnreadCount) {
+            this.isActive = true;
+            this.startSyncReadReceipt();
+        }
+    }
+    stopObservingReadReceiptQueue() {
+        this.isActive = false;
+        this.jobQueue.map(job => {
+            if (job.syncState === "syncing" /* Amity.ReadReceiptSyncState.SYNCING */) {
+                return Object.assign(Object.assign({}, job), { syncState: "create" /* Amity.ReadReceiptSyncState.CREATED */ });
+            }
+            return job;
+        });
+        if (this.timer)
+            clearInterval(this.timer);
+    }
+    // Session Management
+    onSessionEstablished() {
+        this.startObservingReadReceiptQueue();
+    }
+    onSessionDestroyed() {
+        this.stopObservingReadReceiptQueue();
+        this.jobQueue = [];
+    }
+    onTokenExpired() {
+        this.stopObservingReadReceiptQueue();
+    }
+    // Network Connection Management
+    onNetworkOffline() {
+        // Stop observing to the read receipt queue.
+        this.stopObservingReadReceiptQueue();
+    }
+    onNetworkOnline() {
+        // Resume observing to the read receipt queue.
+        this.startObservingReadReceiptQueue();
+    }
+    markRead(channelId, segment) {
+        var _a;
+        // Step 1: Optimistic update of channelUnread.readToSegment to message.segment and update unreadCount value
+        const cacheKey = ['channelUnread', 'get', channelId];
+        const channelUnread = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+        if (channelUnread && segment > channelUnread.readToSegment) {
+            channelUnread.readToSegment = segment;
+            channelUnread.unreadCount = Math.max(channelUnread.lastSegment - segment, 0);
+            pushToCache(cacheKey, channelUnread);
+            fireEvent('local.channelUnread.updated', channelUnread);
+        }
+        // Step 2: Enqueue the read receipt
+        this.enqueueReadReceipt(channelId, segment);
+    }
+    enqueueReadReceipt(channelId, segment) {
+        var _a;
+        const readReceipt = (_a = pullFromCache(['readReceipt', channelId])) === null || _a === void 0 ? void 0 : _a.data;
+        // Create new read receipt if it's not exists and add the job to queue
+        if (!readReceipt) {
+            const readReceiptChannel = {
+                channelId,
+                latestSegment: segment,
+                latestSyncSegment: 0,
+            };
+            pushToCache(['readReceipt', channelId], readReceiptChannel);
+        }
+        else if (readReceipt.latestSegment < segment) {
+            // Update latestSegment in read receipt cache
+            pushToCache(['readReceipt', channelId], Object.assign(Object.assign({}, readReceipt), { latestSegment: segment }));
+        }
+        else if (readReceipt.latestSyncSegment >= segment) {
+            // Skip the job when lastSyncSegment > = segment
+            return;
+        }
+        let syncJob = this.getSyncJob(channelId);
+        if (syncJob === null || syncJob.syncState === "syncing" /* Amity.ReadReceiptSyncState.SYNCING */) {
+            syncJob = {
+                channelId,
+                segment,
+                syncState: "create" /* Amity.ReadReceiptSyncState.CREATED */,
+                retryCount: 0,
+            };
+            this.enqueueJob(syncJob);
+        }
+        else if (syncJob.segment < segment) {
+            syncJob.segment = segment;
+        }
+    }
+    getSyncJob(channelId) {
+        const { jobQueue } = this;
+        const targetJob = jobQueue.find(job => job.channelId === channelId);
+        return targetJob || null;
+    }
+    enqueueJob(syncJob) {
+        if (this.jobQueue.length < this.JOB_QUEUE_SIZE) {
+            this.jobQueue.push(syncJob);
+        }
+        else {
+            // Remove oldest job when queue reach maximum capacity
+            this.jobQueue.shift();
+            this.jobQueue.push(syncJob);
+        }
+    }
+}
+let instance$4 = null;
+var ReadReceiptSyncEngine = {
+    getInstance: () => {
+        if (!instance$4)
+            instance$4 = new MessageReadReceiptSyncEngine();
+        return instance$4;
+    },
+};
+
 /**
  *
  * Mark subChannel as read by readToSegment
@@ -21720,7 +21936,7 @@ const reCalculateChannelUnreadInfo = (channelId) => {
     return channelUnreadInfo;
 };
 
-class MessageReadReceiptSyncEngine {
+class LegacyMessageReadReceiptSyncEngine {
     constructor() {
         this.isActive = true;
         this.MAX_RETRY = 3;
@@ -21751,7 +21967,7 @@ class MessageReadReceiptSyncEngine {
     getUnsyncJobs() {
         var _a;
         // Get all read receipts that has latestSyncSegment < latestSegment
-        const readReceipts = (_a = queryCache(['readReceipt'])) === null || _a === void 0 ? void 0 : _a.filter(({ data }) => {
+        const readReceipts = (_a = queryCache(['legacyReadReceipt'])) === null || _a === void 0 ? void 0 : _a.filter(({ data }) => {
             return data.latestSyncSegment < data.latestSegment;
         });
         // Enqueue unsync read receipts to the job queue
@@ -21770,7 +21986,7 @@ class MessageReadReceiptSyncEngine {
             return;
         // Get readReceipt from cache by subChannelId
         const readReceipt = (_a = pullFromCache([
-            'readReceipt',
+            'legacyReadReceipt',
             syncJob.subChannelId,
         ])) === null || _a === void 0 ? void 0 : _a.data;
         if (!readReceipt)
@@ -21793,10 +22009,10 @@ class MessageReadReceiptSyncEngine {
         if (response) {
             this.removeSynedReceipt(syncJob.subChannelId, syncJob.segment);
             const readReceiptCache = (_a = pullFromCache([
-                'readReceipt',
+                'legacyReadReceipt',
                 subChannelId,
             ])) === null || _a === void 0 ? void 0 : _a.data;
-            pushToCache(['readReceipt', subChannelId], Object.assign(Object.assign({}, readReceiptCache), { latestSyncSegment: segment }));
+            pushToCache(['legacyReadReceipt', subChannelId], Object.assign(Object.assign({}, readReceiptCache), { latestSyncSegment: segment }));
         }
         else if (!response) {
             if (newSyncJob.retryCount > this.MAX_RETRY) {
@@ -21863,7 +22079,7 @@ class MessageReadReceiptSyncEngine {
             subChannelUnreadInfo.readToSegment = segment;
             subChannelUnreadInfo.unreadCount = Math.max(subChannelUnreadInfo.lastSegment - segment, 0);
             const channelUnreadInfo = reCalculateChannelUnreadInfo(subChannelUnreadInfo.channelId);
-            fireEvent('local.channelUnread.updated', channelUnreadInfo);
+            fireEvent('local.channelUnreadInfo.updated', channelUnreadInfo);
             pushToCache(cacheKey, subChannelUnreadInfo);
             fireEvent('local.subChannelUnread.updated', subChannelUnreadInfo);
         }
@@ -21872,7 +22088,10 @@ class MessageReadReceiptSyncEngine {
     }
     enqueueReadReceipt(subChannelId, segment) {
         var _a;
-        const readReceipt = (_a = pullFromCache(['readReceipt', subChannelId])) === null || _a === void 0 ? void 0 : _a.data;
+        const readReceipt = (_a = pullFromCache([
+            'legacyReadReceipt',
+            subChannelId,
+        ])) === null || _a === void 0 ? void 0 : _a.data;
         // Create new read receipt if it's not exists and add job to queue
         if (!readReceipt) {
             const readReceiptSubChannel = {
@@ -21880,10 +22099,10 @@ class MessageReadReceiptSyncEngine {
                 latestSegment: segment,
                 latestSyncSegment: 0,
             };
-            pushToCache(['readReceipt', subChannelId], readReceiptSubChannel);
+            pushToCache(['legacyReadReceipt', subChannelId], readReceiptSubChannel);
         }
         else if (readReceipt.latestSegment < segment) {
-            pushToCache(['readReceipt', subChannelId], Object.assign(Object.assign({}, readReceipt), { latestSegment: segment }));
+            pushToCache(['legacyReadReceipt', subChannelId], Object.assign(Object.assign({}, readReceipt), { latestSegment: segment }));
         }
         else if (readReceipt.latestSyncSegment >= segment) {
             // Skip the job when lastSyncSegment > = segment
@@ -21926,18 +22145,24 @@ class MessageReadReceiptSyncEngine {
     }
 }
 let instance$3 = null;
-var ReadReceiptSyncEngine = {
+var LegacyReadReceiptSyncEngine = {
     getInstance: () => {
         if (!instance$3)
-            instance$3 = new MessageReadReceiptSyncEngine();
+            instance$3 = new LegacyMessageReadReceiptSyncEngine();
         return instance$3;
     },
 };
 
 const markReadMessage = (message) => {
-    const { subChannelId, channelSegment } = message;
-    const markReadReceiptEngine = ReadReceiptSyncEngine.getInstance();
-    markReadReceiptEngine.markRead(subChannelId, channelSegment);
+    const client = getActiveClient();
+    if (client.useLegacyUnreadCount) {
+        const markReadReceiptEngine = ReadReceiptSyncEngine.getInstance();
+        markReadReceiptEngine.markRead(message.channelId, message.channelSegment);
+    }
+    else {
+        const markReadReceiptEngine = LegacyReadReceiptSyncEngine.getInstance();
+        markReadReceiptEngine.markRead(message.subChannelId, message.channelSegment);
+    }
 };
 
 const messageLinkedObject = (message) => {
@@ -22925,6 +23150,24 @@ const preUpdateChannelCache = (rawPayload, options = { isMessagePreviewUpdated:
         channels: rawPayload.channels.map(channel => convertFromRaw(channel, { isMessagePreviewUpdated: options.isMessagePreviewUpdated })),
     });
 };
+const updateChannelUnread = ({ currentUserId, channels, channelUsers, }) => {
+    for (let i = 0; i < channels.length; i += 1) {
+        const cacheKey = ['channelUnread', 'get', channels[i].channelId];
+        const { readToSegment, lastMentionedSegment } = channelUsers.find(channelUser => channelUser.channelId === channels[i].channelId && channelUser.userId === currentUserId) || {
+            readToSegment: 0,
+            lastMentionedSegment: 0,
+        };
+        pushToCache(cacheKey, {
+            channelId: channels[i].channelId,
+            lastSegment: channels[i].messageCount,
+            readToSegment,
+            lastMentionedSegment,
+            unreadCount: channels[i].messageCount - readToSegment,
+            isMentioned: lastMentionedSegment > readToSegment,
+            isDeleted: channels[i].isDeleted,
+        });
+    }
+};
 const prepareChannelPayload = async (rawPayload, options = { isMessagePreviewUpdated: true }) => {
     const client = getActiveClient();
     const networkPreviewSetting = await client.getMessagePreviewSetting(false);
@@ -22934,23 +23177,34 @@ const prepareChannelPayload = async (rawPayload, options = { isMessagePreviewUpd
         rawPayload.messagePreviews.length > 0) {
         updateChannelMessagePreviewCache(rawPayload);
     }
-    const markerIds = rawPayload.channels
-        // filter channel by type. Only conversation, community and broadcast type are included.
-        .filter(isUnreadCountSupport)
-        .map(({ channelInternalId }) => channelInternalId);
-    if (markerIds.length > 0) {
-        // since the get markers method requires a channel cache to function with the reducer.
-        preUpdateChannelCache(rawPayload, { isMessagePreviewUpdated: options.isMessagePreviewUpdated });
-        try {
-            await getChannelMarkers(markerIds);
-        }
-        catch (e) {
-            // empty block (from the spec, allow marker fetch to fail without having to do anything)
+    if (client.useLegacyUnreadCount) {
+        updateChannelUnread({
+            channels: rawPayload.channels,
+            channelUsers: rawPayload.channelUsers,
+            currentUserId: client.userId,
+        });
+    }
+    else {
+        const markerIds = rawPayload.channels
+            // filter channel by type. Only conversation, community and broadcast type are included.
+            .filter(isUnreadCountSupport)
+            .map(({ channelInternalId }) => channelInternalId);
+        if (markerIds.length > 0) {
+            // since the get markers method requires a channel cache to function with the reducer.
+            preUpdateChannelCache(rawPayload, {
+                isMessagePreviewUpdated: options.isMessagePreviewUpdated,
+            });
+            try {
+                await getChannelMarkers(markerIds);
+            }
+            catch (e) {
+                // empty block (from the spec, allow marker fetch to fail without having to do anything)
+            }
         }
     }
-    // attach marker to channel
+    // convert raw channel to internal channel
     const channels = rawPayload.channels.map(payload => convertFromRaw(payload, { isMessagePreviewUpdated: options.isMessagePreviewUpdated }));
-    // user marker to channel users
+    // convert raw channel user to membership (add user object)
     const channelUsers = rawPayload.channelUsers.map(channelUser => {
         return convertRawMembershipToMembership(channelUser);
     });
@@ -23077,15 +23331,28 @@ const getSubChannelsUnreadCount = (channel, marker) => {
     return (_e = (_c = marker === null || marker === void 0 ? void 0 : marker.unreadCount) !== null && _c !== void 0 ? _c : (_d = getCachedMarker(channel.channelInternalId)) === null || _d === void 0 ? void 0 : _d.unreadCount) !== null && _e !== void 0 ? _e : 0;
 };
 
+const getLegacyChannelUnread = (channelId) => {
+    var _a;
+    return (_a = pullFromCache(['channelUnread', 'get', channelId])) === null || _a === void 0 ? void 0 : _a.data;
+};
+
 const constructChannelDynamicValue = (channel) => {
+    const client = getActiveClient();
     const rest = __rest(channel, ["messageCount"]);
     return shallowClone(rest, {
-        get isMentioned() {
-            return getChannelIsMentioned(rest);
+        get unreadCount() {
+            var _a, _b;
+            return (_b = (_a = getLegacyChannelUnread(rest.channelId)) === null || _a === void 0 ? void 0 : _a.unreadCount) !== null && _b !== void 0 ? _b : 0;
         },
         get subChannelsUnreadCount() {
             return getSubChannelsUnreadCount(rest);
         },
+        get isMentioned() {
+            var _a, _b;
+            if (client.useLegacyUnreadCount)
+                return (_b = (_a = getLegacyChannelUnread(rest.channelId)) === null || _a === void 0 ? void 0 : _a.isMentioned) !== null && _b !== void 0 ? _b : false;
+            return getChannelIsMentioned(rest);
+        },
     });
 };
 
@@ -23742,12 +24009,21 @@ const onChannelDeleted = (callback) => {
         const client = getActiveClient();
         const filter = async (payload) => {
             const data = await prepareChannelPayload(payload);
-            if (client.isUnreadCountEnabled && client.getMarkerSyncConsistentMode()) {
-                data.channels.forEach(channel => {
+            const isConsistentMode = client.getMarkerSyncConsistentMode() && client.isUnreadCountEnabled;
+            const isLegacyUnreadCount = client.useLegacyUnreadCount;
+            data.channels.forEach(channel => {
+                if (isConsistentMode) {
                     addFlagIsDeletedSubChannelUnreadByChannelId(channel.channelId);
                     deleteChannelUnreadByChannelId(channel.channelId);
-                });
-            }
+                }
+                else if (isLegacyUnreadCount) {
+                    const cacheKey = ['channelUnread', 'get', channel.channelId];
+                    const cache = pullFromCache(cacheKey);
+                    if (cache) {
+                        pushToCache(cacheKey, Object.assign(Object.assign({}, cache), { isDeleted: true }));
+                    }
+                }
+            });
             ingestInCache(data);
             callbacks$b.forEach(cb => cb(data.channels[0]));
         };
@@ -23861,6 +24137,25 @@ var readReceiptSyncEngineOnLoginHandler = () => {
     };
 };
 
+var legacyReadReceiptSyncEngineOnLoginHandler = () => {
+    const readReceiptSyncEngine = LegacyReadReceiptSyncEngine.getInstance();
+    readReceiptSyncEngine.startSyncReadReceipt();
+    onSessionStateChange(state => {
+        if (state === "established" /* Amity.SessionStates.ESTABLISHED */) {
+            readReceiptSyncEngine.onSessionEstablished();
+        }
+        else if (state === "tokenExpired" /* Amity.SessionStates.TOKEN_EXPIRED */) {
+            readReceiptSyncEngine.onTokenExpired();
+        }
+        else {
+            readReceiptSyncEngine.onSessionDestroyed();
+        }
+    });
+    return () => {
+        readReceiptSyncEngine.onSessionDestroyed();
+    };
+};
+
 const onOnline = (callback) => {
     if (typeof window !== 'undefined' && window.addEventListener) {
         window.addEventListener('online', callback);
@@ -24427,10 +24722,17 @@ const onChannelLeft = (callback) => {
             const preparedPayload = await prepareChannelPayload(payload, {
                 isMessagePreviewUpdated: isLeftByMe,
             });
-            if (client.isUnreadCountEnabled && client.getMarkerSyncConsistentMode() && isLeftByMe) {
+            const isConsistentMode = client.getMarkerSyncConsistentMode() && client.isUnreadCountEnabled;
+            const isLegacyUnreadCount = client.useLegacyUnreadCount;
+            if (isLeftByMe) {
                 preparedPayload.channels.forEach(channel => {
-                    addFlagIsDeletedSubChannelUnreadByChannelId(channel.channelId);
-                    deleteChannelUnreadByChannelId(channel.channelId);
+                    if (isConsistentMode) {
+                        addFlagIsDeletedSubChannelUnreadByChannelId(channel.channelId);
+                        deleteChannelUnreadByChannelId(channel.channelId);
+                    }
+                    else if (isLegacyUnreadCount) {
+                        dropFromCache(['channelUnread', 'get', channel.channelId]);
+                    }
                 });
             }
             const { channels, channelUsers } = preparedPayload;
@@ -24698,6 +25000,29 @@ const onMessageCreatedMqtt = (callback) => {
                 reCalculateChannelUnreadInfo(message.channelId);
             });
         }
+        if (client.useLegacyUnreadCount) {
+            rawPayload.messages.forEach(message => {
+                var _a, _b;
+                const channelUnread = (_a = pullFromCache([
+                    'channelUnread',
+                    'get',
+                    message.channelId,
+                ])) === null || _a === void 0 ? void 0 : _a.data;
+                if (!channelUnread || channelUnread.lastSegment >= message.segment)
+                    return;
+                const lastSegment = message.segment;
+                const isMentionedInMessage = (_b = message.mentionedUsers) === null || _b === void 0 ? void 0 : _b.some(mention => {
+                    return (mention.type === 'channel' ||
+                        (mention.type === 'user' &&
+                            client.userId &&
+                            mention.userPublicIds.includes(client.userId)));
+                });
+                const lastMentionSegment = isMentionedInMessage
+                    ? message.segment
+                    : channelUnread.lastMentionSegment;
+                pushToCache(['channelUnread', 'get', message.channelId], Object.assign(Object.assign({}, channelUnread), { lastSegment, unreadCount: lastSegment - channelUnread.readToSegment, lastMentionSegment, isMentioned: !(channelUnread.readToSegment >= lastMentionSegment) }));
+            });
+        }
         // Update in cache
         ingestInCache(payload);
         payload.messages.forEach(message => {
@@ -24873,6 +25198,7 @@ const enableUnreadCount = () => {
     if (client.isUnreadCountEnabled)
         return false;
     client.isUnreadCountEnabled = true;
+    client.useLegacyUnreadCount = false;
     client.emitter.emit('unreadCountEnabled', true);
     return true;
 };
@@ -25188,7 +25514,12 @@ const login = async (params, sessionHandler, config) => {
         // NOTE: This is a temporary solution to handle the channel marker when the user is forced to leave
         // the channel because currently backend can't handle this, so every time a user is banned from
         // a channel or the channel is deleted the channel's unread count will not be reset to zero
-        onChannelDeleted(removeChannelMarkerCache), onChannelMemberBanned(removeChannelMarkerCache), markReadEngineOnLoginHandler(), analyticsEngineOnLoginHandler(), readReceiptSyncEngineOnLoginHandler(), objectResolverEngineOnLoginHandler());
+        onChannelDeleted(removeChannelMarkerCache), onChannelMemberBanned(removeChannelMarkerCache), markReadEngineOnLoginHandler(), analyticsEngineOnLoginHandler(), objectResolverEngineOnLoginHandler());
+        if (client.useLegacyUnreadCount) {
+            subscriptions.push(readReceiptSyncEngineOnLoginHandler());
+        }
+        else
+            subscriptions.push(legacyReadReceiptSyncEngineOnLoginHandler());
         const markerSyncUnsubscriber = await startMarkerSync();
         subscriptions.push(markerSyncUnsubscriber);
     }
@@ -25369,6 +25700,8 @@ const createClient = (apiKey, apiRegion = API_REGIONS.SG, { debugSession = DEFAU
     const sessionState = "notLoggedIn" /* Amity.SessionStates.NOT_LOGGED_IN */;
     const sessionHandler = undefined;
     const isUnreadCountEnabled = false;
+    // Legacy unread count is true by default
+    const useLegacyUnreadCount = true;
     const client = {
         version: `${VERSION}`,
         apiKey,
@@ -25398,6 +25731,7 @@ const createClient = (apiKey, apiRegion = API_REGIONS.SG, { debugSession = DEFAU
         getMessagePreviewSetting,
         use: () => setActiveClient(client),
         isUnreadCountEnabled,
+        useLegacyUnreadCount,
         getMarkerSyncConsistentMode,
         /**
          * Prefix for the deviceId key in the local storage or async storage.
@@ -32531,19 +32865,37 @@ var index$f = /*#__PURE__*/Object.freeze({
 /**
  * Internal used only
  *
- * Fired when an {@link Amity.userMessageFeedMarkers} has been resolved by Object Rsesolver
+ * Fired when an {@link Amity.channelUnreadInfo} has been updated.
  *
  * @param callback The function to call when the event was fired
  * @returns an {@link Amity.Unsubscriber} function to stop listening
  *
- * @category MessageMarker Events
+ * @category ChannelMarker Events
+ */
+const onChannelUnreadInfoUpdatedLocal = (callback) => {
+    const client = getActiveClient();
+    const filter = (payload) => {
+        callback(payload);
+    };
+    return createEventSubscriber(client, 'channelMarker/onChannelUnreadInfoUpdatedLocal', 'local.channelUnreadInfo.updated', filter);
+};
+
+/**
+ * Internal used only
+ *
+ * Fired when an {@link Amity.ChannelUnread} has been updated.
+ *
+ * @param callback The function to call when the event was fired
+ * @returns an {@link Amity.Unsubscriber} function to stop listening
+ *
+ * @category Channel Events
  */
 const onChannelUnreadUpdatedLocal = (callback) => {
     const client = getActiveClient();
     const filter = (payload) => {
         callback(payload);
     };
-    return createEventSubscriber(client, 'channelMarker/onChannelUnreadUpdatedLocal', 'local.channelUnread.updated', filter);
+    return createEventSubscriber(client, 'channel/onChannelUnreadUpdatedLocal', 'local.channelUnread.updated', filter);
 };
 
 /* begin_public_function
@@ -32745,6 +33097,7 @@ const getChannel = (channelId, callback) => {
             return onSubChannelUpdated(updateMessagePreview);
         }, 'channelId', 'channel'),
         convertEventPayload(onSubChannelCreated, 'channelId', 'channel'),
+        convertEventPayload(onChannelUnreadInfoUpdatedLocal, 'channelId', 'channel'),
         convertEventPayload(onChannelUnreadUpdatedLocal, 'channelId', 'channel'),
     ], {
         forceDispatch: true,
@@ -33258,6 +33611,10 @@ class ChannelLiveCollectionController extends LiveCollectionController {
                 },
                 action: "OnResolveUnread" /* Amity.ChannelActionType.OnResolveUnread */,
             },
+            {
+                fn: convertEventPayload(onChannelUnreadInfoUpdatedLocal, 'channelId', 'channel'),
+                action: "onUpdate" /* Amity.ChannelActionType.OnUpdate */,
+            },
             {
                 fn: convertEventPayload(onChannelUnreadUpdatedLocal, 'channelId', 'channel'),
                 action: "onUpdate" /* Amity.ChannelActionType.OnUpdate */,