@amityco/ts-sdk 7.1.1-207e990f.0 → 7.1.1-5d7c3fd0.0

package/dist/{channelRepository → marker}/events/onChannelUnreadUpdatedLocal.d.ts

@@ -1,12 +1,12 @@
 /**
  * Internal used only
  *
- * Fired when an {@link Amity.ChannelUnread} has been updated.
+ * Fired when an {@link Amity.userMessageFeedMarkers} has been resolved by Object Rsesolver
  *
  * @param callback The function to call when the event was fired
  * @returns an {@link Amity.Unsubscriber} function to stop listening
  *
- * @category Channel Events
+ * @category MessageMarker Events
  */
 export declare const onChannelUnreadUpdatedLocal: (callback: Amity.Listener<Amity.Events['local.channelUnread.updated']>) => Amity.Unsubscriber;
 //# sourceMappingURL=onChannelUnreadUpdatedLocal.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"onChannelUnreadUpdatedLocal.d.ts","sourceRoot":"","sources":["../../../src/marker/events/onChannelUnreadUpdatedLocal.ts"],"names":[],"mappings":"AAGA;;;;;;;;;GASG;AACH,eAAO,MAAM,2BAA2B,aAC5B,MAAM,QAAQ,CAAC,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC,KACpE,MAAM,YAaR,CAAC"}

