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

package/dist/marker/events/onMessageMarked.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"onMessageMarked.d.ts","sourceRoot":"","sources":["../../../src/marker/events/onMessageMarked.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,eAAe,aAChB,MAAM,QAAQ,CAAC,MAAM,aAAa,CAAC,KAC5C,MAAM,YA0CR,CAAC"}
+{"version":3,"file":"onMessageMarked.d.ts","sourceRoot":"","sources":["../../../src/marker/events/onMessageMarked.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,eAAe,aAChB,MAAM,QAAQ,CAAC,MAAM,aAAa,CAAC,KAC5C,MAAM,YAiDR,CAAC"}

package/dist/messageRepository/observers/getMessages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getMessages.d.ts","sourceRoot":"","sources":["../../../src/messageRepository/observers/getMessages.ts"],"names":[],"mappings":"AA+BA;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,WAAW,WACd,MAAM,sBAAsB,YAC1B,MAAM,sBAAsB,CAAC,MAAM,OAAO,CAAC,WAC5C,MAAM,oBAAoB,KAClC,MAAM,YA+GR,CAAC"}
+{"version":3,"file":"getMessages.d.ts","sourceRoot":"","sources":["../../../src/messageRepository/observers/getMessages.ts"],"names":[],"mappings":"AAgCA;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,WAAW,WACd,MAAM,sBAAsB,YAC1B,MAAM,sBAAsB,CAAC,MAAM,OAAO,CAAC,WAC5C,MAAM,oBAAoB,KAClC,MAAM,YAkHR,CAAC"}

package/dist/messageRepository/utils/prepareMessagePayload.d.ts

@@ -9,7 +9,7 @@ declare type RawQueryMessages = Omit<Amity.QueryMessages, 'page' | 'sortBy' | 's
         token: string;
     };
 };
-export declare function convertParams({ subChannelId, mentionees, ...rest }: Partial<Amity.Message>): Record<string, any>;
+export declare function convertParams({ subChannelId, mentionees, dataType, data, ...rest }: Partial<Amity.Message>): Record<string, any>;
 export declare function convertQueryParams({ page, sortBy, subChannelId, tags, includeDeleted, ...rest }: Amity.QueryMessages): RawQueryMessages;
 export {};
 //# sourceMappingURL=prepareMessagePayload.d.ts.map

