@amityco/ts-sdk 6.35.3-fa3d4ac.0 → 7.0.1-54f1ba3.0

package/src/fileRepository/index.ts

@@ -1,2 +1 @@
 export * from './api';
-export * from './observers';

package/src/liveStreamPlayer/api/getPlayer.ts

@@ -1,5 +1,5 @@
 import Hls from 'hls.js';
-import { getStream } from '~/streamRepository/api/getStream';
+import { getStream } from '~/streamRepository/internalApi/getStream';
 import { EventRegister } from '../utils/eventRegister';
 
 /**

package/src/messagePreview/utils/getChannelMessagePreviewWithUser.ts

@@ -3,8 +3,8 @@ import { getChannelMessagePreview } from './getChannelMessagePreview';
 import { LinkedObject } from '~/utils/linkedObject';
 
 export const getChannelMessagePreviewWithUser = (
-  channel: Amity.InternalChannel,
-): Amity.InternalChannel & {
+  channel: Amity.StaticInternalChannel,
+): Amity.StaticInternalChannel & {
   messagePreview: Amity.MessagePreview | null;
 } => {
   const messagePreview = channel.messagePreviewId

package/src/messageRepository/api/createMessage.ts

@@ -30,7 +30,6 @@ const createMessageOptimistic = <T extends Amity.MessageContentType>(
   bundle: createMessageParam<T>,
 ): Amity.InternalMessage | undefined => {
   const client = getActiveClient();
-  const { objectSyncMap } = client;
 
   if (!client.cache) return;
 
@@ -56,7 +55,11 @@ const createMessageOptimistic = <T extends Amity.MessageContentType>(
     });
 
     if (subChannel.data.channelId === subChannel.data.subChannelId) {
-      const channel = pullFromCache<Amity.Channel>(['channel', 'get', subChannel.data.channelId]);
+      const channel = pullFromCache<Amity.StaticInternalChannel>([
+        'channel',
+        'get',
+        subChannel.data.channelId,
+      ]);
 
       if (channel?.data) {
         upsertInCache(['channel', 'get', subChannel.data.channelId], {
@@ -86,8 +89,6 @@ const createMessageOptimistic = <T extends Amity.MessageContentType>(
 
   pushToCache(['message', 'get', message.messageId], message, { cachedAt });
 
-  objectSyncMap.set(message.messageId, undefined);
-
   fireEvent('local.message.created', { messages: [message] });
 
   return message;
@@ -119,7 +120,6 @@ export const createMessage = async <T extends Amity.MessageContentType>(
 ): Promise<Amity.Cached<Amity.Message>> => {
   const client = getActiveClient();
 
-  const { objectSyncMap } = client;
   client.log('message/createMessage', bundle);
 
   const optimisticData = createMessageOptimistic<T>(bundle);
@@ -133,9 +133,6 @@ export const createMessage = async <T extends Amity.MessageContentType>(
       referenceId,
     });
 
-    objectSyncMap.set(referenceId, payload.messages[0].messageId);
-    objectSyncMap.set(payload.messages[0].messageId, referenceId);
-
     const data = await prepareMessagePayload(payload);
     const { messages } = data;
 

package/src/messageRepository/api/index.ts

@@ -1,5 +1,3 @@
-export { getMessages as getMessageByIds } from './getMessages';
-
 export * from './createMessage';
 export * from './updateMessage';
 export * from './editMessage';

package/src/messageRepository/api/tests/createMessage.test.ts

@@ -81,6 +81,7 @@ describe('createMessage', () => {
   });
 });
 
+// TODO: fix this test, because createMessage.optimistically is not exist anymore
 describe('createMessage.optimistically', () => {
   beforeEach(enableCache);
 
@@ -125,7 +126,11 @@ describe('createMessage.optimistically', () => {
 
       createMessage.optimistically(messageWithoutId);
 
-      const cacheChannel = pullFromCache<Amity.Channel>(['channel', 'get', subChannelId])?.data;
+      const cacheChannel = pullFromCache<Amity.StaticInternalChannel>([
+        'channel',
+        'get',
+        subChannelId,
+      ])?.data;
       expect(cacheChannel?.messageCount).toBe(3);
     });
   });

package/src/messageRepository/api/tests/deleteMessage.test.ts

@@ -92,7 +92,11 @@ describe('softDeleteMessage.optimistically', () => {
     pushToCache(['message', 'get', deleteId], { ...messageToDelete, channelId });
 
     softDeleteMessage.optimistically(deleteId);
-    const recieved = pullFromCache<Amity.Channel>(['channel', 'get', channelId])?.data;
+    const recieved = pullFromCache<Amity.StaticInternalChannel>([
+      'channel',
+      'get',
+      channelId,
+    ])?.data;
 
     expect(recieved?.messageCount).toBe(1);
   });

package/src/messageRepository/internalApi/getMessage.ts

@@ -31,12 +31,6 @@ export const getMessage = async (
   const client = getActiveClient();
   client.log('message/getMessage', messageId);
 
-  if (!isLive) {
-    console.log(
-      'getMessage will be deprecated on 15th November 2022, please use liveMessage instead.',
-    );
-  }
-
   isInTombstone('message', messageId);
 
   let data: Amity.ProcessedMessagePayload;

package/src/messageRepository/observers/getMessages/MessageLiveCollectionController.ts

@@ -101,26 +101,6 @@ export class MessageLiveCollectionController extends LiveCollectionController<
   applyFilter(data: Amity.Message[]) {
     let messages = data;
 
-    messages = messages.filter(m => {
-      if (this.query.tags) {
-        return this.query.tags.find(value => {
-          if (!m.tags) return false;
-          return m.tags.includes(value);
-        });
-      }
-      return true;
-    });
-
-    messages = messages.filter(m => {
-      if (this.query.excludeTags) {
-        return (this.query.excludeTags || []).find(value => {
-          if (!m.tags) return true;
-          return !m.tags.includes(value);
-        });
-      }
-      return true;
-    });
-
     /*
      * for cases when message is deleted via RTE, this flag is used to get
      * items from cache that are !deleted

package/src/messageRepository/observers/getMessages/MessageQueryStreamController.ts

@@ -4,7 +4,7 @@ import { pullFromCache, pushToCache } from '~/cache/api';
 import { ingestInCache } from '~/cache/api/ingestInCache';
 import { getActiveClient } from '~/client';
 import { MessagePaginationController } from './MessagePaginationController';
-import { getMessageIdentifierIds } from '~/messageRepository/utils';
+import { getResolver } from '~/core/model';
 
 export class MessageQueryStreamController extends QueryStreamController<
   Amity.MessagePayload,
@@ -50,7 +50,7 @@ export class MessageQueryStreamController extends QueryStreamController<
   ) {
     if (refresh) {
       pushToCache(this.cacheKey, {
-        data: getMessageIdentifierIds(response.messages),
+        data: response.messages.map(getResolver('message')),
         query: this.query,
       });
     } else {
@@ -62,8 +62,8 @@ export class MessageQueryStreamController extends QueryStreamController<
         ...collection,
         data:
           direction === 'next'
-            ? [...new Set([...messages, ...getMessageIdentifierIds(response.messages)])]
-            : [...new Set([...getMessageIdentifierIds(response.messages), ...messages])],
+            ? [...new Set([...messages, ...response.messages.map(getResolver('message'))])]
+            : [...new Set([...response.messages.map(getResolver('message')), ...messages])],
       });
     }
   }
@@ -79,19 +79,12 @@ export class MessageQueryStreamController extends QueryStreamController<
 
         if (this.query.type && this.query.type !== payload.dataType) return;
 
-        if (this.query.dataType && this.query.dataType !== payload.dataType) return;
-
         if (
           this.query.excludingTags &&
           this.query.excludingTags?.some(value => payload.tags?.includes(value))
         )
           return;
 
-        if (
-          this.query.excludeTags &&
-          this.query.excludeTags?.some(value => payload.tags?.includes(value))
-        )
-          return;
         if (!!this.query.hasFlags !== !!payload.flagCount) return;
 
         if (this.query.parentId && this.query.parentId !== payload.parentId) return;
@@ -109,9 +102,6 @@ export class MessageQueryStreamController extends QueryStreamController<
         )
           return;
 
-        if (this.query.tags && !this.query.tags?.some(value => payload.tags?.includes(value)))
-          return;
-
         if (
           (!this.query.sortBy || this.query.sortBy === 'segmentDesc') &&
           !this.paginationController.getPrevToken()

package/src/messageRepository/observers/getMessages/getMessages.ts

@@ -1,62 +1,8 @@
-/* eslint-disable no-use-before-define */
 import { getActiveClient } from '~/client/api';
 import { dropFromCache } from '~/cache/api';
