npm - @amityco/ts-sdk - Versions diffs - 7.19.1-0d42b83a.0 → 7.19.1-0e4fcc82.0 - Mend

@amityco/ts-sdk 7.19.1-0d42b83a.0 → 7.19.1-0e4fcc82.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/dist/channelRepository/utils/prepareChannelPayload.d.ts.map +1 -1
package/dist/index.cjs.js +31 -12
package/dist/index.esm.js +31 -12
package/dist/index.umd.js +1 -1
package/dist/messageRepository/events/onMessageCreated.d.ts.map +1 -1
package/package.json +1 -1

package/dist/channelRepository/utils/prepareChannelPayload.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"prepareChannelPayload.d.ts","sourceRoot":"","sources":["../../../src/channelRepository/utils/prepareChannelPayload.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,4BAA4B,UAA6C,CAAC;AACvF,eAAO,MAAM,oBAAoB,aAAc,KAAK,MAAM,UAAU,EAAE,MAAM,CAAC,YAChC,CAAC;AAE9C,wBAAgB,cAAc,CAC5B,OAAO,EAAE,KAAK,CAAC,UAAU,EACzB,OAAO,GAAE;IAAE,uBAAuB,CAAC,EAAE,OAAO,CAAA;CAAsC,GACjF,KAAK,CAAC,qBAAqB,CAmB7B;AAED,eAAO,MAAM,qBAAqB,eACpB,MAAM,cAAc,YACvB;IAAE,uBAAuB,CAAC,EAAE,OAAO,CAAA;CAAE,SAO/C,CAAC;~~AAkDF~~,eAAO,MAAM,qBAAqB,eACpB,MAAM,cAAc,YACvB;IAAE,uBAAuB,CAAC,EAAE,OAAO,CAAA;CAAE,KAC7C,QAAQ,MAAM,uBAAuB,CA2DvC,CAAC"}
1	+ {"version":3,"file":"prepareChannelPayload.d.ts","sourceRoot":"","sources":["../../../src/channelRepository/utils/prepareChannelPayload.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,4BAA4B,UAA6C,CAAC;AACvF,eAAO,MAAM,oBAAoB,aAAc,KAAK,MAAM,UAAU,EAAE,MAAM,CAAC,YAChC,CAAC;AAE9C,wBAAgB,cAAc,CAC5B,OAAO,EAAE,KAAK,CAAC,UAAU,EACzB,OAAO,GAAE;IAAE,uBAAuB,CAAC,EAAE,OAAO,CAAA;CAAsC,GACjF,KAAK,CAAC,qBAAqB,CAmB7B;AAED,eAAO,MAAM,qBAAqB,eACpB,MAAM,cAAc,YACvB;IAAE,uBAAuB,CAAC,EAAE,OAAO,CAAA;CAAE,SAO/C,CAAC;AA2EF,eAAO,MAAM,qBAAqB,eACpB,MAAM,cAAc,YACvB;IAAE,uBAAuB,CAAC,EAAE,OAAO,CAAA;CAAE,KAC7C,QAAQ,MAAM,uBAAuB,CA2DvC,CAAC"}

package/dist/index.cjs.js CHANGED Viewed

@@ -5994,24 +5994,43 @@ const preUpdateChannelCache = (rawPayload, options = { isMessagePreviewUpdated:
     });
 };
 const updateChannelUnread = ({ currentUserId, channels, channelUsers, }) => {
+    var _a, _b;
     const channelsUnread = [];
     for (let i = 0; i < channels.length; i += 1) {
         if (isUnreadCountSupport(channels[i])) {
             const cacheKey = ['channelUnread', 'get', channels[i].channelId];
             const channelUser = channelUsers.find(channelUser => channelUser.channelId === channels[i].channelId && channelUser.userId === currentUserId);
-            let unreadCount = 0;
+            // readToSegment, lastMentionedSegment and lastSegment are monotonically non-decreasing;
+            // prefer cached values when ahead of the server so a refetch returning stale data cannot
+            // revert updates already written by MessageReadReceiptSyncEngine.markRead (readToSegment)
+            // or onMessageCreatedMqtt (lastSegment).
+            const cached = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+            const lastSegment = Math.max((_b = cached === null || cached === void 0 ? void 0 : cached.lastSegment) !== null && _b !== void 0 ? _b : 0, channels[i].messageCount);
             let readToSegment = null;
             let lastMentionedSegment = null;
+            let unreadCount = 0;
             let isMentioned = false;
             if (channelUser) {
-                readToSegment = channelUser.readToSegment;
-                lastMentionedSegment = channelUser.lastMentionedSegment;
-                unreadCount = Math.max(channels[i].messageCount - readToSegment, 0);
-                isMentioned = lastMentionedSegment > readToSegment;
+                const serverRead = channelUser.readToSegment;
+                const serverMention = channelUser.lastMentionedSegment;
+                readToSegment =
+                    typeof (cached === null || cached === void 0 ? void 0 : cached.readToSegment) === 'number' &&
+                        (typeof serverRead !== 'number' || cached.readToSegment > serverRead)
+                        ? cached.readToSegment
+                        : serverRead !== null && serverRead !== void 0 ? serverRead : null;
+                lastMentionedSegment =
+                    typeof (cached === null || cached === void 0 ? void 0 : cached.lastMentionedSegment) === 'number' &&
+                        (typeof serverMention !== 'number' || cached.lastMentionedSegment > serverMention)
+                        ? cached.lastMentionedSegment
+                        : serverMention !== null && serverMention !== void 0 ? serverMention : null;
+                const readForCalc = readToSegment !== null && readToSegment !== void 0 ? readToSegment : 0;
+                unreadCount = Math.max(lastSegment - readForCalc, 0);
+                isMentioned =
+                    typeof lastMentionedSegment === 'number' && readForCalc < lastMentionedSegment;
             }
             const cacheChannelUnread = {
                 channelId: channels[i].channelId,
-                lastSegment: channels[i].messageCount,
+                lastSegment,
                 readToSegment,
                 lastMentionedSegment,
                 unreadCount,
@@ -6021,6 +6040,8 @@ const updateChannelUnread = ({ currentUserId, channels, channelUsers, }) => {
             pushToCache(cacheKey, cacheChannelUnread);
             channelsUnread.push(cacheChannelUnread);
         }
+    }
+    if (channelsUnread.length > 0) {
         fireEvent('local.channelUnread.updated', channelsUnread);
     }
 };
@@ -10006,16 +10027,13 @@ const onMessageCreatedMqtt = (callback) => {
         }
         if (client.useLegacyUnreadCount) {
             rawPayload.messages.forEach(message => {
-                var _a, _b;
+                var _a, _b, _c;
                 const channelUnread = (_a = pullFromCache([
                     'channelUnread',
                     'get',
                     message.channelId,
                 ])) === null || _a === void 0 ? void 0 : _a.data;
-                if (!channelUnread ||
-                    channelUnread.lastSegment >= message.segment ||
-                    typeof channelUnread.readToSegment !== 'number' ||
-                    typeof channelUnread.lastMentionedSegment !== 'number')
+                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 => {
@@ -10027,7 +10045,8 @@ const onMessageCreatedMqtt = (callback) => {
                 const lastMentionedSegment = isMentionedInMessage
                     ? message.segment
                     : channelUnread.lastMentionedSegment;
-                const updatedChannelUnread = Object.assign(Object.assign({}, channelUnread), { lastSegment, unreadCount: Math.max(lastSegment - channelUnread.readToSegment, 0), lastMentionedSegment, isMentioned: !(channelUnread.readToSegment >= lastMentionedSegment) });
+                const readToSegment = (_c = channelUnread.readToSegment) !== null && _c !== void 0 ? _c : 0;
+                const updatedChannelUnread = Object.assign(Object.assign({}, channelUnread), { lastSegment, unreadCount: Math.max(lastSegment - readToSegment, 0), lastMentionedSegment, isMentioned: typeof lastMentionedSegment === 'number' && readToSegment < lastMentionedSegment });
                 pushToCache(['channelUnread', 'get', message.channelId], updatedChannelUnread);
                 fireEvent('local.channelUnread.updated', [updatedChannelUnread]);
             });

package/dist/index.esm.js CHANGED Viewed

@@ -22086,24 +22086,43 @@ const preUpdateChannelCache = (rawPayload, options = { isMessagePreviewUpdated:
     });
 };
 const updateChannelUnread = ({ currentUserId, channels, channelUsers, }) => {
+    var _a, _b;
     const channelsUnread = [];
     for (let i = 0; i < channels.length; i += 1) {
         if (isUnreadCountSupport(channels[i])) {
             const cacheKey = ['channelUnread', 'get', channels[i].channelId];
             const channelUser = channelUsers.find(channelUser => channelUser.channelId === channels[i].channelId && channelUser.userId === currentUserId);
-            let unreadCount = 0;
+            // readToSegment, lastMentionedSegment and lastSegment are monotonically non-decreasing;
+            // prefer cached values when ahead of the server so a refetch returning stale data cannot
+            // revert updates already written by MessageReadReceiptSyncEngine.markRead (readToSegment)
+            // or onMessageCreatedMqtt (lastSegment).
+            const cached = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+            const lastSegment = Math.max((_b = cached === null || cached === void 0 ? void 0 : cached.lastSegment) !== null && _b !== void 0 ? _b : 0, channels[i].messageCount);
             let readToSegment = null;
             let lastMentionedSegment = null;
+            let unreadCount = 0;
             let isMentioned = false;
             if (channelUser) {
-                readToSegment = channelUser.readToSegment;
-                lastMentionedSegment = channelUser.lastMentionedSegment;
-                unreadCount = Math.max(channels[i].messageCount - readToSegment, 0);
-                isMentioned = lastMentionedSegment > readToSegment;
+                const serverRead = channelUser.readToSegment;
+                const serverMention = channelUser.lastMentionedSegment;
+                readToSegment =
+                    typeof (cached === null || cached === void 0 ? void 0 : cached.readToSegment) === 'number' &&
+                        (typeof serverRead !== 'number' || cached.readToSegment > serverRead)
+                        ? cached.readToSegment
+                        : serverRead !== null && serverRead !== void 0 ? serverRead : null;
+                lastMentionedSegment =
+                    typeof (cached === null || cached === void 0 ? void 0 : cached.lastMentionedSegment) === 'number' &&
+                        (typeof serverMention !== 'number' || cached.lastMentionedSegment > serverMention)
+                        ? cached.lastMentionedSegment
+                        : serverMention !== null && serverMention !== void 0 ? serverMention : null;
+                const readForCalc = readToSegment !== null && readToSegment !== void 0 ? readToSegment : 0;
+                unreadCount = Math.max(lastSegment - readForCalc, 0);
+                isMentioned =
+                    typeof lastMentionedSegment === 'number' && readForCalc < lastMentionedSegment;
             }
             const cacheChannelUnread = {
                 channelId: channels[i].channelId,
-                lastSegment: channels[i].messageCount,
+                lastSegment,
                 readToSegment,
                 lastMentionedSegment,
                 unreadCount,
@@ -22113,6 +22132,8 @@ const updateChannelUnread = ({ currentUserId, channels, channelUsers, }) => {
             pushToCache(cacheKey, cacheChannelUnread);
             channelsUnread.push(cacheChannelUnread);
         }
+    }
+    if (channelsUnread.length > 0) {
         fireEvent('local.channelUnread.updated', channelsUnread);
     }
 };
@@ -26098,16 +26119,13 @@ const onMessageCreatedMqtt = (callback) => {
         }
         if (client.useLegacyUnreadCount) {
             rawPayload.messages.forEach(message => {
-                var _a, _b;
+                var _a, _b, _c;
                 const channelUnread = (_a = pullFromCache([
                     'channelUnread',
                     'get',
                     message.channelId,
                 ])) === null || _a === void 0 ? void 0 : _a.data;
-                if (!channelUnread ||
-                    channelUnread.lastSegment >= message.segment ||
-                    typeof channelUnread.readToSegment !== 'number' ||
-                    typeof channelUnread.lastMentionedSegment !== 'number')
+                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 => {
@@ -26119,7 +26137,8 @@ const onMessageCreatedMqtt = (callback) => {
                 const lastMentionedSegment = isMentionedInMessage
                     ? message.segment
                     : channelUnread.lastMentionedSegment;
-                const updatedChannelUnread = Object.assign(Object.assign({}, channelUnread), { lastSegment, unreadCount: Math.max(lastSegment - channelUnread.readToSegment, 0), lastMentionedSegment, isMentioned: !(channelUnread.readToSegment >= lastMentionedSegment) });
+                const readToSegment = (_c = channelUnread.readToSegment) !== null && _c !== void 0 ? _c : 0;
+                const updatedChannelUnread = Object.assign(Object.assign({}, channelUnread), { lastSegment, unreadCount: Math.max(lastSegment - readToSegment, 0), lastMentionedSegment, isMentioned: typeof lastMentionedSegment === 'number' && readToSegment < lastMentionedSegment });
                 pushToCache(['channelUnread', 'get', message.channelId], updatedChannelUnread);
                 fireEvent('local.channelUnread.updated', [updatedChannelUnread]);
             });