package/dist/messageRepository/utils/prepareMessagePayload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prepareMessagePayload.d.ts","sourceRoot":"","sources":["../../../src/messageRepository/utils/prepareMessagePayload.ts"],"names":[],"mappings":"AASA,wBAAgB,cAAc,CAC5B,OAAO,EAAE,KAAK,CAAC,UAAU,EACzB,QAAQ,CAAC,EAAE,KAAK,CAAC,OAAO,EAAE,EAC1B,KAAK,CAAC,EAAE,MAAM,KAAK,CAAC,iBAAiB,GACpC,KAAK,CAAC,OAAO,CAsEf;AAQD,eAAO,MAAM,qBAAqB,YACvB,MAAM,cAAc,UACrB,MAAM,MAAM,iBAAiB,KACpC,QAAQ,MAAM,uBAAuB,CAkBvC,CAAC;AAEF,aAAK,gBAAgB,GAAG,IAAI,CAC1B,KAAK,CAAC,aAAa,EAInB,MAAM,GAAG,QAAQ,GAAG,cAAc,GAAG,MAAM,GAAG,gBAAgB,CAC/D,GAAG;IACF,WAAW,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAC1C,SAAS,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACvC,aAAa,EAAE,KAAK,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;IACnD,OAAO,EAAE;QACP,MAAM,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACvC,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;CACH,CAAC;AAEF,wBAAgB,aAAa,CAAC,EAC5B,YAAY,EACZ,UAAU,EACV,GAAG,IAAI,EACR,EAAE,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAE9C;AAED,wBAAgB,kBAAkB,CAAC,EACjC,IAAI,EACJ,MAAM,EACN,YAAY,EACZ,IAAI,EACJ,cAAc,EACd,GAAG,IAAI,EACR,EAAE,KAAK,CAAC,aAAa,GAAG,gBAAgB,CAiBxC"}
+{"version":3,"file":"prepareMessagePayload.d.ts","sourceRoot":"","sources":["../../../src/messageRepository/utils/prepareMessagePayload.ts"],"names":[],"mappings":"AAUA,wBAAgB,cAAc,CAC5B,OAAO,EAAE,KAAK,CAAC,UAAU,EACzB,QAAQ,CAAC,EAAE,KAAK,CAAC,OAAO,EAAE,EAC1B,KAAK,CAAC,EAAE,MAAM,KAAK,CAAC,iBAAiB,GACpC,KAAK,CAAC,OAAO,CAsEf;AAQD,eAAO,MAAM,qBAAqB,YACvB,MAAM,cAAc,UACrB,MAAM,MAAM,iBAAiB,KACpC,QAAQ,MAAM,uBAAuB,CAkBvC,CAAC;AAEF,aAAK,gBAAgB,GAAG,IAAI,CAC1B,KAAK,CAAC,aAAa,EAInB,MAAM,GAAG,QAAQ,GAAG,cAAc,GAAG,MAAM,GAAG,gBAAgB,CAC/D,GAAG;IACF,WAAW,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAC1C,SAAS,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACvC,aAAa,EAAE,KAAK,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;IACnD,OAAO,EAAE;QACP,MAAM,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACvC,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;CACH,CAAC;AAEF,wBAAgB,aAAa,CAAC,EAC5B,YAAY,EACZ,UAAU,EACV,QAAQ,EACR,IAAI,EACJ,GAAG,IAAI,EACR,EAAE,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAc9C;AAED,wBAAgB,kBAAkB,CAAC,EACjC,IAAI,EACJ,MAAM,EACN,YAAY,EACZ,IAAI,EACJ,cAAc,EACd,GAAG,IAAI,EACR,EAAE,KAAK,CAAC,aAAa,GAAG,gBAAgB,CAiBxC"}