-import { filterByPropEquality } from '~/core/query';
-
 import { ENABLE_CACHE_MESSAGE } from '~/utils/constants';
 import { MessageLiveCollectionController } from './MessageLiveCollectionController';
 
-/*
- * Exported for testing
- * @hidden
- */
-export const applyFilter = <T extends Amity.Message>(
-  data: T[],
-  params: Amity.MessagesLiveCollection,
-): T[] => {
-  let messages = data;
-
-  messages = messages.filter(m => {
-    if (params.tags) {
-      return params.tags.find(value => {
-        if (!m.tags) return false;
-        return m.tags.includes(value);
-      });
-    }
-    return true;
-  });
-
-  messages = messages.filter(m => {
-    if (params.excludeTags) {
-      return (params.excludeTags || []).find(value => {
-        if (!m.tags) return true;
-        return !m.tags.includes(value);
-      });
-    }
-    return true;
-  });
-
-  /*
-   * for cases when message is deleted via RTE, this flag is used to get
-   * items from cache that are !deleted
-   */
-  if (!params.includeDeleted) {
-    messages = filterByPropEquality(messages, 'isDeleted', false);
-  }
-
-  messages = messages.sort((message1, message2) => {
-    if (params.sortBy === 'segmentAsc') {
-      return message1.channelSegment - message2.channelSegment;
-    }
-    if (params.sortBy === 'segmentDesc') {
-      return message2.channelSegment - message1.channelSegment;
-    }
-    return 0;
-  });
-
-  return messages;
-};
-
 /* begin_public_function
   id: message.query
 */

