@amityco/ts-sdk 6.20.1-84eace1.0 → 6.20.1

package/dist/index.cjs.js

@@ -98,8 +98,8 @@ const PostContentType = Object.freeze({
 
 function getVersion() {
     try {
-        // the string ''v6.20.0-cjs'' should be replaced by actual value by @rollup/plugin-replace
-        return 'v6.20.0-cjs';
+        // the string ''v6.20.1-cjs'' should be replaced by actual value by @rollup/plugin-replace
+        return 'v6.20.1-cjs';
     }
     catch (error) {
         return '__dev__';
@@ -504,7 +504,7 @@ const idResolvers = {
     user: ({ userId }) => userId,
     file: ({ fileId }) => fileId,
     role: ({ roleId }) => roleId,
-    channel: ({ channelInternalId }) => channelInternalId,
+    channel: ({ channelId }) => channelId,
     subChannel: ({ subChannelId }) => subChannelId,
     channelUsers: ({ channelId, userId }) => `${channelId}#${userId}`,
     message: ({ messageId }) => messageId,
@@ -1067,7 +1067,7 @@ const filterByChannelMembership = (collection, membership, userId) => {
             return true;
         // get resolver for the channel by user
         const channelUserCacheKey = getResolver('channelUsers')({
-            channelId: c.channelPublicId,
+            channelId: c.channelId,
             userId,
         });
         const channelUser = (_a = pullFromCache([
@@ -1308,9 +1308,6 @@ const WS_EVENTS = [
     'sessionStateChange',
     // for internal use by accessTokenExpiryWatcher
     'tokenExpired',
-    'v3.video-streaming.didRecord',
-    'v3.video-streaming.didStart',
-    'v3.video-streaming.didStop',
 ];
 const MQTT_EVENTS = [
     'connect',
@@ -5650,16 +5647,6 @@ const messageLinkedObject = (message) => {
         } });
 };
 
-const reactorLinkedObject = (reactor) => {
-    return Object.assign(Object.assign({}, reactor), { get user() {
-            var _a;
-            const user = (_a = pullFromCache(['user', 'get', reactor.userId])) === null || _a === void 0 ? void 0 : _a.data;
-            if (!user)
-                return undefined;
-            return userLinkedObject(user);
-        } });
-};
-
 const LinkedObject = {
     comment: commentLinkedObject,
     post: postLinkedObject,
@@ -5668,7 +5655,6 @@ const LinkedObject = {
     story: storyLinkedObject,
     storyTarget: storyTargetLinkedObject,
     message: messageLinkedObject,
-    reactor: reactorLinkedObject,
 };
 
 const getChannelMessagePreviewWithUser = (channel) => {
@@ -5990,8 +5976,7 @@ const getSubChannelsUnreadCount = (channel, marker) => {
     var _a, _b, _c, _d, _e;
     const client = getActiveClient();
     if (client.isUnreadCountEnabled && client.getMarkerSyncConsistentMode()) {
-        // Marker service API uses channelInternalId as channelId
-        return (_b = (_a = getUnreadInfoCached$1(channel.channelInternalId)) === null || _a === void 0 ? void 0 : _a.unreadCount) !== null && _b !== void 0 ? _b : 0;
+        return (_b = (_a = getUnreadInfoCached$1(channel.channelId)) === null || _a === void 0 ? void 0 : _a.unreadCount) !== null && _b !== void 0 ? _b : 0;
     }
     if (marker === null || marker === void 0 ? void 0 : marker.isDeleted) {
         // NOTE: This is a temporary solution to handle the channel marker when the user is forced to
@@ -5999,7 +5984,7 @@ const getSubChannelsUnreadCount = (channel, marker) => {
         // from a channel or the channel is deleted the channel's unread count will reset to zero
         return 0;
     }
-    return (_e = (_c = marker === null || marker === void 0 ? void 0 : marker.unreadCount) !== null && _c !== void 0 ? _c : (_d = getCachedMarker$1(channel.channelInternalId)) === null || _d === void 0 ? void 0 : _d.unreadCount) !== null && _e !== void 0 ? _e : 0;
+    return (_e = (_c = marker === null || marker === void 0 ? void 0 : marker.unreadCount) !== null && _c !== void 0 ? _c : (_d = getCachedMarker$1(channel.channelId)) === null || _d === void 0 ? void 0 : _d.unreadCount) !== null && _e !== void 0 ? _e : 0;
 };
 
 const getCachedMarker = (entityId) => {
@@ -6030,11 +6015,11 @@ const getChannelIsMentioned = (channel, marker) => {
     var _a, _b, _c, _d;
     const client = getActiveClient();
     if (client.isUnreadCountEnabled && client.getMarkerSyncConsistentMode()) {
-        return (_b = (_a = getUnreadInfoCached(channel.channelPublicId)) === null || _a === void 0 ? void 0 : _a.isMentioned) !== null && _b !== void 0 ? _b : false;
+        return (_b = (_a = getUnreadInfoCached(channel.channelId)) === null || _a === void 0 ? void 0 : _a.isMentioned) !== null && _b !== void 0 ? _b : false;
     }
     return (marker === null || marker === void 0 ? void 0 : marker.hasMentioned) !== undefined
         ? marker === null || marker === void 0 ? void 0 : marker.hasMentioned
-        : (_d = (_c = getCachedMarker(channel.channelPublicId)) === null || _c === void 0 ? void 0 : _c.hasMentioned) !== null && _d !== void 0 ? _d : false;
+        : (_d = (_c = getCachedMarker(channel.channelId)) === null || _c === void 0 ? void 0 : _c.hasMentioned) !== null && _d !== void 0 ? _d : false;
 };
 
 const MARKER_INCLUDED_CHANNEL_TYPE = ['broadcast', 'conversation', 'community'];
@@ -6061,7 +6046,7 @@ function convertFromRaw$2(channel, options = { isMessagePreviewUpdated: true })
         },
         get subChannelsUnreadCount() {
             return getSubChannelsUnreadCount(channel);
-        } }, channel), { defaultSubChannelId: channel.channelInternalId, isUnreadCountSupport: isUnreadCountSupport$2(channel), messagePreviewId });
+        } }, channel), { defaultSubChannelId: channel._id, isUnreadCountSupport: isUnreadCountSupport$2(channel), messagePreviewId });
 }
 const preUpdateChannelCache = (rawPayload, options = { isMessagePreviewUpdated: true }) => {
     ingestInCache({
@@ -6080,7 +6065,7 @@ const prepareChannelPayload = async (rawPayload, options = { isMessagePreviewUpd
     const markerIds = rawPayload.channels
         // filter channel by type. Only conversation, community and broadcast type are included.
         .filter(isUnreadCountSupport$2)
-        .map(({ channelInternalId }) => channelInternalId);
+        .map(({ channelId }) => channelId);
     if (markerIds.length > 0) {
         // since the get markers method requires a channel cache to function with the reducer.
         preUpdateChannelCache(rawPayload, { isMessagePreviewUpdated: options.isMessagePreviewUpdated });
@@ -6100,85 +6085,6 @@ const prepareChannelPayload = async (rawPayload, options = { isMessagePreviewUpd
         channelUsers });
 };
 
-/**
- * ```js
- * import { getSubChannelMarkers } from '@amityco/ts-sdk'
- * const subChannelMarkers = await getSubChannelMarkers(['sch1', 'sch2'])
- * ```
- *
- * Fetches a paginable list of {@link Amity.SubChannelMarker} objects
- *
- * @param messageFeedIds the feed IDs of the {@link Amity.RawSubChannel} marker to fetch
- * @param page
- * @returns A page of {@link Amity.SubChannelMarker} objects
- *
- * @category Channel API
- * @async
- * @private
- */
-const getUserMessageFeedMakers = async (channelIds) => {
-    const client = getActiveClient();
-    client.log('channel/getUserMessageFeedMakers', channelIds);
-    const { data } = await client.http.get(`/api/v1/markers/user-message-feed`, {
-        params: {
-            channelIds,
-        },
-    });
-    fireEvent('local.userMessageFeedMarker.fetched', { userMessageFeedMarker: data });
-    return data;
-};
-
-const persistUnreadCountInfo = (payload) => {
-    const { feedMarkers, userFeedMarkers } = payload;
-    // calculate sub channel unread info and channel unread info
-    if (feedMarkers.length > 0 && userFeedMarkers.length > 0) {
-        const channelIds = [];
-        const feedMarkerMap = new Map(feedMarkers.map(fm => [fm.feedId, fm]));
-        userFeedMarkers.forEach(userFeedMarker => {
-            const feedMarker = feedMarkerMap.get(userFeedMarker.feedId);
-            if (!feedMarker)
-                return;
-            if (feedMarker.feedId === userFeedMarker.feedId) {
-                const unreadCount = feedMarker.lastSegment - userFeedMarker.readToSegment;
-                const subChannelUnreadInfo = {
-                    subChannelId: feedMarker.feedId,
-                    channelId: feedMarker.entityId,
-                    readToSegment: userFeedMarker.readToSegment,
-                    lastSegment: feedMarker.lastSegment,
-                    lastMentionSegment: userFeedMarker.lastMentionSegment,
-                    unreadCount: Math.max(0, unreadCount),
-                    isMentioned: userFeedMarker.isMentioned,
-                    isDeleted: feedMarker.isDeleted,
-                    createdAt: userFeedMarker.createdAt,
-                    updatedAt: userFeedMarker.updatedAt,
-                };
-                // update sub channel unread info in cache
-                ingestInCache({ subChannelUnreadInfo: [subChannelUnreadInfo] });
-                if (!channelIds.includes(feedMarker.entityId)) {
-                    channelIds.push(feedMarker.entityId);
-                }
-            }
-        });
-        // re-calculate channel unread info in cache
-        channelIds.forEach(channelId => {
-            reCalculateChannelUnreadInfo(channelId);
-        });
-    }
-};
-
-const prepareUnreadCountInfo = async (rawPayload) => {
-    const client = getActiveClient();
-    // if consistent mode is enabled, persist the unread count info to the cache
-    // Marker service API uses channelInternalId as channelId
-    const queryPayload = await getUserMessageFeedMakers(rawPayload.channels.map(({ channelInternalId }) => channelInternalId));
-    const { feedMarkers, userFeedMarkers } = queryPayload;
-    persistUnreadCountInfo({
-        feedMarkers,
-        userFeedMarkers,
-    });
-    client.log('channel/prepareUnreadCountInfo', rawPayload.channels);
-};
-
 /**
  * ```js
  * import { getChannelByIds } from '@amityco/ts-sdk'
@@ -6208,16 +6114,12 @@ const getChannelByIds = async (channelIds) => {
     catch (error) {
         channelIds.forEach(channelId => {
             if (checkIfShouldGoesToTombstone(error === null || error === void 0 ? void 0 : error.code)) {
-                // NOTE: use channelPublicId as tombstone cache key since we cannot get the channelPrivateId that come along with channel data from server
                 pushToTombstone('channel', channelId);
             }
         });
         throw error;
     }
     const data = await prepareChannelPayload(payload);
-    if (client.isUnreadCountEnabled && client.getMarkerSyncConsistentMode()) {
-        await prepareUnreadCountInfo(payload);
-    }
     const cachedAt = client.cache && Date.now();
     if (client.cache)
         ingestInCache(data, { cachedAt });
@@ -6241,18 +6143,18 @@ const getChannelByIds = async (channelIds) => {
  * @category Channel API
  */
 getChannelByIds.locally = (channelIds) => {
-    var _a, _b;
+    var _a;
     const client = getActiveClient();
     client.log('channel/getChannelByIds.locally', channelIds);
     if (!client.cache)
         return;
-    const cached = (_a = queryCache(['channel', 'get'])) === null || _a === void 0 ? void 0 : _a.filter(({ data }) => {
-        return channelIds.includes(data.channelPublicId);
-    });
-    if (!cached || (cached === null || cached === void 0 ? void 0 : cached.length) < channelIds.length)
+    const cached = channelIds
+        .map(channelId => pullFromCache(['channel', 'get', channelId]))
+        .filter(Boolean);
+    if ((cached === null || cached === void 0 ? void 0 : cached.length) < channelIds.length)
         return;
     const channels = cached.map(({ data }) => data);
-    const oldest = (_b = cached.sort((a, b) => (a.cachedAt < b.cachedAt ? -1 : 1))) === null || _b === void 0 ? void 0 : _b[0];
+    const oldest = (_a = cached.sort((a, b) => (a.cachedAt < b.cachedAt ? -1 : 1))) === null || _a === void 0 ? void 0 : _a[0];
     return {
         data: channels,
         cachedAt: oldest.cachedAt,
@@ -6292,6 +6194,44 @@ const getMessageMarkers = async (messageIds) => {
     return { data: contentMarkers, cachedAt };
 };
 
+const persistUnreadCountInfo = (payload) => {
+    const { feedMarkers, userFeedMarkers } = payload;
+    // calculate sub channel unread info and channel unread info
+    if (feedMarkers.length > 0 && userFeedMarkers.length > 0) {
+        const channelIds = [];
+        const feedMarkerMap = new Map(feedMarkers.map(fm => [fm.feedId, fm]));
+        userFeedMarkers.forEach(userFeedMarker => {
+            const feedMarker = feedMarkerMap.get(userFeedMarker.feedId);
+            if (!feedMarker)
+                return;
+            if (feedMarker.feedId === userFeedMarker.feedId) {
+                const unreadCount = feedMarker.lastSegment - userFeedMarker.readToSegment;
+                const subChannelUnreadInfo = {
+                    subChannelId: feedMarker.feedId,
+                    channelId: feedMarker.entityId,
+                    readToSegment: userFeedMarker.readToSegment,
+                    lastSegment: feedMarker.lastSegment,
+                    lastMentionSegment: userFeedMarker.lastMentionSegment,
+                    unreadCount: Math.max(0, unreadCount),
+                    isMentioned: userFeedMarker.isMentioned,
+                    isDeleted: feedMarker.isDeleted,
+                    createdAt: userFeedMarker.createdAt,
+                    updatedAt: userFeedMarker.updatedAt,
+                };
+                // update sub channel unread info in cache
+                ingestInCache({ subChannelUnreadInfo: [subChannelUnreadInfo] });
+                if (!channelIds.includes(feedMarker.entityId)) {
+                    channelIds.push(feedMarker.entityId);
+                }
+            }
+        });
+        // re-calculate channel unread info in cache
+        channelIds.forEach(channelId => {
+            reCalculateChannelUnreadInfo(channelId);
+        });
+    }
+};
+
 /**
  * ```js
  * import { getSubChannelMarkers } from '@amityco/ts-sdk'
@@ -7581,19 +7521,32 @@ const onOffline = (callback) => {
     return () => console.error('Unsupported environment');
 };
 
-const resolveChannels = async (channelIds) => {
-    const { data: channels } = await getChannelByIds(channelIds);
-    fireEvent('local.channel.resolved', channels);
-};
-
-const resolveUserMessageFeedMarkers = async (channelIds) => {
-    const queryPayload = await getUserMessageFeedMakers(channelIds);
-    const { feedMarkers, userFeedMarkers } = queryPayload;
-    persistUnreadCountInfo({
-        feedMarkers,
-        userFeedMarkers,
+/**
+ * ```js
+ * import { getSubChannelMarkers } from '@amityco/ts-sdk'
+ * const subChannelMarkers = await getSubChannelMarkers(['sch1', 'sch2'])
+ * ```
+ *
+ * Fetches a paginable list of {@link Amity.SubChannelMarker} objects
+ *
+ * @param messageFeedIds the feed IDs of the {@link Amity.RawSubChannel} marker to fetch
+ * @param page
+ * @returns A page of {@link Amity.SubChannelMarker} objects
+ *
+ * @category Channel API
+ * @async
+ * @private
+ */
+const getUserMessageFeedMakers = async (channelIds) => {
+    const client = getActiveClient();
+    client.log('channel/getUserMessageFeedMakers', channelIds);
+    const { data } = await client.http.get(`/api/v1/markers/user-message-feed`, {
+        params: {
+            channelIds,
+        },
     });
-    fireEvent('local.userMessageFeedMarkers.resolved', { feedMarkers, userFeedMarkers });
+    fireEvent('local.userMessageFeedMarker.fetched', { userMessageFeedMarker: data });
+    return data;
 };
 
 class ObjectResolverEngine {
@@ -7660,9 +7613,9 @@ class ObjectResolverEngine {
         // Incase of failure: Ignore
         // Incase of success: Persist in Domain DB & Notify Live collection
         if (channelIds.length > 0)
-            resolveChannels(channelIds);
+            getChannelByIds(channelIds);
         if (userMessageFeedMarkerIds.length > 0)
-            resolveUserMessageFeedMarkers(userMessageFeedMarkerIds);
+            getUserMessageFeedMakers(userMessageFeedMarkerIds);
         // After sending request
         this.isResolvingTask = false;
     }
@@ -8732,7 +8685,9 @@ const login = async (params, sessionHandler, config) => {
         // FIXME: events are duplicated if connectClient is called few times without disconnectClient
         // wire websocket events to our event emitter
         proxyWebsocketEvents(client.ws, client.emitter);
-        client.ws.open();
+        client.ws.once('connect', () => {
+            client.ws.open();
+        });
         client.userId = user.userId;
         client.sessionHandler = sessionHandler;
         /*
@@ -13148,7 +13103,7 @@ const onReactionRemoved = (referenceType, referenceId, callback) => {
  * })
  * ```
  *
- * Fired when an {@link Amity.InternalReactor} has been added
+ * Fired when an {@link Amity.Reactor} has been added
  *
  * @param {@link Amity.ReactableType} referenceType
  * @param {string} referenceId
@@ -13211,7 +13166,7 @@ const onReactorAdded = (referenceType, referenceId, callback) => {
  * })
  * ```
  *
- * Fired when an {@link Amity.InternalReactor} has been removed
+ * Fired when an {@link Amity.Reactor} has been removed
  *
  * @param {@link Amity.ReactableType} referenceType
  * @param {string} referenceId
@@ -13318,10 +13273,10 @@ const queryReactions = async (query) => {
  * })
  * ```
  *
- * Queries a paginable list of {@link Amity.InternalReactor} objects
+ * Queries a paginable list of {@link Amity.Reactor} objects
  *
  * @param query The query parameters
- * @returns A page of {@link Amity.InternalReactor} objects
+ * @returns A page of {@link Amity.Reactor} objects
  *
  * @reaction Reaction API
  * @async
@@ -13347,7 +13302,7 @@ const queryReactor = async (query) => {
  * }, response => merge(reactions, response.data))
  * ```
  *
- * Observe all mutations on a list of {@link Amity.InternalReactor} for a given target object
+ * Observe all mutations on a list of {@link Amity.Reactor} for a given target object
  *
  * @param params for querying reactions
  * @param callback the function to call when new data are available
@@ -13377,7 +13332,7 @@ const getReactions = (params, callback, config) => {
         const reactions = (_a = data.data
             .map(reactorId => pullFromCache(['reactor', 'get', reactorId]))
             .filter(Boolean)
-            .map(({ data }) => LinkedObject.reactor(data))) !== null && _a !== void 0 ? _a : [];
+            .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
         callback({
             onNextPage: onFetch,
             data: reactions,
@@ -13652,6 +13607,18 @@ const updateChannel = async (channelId, patch) => {
 };
 /* end_public_function */
 
+const prepareUnreadCountInfo = async (rawPayload) => {
+    const client = getActiveClient();
+    // if consistent mode is enabled, persist the unread count info to the cache
+    const queryPayload = await getUserMessageFeedMakers(rawPayload.channels.map(({ channelId }) => channelId));
+    const { feedMarkers, userFeedMarkers } = queryPayload;
+    persistUnreadCountInfo({
+        feedMarkers,
+        userFeedMarkers,
+    });
+    client.log('channel/prepareUnreadCountInfo', rawPayload.channels);
+};
+
 /**
  * ```js
  * import { getChannel } from '@amityco/ts-sdk'
@@ -13680,7 +13647,6 @@ const getChannel$1 = async (channelId) => {
     }
     catch (error) {
         if (checkIfShouldGoesToTombstone(error === null || error === void 0 ? void 0 : error.code)) {
-            // NOTE: use channelPublicId as tombstone cache key since we cannot get the channelPrivateId that come along with channel data from server
             pushToTombstone('channel', channelId);
         }
         throw error;
@@ -13708,20 +13674,16 @@ const getChannel$1 = async (channelId) => {
  * @category Channel API
  */
 getChannel$1.locally = (channelId) => {
-    var _a;
     const client = getActiveClient();
     client.log('channel/getChannel.locally', channelId);
     if (!client.cache)
         return;
-    // use queryCache to get all channel caches and filter by channelPublicId since we use channelPrivateId as cache key
-    const cached = (_a = queryCache(['channel', 'get'])) === null || _a === void 0 ? void 0 : _a.filter(({ data }) => {
-        return data.channelPublicId === channelId;
-    });
-    if (!cached || (cached === null || cached === void 0 ? void 0 : cached.length) === 0)
+    const cached = pullFromCache(['channel', 'get', channelId]);
+    if (!cached)
         return;
     return {
-        data: cached[0].data,
-        cachedAt: cached[0].cachedAt,
+        data: cached.data,
+        cachedAt: cached.cachedAt,
     };
 };
 
@@ -16365,7 +16327,6 @@ const getChannel = (channelId, callback) => {
                 await handleMessageCreated(message);
                 if (message.channelId !== channelId)
                     return;
-                // channelId from message is channelInternalId
                 const channel = (_a = pullFromCache(['channel', 'get', channelId])) === null || _a === void 0 ? void 0 : _a.data;
                 if (!channel)
                     return;
@@ -16385,7 +16346,6 @@ const getChannel = (channelId, callback) => {
                 await handleMessageCreated(message);
                 if (message.channelId !== channelId)
                     return;
-                // channelId from message is channelInternalId
                 const channel = (_a = pullFromCache(['channel', 'get', channelId])) === null || _a === void 0 ? void 0 : _a.data;
                 if (!channel)
                     return;
@@ -16549,15 +16509,15 @@ class ChannelQueryStreamController extends QueryStreamController {
             if ([
                 "onCreate" /* Amity.ChannelActionType.OnCreate */,
                 "onJoin" /* Amity.ChannelActionType.OnJoin */,
-                "onResolve" /* Amity.ChannelActionType.OnResolve */,
+                "onFetch" /* Amity.ChannelActionType.OnFetch */,
+                "onUserMessageFeedMarkerFetch" /* Amity.ChannelActionType.OnUserMessageFeedMarkerFetch */,
             ].includes(action)) {
-                if (Array.isArray(payload)) {
+                if (Array.isArray(payload))
                     collection.data = [
-                        ...new Set([...payload.map(getResolver('channel')), ...collection.data]),
+                        ...new Set([...payload.map(({ channelId }) => channelId), ...collection.data]),
                     ];
-                }
                 else
-                    collection.data = [...new Set([payload.channelInternalId, ...collection.data])];
+                    collection.data = [...new Set([payload.channelId, ...collection.data])];
             }
             pushToCache(this.cacheKey, collection);
             this.notifyChange({ origin: "event" /* Amity.LiveDataOrigin.EVENT */, loading: false });
@@ -16568,50 +16528,62 @@ class ChannelQueryStreamController extends QueryStreamController {
     }
 }
 
-const resolveUnreadInfoOnChannelEvent = (channel, callback) => {
-    const client = getActiveClient();
-    if (client.isUnreadCountEnabled && client.getMarkerSyncConsistentMode()) {
-        const objectResolverEngine = ObjectResolverEngine$1.getInstance();
-        objectResolverEngine.resolve(channel.channelId, "userMessageFeedMarker" /* Amity.ReferenceType.USER_MESSAGE_FEED_MARKER */);
-    }
-    else
-        callback(channel);
-};
-
 /**
- * Internal used only
+ * ```js
+ * import { onChannelFetched } from '@amityco/ts-sdk'
+ * const dispose = onChannelFetched(channel => {
+ *   // ...
+ * })
+ * ```
  *
- * Fired when any {@link Amity.Channel} have been resolved by Object resolver
+ * Fired when any {@link Amity.Channel} list have been fetched
  *
  * @param callback The function to call when the event was fired
  * @returns an {@link Amity.Unsubscriber} function to stop listening
  *
  * @category Channel Events
  */
-const onChannelResolved = (callback) => {
+const onChannelFetched = (callback) => {
     const client = getActiveClient();
     const filter = async (payload) => {
         callback(payload);
     };
-    return createEventSubscriber(client, 'onChannelResolved', 'local.channel.resolved', filter);
+    return createEventSubscriber(client, 'onChannelFetched', 'local.channel.fetched', filter);
 };
 
 /**
- * Internal used only
+ * ```js
+ * import { onFeedMarkerUpdated } from '@amityco/ts-sdk'
+ * const dispose = onFeedMarkerUpdated(feedMarker => {
+ *   // ...
+ * })
+ * ```
  *
- * Fired when an {@link Amity.userMessageFeedMarkers} has been resolved by Object Rsesolver
+ * Fired when an {@link Amity.UserMessageFeedMarkerPayload} 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 FeedMarker Events
  */
-const onUserMessageFeedMarkerResolved = (callback) => {
+const onUserFeedMarkerFetched = (callback) => {
     const client = getActiveClient();
     const filter = (payload) => {
-        callback(payload);
+        // update sub channel unread info and channel unread info in cache
+        persistUnreadCountInfo(payload.userMessageFeedMarker);
+        callback(payload.userMessageFeedMarker);
     };
-    return createEventSubscriber(client, 'userMessageFeedMarker/onUserMessageFeedMarkerResolved', 'local.userMessageFeedMarkers.resolved', filter);
+    return createEventSubscriber(client, 'feedMarker/onUserFeedMarkerFetched', 'local.userMessageFeedMarker.fetched', filter);
+};
+
+const resolveUnreadInfoOnChannelEvent = (channel, callback) => {
+    const client = getActiveClient();
+    if (client.isUnreadCountEnabled && client.getMarkerSyncConsistentMode()) {
+        const objectResolverEngine = ObjectResolverEngine$1.getInstance();
+        objectResolverEngine.resolve(channel.channelId, "userMessageFeedMarker" /* Amity.ReferenceType.USER_MESSAGE_FEED_MARKER */);
+    }
+    else
+        callback(channel);
 };
 
 /* eslint-disable no-use-before-define */
@@ -16748,6 +16720,7 @@ class ChannelLiveCollectionController extends LiveCollectionController {
     getSubscriptions() {
         const subscriptions = [
             {
+                // TODO: merge this code to another onMessageCreated in this file
                 fn: convertEventPayload((callback) => {
                     return onMessageCreatedMqtt(message => {
                         var _a;
@@ -16758,7 +16731,6 @@ class ChannelLiveCollectionController extends LiveCollectionController {
                         ])) === null || _a === void 0 ? void 0 : _a.data;
                         if (!cacheData) {
                             const objectResolverEngine = ObjectResolverEngine$1.getInstance();
-                            // channelId from message event payload is channelInternalId
                             objectResolverEngine.resolve(message.channelId, "channel" /* Amity.ReferenceType.CHANNEL */);
                         }
                         else {
@@ -16772,6 +16744,7 @@ class ChannelLiveCollectionController extends LiveCollectionController {
                 action: "onUpdate" /* Amity.ChannelActionType.OnUpdate */,
             },
             {
+                // TODO: merge this code to another onMessageCreated in this file
                 fn: convertEventPayload((callback) => {
                     return onMessageCreatedLocal(message => {
                         var _a;
@@ -16963,25 +16936,23 @@ class ChannelLiveCollectionController extends LiveCollectionController {
                 action: "onUpdate" /* Amity.ChannelActionType.OnUpdate */,
             },
             {
-                fn: onChannelResolved,
-                action: "onResolve" /* Amity.ChannelActionType.OnResolve */,
+                fn: onChannelFetched,
+                action: "onFetch" /* Amity.ChannelActionType.OnFetch */,
             },
             {
                 fn: (callback) => {
-                    const handleUserFeedMarkerResolved = async (marker) => {
+                    const handleUserFeedMarkerFetch = async (marker) => {
                         if (marker.feedMarkers) {
-                            const channelIds = [
-                                ...new Set(marker.feedMarkers.map(feedMarker => feedMarker.entityId)),
-                            ];
+                            const channelIds = marker.feedMarkers.map(feedMarker => feedMarker.entityId);
                             const channels = channelIds
                                 .map(channelId => { var _a; return (_a = pullFromCache(['channel', 'get', channelId])) === null || _a === void 0 ? void 0 : _a.data; })
                                 .filter(Boolean);
                             callback(channels);
                         }
                     };
-                    return onUserMessageFeedMarkerResolved(handleUserFeedMarkerResolved);
+                    return onUserFeedMarkerFetched(handleUserFeedMarkerFetch);
                 },
-                action: "onResolve" /* Amity.ChannelActionType.OnResolve */,
+                action: "onUserMessageFeedMarkerFetch" /* Amity.ChannelActionType.OnUserMessageFeedMarkerFetch */,
             },
         ];
         if (this.paginationController instanceof PaginationController) {
@@ -21253,6 +21224,7 @@ const getComments = (params, callback, config) => {
     const { limit: queryLimit } = params, queryParams = __rest(params, ["limit"]);
     const { policy = COLLECTION_DEFAULT_CACHING_POLICY } = config !== null && config !== void 0 ? config : {};
     const disposers = [];
+    const sortBy = params.sortBy ? params.sortBy : 'lastCreated';
     const cacheKey = [
         'comment',
         'collection',
@@ -21260,6 +21232,7 @@ const getComments = (params, callback, config) => {
             referenceId: params.referenceType,
             referenceType: params.referenceId,
             parentId: (params === null || params === void 0 ? void 0 : params.parentId) || '',
+            sortBy,
         },
     ];
     const responder = (data) => {
@@ -21272,7 +21245,6 @@ const getComments = (params, callback, config) => {
         if (!params.includeDeleted) {
             comments = filterByPropEquality(comments, 'isDeleted', false);
         }
-        const sortBy = params.sortBy ? params.sortBy : 'lastCreated';
         comments = comments.sort(sortBy === 'lastCreated' ? sortByLastCreated : sortByFirstCreated);
         callback({
             onNextPage: onFetch,
@@ -21307,9 +21279,7 @@ const getComments = (params, callback, config) => {
             return;
         const query = createQuery(queryComments, Object.assign(Object.assign({}, queryParams), { limit: queryLimit, page: !initial ? collection === null || collection === void 0 ? void 0 : collection.params.page : undefined }));
         runQuery(query, ({ data: result, error, loading, paging }) => {
-            // depend on sortBy value we have two different pagination types
-            const sorting = queryParams.sortBy || 'lastCreated';
-            const page = sorting === 'lastCreated' ? paging === null || paging === void 0 ? void 0 : paging.next : paging === null || paging === void 0 ? void 0 : paging.previous;
+            const page = paging === null || paging === void 0 ? void 0 : paging.next;
             const data = {
                 loading,
                 error,
@@ -21606,7 +21576,7 @@ const onStreamStarted = (callback) => {
         ingestInCache(payload);
         callback(payload.videoStreamings[0]);
     };
-    return createEventSubscriber(client, 'stream/onStreamStarted', 'v3.video-streaming.didStart', filter);
+    return createEventSubscriber(client, 'stream/onStreamStarted', 'video-streaming.didStart', filter);
 };
 
 /**
@@ -21630,7 +21600,7 @@ const onStreamStopped = (callback) => {
         ingestInCache(payload);
         callback(payload.videoStreamings[0]);
     };
-    return createEventSubscriber(client, 'stream/onStreamStropped', 'v3.video-streaming.didStop', filter);
+    return createEventSubscriber(client, 'stream/onStreamStarted', 'video-streaming.didStop', filter);
 };
 
 /**
@@ -21654,7 +21624,7 @@ const onStreamRecorded = (callback) => {
         ingestInCache(payload);
         callback(payload.videoStreamings[0]);
     };
-    return createEventSubscriber(client, 'stream/onStreamRecorded', 'v3.video-streaming.didRecord', filter);
+    return createEventSubscriber(client, 'stream/onStreamRecorded', 'video-streaming.didRecord', filter);
 };
 
 /* eslint-disable no-use-before-define */
@@ -22188,7 +22158,7 @@ var index$2 = /*#__PURE__*/Object.freeze({
   getPoll: getPoll
 });
 
-const privateKey = "-----BEGIN PRIVATE KEY-----\nMIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDAARz+hmBgi8pJ\nQb8LeY41gtHhk+ACMwRfhsn7GqpqRQNG2qU0755mzZuVDUqjQMGSo8THJB7O+OJs\nflbZRkFXlFoFOVNw1UpNOgwEQZ6wB9oRwzepTJAfF1sVhm/o/ixvXh1zDFNDy6yZ\npXyiiJHUVxqyjllZhxnwdvjoVtDs6hW6awG09bB9nh/TTejlUKXoAgzqVwu/1QMu\nUVViET495elEe19aUarEy+oL2iKeXCEvqda/pWNBdbieFyJvvZ08HN8dPuT88wq2\njZLEAth1vrwQ2IAa4ktaLcBQdLJgIkrbDvAiVZ8lQAjS/bq5vXQikTGvoPlC5bbn\nvuOM/3eLAgMBAAECggEAVZ+peHAghq2QVj71nX5lxsNCKaCyYwixSJBpfouTt7Rz\nE6PpzMOXFi1W1o+I22jDakuSM2SOQKqI/u0QefB0r0O/KVk5NrZHXk0mkrdYtxOp\nUgaGyf8UvmjB+8VqHrNKyZdk9qtmbnNj01kTTcAtmE4H39zPR7eR/8Rul94vaZbs\nwCnKJS3mLT3JxyGug6lxanveKkjG+CKC1nJQYWaxCJxaFSzbwXQPvDhB+TvrIbee\npd5v4EAyEJohpr+T9oDGGJkb/KARBZCtwLyB976PKJwwBA8MRVL1i5QwawuMiMq5\nUtnOnbGKtCeFzaLbNU0Qi8bqyims84EQxC6DOu1fkQKBgQDdvsoBsEhsOXV7hlIJ\naEd0eSJZVkdqimxH8uGoMM2FeNaOrcB6yBXqTSP0R3OIyf8eaY6yjRvP30ZNXcll\n/gD3O1Mu6YmWQdt1W2WA6pKOsUuPXasf0pdOF7IiFZKlSabz5YHXFqwVuqm8loaj\nsXel3YWqPVdHiankE7tz+3ssnQKBgQDdqi4TNdD1MdEpihx19jr0QjUiXW3939FK\nqp30HESPEGDGQzXdmJgif9HhZb+cJSuWaHEbjgBrYahvgCF+y6LbEpOD+D/dmT+s\nDEAQaR84sah6dokwPjV8fjBSrcVFjCS+doxv0d3p/9OUEeyUhFrY03nxtIEYkLIE\n/Zvn37b4RwKBgQCLENVFe9XfsaVhQ5r9dV2iyTlmh7qgMZG5CbTFs12hQGhm8McO\n+Z7s41YSJCFr/yq1WwP4LJDtrBw99vyQr1zRsG35tNLp3gGRNzGQSQyC2uQFVHw2\np+7mNewsfhUK/gbrXNsyFnDz6635rPlhfbII3sWuP2wWXFqkxE9CbMwR7QKBgQC6\nawDMzxmo2/iYArrkyevSuEuPVxvFwpF1RgAI6C0QVCnPE38dmdN4UB7mfHekje4W\nVEercMURidPp0cxZolCYBQtilUjAyL0vqC3In1/Ogjq6oy3FEMxSop1pKxMY5j+Q\nnoqFD+6deLUrddeNH7J3X4LSr4dSbX4JjG+tlgt+yQKBgQCuwTL4hA6KqeInQ0Ta\n9VQX5Qr8hFlqJz1gpymi/k63tW/Ob8yedbg3WWNWyShwRMFYyY9S81ITFWM95uL6\nvF3x9rmRjwElJw9PMwVu6dmf/CO0Z1wzXSp2VVD12gbrUD/0/d7MUoJ9LgC8X8f/\nn0txLHYGHbx+nf95+JUg6lV3hg==\n-----END PRIVATE KEY-----";
+const privateKey = "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDHo80SecH7FuF2\nhFYnb+l26/VN8UMLXAQFLnxciNTEwkGVFMpdezlH8rU2HtUJL4RETogbAOLVY0XM\njs6sPn8G1nALmh9qeDpUtVqFOVtBHxEZ910TLOtQiunjqJKO5nWdqZ71EC3OFluR\niGQkO84BiIFbv37ub7xl3S8XarbtKoLcyVpkDHi+1wx1pgCAn6gtBUgckPL5NR8j\nLseabl3HAXQfhTCKo4tmOFM2Dxwl1IUMmIJrJg/aIU/U0tj/1Eoo7mG0JcNWX19l\nW3EecCbi0ncCJOrkUdwlBrcjaMayaX/ubEwyUeTGiLdyc4L3GRLHjyK8xgVNXRMH\nbZWJ2a5NAgMBAAECggEASxuE+35zTFO/XydKgmvIGcWL9FbgMlXb7Vcf0nBoG945\nbiz0NVc2paraIhJXc608xbYF3qLmtAE1MVBI0ORyRdBHNxY024l/6H6SH60Ed+uI\nM4ysp5ourY6Vj+DLwpdRiI9YDjqYAQDIUmhNxJP7XPhOMoZI6st+xZQBM34ic/bv\nAMSJm9OZphSp3+qXVkFZztr2mxD2EZSJJLYxi8BCdgM2qhazalbcJ6zDKHCZWVWm\n8RRxDGldyMb/237JxETzP40tAlzOZDmBAbUgEnurDJ93RVDIE3rbZUshwgeQd18a\nem096mWgvB1AIKYgsTAR3pw+V19YWAjq/glP6fz8wQKBgQD/oQq+ukKF0PRgBeM5\ngeTjSwsdGppQLmf5ndujvoiz/TpdjDEPu6R8kigQr1rG2t4K/yfdZoI8RdmJD1al\n3Q7N9hofooSy4rj6E3txzWZCHJjHad2cnCp/O26HiReGAl7wTcfTmNdiFHhZQzm5\nJBkvWAiwuvQMNfEbnXxw6/vIDwKBgQDH7fX8gsc77JLvAWgp1MaQN/sbqVb6JeT1\nFQfR8E/WFCSmzQBtNzd5KgYuCeelwr/8DyYytvN2BzCYZXp73gI1jF3YlW5jVn74\nOY6TwQ095digwo6Z0yuxopdIOApKgAkL9PRKgNrqAf3NAyMua6lOGifzjDojC3KU\nfylQmxMn4wKBgHp2B9O/H0dEBw5JQ8W0+JX6yWQz7mEjGiR2/1W+XXb8hQ1zr709\nw1r6Gb+EghRpnZ3fBpYGGbYOMFx8wKHM+N6qW3F0ReX8v2juFGE8aRSa5oYBrWzt\nU16Idjbv8hj84cZ1PJmdyvDtpYn9rpWHOZl4rxEbPvbqkIsOMyNVqdT5AoGAOSge\nmwIIU2le2FVeohbibXiToWTYKMuMmURZ5/r72AgKMmWJKbAPe+Q3wBG01/7FRBpQ\noU8Ma0HC8s6QJbliiEyIx9JwrJWd1vkdecBHONrtA4ibm/5zD2WcOllLF+FitLhi\n3qnX6+6F0IaFGFBPJrTzlv0P4dTz/OAdv52V7GECgYEA2TttOKBAqWllgOaZOkql\nLVMJVmgR7s6tLi1+cEP8ZcapV9aRbRzTAKXm4f8AEhtlG9F9kCOvHYCYGi6JaiWJ\nZkHjeex3T+eE6Di6y5Bm/Ift5jtVhJ4jCVwHOKTMej79NPUFTJfv8hCo29haBDv6\nRXFrv+T21KCcw8k3sJeJWWQ=\n-----END PRIVATE KEY-----";
 /*
  * The crypto algorithm used for importing key and signing string
  */