package/dist/subChannelRepository/utils/markReadEngine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"markReadEngine.d.ts","sourceRoot":"","sources":["../../../src/subChannelRepository/utils/markReadEngine.ts"],"names":[],"mappings":"AAmDA;;;;;GAKG;AACH,eAAO,MAAM,4BAA4B,kBAYxC,CAAC;AAsCF;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,YAAY,iBAAwB,MAAM,UAAU,CAAC,cAAc,CAAC,qBAchF,CAAC;AAMF;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,WAAW,iBAAkB,MAAM,UAAU,CAAC,cAAc,CAAC,qBAIzE,CAAC"}
+{"version":3,"file":"markReadEngine.d.ts","sourceRoot":"","sources":["../../../src/subChannelRepository/utils/markReadEngine.ts"],"names":[],"mappings":"AAgDA;;;;;GAKG;AACH,eAAO,MAAM,4BAA4B,kBAYxC,CAAC;AA0CF;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,YAAY,iBAAwB,MAAM,UAAU,CAAC,cAAc,CAAC,qBAchF,CAAC;AAMF;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,WAAW,iBAAkB,MAAM,UAAU,CAAC,cAAc,CAAC,qBAIzE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amityco/ts-sdk",
-  "version": "6.7.3-cbeeb97.0",
+  "version": "6.7.3-cc7ca05.0",
   "license": "CC-BY-ND-4.0",
   "author": "amity.co <developers@amity.co> (https://amity.co)",
   "description": "Amity Social Cloud Typescript SDK",

package/src/@types/domains/content.ts

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

package/src/client/utils/markerSyncEngine.ts

@@ -18,7 +18,7 @@ import { onOnline } from './onOnline';
 const SYNC_TRIGGER_INTERVAL_TIME = 2000;
 const ON_SUB_CHANNEL_DELETE_SYNC_TRIGGER_DELAY = 2000;
 
-let clearSyncTrigger: Amity.Unsubscriber | undefined;
+let isSyncRunning = false;
 let disposers: (() => void)[] = [];
 let isWaitingForResponse = false;
 
@@ -105,6 +105,9 @@ export const markerSyncTrigger = async () => {
 };
 
 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
@@ -166,19 +169,7 @@ const unRegisterEventListeners = () => {
 export const startUnreadSync = async () => {
   await fetchDeviceLastSyncAt();
   pushMarkerSyncEvent(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();
 };
 
@@ -193,8 +184,7 @@ export const startUnreadSync = async () => {
  * @category Marker API
  */
 export const stopUnreadSync = () => {
-  clearSyncTrigger?.();
-  clearSyncTrigger = undefined;
+  isSyncRunning = false;
   setMarkerSyncEvents([]);
   unRegisterEventListeners();
 };
@@ -207,3 +197,9 @@ export const stopUnreadSyncing = () => {
 
   return stopUnreadSync();
 };
+
+setIntervalTask(async () => {
+  if (!isSyncRunning) return;
+
+  await markerSyncTrigger();
+}, SYNC_TRIGGER_INTERVAL_TIME);

package/src/marker/events/onMessageMarked.ts

@@ -29,25 +29,32 @@ export const onMessageMarked = (
 
     const cacheCollection = queryCache<Amity.MessageLiveCollectionCache>(['message', 'collection']);
 
-    if (cacheCollection) {
+    if (cacheCollection && 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 => {
-          return pullFromCache<Amity.Message>(['message', 'get', messageId]);
-        });
+      if (currentMessageCollection.length > 0) {
+        const currentMessages =
+          currentMessageCollection[0].data?.data?.map(messageId => {
+            return pullFromCache<Amity.Message>(['message', 'get', messageId]);
+          }) || [];
 
         currentMessages.forEach(message => {
-          const isSameSubChannelId =
-            payload.contentMarkers[0].feedId === message?.data.subChannelId;
-          const isReadCountLatest = payload.contentMarkers[0].readCount > message?.data.readCount!;
-          if (isSameSubChannelId && isReadCountLatest) {
+          const isSameSubChannelId = contentMarker.feedId === message?.data.subChannelId;
+          const isReadCountLatest = contentMarker.readCount > message?.data.readCount!;
+          const isDeliveredCountLatest =
+            contentMarker.deliveredCount > message?.data.deliveredCount!;
+
+          if (isSameSubChannelId) {
             pushToCache(['message', 'get', message.data.messageId], {
               ...message.data,
-              readCount: payload.contentMarkers[0].readCount,
+              readCount: isReadCountLatest ? contentMarker.readCount : message?.data.readCount!,
+              deliveredCount: isDeliveredCountLatest
+                ? contentMarker.deliveredCount
+                : message?.data.deliveredCount!,
             });
           }
         });

package/src/messageRepository/observers/getMessages.ts

@@ -4,6 +4,7 @@ import { getActiveClient } from '~/client/api';
 import { dropFromCache, pullFromCache, pushToCache } from '~/cache/api';
 import { createQuery, filterByPropEquality, queryOptions, runQuery } from '~/core/query';
 import { onMessageMarked, onMessageMarkerFetched } from '~/marker/events';
+import { uuid } from '~/core/uuid';
 
 import {
   COLLECTION_DEFAULT_CACHING_POLICY,
@@ -68,13 +69,20 @@ export const getMessages = (
   const { policy = COLLECTION_DEFAULT_CACHING_POLICY } = config ?? {};
 
   const disposers: Amity.Unsubscriber[] = [];
-  const cacheKey = ['message', 'collection', params];
+  const cacheKey = ['message', 'collection', params, uuid()];
 
   const responder = (data: Amity.MessageLiveCollectionCache) => {
     let messages: Amity.Message[] =
       data.data
         .map(messageId => pullFromCache<Amity.Message>(['message', 'get', messageId])!)
         .filter(Boolean)
+        .filter(item => {
+          if (!params.tags) return true;
+          return params.tags.find(value => {
+            if (!item.data?.tags) return false;
+            return item.data.tags.includes(value);
+          });
+        })
         .map(({ data }) => data) ?? [];
 
     /*
@@ -94,15 +102,11 @@ export const getMessages = (
     });
   };
 
-  const realtimeRouter = (_: Amity.MessageActionType) => (message: Amity.Message) => {
+  const realtimeRouter = (action: Amity.MessageActionType) => (message: Amity.Message) => {
     const collection = pullFromCache<Amity.MessageLiveCollectionCache>(cacheKey)?.data;
 
     if (params.subChannelId !== message?.subChannelId || !collection) return;
 
-    if (!collection.data.includes(message.messageId)) {
-      collection.data = [...new Set([message.messageId, ...collection.data])];
-    }
-
     pushToCache(cacheKey, collection);
 
     responder(collection);

package/src/messageRepository/utils/prepareMessagePayload.ts

@@ -6,6 +6,7 @@ import { prepareMessagePayloadForCache } from '~/reactionRepository/utils/prepar
 import { inferIsDeleted } from '~/utils/inferIsDeleted';
 
 import { getMessageReadCount } from './getMessageReadCount';
+import { MessageContentType } from '~/@types';
 
 export function convertFromRaw(
   message: Amity.RawMessage,
@@ -131,9 +132,23 @@ type RawQueryMessages = Omit<
 export function convertParams({
   subChannelId,
   mentionees,
+  dataType,
+  data,
   ...rest
 }: Partial<Amity.Message>): Record<string, any> {
-  return { messageFeedId: subChannelId, mentionedUsers: mentionees, ...rest };
+  if (dataType === MessageContentType.IMAGE || dataType === MessageContentType.FILE) {
+    return {
+      messageFeedId: subChannelId,
+      mentionedUsers: mentionees,
+      dataType,
+      data: {
+        caption: '',
+        ...(data as Record<string, any>),
+      },
+      ...rest,
+    };
+  }
+  return { messageFeedId: subChannelId, mentionedUsers: mentionees, dataType, data, ...rest };
 }
 
 export function convertQueryParams({

package/src/subChannelRepository/utils/markReadEngine.ts

@@ -10,7 +10,7 @@ import { stopReadingAPI } from '../api/stopReadingAPI';
 
 const START_READING_INTERVAL_TIME = 30000;
 
-let clearIntervalTask: Amity.Unsubscriber | null = null;
+let isSyncRunning = false;
 let disposers: (() => void)[] = [];
 
 /**
@@ -39,14 +39,11 @@ const startReadingFromReadingList = async () => {
 };
 
 const startIntervalTask = () => {
-  if (clearIntervalTask === null) {
-    clearIntervalTask = setIntervalTask(startReadingFromReadingList, START_READING_INTERVAL_TIME);
-  }
+  isSyncRunning = true;
 };
 
 const stopIntervalTask = () => {
-  clearIntervalTask?.();
-  clearIntervalTask = null;
+  isSyncRunning = false;
 };
 
 /**
@@ -83,6 +80,10 @@ const getParentChannelId = async (
 };
 
 const registerEventListeners = () => {
+  if (disposers.length > 0) {
+    return;
+  }
+
   disposers.push(
     onOnline(() => {
       // Start reading the reading subChannel again when resume from offline state
@@ -161,3 +162,9 @@ export const stopReading = (subChannelId: Amity.SubChannel['subChannelId']) => {
   return stopReadingAPI(subChannelId);
 };
 /* end_public_function */
+
+setIntervalTask(async () => {
+  if (!isSyncRunning) return;
+
+  await startReadingFromReadingList();
+}, START_READING_INTERVAL_TIME);

package/src/utils/tests/dummy/message.ts

@@ -9,7 +9,7 @@ export function generateRawMessage(params?: Partial<Amity.RawMessage>): Amity.Ra
     createdAt: new Date().toISOString(),
     creatorId: 'user-id',
     creatorPublicId: 'user-public-id',
-    data: { text: 'message text' },
+    data: { text: 'message text', caption: '' },
     dataType: 'text',
     editedAt: new Date().toISOString(),
     flagCount: 0,