package/src/messageRepository/observers/index.ts

@@ -1,5 +1,2 @@
 export { getMessage } from './getMessage';
 export { getMessages } from './getMessages';
-
-export { observeMessage } from './observeMessage';
-export { observeMessages } from './observeMessages';

package/src/messageRepository/utils/getMessageFromMainDB.ts

@@ -1,14 +1,10 @@
 import { pullFromCache } from '~/cache/api/pullFromCache';
-import { getActiveClient } from '~/client/api/activeClient';
-import { isLocalId } from '~/core/model';
+import { queryCache } from '~/cache/api/queryCache';
 
 export const getMessageFromMainDB = (messageId: string): Amity.InternalMessage | undefined => {
-  const client = getActiveClient();
-  const { objectSyncMap } = client;
+  const message = pullFromCache<Amity.InternalMessage>(['message', 'get', messageId])?.data;
+  if (message) return message;
 
-  const resolvedMessageId = isLocalId(messageId)
-    ? messageId
-    : objectSyncMap.get(messageId) ?? messageId;
-
-  return pullFromCache<Amity.InternalMessage>(['message', 'get', resolvedMessageId])?.data;
+  const messages = queryCache<Amity.InternalMessage>(['message', 'get']);
+  return messages?.find(({ data }) => data.messageId === messageId)?.data;
 };

package/src/messageRepository/utils/index.ts

@@ -1,2 +1 @@
 export * from './prepareMessagePayload';
-export * from './getMessageIdentifierIds';

package/src/messageRepository/utils/prepareMessagePayload.ts

@@ -1,4 +1,4 @@
-import { pullFromCache } from '~/cache/api';
+import { pullFromCache, queryCache } from '~/cache/api';
 import { ingestInCache } from '~/cache/api/ingestInCache';
 import { getMessageMarkers } from '~/marker/api/getMessageMarkers';
 import { prepareMessagePayloadForCache } from '~/reactionRepository/utils/prepareMessagePayloadForCache';
@@ -8,27 +8,22 @@ import { MessageContentType } from '~/@types';
 import { convertFromRaw as convertSubChannelFromRaw } from '~/subChannelRepository/utils/convertSubChannelFromRaw';
 import { updateSubChannelCache } from '~/subChannelRepository/utils/updateSubChannelCache';
 import { COLLECTION_DEFAULT_PAGINATION_LIMIT } from '~/utils/constants';