package/dist/messageRepository/events/onMessageCreated.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"onMessageCreated.d.ts","sourceRoot":"","sources":["../../../src/messageRepository/events/onMessageCreated.ts"],"names":[],"mappings":"AAUA;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,oBAAoB,aACrB,MAAM,QAAQ,CAAC,MAAM,eAAe,CAAC,KAC9C,MAAM,YAgER,CAAC;AAEF,eAAO,MAAM,qBAAqB,aACtB,MAAM,QAAQ,CAAC,MAAM,eAAe,CAAC,KAC9C,MAAM,YAoBR,CAAC"}
+{"version":3,"file":"onMessageCreated.d.ts","sourceRoot":"","sources":["../../../src/messageRepository/events/onMessageCreated.ts"],"names":[],"mappings":"AASA;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,oBAAoB,aACrB,MAAM,QAAQ,CAAC,MAAM,eAAe,CAAC,KAC9C,MAAM,YA+BR,CAAC;AAEF,eAAO,MAAM,qBAAqB,aACtB,MAAM,QAAQ,CAAC,MAAM,eAAe,CAAC,KAC9C,MAAM,YAoBR,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"markReadMessage.d.ts","sourceRoot":"","sources":["../../../src/messageRepository/utils/markReadMessage.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,eAAe,YAAa,MAAM,eAAe,SAU7D,CAAC"}
+{"version":3,"file":"markReadMessage.d.ts","sourceRoot":"","sources":["../../../src/messageRepository/utils/markReadMessage.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,eAAe,YAAa,MAAM,eAAe,SAK7D,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amityco/ts-sdk",
-  "version": "7.1.1-207e990f.0",
+  "version": "7.1.1-5d7c3fd0.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/core/events.ts

@@ -237,8 +237,7 @@ declare global {
       };
 
       'local.subChannelUnread.updated': Amity.SubChannelUnreadInfo;
-      'local.channelUnreadInfo.updated': Amity.ChannelUnreadInfo;
-      'local.channelUnread.updated': Amity.ChannelUnread;
+      'local.channelUnread.updated': Amity.ChannelUnreadInfo;
 
       'local.story.created': Amity.StoryPayload;
       'local.story.updated': Amity.StoryPayload;

package/src/@types/core/model.ts

@@ -25,8 +25,6 @@ declare global {
       channelUnreadInfo: Amity.ChannelUnreadInfo;
       subChannelUnreadInfo: Amity.SubChannelUnreadInfo;
 
-      channelUnread: Amity.ChannelUnread;
-
       channelMarker: Amity.ChannelMarker;
       subChannelMarker: Amity.SubChannelMarker;
       messageMarker: Amity.MessageMarker;
@@ -86,8 +84,6 @@ declare global {
       channelUnreadInfo: Pick<Amity.ChannelUnreadInfo, 'channelId'>;
       subChannelUnreadInfo: Pick<Amity.SubChannelUnreadInfo, 'subChannelId'>;
 
-      channelUnread: Pick<Amity.ChannelUnread, 'channelId'>;
-
       channelMarker: Pick<Amity.ChannelMarker, 'entityId' | 'userId'>;
       subChannelMarker: Pick<Amity.SubChannelMarker, 'feedId' | 'entityId' | 'userId'>;
       messageMarker: Pick<Amity.MessageMarker, 'feedId' | 'contentId' | 'creatorId'>;

package/src/@types/core/readReceipt.ts

@@ -8,25 +8,12 @@ declare global {
     }
 
     type ReadReceipt = {
-      channelId: Amity.Channel['channelId'];
-      latestSegment: number;
-      latestSyncSegment: number;
-    };
-
-    type ReadReceiptSyncJob = {
-      channelId: Amity.Channel['channelId'];
-      segment: number;
-      syncState: ReadReceiptSyncState;
-      retryCount: number;
-    };
-
-    type LegacyReadReceipt = {
       subChannelId: Amity.SubChannel['subChannelId'];
       latestSegment: number;
       latestSyncSegment: number;
     };
 
-    type LegacyReadReceiptSyncJob = {
+    type ReadReceiptSyncJob = {
       subChannelId: Amity.SubChannel['subChannelId'];
       segment: number;
       syncState: ReadReceiptSyncState;

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

@@ -84,8 +84,6 @@ declare global {
     > & {
       isMentioned: boolean;
       subChannelsUnreadCount: number;
-      // legacy unread count does not use the maker service
-      unreadCount: number;
     };
 
     /* public type */
@@ -139,16 +137,5 @@ declare global {
       Amity.Membership<'channel'>['userId'],
       Pick<QueryChannelMembers, 'page'>
     >;
-
-    // Use for channel's unread count value stored in the local cache
-    type ChannelUnread = {
-      channelId: Amity.Channel['channelId'];
-      unreadCount: number;
-      isMentioned: boolean;
-      readToSegment: number;
-      lastSegment: number;
-      lastMentionSegment: number;
-      isDeleted: boolean;
-    };
   }
 }

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

@@ -36,6 +36,7 @@ declare global {
 
       log: Logger;
       http: AxiosInstance;
+      upload: AxiosInstance;
       mqtt?: Amity.MqttClient;
       ws?: SocketIOClient.Socket;
       emitter: Emitter<Amity.Events>;
@@ -56,8 +57,6 @@ declare global {
 
       isUnreadCountEnabled: boolean;
 
-      useLegacyUnreadCount: boolean;
-
       use: () => void;
 
       accessTokenExpiryWatcher: (sessionHandler: Amity.SessionHandler) => Amity.Unsubscriber;

package/src/channelRepository/events/onChannelDeleted.ts

@@ -6,7 +6,6 @@ import { ingestInCache } from '~/cache/api/ingestInCache';
 import { prepareChannelPayload } from '../utils/prepareChannelPayload';
 import { addFlagIsDeletedSubChannelUnreadByChannelId } from '~/marker/utils/addFlagIsDeletedSubChannelUnreadByChannelId';
 import { deleteChannelUnreadByChannelId } from '../../marker/utils/deleteChannelUnreadByChannelId';
-import { dropFromCache, pullFromCache, pushToCache } from '~/cache/api';
 
 type CallbackFn = (channel: Amity.StaticInternalChannel) => void;
 const callbacks: CallbackFn[] = [];
@@ -29,24 +28,12 @@ export const onChannelDeleted = (callback: Amity.Listener<Amity.StaticInternalCh
     const filter = async (payload: Amity.ChannelPayload) => {
       const data = await prepareChannelPayload(payload);
 
-      const isConsistentMode = client.getMarkerSyncConsistentMode() && client.isUnreadCountEnabled;
-      const isLegacyUnreadCount = client.useLegacyUnreadCount;
-
-      data.channels.forEach(channel => {
-        if (isConsistentMode) {
+      if (client.isUnreadCountEnabled && client.getMarkerSyncConsistentMode()) {
+        data.channels.forEach(channel => {
           addFlagIsDeletedSubChannelUnreadByChannelId(channel.channelId);
           deleteChannelUnreadByChannelId(channel.channelId);
-        } else if (isLegacyUnreadCount) {
-          const cacheKey = ['channelUnread', 'get', channel.channelId];
-          const cache = pullFromCache<Amity.ChannelUnread>(cacheKey);
-          if (cache) {
-            pushToCache(cacheKey, {
-              ...cache,
-              isDeleted: true,
-            });
-          }
-        }
-      });
+        });
+      }
 
       ingestInCache(data);
       callbacks.forEach(cb => cb(data.channels[0]));

package/src/channelRepository/events/onChannelLeft.ts

@@ -6,7 +6,6 @@ import { ingestInCache } from '~/cache/api/ingestInCache';
 import { prepareChannelPayload } from '../utils';
 import { deleteChannelUnreadByChannelId } from '../../marker/utils/deleteChannelUnreadByChannelId';
 import { addFlagIsDeletedSubChannelUnreadByChannelId } from '~/marker/utils/addFlagIsDeletedSubChannelUnreadByChannelId';
-import { dropFromCache } from '~/cache/api';
 
 type CallbackFn = (
   channel: Amity.StaticInternalChannel,
@@ -41,17 +40,10 @@ export const onChannelLeft = (
         isMessagePreviewUpdated: isLeftByMe,
       });
 
-      const isConsistentMode = client.getMarkerSyncConsistentMode() && client.isUnreadCountEnabled;
-      const isLegacyUnreadCount = client.useLegacyUnreadCount;
-
-      if (isLeftByMe) {
+      if (client.isUnreadCountEnabled && client.getMarkerSyncConsistentMode() && isLeftByMe) {
         preparedPayload.channels.forEach(channel => {
-          if (isConsistentMode) {
-            addFlagIsDeletedSubChannelUnreadByChannelId(channel.channelId);
-            deleteChannelUnreadByChannelId(channel.channelId);
-          } else if (isLegacyUnreadCount) {
-            dropFromCache(['channelUnread', 'get', channel.channelId]);
-          }
+          addFlagIsDeletedSubChannelUnreadByChannelId(channel.channelId);
+          deleteChannelUnreadByChannelId(channel.channelId);
         });
       }
 

package/src/channelRepository/observers/getChannel.ts

@@ -32,9 +32,8 @@ import { isEqual } from '~/utils/isEqual';
 import { updateChannelCache } from '../utils/updateChannelCache';
 import { onChannelMarkerUpdated } from '~/marker/events/onChannelMarkerUpdated';
 import { onSubChannelCreated } from '~/subChannelRepository';
-import { onChannelUnreadInfoUpdatedLocal } from '~/marker/events/onChannelUnreadInfoUpdatedLocal';
+import { onChannelUnreadUpdatedLocal } from '~/marker/events/onChannelUnreadUpdatedLocal';
 import { constructChannelObject } from '../utils/constructChannelObject';
-import { onChannelUnreadUpdatedLocal } from '../events/onChannelUnreadUpdatedLocal';
 
 /* begin_public_function
   id: channel.get
@@ -296,7 +295,6 @@ export const getChannel = (
         'channel',
       ),
       convertEventPayload(onSubChannelCreated, 'channelId', 'channel'),
-      convertEventPayload(onChannelUnreadInfoUpdatedLocal, 'channelId', 'channel'),
       convertEventPayload(onChannelUnreadUpdatedLocal, 'channelId', 'channel'),
     ],
     {

package/src/channelRepository/observers/getChannels/ChannelLiveCollectionController.ts

@@ -55,9 +55,8 @@ import { prepareUnreadCountInfo } from '~/channelRepository/utils/prepareUnreadC
 import { resolveUnreadInfoOnChannelEvent } from '~/channelRepository/utils/resolveUnreadInfoOnChannelEvent';
 import { onChannelResolved } from '~/channelRepository/events/onChannelResolved';
 import { onUserMessageFeedMarkerResolved } from '~/marker/events/onUserMessageFeedMarkerResolved';
-import { onChannelUnreadInfoUpdatedLocal } from '~/marker/events/onChannelUnreadInfoUpdatedLocal';
+import { onChannelUnreadUpdatedLocal } from '~/marker/events/onChannelUnreadUpdatedLocal';
 import { constructChannelObject } from '~/channelRepository/utils/constructChannelObject';
-import { onChannelUnreadUpdatedLocal } from '~/channelRepository/events/onChannelUnreadUpdatedLocal';
 
 export class ChannelLiveCollectionController extends LiveCollectionController<
   'channel',
@@ -567,10 +566,6 @@ export class ChannelLiveCollectionController extends LiveCollectionController<
         },
         action: Amity.ChannelActionType.OnResolveUnread,
       },
-      {
-        fn: convertEventPayload(onChannelUnreadInfoUpdatedLocal, 'channelId', 'channel'),
-        action: Amity.ChannelActionType.OnUpdate,
-      },
       {
         fn: convertEventPayload(onChannelUnreadUpdatedLocal, 'channelId', 'channel'),
         action: Amity.ChannelActionType.OnUpdate,

package/src/channelRepository/utils/constructChannelDynamicValue.ts

@@ -1,27 +1,17 @@
-import { get } from 'http';
 import { shallowClone } from '~/utils/shallowClone';
 import { getChannelIsMentioned } from './getChannelIsMentioned';
 import { getSubChannelsUnreadCount } from './getSubChannelsUnreadCount';
-import { getActiveClient } from '~/client/api/activeClient';
-import { getLegacyChannelUnread } from './getLegacyChannelUnread';
 
 export const constructChannelDynamicValue = (
   channel: Amity.StaticInternalChannel,
 ): Amity.InternalChannel => {
-  const client = getActiveClient();
   const { messageCount, ...rest } = channel;
-
   return shallowClone(rest, {
-    get unreadCount() {
-      return getLegacyChannelUnread(rest.channelId)?.unreadCount ?? 0;
+    get isMentioned() {
+      return getChannelIsMentioned(rest);
     },
     get subChannelsUnreadCount() {
       return getSubChannelsUnreadCount(rest);
     },
-    get isMentioned() {
-      if (client.useLegacyUnreadCount)
-        return getLegacyChannelUnread(rest.channelId)?.isMentioned ?? false;
-      return getChannelIsMentioned(rest);
-    },
   });
 };

package/src/channelRepository/utils/prepareChannelPayload.ts

@@ -5,8 +5,9 @@ import { getChannelMarkers } from '~/marker/api/getChannelMarkers';
 import { updateChannelMessagePreviewCache } from '~/messagePreview/utils';
 import { getActiveClient } from '~/client/api/activeClient';
 import { pullFromCache } from '~/cache/api/pullFromCache';
+import { getSubChannelsUnreadCount } from './getSubChannelsUnreadCount';
+import { getChannelIsMentioned } from './getChannelIsMentioned';
 import { convertRawUserToInternalUser } from '~/userRepository/utils/convertRawUserToInternalUser';
-import { pushToCache } from '~/cache/api';
 
 export const MARKER_INCLUDED_CHANNEL_TYPE = ['broadcast', 'conversation', 'community'];
 export const isUnreadCountSupport = ({ type }: Pick<Amity.RawChannel, 'type'>) =>
@@ -47,37 +48,6 @@ export const preUpdateChannelCache = (
   });
 };
 
-const updateChannelUnread = ({
-  currentUserId,
-  channels,
-  channelUsers,
-}: {
-  currentUserId: Amity.User['userId'];
-  channels: Amity.RawChannel[];
-  channelUsers: Amity.RawMembership<'channel'>[];
-}) => {
-  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,
-    });
-  }
-};
-
 export const prepareChannelPayload = async (
   rawPayload: Amity.ChannelPayload,
   options: { isMessagePreviewUpdated?: boolean } = { isMessagePreviewUpdated: true },
@@ -94,38 +64,28 @@ export const prepareChannelPayload = async (
     updateChannelMessagePreviewCache(rawPayload);
   }
 
-  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)
-      }
+  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)
     }
   }
 
-  // convert raw channel to internal channel
+  // attach marker to channel
   const channels = rawPayload.channels.map(payload =>
     convertFromRaw(payload, { isMessagePreviewUpdated: options.isMessagePreviewUpdated }),
   );
 
-  // convert raw channel user to membership (add user object)
+  // user marker to channel users
   const channelUsers: Amity.Membership<'channel'>[] = rawPayload.channelUsers.map(channelUser => {
     return convertRawMembershipToMembership<'channel'>(channelUser);
   });

package/src/client/api/createClient.ts

@@ -50,7 +50,7 @@ export const createClient = (
     rteEnabled = true,
   }: {
     debugSession?: string;
-    apiEndpoint?: { http?: string; mqtt?: string };
+    apiEndpoint?: { http?: string; mqtt?: string; upload?: string };
     prefixDeviceIdKey?: string;
     rteEnabled?: boolean;
   } = {},
@@ -63,9 +63,11 @@ export const createClient = (
   });
 
   const httpEndpoint = apiEndpoint?.http ?? computeUrl('http', apiRegion);
+  const uploadEndpoint = apiEndpoint?.upload ?? computeUrl('upload', apiRegion);
   const mqttEndpoint = apiEndpoint?.mqtt ?? computeUrl('mqtt', apiRegion);
 
   const http = createHttpTransport(httpEndpoint);
+  const upload = createHttpTransport(uploadEndpoint);
 
   let ws;
   let mqtt;
@@ -86,8 +88,6 @@ export const createClient = (
   const sessionHandler = undefined;
 
   const isUnreadCountEnabled = false;
-  // Legacy unread count is true by default
-  const useLegacyUnreadCount = true;
 
   const client = {
     version: `${VERSION}`,
@@ -105,6 +105,7 @@ export const createClient = (
     http,
     ws,
     mqtt,
+    upload,
     emitter,
 
     /*
@@ -124,7 +125,6 @@ export const createClient = (
     use: () => setActiveClient(client),
 
     isUnreadCountEnabled,
-    useLegacyUnreadCount,
 
     getMarkerSyncConsistentMode,
 

package/src/client/api/enableUnreadCount.ts

@@ -17,7 +17,6 @@ export const enableUnreadCount = () => {
   if (client.isUnreadCountEnabled) return false;
 
   client.isUnreadCountEnabled = true;
-  client.useLegacyUnreadCount = false;
 
   client.emitter.emit('unreadCountEnabled', true);
 

package/src/client/api/login.ts

@@ -11,7 +11,6 @@ import { onUserDeleted } from '~/userRepository/events/onUserDeleted';
 
 import analyticsEngineOnLoginHandler from '~/analytic/utils/analyticsEngineOnLoginHandler';
 import readReceiptSyncEngineOnLoginHandler from '~/client/utils/ReadReceiptSync/readReceiptSyncEngineOnLoginHandler';
-import legacyReadReceiptSyncEngineOnLoginHandler from '~/client/utils/ReadReceiptSync/legacyReadReceiptSyncEngineOnLoginHandler';
 import objectResolverEngineOnLoginHandler from '~/client/utils/ObjectResolver/objectResolverEngineOnLoginHandler';
 import { logout } from './logout';
 
@@ -201,13 +200,10 @@ export const login = async (
 
       markReadEngineOnLoginHandler(),
       analyticsEngineOnLoginHandler(),
+      readReceiptSyncEngineOnLoginHandler(),
       objectResolverEngineOnLoginHandler(),
     );
 
-    if (client.useLegacyUnreadCount) {
-      subscriptions.push(readReceiptSyncEngineOnLoginHandler());
-    } else subscriptions.push(legacyReadReceiptSyncEngineOnLoginHandler());
-
     const markerSyncUnsubscriber = await startMarkerSync();
     subscriptions.push(markerSyncUnsubscriber);
   }