@amityco/ts-sdk 6.7.3-cbeeb97.0 → 6.7.3-ceeb20b.0

package/dist/@types/domains/content.d.ts

@@ -17,6 +17,7 @@ declare global {
         };
         type ContentDataImage = {
             fileId: Amity.File<'image'>['fileId'];
+            caption?: string;
         };
         type Attachment = {
             type: 'image' | 'link';

package/dist/@types/domains/content.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"content.d.ts","sourceRoot":"","sources":["../../../src/@types/domains/content.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,eAAe;;;;;;EAM1B,CAAC;AAEH,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,KAAK,CAAC;QACd,KAAK,WAAW,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;QAElF,KAAK,eAAe,GAAG,OAAO,CAAC,OAAO,eAAe,CAAC,CAAC;QAEvD,KAAK,eAAe,GAAG;YACrB,IAAI,EAAE,MAAM,CAAC;SACd,CAAC;QAEF,KAAK,eAAe,GAAG;YACrB,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC;SACtC,CAAC;QAEF,KAAK,gBAAgB,GAAG;YACtB,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC;SACvC,CAAC;QAEF,KAAK,UAAU,GAAG;YAChB,IAAI,EAAE,OAAO,GAAG,MAAM,CAAC;YACvB,GAAG,CAAC,EAAE,MAAM,CAAC;YACb,MAAM,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC;SACxC,CAAC;QAEF,KAAK,gBAAgB,GAAG;YACtB,eAAe,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC;YAC/C,WAAW,EAAE;iBACV,CAAC,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC;aACvD,CAAC;SACH,CAAC;QAEF,KAAK,eAAe,GAAG;YACrB,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAC9B,CAAC;QAEF,KAAK,WAAW,CAAC,CAAC,SAAS,WAAW,IAAI,CAAC,SAAS,MAAM,GACtD,eAAe,GACf,CAAC,SAAS,MAAM,GAChB,eAAe,GACf,CAAC,SAAS,OAAO,GACjB,gBAAgB,GAChB,CAAC,SAAS,OAAO,GACjB,gBAAgB,GAChB,CAAC,SAAS,MAAM,GAChB,eAAe,GACf,CAAC,SAAS,MAAM,GAChB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvB,CAAC,SAAS,MAAM,GAChB,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAChC,KAAK,CAAC;QAEV,KAAK,OAAO,CAAC,CAAC,SAAS,WAAW,IAAI;YAEpC,QAAQ,CAAC,EAAE,CAAC,CAAC;YACb,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC;YAChB,IAAI,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;SACvB,CAAC;QAEF,KAAK,kBAAkB,GAAG;YACxB,WAAW,EAAE,MAAM,CAAC;YACpB,OAAO,EAAE,OAAO,CAAC;SAClB,CAAC;QAEF,KAAK,mBAAmB,GAAG;YACzB,WAAW,EAAE,OAAO,CAAC;YACrB,OAAO,EAAE,OAAO,CAAC;YACjB,kBAAkB,EAAE,MAAM,CAAC;YAC3B,eAAe,EAAE;gBACf,aAAa,EAAE,KAAK,CAAC,eAAe,CAAC;gBACrC,aAAa,EAAE,KAAK,CAAC,eAAe,CAAC;aACtC,CAAC;SACH,CAAC;QAEF,KAAK,cAAc,CAAC,CAAC,SAAS,WAAW,GAAG,MAAM,GAAG,OAAO,IAAI,CAAC,SAAS,MAAM,GAC5E,kBAAkB,GAClB,CAAC,SAAS,OAAO,GACjB,mBAAmB,GACnB,KAAK,CAAC;KACX;CACF"}
+{"version":3,"file":"content.d.ts","sourceRoot":"","sources":["../../../src/@types/domains/content.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,eAAe;;;;;;EAM1B,CAAC;AAEH,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,KAAK,CAAC;QACd,KAAK,WAAW,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;QAElF,KAAK,eAAe,GAAG,OAAO,CAAC,OAAO,eAAe,CAAC,CAAC;QAEvD,KAAK,eAAe,GAAG;YACrB,IAAI,EAAE,MAAM,CAAC;SACd,CAAC;QAEF,KAAK,eAAe,GAAG;YACrB,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC;SACtC,CAAC;QAEF,KAAK,gBAAgB,GAAG;YACtB,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC;YACtC,OAAO,CAAC,EAAE,MAAM,CAAC;SAClB,CAAC;QAEF,KAAK,UAAU,GAAG;YAChB,IAAI,EAAE,OAAO,GAAG,MAAM,CAAC;YACvB,GAAG,CAAC,EAAE,MAAM,CAAC;YACb,MAAM,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC;SACxC,CAAC;QAEF,KAAK,gBAAgB,GAAG;YACtB,eAAe,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC;YAC/C,WAAW,EAAE;iBACV,CAAC,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC;aACvD,CAAC;SACH,CAAC;QAEF,KAAK,eAAe,GAAG;YACrB,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAC9B,CAAC;QAEF,KAAK,WAAW,CAAC,CAAC,SAAS,WAAW,IAAI,CAAC,SAAS,MAAM,GACtD,eAAe,GACf,CAAC,SAAS,MAAM,GAChB,eAAe,GACf,CAAC,SAAS,OAAO,GACjB,gBAAgB,GAChB,CAAC,SAAS,OAAO,GACjB,gBAAgB,GAChB,CAAC,SAAS,MAAM,GAChB,eAAe,GACf,CAAC,SAAS,MAAM,GAChB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvB,CAAC,SAAS,MAAM,GAChB,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAChC,KAAK,CAAC;QAEV,KAAK,OAAO,CAAC,CAAC,SAAS,WAAW,IAAI;YAEpC,QAAQ,CAAC,EAAE,CAAC,CAAC;YACb,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC;YAChB,IAAI,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;SACvB,CAAC;QAEF,KAAK,kBAAkB,GAAG;YACxB,WAAW,EAAE,MAAM,CAAC;YACpB,OAAO,EAAE,OAAO,CAAC;SAClB,CAAC;QAEF,KAAK,mBAAmB,GAAG;YACzB,WAAW,EAAE,OAAO,CAAC;YACrB,OAAO,EAAE,OAAO,CAAC;YACjB,kBAAkB,EAAE,MAAM,CAAC;YAC3B,eAAe,EAAE;gBACf,aAAa,EAAE,KAAK,CAAC,eAAe,CAAC;gBACrC,aAAa,EAAE,KAAK,CAAC,eAAe,CAAC;aACtC,CAAC;SACH,CAAC;QAEF,KAAK,cAAc,CAAC,CAAC,SAAS,WAAW,GAAG,MAAM,GAAG,OAAO,IAAI,CAAC,SAAS,MAAM,GAC5E,kBAAkB,GAClB,CAAC,SAAS,OAAO,GACjB,mBAAmB,GACnB,KAAK,CAAC;KACX;CACF"}

package/dist/client/utils/markerSyncEngine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"markerSyncEngine.d.ts","sourceRoot":"","sources":["../../../src/client/utils/markerSyncEngine.ts"],"names":[],"mappings":"AAoDA;;;GAGG;AACH,eAAO,MAAM,mBAAmB,+BAAe,CAAC;AAEhD;;;GAGG;AACH,eAAO,MAAM,mBAAmB,cAAe,MAAM,eAAe,EAAE,SAErE,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,mBAAmB,UAAW,MAAM,eAAe,WAAuB,CAAC;AAExF;;;GAGG;AACH,eAAO,MAAM,iBAAiB,qBA4B7B,CAAC;AAkDF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,eAAe,qBAiB3B,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,cAAc,YAK1B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,YAI7B,CAAC"}
+{"version":3,"file":"markerSyncEngine.d.ts","sourceRoot":"","sources":["../../../src/client/utils/markerSyncEngine.ts"],"names":[],"mappings":"AAoDA;;;GAGG;AACH,eAAO,MAAM,mBAAmB,+BAAe,CAAC;AAEhD;;;GAGG;AACH,eAAO,MAAM,mBAAmB,cAAe,MAAM,eAAe,EAAE,SAErE,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,mBAAmB,UAAW,MAAM,eAAe,WAAuB,CAAC;AAExF;;;GAGG;AACH,eAAO,MAAM,iBAAiB,qBA4B7B,CAAC;AAqDF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,eAAe,qBAK3B,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,cAAc,YAI1B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,YAI7B,CAAC"}

package/dist/index.cjs.js

@@ -5238,8 +5238,11 @@ const prepareMessagePayload = async (payload, event) => {
     return Object.assign(Object.assign({}, payload), { messages: payload.messages.map(m => convertFromRaw$1(m, payload.reactions, event)) });
 };
 function convertParams(_a) {
-    var { subChannelId, mentionees } = _a, rest = __rest(_a, ["subChannelId", "mentionees"]);
-    return Object.assign({ messageFeedId: subChannelId, mentionedUsers: mentionees }, rest);
+    var { subChannelId, mentionees, dataType, data } = _a, rest = __rest(_a, ["subChannelId", "mentionees", "dataType", "data"]);
+    if (dataType === MessageContentType.IMAGE || dataType === MessageContentType.FILE) {
+        return Object.assign({ messageFeedId: subChannelId, mentionedUsers: mentionees, dataType, data: Object.assign({ caption: '' }, data) }, rest);
+    }
+    return Object.assign({ messageFeedId: subChannelId, mentionedUsers: mentionees, dataType, data }, rest);
 }
 function convertQueryParams$1(_a) {
     var { page, sortBy, subChannelId, tags, includeDeleted } = _a, rest = __rest(_a, ["page", "sortBy", "subChannelId", "tags", "includeDeleted"]);
@@ -5513,7 +5516,7 @@ const stopReadingAPI = async (messageFeedId) => {
 };
 
 const START_READING_INTERVAL_TIME = 30000;
-let clearIntervalTask = null;
+let isSyncRunning$1 = false;
 let disposers$1 = [];
 /**
  * map contains subChannelId and isReading flag to determine which subChannel is on reading state
@@ -5536,13 +5539,10 @@ const startReadingFromReadingList = async () => {
     return readingAPI(isReadingSubChannelIds);
 };
 const startIntervalTask = () => {
-    if (clearIntervalTask === null) {
-        clearIntervalTask = setIntervalTask(startReadingFromReadingList, START_READING_INTERVAL_TIME);
-    }
+    isSyncRunning$1 = true;
 };
 const stopIntervalTask = () => {
-    clearIntervalTask === null || clearIntervalTask === void 0 ? void 0 : clearIntervalTask();
-    clearIntervalTask = null;
+    isSyncRunning$1 = false;
 };
 /**
  * global task for mark read engines runs when the client is authenticated.
@@ -5570,6 +5570,9 @@ const getParentChannelId = async (subChannelId) => {
     return data.channelId;
 };
 const registerEventListeners$1 = () => {
+    if (disposers$1.length > 0) {
+        return;
+    }
     disposers$1.push(onOnline(() => {
         // Start reading the reading subChannel again when resume from offline state
         startReadingFromReadingList();
@@ -5640,7 +5643,12 @@ const stopReading = (subChannelId) => {
     disposeAll();
     return stopReadingAPI(subChannelId);
 };
-/* end_public_function */
+/* end_public_function */
+setIntervalTask(async () => {
+    if (!isSyncRunning$1)
+        return;
+    await startReadingFromReadingList();
+}, START_READING_INTERVAL_TIME);
 
 const createUserEventSubscriber = (event, callback) => {
     const client = getActiveClient();
@@ -6425,23 +6433,28 @@ const convertGetterPropsToStatic = (obj) => {
 const onMessageMarked = (callback) => {
     const client = getActiveClient();
     const filter = (payload) => {
+        var _a, _b;
         ingestInCache(payload);
         const cacheCollection = queryCache(['message', 'collection']);
-        if (cacheCollection) {
+        if (cacheCollection && (cacheCollection === null || cacheCollection === void 0 ? void 0 : cacheCollection.length) > 0) {
+            const contentMarker = payload.contentMarkers[0];
             const currentMessageCollection = cacheCollection.filter(currentMessage => {
                 if (!isObject(currentMessage.key[2]))
                     return false;
-                return currentMessage.key[2].subChannelId === payload.contentMarkers[0].feedId;
+                return currentMessage.key[2].subChannelId === contentMarker.feedId;
             });
-            if (currentMessageCollection) {
-                const currentMessages = currentMessageCollection[0].data.data.map(messageId => {
+            if (currentMessageCollection.length > 0) {
+                const currentMessages = ((_b = (_a = currentMessageCollection[0].data) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.map(messageId => {
                     return pullFromCache(['message', 'get', messageId]);
-                });
+                })) || [];
                 currentMessages.forEach(message => {
-                    const isSameSubChannelId = payload.contentMarkers[0].feedId === (message === null || message === void 0 ? void 0 : message.data.subChannelId);
-                    const isReadCountLatest = payload.contentMarkers[0].readCount > (message === null || message === void 0 ? void 0 : message.data.readCount);
-                    if (isSameSubChannelId && isReadCountLatest) {
-                        pushToCache(['message', 'get', message.data.messageId], Object.assign(Object.assign({}, message.data), { readCount: payload.contentMarkers[0].readCount }));
+                    const isSameSubChannelId = contentMarker.feedId === (message === null || message === void 0 ? void 0 : message.data.subChannelId);
+                    const isReadCountLatest = contentMarker.readCount > (message === null || message === void 0 ? void 0 : message.data.readCount);
+                    const isDeliveredCountLatest = contentMarker.deliveredCount > (message === null || message === void 0 ? void 0 : message.data.deliveredCount);
+                    if (isSameSubChannelId) {
+                        pushToCache(['message', 'get', message.data.messageId], Object.assign(Object.assign({}, message.data), { readCount: isReadCountLatest ? contentMarker.readCount : message === null || message === void 0 ? void 0 : message.data.readCount, deliveredCount: isDeliveredCountLatest
+                                ? contentMarker.deliveredCount
+                                : message === null || message === void 0 ? void 0 : message.data.deliveredCount }));
                     }
                 });
             }
@@ -8389,7 +8402,7 @@ const onSubChannelDeleted = (callback) => {
 
 const SYNC_TRIGGER_INTERVAL_TIME = 2000;
 const ON_SUB_CHANNEL_DELETE_SYNC_TRIGGER_DELAY = 2000;
-let clearSyncTrigger;
+let isSyncRunning = false;
 let disposers = [];
 let isWaitingForResponse = false;
 let deviceLastSyncAt = null;
@@ -8458,6 +8471,9 @@ const markerSyncTrigger = async () => {
     isWaitingForResponse = false;
 };
 const registerEventListeners = () => {
+    if (disposers.length > 0) {
+        return;
+    }
     // based on the tech spec design, we designed a fetch marker in case of these events
     // - new message
     // - create channel
@@ -8499,17 +8515,7 @@ const unRegisterEventListeners = () => {
 const startUnreadSync = async () => {
     await fetchDeviceLastSyncAt();
     pushMarkerSyncEvent("start syncing" /* Amity.MarkerSyncEvent.START_SYNCING */);
-    if (!clearSyncTrigger) {
-        // it is possible to repeatedly call the API when multiple events occur at the same time.
-        // This is very burdensome to the BE Server, so we have an interval loop for
-        // grouping every event that occurs within 2 seconds into a single API call.
-        //
-        // interval loop is also useful for fetching large results. Because if the result
-        // is more than 20 records, the API will split the result into multiple pages
-        // and the SDK will need to fetch it repeatedly until all the results are available.
-        // So we need an interval loop for repeat fetch.
-        clearSyncTrigger = setIntervalTask(markerSyncTrigger, SYNC_TRIGGER_INTERVAL_TIME);
-    }
+    isSyncRunning = true;
     registerEventListeners();
 };
 /**
@@ -8523,8 +8529,7 @@ const startUnreadSync = async () => {
  * @category Marker API
  */
 const stopUnreadSync = () => {
-    clearSyncTrigger === null || clearSyncTrigger === void 0 ? void 0 : clearSyncTrigger();
-    clearSyncTrigger = undefined;
+    isSyncRunning = false;
     setMarkerSyncEvents([]);
     unRegisterEventListeners();
 };
@@ -8534,7 +8539,12 @@ const stopUnreadSync = () => {
 const stopUnreadSyncing = () => {
     console.warn('`stopUnreadSyncing` has been deprecated, please use `stopUnreadSync` instead');
     return stopUnreadSync();
-};
+};
+setIntervalTask(async () => {
+    if (!isSyncRunning)
+        return;
+    await markerSyncTrigger();
+}, SYNC_TRIGGER_INTERVAL_TIME);
 
 var index$f = /*#__PURE__*/Object.freeze({
   __proto__: null,
@@ -13077,12 +13087,22 @@ const getMessages = (params, callback, config) => {
     const limit = queryLimit !== null && queryLimit !== void 0 ? queryLimit : COLLECTION_DEFAULT_PAGINATION_LIMIT;
     const { policy = COLLECTION_DEFAULT_CACHING_POLICY } = config !== null && config !== void 0 ? config : {};
     const disposers = [];
-    const cacheKey = ['message', 'collection', params];
+    const cacheKey = ['message', 'collection', params, uuid()];
     const responder = (data) => {
         var _a, _b;
         let messages = (_a = data.data
             .map(messageId => pullFromCache(['message', 'get', messageId]))
             .filter(Boolean)
+            .filter(item => {
+            if (!params.tags)
+                return true;
+            return params.tags.find(value => {
+                var _a;
+                if (!((_a = item.data) === null || _a === void 0 ? void 0 : _a.tags))
+                    return false;
+                return item.data.tags.includes(value);
+            });
+        })
             .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
         /*
          * for cases when message is deleted via RTE, this flag is used to get
@@ -13099,14 +13119,11 @@ const getMessages = (params, callback, config) => {
             error: data.error,
         });
     };
-    const realtimeRouter = (_) => (message) => {
+    const realtimeRouter = (action) => (message) => {
         var _a;
         const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
         if (params.subChannelId !== (message === null || message === void 0 ? void 0 : message.subChannelId) || !collection)
             return;
-        if (!collection.data.includes(message.messageId)) {
-            collection.data = [...new Set([message.messageId, ...collection.data])];
-        }
         pushToCache(cacheKey, collection);
         responder(collection);
     };

package/dist/index.esm.js

@@ -21329,8 +21329,11 @@ const prepareMessagePayload = async (payload, event) => {
     return Object.assign(Object.assign({}, payload), { messages: payload.messages.map(m => convertFromRaw$1(m, payload.reactions, event)) });
 };
 function convertParams(_a) {
-    var { subChannelId, mentionees } = _a, rest = __rest(_a, ["subChannelId", "mentionees"]);
-    return Object.assign({ messageFeedId: subChannelId, mentionedUsers: mentionees }, rest);
+    var { subChannelId, mentionees, dataType, data } = _a, rest = __rest(_a, ["subChannelId", "mentionees", "dataType", "data"]);
+    if (dataType === MessageContentType.IMAGE || dataType === MessageContentType.FILE) {
+        return Object.assign({ messageFeedId: subChannelId, mentionedUsers: mentionees, dataType, data: Object.assign({ caption: '' }, data) }, rest);
+    }
+    return Object.assign({ messageFeedId: subChannelId, mentionedUsers: mentionees, dataType, data }, rest);
 }
 function convertQueryParams$1(_a) {
     var { page, sortBy, subChannelId, tags, includeDeleted } = _a, rest = __rest(_a, ["page", "sortBy", "subChannelId", "tags", "includeDeleted"]);
@@ -21604,7 +21607,7 @@ const stopReadingAPI = async (messageFeedId) => {
 };
 
 const START_READING_INTERVAL_TIME = 30000;
-let clearIntervalTask = null;
+let isSyncRunning$1 = false;
 let disposers$1 = [];
 /**
  * map contains subChannelId and isReading flag to determine which subChannel is on reading state
@@ -21627,13 +21630,10 @@ const startReadingFromReadingList = async () => {
     return readingAPI(isReadingSubChannelIds);
 };
 const startIntervalTask = () => {
-    if (clearIntervalTask === null) {
-        clearIntervalTask = setIntervalTask(startReadingFromReadingList, START_READING_INTERVAL_TIME);
-    }
+    isSyncRunning$1 = true;
 };
 const stopIntervalTask = () => {
-    clearIntervalTask === null || clearIntervalTask === void 0 ? void 0 : clearIntervalTask();
-    clearIntervalTask = null;
+    isSyncRunning$1 = false;
 };
 /**
  * global task for mark read engines runs when the client is authenticated.
@@ -21661,6 +21661,9 @@ const getParentChannelId = async (subChannelId) => {
     return data.channelId;
 };
 const registerEventListeners$1 = () => {
+    if (disposers$1.length > 0) {
+        return;
+    }
     disposers$1.push(onOnline(() => {
         // Start reading the reading subChannel again when resume from offline state
         startReadingFromReadingList();
@@ -21731,7 +21734,12 @@ const stopReading = (subChannelId) => {
     disposeAll();
     return stopReadingAPI(subChannelId);
 };
-/* end_public_function */
+/* end_public_function */
+setIntervalTask(async () => {
+    if (!isSyncRunning$1)
+        return;
+    await startReadingFromReadingList();
+}, START_READING_INTERVAL_TIME);
 
 const createUserEventSubscriber = (event, callback) => {
     const client = getActiveClient();
@@ -22516,23 +22524,28 @@ const convertGetterPropsToStatic = (obj) => {
 const onMessageMarked = (callback) => {
     const client = getActiveClient();
     const filter = (payload) => {
+        var _a, _b;
         ingestInCache(payload);
         const cacheCollection = queryCache(['message', 'collection']);
-        if (cacheCollection) {
+        if (cacheCollection && (cacheCollection === null || cacheCollection === void 0 ? void 0 : cacheCollection.length) > 0) {
+            const contentMarker = payload.contentMarkers[0];
             const currentMessageCollection = cacheCollection.filter(currentMessage => {
                 if (!isObject(currentMessage.key[2]))
                     return false;
-                return currentMessage.key[2].subChannelId === payload.contentMarkers[0].feedId;
+                return currentMessage.key[2].subChannelId === contentMarker.feedId;
             });
-            if (currentMessageCollection) {
-                const currentMessages = currentMessageCollection[0].data.data.map(messageId => {
+            if (currentMessageCollection.length > 0) {
+                const currentMessages = ((_b = (_a = currentMessageCollection[0].data) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.map(messageId => {
                     return pullFromCache(['message', 'get', messageId]);
-                });
+                })) || [];
                 currentMessages.forEach(message => {
-                    const isSameSubChannelId = payload.contentMarkers[0].feedId === (message === null || message === void 0 ? void 0 : message.data.subChannelId);
-                    const isReadCountLatest = payload.contentMarkers[0].readCount > (message === null || message === void 0 ? void 0 : message.data.readCount);
-                    if (isSameSubChannelId && isReadCountLatest) {
-                        pushToCache(['message', 'get', message.data.messageId], Object.assign(Object.assign({}, message.data), { readCount: payload.contentMarkers[0].readCount }));
+                    const isSameSubChannelId = contentMarker.feedId === (message === null || message === void 0 ? void 0 : message.data.subChannelId);
+                    const isReadCountLatest = contentMarker.readCount > (message === null || message === void 0 ? void 0 : message.data.readCount);
+                    const isDeliveredCountLatest = contentMarker.deliveredCount > (message === null || message === void 0 ? void 0 : message.data.deliveredCount);
+                    if (isSameSubChannelId) {
+                        pushToCache(['message', 'get', message.data.messageId], Object.assign(Object.assign({}, message.data), { readCount: isReadCountLatest ? contentMarker.readCount : message === null || message === void 0 ? void 0 : message.data.readCount, deliveredCount: isDeliveredCountLatest
+                                ? contentMarker.deliveredCount
+                                : message === null || message === void 0 ? void 0 : message.data.deliveredCount }));
                     }
                 });
             }
@@ -24480,7 +24493,7 @@ const onSubChannelDeleted = (callback) => {
 
 const SYNC_TRIGGER_INTERVAL_TIME = 2000;
 const ON_SUB_CHANNEL_DELETE_SYNC_TRIGGER_DELAY = 2000;
-let clearSyncTrigger;
+let isSyncRunning = false;
 let disposers = [];
 let isWaitingForResponse = false;
 let deviceLastSyncAt = null;
@@ -24549,6 +24562,9 @@ const markerSyncTrigger = async () => {
     isWaitingForResponse = false;
 };
 const registerEventListeners = () => {
+    if (disposers.length > 0) {
+        return;
+    }
     // based on the tech spec design, we designed a fetch marker in case of these events
     // - new message
     // - create channel
@@ -24590,17 +24606,7 @@ const unRegisterEventListeners = () => {
 const startUnreadSync = async () => {
     await fetchDeviceLastSyncAt();
     pushMarkerSyncEvent("start syncing" /* Amity.MarkerSyncEvent.START_SYNCING */);
-    if (!clearSyncTrigger) {
-        // it is possible to repeatedly call the API when multiple events occur at the same time.
-        // This is very burdensome to the BE Server, so we have an interval loop for
-        // grouping every event that occurs within 2 seconds into a single API call.
-        //
-        // interval loop is also useful for fetching large results. Because if the result
-        // is more than 20 records, the API will split the result into multiple pages
-        // and the SDK will need to fetch it repeatedly until all the results are available.
-        // So we need an interval loop for repeat fetch.
-        clearSyncTrigger = setIntervalTask(markerSyncTrigger, SYNC_TRIGGER_INTERVAL_TIME);
-    }
+    isSyncRunning = true;
     registerEventListeners();
 };
 /**
@@ -24614,8 +24620,7 @@ const startUnreadSync = async () => {
  * @category Marker API
  */
 const stopUnreadSync = () => {
-    clearSyncTrigger === null || clearSyncTrigger === void 0 ? void 0 : clearSyncTrigger();
-    clearSyncTrigger = undefined;
+    isSyncRunning = false;
     setMarkerSyncEvents([]);
     unRegisterEventListeners();
 };
@@ -24625,7 +24630,12 @@ const stopUnreadSync = () => {
 const stopUnreadSyncing = () => {
     console.warn('`stopUnreadSyncing` has been deprecated, please use `stopUnreadSync` instead');
     return stopUnreadSync();
-};
+};
+setIntervalTask(async () => {
+    if (!isSyncRunning)
+        return;
+    await markerSyncTrigger();
+}, SYNC_TRIGGER_INTERVAL_TIME);
 
 var index$f = /*#__PURE__*/Object.freeze({
   __proto__: null,
@@ -29168,12 +29178,22 @@ const getMessages = (params, callback, config) => {
     const limit = queryLimit !== null && queryLimit !== void 0 ? queryLimit : COLLECTION_DEFAULT_PAGINATION_LIMIT;
     const { policy = COLLECTION_DEFAULT_CACHING_POLICY } = config !== null && config !== void 0 ? config : {};
     const disposers = [];
-    const cacheKey = ['message', 'collection', params];
+    const cacheKey = ['message', 'collection', params, uuid()];
     const responder = (data) => {
         var _a, _b;
         let messages = (_a = data.data
             .map(messageId => pullFromCache(['message', 'get', messageId]))
             .filter(Boolean)
+            .filter(item => {
+            if (!params.tags)
+                return true;
+            return params.tags.find(value => {
+                var _a;
+                if (!((_a = item.data) === null || _a === void 0 ? void 0 : _a.tags))
+                    return false;
+                return item.data.tags.includes(value);
+            });
+        })
             .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
         /*
          * for cases when message is deleted via RTE, this flag is used to get
@@ -29190,14 +29210,11 @@ const getMessages = (params, callback, config) => {
             error: data.error,
         });
     };
-    const realtimeRouter = (_) => (message) => {
+    const realtimeRouter = (action) => (message) => {
         var _a;
         const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
         if (params.subChannelId !== (message === null || message === void 0 ? void 0 : message.subChannelId) || !collection)
             return;
-        if (!collection.data.includes(message.messageId)) {
-            collection.data = [...new Set([message.messageId, ...collection.data])];
-        }
         pushToCache(cacheKey, collection);
         responder(collection);
     };