-import { getActiveClient } from '~/client/api/activeClient';
-import { isLocalId } from '~/core/model';
 
-const addLocalReferenceId = (payload: Amity.RawMessage) => {
-  const client = getActiveClient();
-  const { objectSyncMap } = client;
+const mergePayloadWithLocal = (payload: Amity.RawMessage) => {
+  const localMessage = queryCache<Amity.InternalMessage>(['message', 'get'])?.find(
+    ({ data }) => data.messageId === payload.messageId,
+  )?.data;
 
-  return {
-    ...payload,
-    /* NOTE: This logic is used to get local referenceId for each message.
-     *
-     * if messageId is a local reference id, use it as referenceId else get referenceId from objectSyncMap.
-     * if find referenceId in objectSyncMap, this means this message is a local created message. The referenceId will be local reference id.
-     * if cannot find referenceId in objectSyncMap, referenceId will be undefined.
-     *
-     * The referenceId is undefined means this message is not a local created message (optimistic creation message).
-     */
-    referenceId: isLocalId(payload.messageId)
-      ? payload.messageId
-      : objectSyncMap.get(payload.messageId),
-  };
+  if (localMessage) {
+    return {
+      ...localMessage,
+      ...payload,
+      // NOTE: referenceId is missing in the some payload event. If we have local message data with referenceId, use it instead.
+      referenceId: localMessage.referenceId ?? payload.referenceId,
+    };
+  }
+
+  return payload;
 };
 
 export function convertFromRaw(
@@ -36,7 +31,7 @@ export function convertFromRaw(
   reactors?: Amity.InternalReactor[],
   event?: keyof Amity.MqttMessageEvents,
 ): Amity.InternalMessage {
-  const messageWithReferenceId = addLocalReferenceId(message);
+  const mergeMessage = mergePayloadWithLocal(message);
 
   const {
     channelPublicId,
@@ -52,7 +47,7 @@ export function convertFromRaw(
     messageId,
     creatorId,
     ...rest
-  } = messageWithReferenceId;
+  } = mergeMessage;
 
   let cache: Amity.CacheEntry<Amity.Message> | undefined;
 
@@ -149,8 +144,7 @@ export const prepareMessagePayload = async (
         {};
 
       // exclude getter properties from existing subChannel cache, update only other properties to existing subChannel cache
-      const { unreadCount, hasMentioned, isMentioned, ...restSubChannel } =
-        convertSubChannelFromRaw(messageFeed);
+      const { unreadCount, isMentioned, ...restSubChannel } = convertSubChannelFromRaw(messageFeed);
 
       updateSubChannelCache(messageFeed.messageFeedId, subChannelCache, restSubChannel);
     });
@@ -215,7 +209,6 @@ export function convertParams({
 export function convertQueryParams({
   sortBy,
   subChannelId,
-  tags,
   includingTags,
   excludingTags,
   includeDeleted,
@@ -235,10 +228,6 @@ export function convertQueryParams({
     },
   };
 
-  if (tags) {
-    out.includeTags = tags;
-  }
-
   if (includingTags) {
     out.includeTags = includingTags;
   }

package/src/pollRepository/observers/index.ts

@@ -1,2 +1 @@
-export * from './observePoll';
 export * from './getPoll';

package/src/postRepository/api/index.ts

@@ -1,7 +1,6 @@
 export * from './getPostByIds';
 
 export * from './createPost';
-export * from './updatePost';
 export * from './editPost';
 
 export * from './deletePost';

package/src/postRepository/observers/index.ts

@@ -1,5 +1,3 @@
-export * from './observePosts';
-export * from './observePost';
 export * from './getPost';
 export * from './getPosts';
 export * from './getPinnedPosts';

package/src/role/api/queryRoles.ts

@@ -21,31 +21,19 @@ import { ingestInCache } from '~/cache/api/ingestInCache';
 export const queryRoles = async (query?: {
   displayName?: Amity.Role['displayName'];
   sortBy?: 'displayName' | 'firstCreated' | 'lastCreated';
-  /**
-   * @deprecated please use `queryToken` to query next pages or previous pages
-   * The first page result includes previous token and next token in paging field
-   * use this token as the `queryToken` to query next pages or previous pages
-   *
-   */
-  page?: Amity.Page;
   limit?: number;
   queryToken?: string;
 }): Promise<Amity.Cached<Amity.Paged<Amity.Role>> & Amity.Pagination> => {
   const client = getActiveClient();
   client.log('role/queryRoles', query);
 
-  const { page, limit = 10, queryToken, displayName, sortBy, ...params } = query ?? {};
+  const { limit = 10, queryToken, displayName, sortBy, ...params } = query ?? {};
 
   const options = (() => {
     if (queryToken) return { token: queryToken };
 
     if (limit) return { limit };
 
-    if (page)
-      return {
-        token: toToken(page, 'skiplimit'),
-      };
-
     return undefined;
   })();
 

package/src/streamRepository/api/deleteStream.ts

@@ -2,7 +2,7 @@ import { getActiveClient } from '~/client/api';
 
 import { upsertInCache } from '~/cache/api';
 
-import { getStream } from './getStream';
+import { getStream } from '../internalApi/getStream';
 
 // import { unwrapPayload } from '~/core/transports'
 

package/src/streamRepository/api/index.ts

@@ -2,7 +2,3 @@ export * from './createStream';
 export * from './updateStream';
 export * from './deleteStream';
 export * from './disposeStream';
-
-// deprecated
-export * from './queryStreams';
-export * from './getStream';

package/src/streamRepository/api/tests/getStream.test.ts

@@ -1,6 +1,6 @@
 import { enableCache } from '~/cache/api';
 import { client, connectClient, disconnectClient, streamResponse } from '~/utils/tests';
-import { getStream } from '~/streamRepository/api/getStream';
+import { getStream } from '~/streamRepository/internalApi/getStream';
 
 const STREAM_ID = streamResponse.data.videoStreamings[0].streamId;
 

package/src/streamRepository/events/onStreamFlagged.ts

@@ -28,10 +28,5 @@ export const onStreamFlagged = (
     callback(payload.videoStreamings[0]);
   };
 
-  return createEventSubscriber(
-    client,
-    'stream/onStreamFlagged',
-    'v3.video-streaming.didFlag',
-    filter,
-  );
+  return createEventSubscriber(client, 'stream/onStreamFlagged', 'video-streaming.didFlag', filter);
 };

package/src/streamRepository/events/onStreamRecorded.ts

@@ -31,7 +31,7 @@ export const onStreamRecorded = (
   return createEventSubscriber(
     client,
     'stream/onStreamRecorded',
-    'v3.video-streaming.didRecord',
+    'video-streaming.didRecord',
     filter,
   );
 };

package/src/streamRepository/events/onStreamStarted.ts

@@ -31,7 +31,7 @@ export const onStreamStarted = (
   return createEventSubscriber(
     client,
     'stream/onStreamStarted',
-    'v3.video-streaming.didStart',
+    'video-streaming.didStart',
     filter,
   );
 };

package/src/streamRepository/events/onStreamStopped.ts

@@ -31,7 +31,7 @@ export const onStreamStopped = (
   return createEventSubscriber(
     client,
     'stream/onStreamStropped',
-    'v3.video-streaming.didStop',
+    'video-streaming.didStop',
     filter,
   );
 };

package/src/streamRepository/events/onStreamTerminated.ts

@@ -31,7 +31,7 @@ export const onStreamTerminated = (
   return createEventSubscriber(
     client,
     'stream/onStreamTerminated',
-    'v3.video-streaming.didTerminate',
+    'video-streaming.didTerminate',
     filter,
   );
 };

package/src/streamRepository/observers/getStreamById.ts

@@ -6,7 +6,7 @@ import { pullFromCache } from '~/cache/api';
 import { onStreamFlagged } from '~/streamRepository/events/onStreamFlagged';
 import { onStreamTerminated } from '~/streamRepository/events/onStreamTerminated';
 import { LinkedObject } from '~/utils/linkedObject';
-import { getStream as _getStream } from '../api/getStream';
+import { getStream as _getStream } from '../internalApi/getStream';
 import { onStreamRecorded, onStreamStarted, onStreamStopped } from '../events';
 
 /* begin_public_function