@amityco/ts-sdk 6.13.2 → 6.14.0

package/dist/index.esm.js

@@ -6,6 +6,7 @@ import axios from 'axios';
 import HttpAgent, { HttpsAgent } from 'agentkeepalive';
 import io from 'socket.io-client';
 import uuid$1 from 'react-native-uuid';
+import hash from 'object-hash';
 import Hls from 'hls.js';
 
 const CommunityPostSettings = Object.freeze({
@@ -83,8 +84,8 @@ const PostContentType = Object.freeze({
 
 function getVersion() {
     try {
-        // the string ''v6.13.2-esm'' should be replaced by actual value by @rollup/plugin-replace
-        return 'v6.13.2-esm';
+        // the string ''v6.14.0-esm'' should be replaced by actual value by @rollup/plugin-replace
+        return 'v6.14.0-esm';
     }
     catch (error) {
         return '__dev__';
@@ -21659,14 +21660,24 @@ function convertParams(_a) {
     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"]);
-    const out = Object.assign(Object.assign({}, rest), { messageFeedId: subChannelId, isDeleted: inferIsDeleted(includeDeleted), options: { token: toToken(page || { limit: 10 }, 'afterbeforeraw') } });
-    if (sortBy !== undefined) {
-        out.options.sortBy = sortBy;
-    }
+    var { sortBy, subChannelId, tags, includingTags, excludingTags, includeDeleted, aroundMessageId, limit, type } = _a, rest = __rest(_a, ["sortBy", "subChannelId", "tags", "includingTags", "excludingTags", "includeDeleted", "aroundMessageId", "limit", "type"]);
+    const out = Object.assign(Object.assign({}, rest), { messageFeedId: subChannelId, isDeleted: inferIsDeleted(includeDeleted), options: {
+            sortBy,
+            limit: limit || COLLECTION_DEFAULT_PAGINATION_LIMIT,
+            around: aroundMessageId,
+        } });
     if (tags) {
         out.includeTags = tags;
     }
+    if (includingTags) {
+        out.includeTags = includingTags;
+    }
+    if (type) {
+        out.dataType = type;
+    }
+    if (excludingTags) {
+        out.excludeTags = excludingTags;
+    }
     return out;
 }
 
@@ -23402,6 +23413,17 @@ function isEqual(x, y) {
     if (Array.isArray(x) && x.length !== y.length) {
         return false;
     }
+    // check each element of the array for equality
+    if (Array.isArray(x) && Array.isArray(y)) {
+        if (x.length !== y.length)
+            return false;
+        for (let i = 0; i < x.length; i += 1) {
+            if (!isEqual(x[i], y[i]))
+                return false;
+        }
+        // if all elements are equal, the arrays are equal
+        return true;
+    }
     // if they are dates, they must had equal valueOf
     if (x instanceof Date) {
         return false;
@@ -24572,9 +24594,7 @@ const queryChannels = async (query) => {
     // API-FIX: backend doesn't answer Amity.Response
     // const { data } = await client.http.get<Amity.Response<Amity.Paged<ChannelPayload>>>(
     const { data: queryPayload } = await client.http.get(`/api/v3/channels`, {
-        params: Object.assign(Object.assign({}, params), { keyword: displayName, filter: membership, options: {
-                token: page,
-            } }),
+        params: Object.assign(Object.assign({}, params), { keyword: displayName, filter: membership, options: page ? { token: page } : { limit } }),
     });
     const { paging } = queryPayload, payload = __rest(queryPayload, ["paging"]);
     const data = await prepareChannelPayload(payload);
@@ -24690,7 +24710,8 @@ const getChannels = (params, callback, config) => {
         const channels = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
         if (!initial && channels.length > 0 && !(collection === null || collection === void 0 ? void 0 : collection.params.page))
             return;
-        const query = createQuery(queryChannels, Object.assign(Object.assign({}, queryParams), { page: !initial ? collection === null || collection === void 0 ? void 0 : collection.params.page : undefined, limit }));
+        const pagingCondition = initial ? { limit } : { page: collection === null || collection === void 0 ? void 0 : collection.params.page };
+        const query = createQuery(queryChannels, Object.assign(Object.assign({}, queryParams), pagingCondition));
         runQuery(query, ({ data: result, error, loading, paging }) => {
             const data = {
                 loading,
@@ -24759,6 +24780,8 @@ const getChannels = (params, callback, config) => {
     }, 'channelId', 'channel')(realtimeRouter()), convertEventPayload((callback) => {
         const updateMessagePreview = async (message) => {
             const messagePreviewSetting = await getMessagePreviewSetting();
+            if (messagePreviewSetting === "no-message-preview" /* Amity.MessagePreviewSetting.NO_MESSAGE_PREVIEW */)
+                return;
             if (messagePreviewSetting === "message-preview-include-deleted" /* Amity.MessagePreviewSetting.MESSAGE_PREVIEW_INCLUDE_DELETED */)
                 await handleMessageUpdated(message);
             if (shouldAbort(message.channelId))
@@ -24971,7 +24994,7 @@ queryChannelMembers.locally = (query) => {
  * Exported for testing
  * @hidden
  */
-const applyFilter$3 = (data, params) => {
+const applyFilter$2 = (data, params) => {
     let channelMembers = filterByPropIntersection(data, 'roles', params.roles);
     if (params.memberships) {
         /*
@@ -25046,7 +25069,7 @@ const getMembers$1 = (params, callback, config) => {
             /*
              * Only apply filter to RTE Model
              */
-            data: isEventModel ? applyFilter$3(channelMembers, params) : channelMembers,
+            data: isEventModel ? applyFilter$2(channelMembers, params) : channelMembers,
             hasNextPage: !!((_b = data.params) === null || _b === void 0 ? void 0 : _b.page),
             loading: data.loading,
             error: data.error,
@@ -25136,7 +25159,7 @@ var index$j = /*#__PURE__*/Object.freeze({
   __proto__: null,
   addMembers: addMembers$1,
   removeMembers: removeMembers$1,
-  applyFilter: applyFilter$3,
+  applyFilter: applyFilter$2,
   getMembers: getMembers$1,
   searchMembers: searchMembers
 });
@@ -25768,7 +25791,7 @@ const unBlockUser = async (userId) => {
  * ```
  *
  * @param query The query parameters
- * @returns A page of {@link Amity.InternalUser} objects
+ * @returns A page of {@link Amity.User} objects
  *
  * @category Block API
  * @async
@@ -25806,11 +25829,11 @@ const queryBlockedUsers = async (query) => {
  * const { data: users } = queryBlockedUsers.locally({ page: 'page_token' })
  * ```
  *
- * Queries a paginable list of {@link Amity.InternalUser} objects from cache
+ * Queries a paginable list of {@link Amity.User} objects from cache
  * Search is performed by displayName such as `.startsWith(search)`
  *
  * @param query The query parameters
- * @returns A page of {@link Amity.InternalUser} objects
+ * @returns A page of {@link Amity.User} objects
  *
  * @category Block API
  */
@@ -27062,11 +27085,11 @@ getUserByIds.locally = (userIds) => {
  * const updated = await updateUser(userId, { displayName: 'foobar' })
  * ```
  *
- * Updates an {@link Amity.InternalUser}
+ * Updates an {@link Amity.User}
  *
- * @param userId The ID of the {@link Amity.InternalUser} to update
+ * @param userId The ID of the {@link Amity.User} to update
  * @param patch The patch data to apply
- * @returns the updated {@link Amity.InternalUser} object
+ * @returns the updated {@link Amity.User} object
  *
  * @category User API
  * @async
@@ -27269,7 +27292,7 @@ const onUserFetched = (callback) => createUserEventSubscriber('user.fetched', ca
  * @category Private
  * @async
  */
-const getUser$1 = async (userId) => {
+const getUser$2 = async (userId) => {
     const client = getActiveClient();
     client.log('user/getUser', userId);
     isInTombstone('user', userId);
@@ -27290,7 +27313,7 @@ const getUser$1 = async (userId) => {
     const { users } = data;
     fireEvent('user.fetched', data);
     return {
-        data: LinkedObject.user(users.find(user => user.userId === userId)),
+        data: users.find(user => user.userId === userId),
         cachedAt,
     };
 };
@@ -27307,7 +27330,7 @@ const getUser$1 = async (userId) => {
  *
  * @category User API
  */
-getUser$1.locally = (userId) => {
+getUser$2.locally = (userId) => {
     const client = getActiveClient();
     client.log('user/getUser.locally', userId);
     if (!client.cache)
@@ -27316,7 +27339,7 @@ getUser$1.locally = (userId) => {
     if (!cached)
         return;
     return {
-        data: LinkedObject.user(cached.data),
+        data: cached.data,
         cachedAt: cached.cachedAt,
     };
 };
@@ -27335,7 +27358,7 @@ getUser$1.locally = (userId) => {
  * });
  * ```
  *
- * Observe all mutation on a given {@link Amity.InternalUser}
+ * Observe all mutation on a given {@link Amity.User}
  *
  * @param userId the ID of the user to observe
  * @param callback the function to call when new data are available
@@ -27343,8 +27366,11 @@ getUser$1.locally = (userId) => {
  *
  * @category Message Live Object
  */
-const getUser = (userId, callback) => {
-    return liveObject(userId, callback, 'userId', getUser$1, [
+const getUser$1 = (userId, callback) => {
+    const reactor = (response) => {
+        return callback(Object.assign(Object.assign({}, response), { data: response.data ? LinkedObject.user(response.data) : response.data }));
+    };
+    return liveObject(userId, reactor, 'userId', getUser$2, [
         onUserFetched,
         onUserUpdated,
         onUserDeleted,
@@ -27376,10 +27402,7 @@ const queryUsers = async (query = {}) => {
     const { page, limit = 10, displayName, filter = 'all', sortBy = 'displayName' } = query, params = __rest(query, ["page", "limit", "displayName", "filter", "sortBy"]);
     const { data } = await client.http.get(`/api/v3/users`, {
         params: Object.assign(Object.assign({}, params), { keyword: displayName, filter,
-            sortBy, options: {
-                token: page,
-                limit,
-            } }),
+            sortBy, options: page ? { token: page } : { limit } }),
     });
     // unpacking
     const { paging } = data, payload = __rest(data, ["paging"]);
@@ -27400,7 +27423,7 @@ const queryUsers = async (query = {}) => {
     }
     fireEvent('user.fetched', data);
     return {
-        data: users.map(user => LinkedObject.user(user)),
+        data: users,
         cachedAt,
         paging,
     };
@@ -27438,7 +27461,7 @@ queryUsers.locally = (query = {}) => {
     const users = (_b = data === null || data === void 0 ? void 0 : data.users.map(userId => pullFromCache(['user', 'get', userId])).filter(Boolean).map(({ data }) => data)) !== null && _b !== void 0 ? _b : [];
     return users.length > 0 && users.length === ((_c = data === null || data === void 0 ? void 0 : data.users) === null || _c === void 0 ? void 0 : _c.length)
         ? {
-            data: users.map(LinkedObject.user),
+            data: users,
             cachedAt,
             paging: data === null || data === void 0 ? void 0 : data.paging,
         }
@@ -27449,7 +27472,7 @@ queryUsers.locally = (query = {}) => {
  * Exported for testing
  * @hidden
  */
-const applyFilter$2 = (data, params) => {
+const applyFilter$1 = (data, params) => {
     let users = filterByStringComparePartially(data, 'displayName', params.displayName);
     switch (params.sortBy) {
         case 'firstCreated':
@@ -27510,7 +27533,7 @@ const getUsers = (params, callback, config) => {
             /*
              * Only apply filter to RTE Model
              */
-            data: isEventModel ? applyFilter$2(users, params) : users,
+            data: isEventModel ? applyFilter$1(users, params) : users,
             hasNextPage: !!((_b = data.params) === null || _b === void 0 ? void 0 : _b.page),
             loading: data.loading,
             error: data.error,
@@ -27531,7 +27554,8 @@ const getUsers = (params, callback, config) => {
         const users = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
         if (!initial && users.length > 0 && !(collection === null || collection === void 0 ? void 0 : collection.params.page))
             return;
-        const query = createQuery(queryUsers, Object.assign(Object.assign({}, queryParams), { limit, page: !initial ? collection === null || collection === void 0 ? void 0 : collection.params.page : undefined }));
+        const pagingCondition = initial ? { limit } : { page: collection === null || collection === void 0 ? void 0 : collection.params.page };
+        const query = createQuery(queryUsers, Object.assign(Object.assign({}, queryParams), pagingCondition));
         runQuery(query, ({ data: result, error, loading, paging }) => {
             const data = {
                 loading,
@@ -27557,6 +27581,72 @@ const getUsers = (params, callback, config) => {
 };
 /* end_public_function */
 
+/**
+ * ```js
+ * import { getUser } from '~/user/api'
+ * const { data: user } = await getUser('foobar')
+ * ```
+ *
+ * Fetches a {@link Amity.User} object
+ *
+ * @param userId the ID of the {@link Amity.User} to fetch
+ * @returns the associated {@link Amity.User} object
+ *
+ * @category Private
+ * @async
+ */
+const getUser = async (userId) => {
+    const client = getActiveClient();
+    client.log('user/getUser', userId);
+    isInTombstone('user', userId);
+    let data;
+    try {
+        const response = await client.http.get(`/api/v3/users/${encodeURIComponent(userId)}`);
+        data = response.data;
+    }
+    catch (error) {
+        if (checkIfShouldGoesToTombstone(error === null || error === void 0 ? void 0 : error.code)) {
+            pushToTombstone('user', userId);
+        }
+        throw error;
+    }
+    const cachedAt = client.cache && Date.now();
+    if (client.cache)
+        ingestInCache(data, { cachedAt });
+    const { users } = data;
+    fireEvent('user.fetched', data);
+    return {
+        data: LinkedObject.user(users.find(user => user.userId === userId)),
+        cachedAt,
+    };
+};
+/**
+ * ```js
+ * import { getUser } from '@amityco/ts-sdk'
+ * const { data: user } = getUser.locally('foobar')
+ * ```
+ *
+ * Fetches a {@link Amity.User} object from cache
+ *
+ * @param userId the ID of the {@link Amity.User} to fetch
+ * @returns the associated {@link Amity.User} object
+ *
+ * @category User API
+ */
+getUser.locally = (userId) => {
+    const client = getActiveClient();
+    client.log('user/getUser.locally', userId);
+    if (!client.cache)
+        return;
+    const cached = pullFromCache(['user', 'get', userId]);
+    if (!cached)
+        return;
+    return {
+        data: LinkedObject.user(cached.data),
+        cachedAt: cached.cachedAt,
+    };
+};
+
 /**
  * ```js
  * import { observeUser } from '@amityco/ts-sdk'
@@ -27591,7 +27681,7 @@ const observeUser = (userId, callback) => {
     };
     const disposers = [];
     disposers.push(onUserUpdated(data => router({ data, loading: false, origin: 'event' }, 'onUpdate')), onUserDeleted(data => router({ data, loading: false, origin: 'event' }, 'onDelete')), onUserFlagged(data => router({ data, loading: false, origin: 'event' }, 'onFlagged')), onUserUnflagged(data => router({ data, loading: false, origin: 'event' }, 'onUnflagged')), onUserFlagCleared(data => router({ data, loading: false, origin: 'event' }, 'onFlagCleared')));
-    runQuery(createQuery(getUser$1, userId), result => result.data && router(result, 'onFetch'));
+    runQuery(createQuery(getUser, userId), result => result.data && router(result, 'onFetch'));
     return () => {
         log(`observeUser(tmpid: ${timestamp}) > dispose`);
         disposers.forEach(fn => fn());
@@ -27716,7 +27806,7 @@ var index$e = /*#__PURE__*/Object.freeze({
   onUserFlagged: onUserFlagged,
   onUserUnflagged: onUserUnflagged,
   onUserFlagCleared: onUserFlagCleared,
-  getUser: getUser,
+  getUser: getUser$1,
   getUsers: getUsers,
   observeUser: observeUser,
   getBlockedUsers: getBlockedUsers$1,
@@ -30328,103 +30418,343 @@ const getMessage = (messageId, callback) => {
 };
 /* end_public_function */
 
+class PaginationController {
+    constructor(queryParams) {
+        const { http } = getActiveClient();
+        this.queryParams = queryParams;
+        this.http = http;
+    }
+    loadFirstPage() {
+        return this.onFetch("first" /* Amity.LiveCollectionPageDirection.FIRST */);
+    }
+    loadNextPage() {
+        return this.onFetch("next" /* Amity.LiveCollectionPageDirection.NEXT */);
+    }
+    loadPreviousPage() {
+        return this.onFetch("prev" /* Amity.LiveCollectionPageDirection.PREV */);
+    }
+    async onFetch(direction = "first" /* Amity.LiveCollectionPageDirection.FIRST */) {
+        var _a, _b, _c, _d;
+        if (direction === 'prev' && !this.previousToken)
+            return;
+        if (direction === 'next' && !this.nextToken)
+            return;
+        let token;
+        if (direction === 'prev')
+            token = this.previousToken;
+        if (direction === 'next')
+            token = this.nextToken;
+        const queryResponse = await this.getRequest(this.queryParams, token);
+        if (direction === 'first') {
+            this.nextToken = (_a = queryResponse.paging) === null || _a === void 0 ? void 0 : _a.next;
+            this.previousToken = (_b = queryResponse.paging) === null || _b === void 0 ? void 0 : _b.previous;
+        }
+        if (direction === 'prev')
+            this.previousToken = (_c = queryResponse.paging) === null || _c === void 0 ? void 0 : _c.previous;
+        if (direction === 'next')
+            this.nextToken = (_d = queryResponse.paging) === null || _d === void 0 ? void 0 : _d.next;
+        return queryResponse;
+    }
+    getNextToken() {
+        return this.nextToken;
+    }
+    getPrevToken() {
+        return this.previousToken;
+    }
+}
+
+/* eslint-disable no-use-before-define */
 /**
- * ```js
- * import { queryMessages } from '@amityco/ts-sdk'
- * const messages = await queryMessages({ channelId })
- * ```
- *
- * Queries a paginable list of {@link Amity.Message} objects
- *
- * @param query The query parameters
- * @returns A page of {@link Amity.Message} objects
- *
- * @category Message API
- * @async
+ * TODO: handle cache receive cache option, and cache policy
+ * TODO: check if querybyIds is supported
  */
-const queryMessages = async (query) => {
-    const client = getActiveClient();
-    client.log('message/queryMessages', query);
-    const _a = convertQueryParams$1(query), { pageToken } = _a, params = __rest(_a, ["pageToken"]);
-    // API-FIX: parameters should be querystring. (1)
-    // API-FIX: backend should answer Amity.Response (2)
-    // API-FIX: pagination should not be indexed on channelSegment (3)
-    // const { data } = await client.http.get<Amity.Response<Amity.Paged<Amity.MessagePayload>>>(
-    const { data: queryPayload } = await client.http.get(`/api/v5/messages`, {
-        params: Object.assign(Object.assign({}, params), (pageToken
-            ? {
-                options: { token: pageToken },
+class MessagePaginationController extends PaginationController {
+    async getRequest(queryParams, token) {
+        const processedQueryParams = convertQueryParams$1(queryParams);
+        const { data: queryResponse } = await this.http.get(`/api/v5/messages`, {
+            params: Object.assign(Object.assign({}, processedQueryParams), { options: token
+                    ? {
+                        token,
+                    }
+                    : Object.assign({}, processedQueryParams.options) }),
+        });
+        return queryResponse;
+    }
+}
+
+class QueryStreamController {
+    constructor(query, cacheKey) {
+        this.query = query;
+        this.cacheKey = cacheKey;
+    }
+}
+
+/* eslint-disable no-use-before-define */
+class MessageQueryStreamController extends QueryStreamController {
+    constructor(query, cacheKey, notifyChange, preparePayload, paginationController) {
+        super(query, cacheKey);
+        this.notifyChange = notifyChange;
+        this.preparePayload = preparePayload;
+        this.paginationController = paginationController;
+    }
+    async saveToMainDB(response) {
+        const processedPayload = await this.preparePayload(response);
+        const client = getActiveClient();
+        const cachedAt = client.cache && Date.now();
+        if (client.cache) {
+            ingestInCache(processedPayload, { cachedAt });
+        }
+    }
+    appendToQueryStream(response, direction, refresh = false) {
+        var _a, _b;
+        if (refresh) {
+            pushToCache(this.cacheKey, {
+                data: response.messages.map(getResolver('message')),
+            });
+        }
+        else {
+            const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+            const messages = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
+            pushToCache(this.cacheKey, Object.assign(Object.assign({}, collection), { data: direction === 'next'
+                    ? [...new Set([...messages, ...response.messages.map(getResolver('message'))])]
+                    : [...new Set([...response.messages.map(getResolver('message')), ...messages])] }));
+        }
+    }
+    reactor(action) {
+        return (payload) => {
+            var _a, _b, _c, _d, _e;
+            if (action === 'onCreate') {
+                const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+                if (!collection)
+                    return;
+                if (this.query.subChannelId !== (payload === null || payload === void 0 ? void 0 : payload.subChannelId) || !collection)
+                    return;
+                if (this.query.type && this.query.type !== payload.dataType)
+                    return;
+                if (this.query.dataType && this.query.dataType !== payload.dataType)
+                    return;
+                if (this.query.excludingTags &&
+                    ((_b = this.query.excludingTags) === null || _b === void 0 ? void 0 : _b.some(value => { var _a; return (_a = payload.tags) === null || _a === void 0 ? void 0 : _a.includes(value); })))
+                    return;
+                if (this.query.excludeTags &&
+                    ((_c = this.query.excludeTags) === null || _c === void 0 ? void 0 : _c.some(value => { var _a; return (_a = payload.tags) === null || _a === void 0 ? void 0 : _a.includes(value); })))
+                    return;
+                if (!!this.query.hasFlags !== !!payload.flagCount)
+                    return;
+                if (this.query.parentId && this.query.parentId !== payload.parentId)
+                    return;
+                if (this.query.hasOwnProperty('includeDeleted') &&
+                    !this.query.includeDeleted &&
+                    payload.isDeleted)
+                    return;
+                if (this.query.includingTags &&
+                    !((_d = this.query.includingTags) === null || _d === void 0 ? void 0 : _d.some(value => { var _a; return (_a = payload.tags) === null || _a === void 0 ? void 0 : _a.includes(value); })))
+                    return;
+                if (this.query.tags && !((_e = this.query.tags) === null || _e === void 0 ? void 0 : _e.some(value => { var _a; return (_a = payload.tags) === null || _a === void 0 ? void 0 : _a.includes(value); })))
+                    return;
+                if ((!this.query.sortBy || this.query.sortBy === 'segmentDesc') &&
+                    !this.paginationController.getPrevToken()) {
+                    collection.data = [...new Set([payload.messageId, ...collection.data])];
+                }
+                if (this.query.sortBy === 'segmentAsc' && !this.paginationController.getNextToken()) {
+                    collection.data = [...new Set([...collection.data, payload.messageId])];
+                }
+                pushToCache(this.cacheKey, collection);
             }
-            : {})),
-    });
-    // API-FIX: backend should answer Amity.Response (2)
-    // const { paging, messages } = unwrapPayload(data)
-    const { paging } = queryPayload, payload = __rest(queryPayload, ["paging"]);
-    const data = await prepareMessagePayload(payload);
-    const { messages } = data;
-    const cachedAt = client.cache && Date.now();
-    if (client.cache) {
-        /*
-         * queryMessages.locally is unsupported for messages as message list updates
-         * frequently and leads to bugs when user switches between channels, i.e. when
-         * the public function (live messages) calls unmount. The list fetched on
-         * after from the cache is stale.
-         */
-        ingestInCache(data, { cachedAt });
-        const cacheKey = ['message', 'query', Object.assign({}, params)];
-        pushToCache(cacheKey, { messages: messages.map(getResolver('message')), paging });
+            this.notifyChange({ origin: "event" /* Amity.LiveDataOrigin.EVENT */, loading: false });
+        };
     }
-    fireEvent('local.message.fetched', { messages });
-    const nextPage = toPageRaw(paging.next);
-    const prevPage = toPageRaw(paging.previous);
-    return { data: messages, cachedAt, prevPage, nextPage, paging };
-};
-/* end_public_function */
+    subscribeRTE(createSubscriber) {
+        return createSubscriber.map(subscriber => subscriber.fn(this.reactor(subscriber.action)));
+    }
+}
 
-/*
- * Exported for testing
- * @hidden
- */
-const applyFilter$1 = (data, params) => {
-    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);
+class LiveCollectionController {
+    constructor(paginationController, queryStreamId, cacheKey, callback) {
+        this.paginationController = paginationController;
+        this.queryStreamId = queryStreamId;
+        this.cacheKey = cacheKey;
+        this.callback = callback;
+    }
+    async refresh() {
+        try {
+            const result = await this.paginationController.loadFirstPage();
+            if (!result)
+                return;
+            await this.persistModel(result);
+            this.persistQueryStream({
+                response: result,
+                direction: "next" /* Amity.LiveCollectionPageDirection.NEXT */,
+                refresh: true,
             });
+            this.notifyChange({ origin: "server" /* Amity.LiveDataOrigin.SERVER */, loading: false });
         }
-        return true;
-    });
-    messages = messages.filter(m => {
-        if (params.excludeTags) {
-            return (params.excludeTags || []).find(value => {
-                if (!m.tags)
-                    return true;
-                return !m.tags.includes(value);
+        catch (e) {
+            this.notifyChange({ origin: "server" /* Amity.LiveDataOrigin.SERVER */, loading: false, error: e });
+        }
+    }
+    loadPage(initial = false, direction = "next" /* Amity.LiveCollectionPageDirection.NEXT */) {
+        this.setup();
+        this.notifyChange({ origin: "local" /* Amity.LiveDataOrigin.LOCAL */, loading: true });
+        if (initial) {
+            this.refresh();
+        }
+        else if (direction === "prev" /* Amity.LiveCollectionPageDirection.PREV */) {
+            this.loadPrevPage();
+        }
+        else if (direction === "next" /* Amity.LiveCollectionPageDirection.NEXT */) {
+            this.loadNextPage();
+        }
+    }
+    async loadNextPage() {
+        try {
+            const result = await this.paginationController.loadNextPage();
+            if (!result)
+                return;
+            await this.persistModel(result);
+            this.persistQueryStream({
+                response: result,
+                direction: "next" /* Amity.LiveCollectionPageDirection.NEXT */,
             });
+            this.notifyChange({ origin: "server" /* Amity.LiveDataOrigin.SERVER */, loading: false });
+        }
+        catch (e) {
+            this.notifyChange({ origin: "server" /* Amity.LiveDataOrigin.SERVER */, loading: false, error: e });
         }
+    }
+    async loadPrevPage() {
+        try {
+            const result = await this.paginationController.loadPreviousPage();
+            if (!result)
+                return;
+            await this.persistModel(result);
+            this.persistQueryStream({
+                response: result,
+                direction: "prev" /* Amity.LiveCollectionPageDirection.PREV */,
+            });
+            this.notifyChange({ origin: "server" /* Amity.LiveDataOrigin.SERVER */, loading: false });
+        }
+        catch (e) {
+            this.notifyChange({ origin: "server" /* Amity.LiveDataOrigin.SERVER */, loading: false, error: e });
+        }
+    }
+    shouldNotify(data) {
+        if (isEqual(this.snapshot, data))
+            return false;
+        this.snapshot = data;
         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;
+    getCacheKey() {
+        return this.cacheKey;
+    }
+}
+
+class MessageLiveCollectionController extends LiveCollectionController {
+    constructor(query, callback) {
+        const queryStreamId = hash(query);
+        const cacheKey = ['message', 'collection', queryStreamId];
+        const paginationController = new MessagePaginationController(query);
+        super(paginationController, queryStreamId, cacheKey, callback);
+        this.query = query;
+        this.queryStreamController = new MessageQueryStreamController(this.query, this.cacheKey, this.notifyChange.bind(this), prepareMessagePayload, this.paginationController);
+        this.callback = callback.bind(this);
+        this.loadPage(true);
+    }
+    setup() {
+        var _a;
+        const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+        if (!collection) {
+            pushToCache(this.cacheKey, {
+                data: [],
+            });
         }
-        if (params.sortBy === 'segmentDesc') {
-            return message2.channelSegment - message1.channelSegment;
+    }
+    async persistModel(response) {
+        await this.queryStreamController.saveToMainDB(response);
+    }
+    persistQueryStream({ response, direction, refresh, }) {
+        this.queryStreamController.appendToQueryStream(response, direction, refresh);
+    }
+    startSubscription() {
+        return this.queryStreamController.subscribeRTE([
+            { fn: onMessageCreated, action: 'onCreate' },
+            { fn: onMessageDeleted, action: 'onDelete' },
+            { fn: onMessageUpdated, action: 'onUpdate' },
+            { fn: onMessageFlagged, action: 'onFlagged' },
+            { fn: onMessageUnflagged, action: 'onUnflagged' },
+            { fn: onMessageFlagCleared, action: 'onFlagCleared' },
+            { fn: onMessageReactionAdded, action: 'onReactionAdded' },
+            { fn: onMessageReactionRemoved, action: 'onReactionRemoved' },
+            {
+                fn: convertEventPayload(onMessageMarkerFetched, 'contentId', 'message'),
+                action: 'onUpdate',
+            },
+            { fn: convertEventPayload(onMessageMarked, 'contentId', 'message'), action: 'onUpdate' },
+        ]);
+    }
+    notifyChange({ origin, loading, error }) {
+        var _a, _b;
+        const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+        if (!collection)
+            return;
+        const data = this.applyFilter((_b = collection.data
+            .map(messageId => pullFromCache(['message', 'get', messageId]))
+            .filter(Boolean)
+            .map(({ data }) => data)) !== null && _b !== void 0 ? _b : []);
+        if (!this.shouldNotify(data) && origin === 'event')
+            return;
+        this.callback({
+            onNextPage: () => this.loadPage(false, "next" /* Amity.LiveCollectionPageDirection.NEXT */),
+            onPrevPage: () => this.loadPage(false, "prev" /* Amity.LiveCollectionPageDirection.PREV */),
+            data,
+            hasNextPage: !!this.paginationController.getNextToken(),
+            hasPrevPage: !!this.paginationController.getPrevToken(),
+            loading,
+            error,
+        });
+    }
+    applyFilter(data) {
+        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
+         */
+        if (!this.query.includeDeleted) {
+            messages = filterByPropEquality(messages, 'isDeleted', false);
         }
-        return 0;
-    });
-    return messages;
-};
+        messages = messages.sort((message1, message2) => {
+            if (this.query.sortBy === 'segmentAsc') {
+                return message1.channelSegment - message2.channelSegment;
+            }
+            if (this.query.sortBy === 'segmentDesc') {
+                return message2.channelSegment - message1.channelSegment;
+            }
+            return 0;
+        });
+        return messages;
+    }
+}
+
 /* begin_public_function
   id: message.query
 */
@@ -30454,76 +30784,12 @@ const getMessages = (params, callback, config) => {
     }
     const timestamp = Date.now();
     log(`getMessages(tmpid: ${timestamp}) > listen`);
-    const { limit: queryLimit } = params, queryParams = __rest(params, ["limit"]);
-    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 uniqueId = uuid();
-    const cacheKey = ['message', 'collection', params, uniqueId];
-    const responder = (data) => {
-        var _a, _b;
-        const messages = applyFilter$1((_a = data.data
-            .map(messageId => pullFromCache(['message', 'get', messageId]))
-            .filter(Boolean)
-            .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [], params);
-        callback({
-            onNextPage: onFetch,
-            data: messages,
-            hasNextPage: !!((_b = data.params) === null || _b === void 0 ? void 0 : _b.page),
-            loading: data.loading,
-            error: data.error,
-        });
-    };
-    const realtimeRouter = (action) => (message) => {
-        var _a, _b, _c;
-        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;
-        // /*
-        //  * check if RTE message event payload is with the params in order to update in the colleciton cache
-        //  */
-        if (params.dataType && params.dataType !== message.dataType)
-            return;
-        if (params.excludeTags && ((_b = params.excludeTags) === null || _b === void 0 ? void 0 : _b.some(value => { var _a; return (_a = message.tags) === null || _a === void 0 ? void 0 : _a.includes(value); })))
-            return;
-        if (!!params.hasFlags !== !!message.flagCount)
-            return;
-        if (params.parentId && params.parentId !== message.parentId)
-            return;
-        if (params.hasOwnProperty('includeDeleted') && !params.includeDeleted && message.isDeleted)
-            return;
-        if (params.tags && !((_c = params.tags) === null || _c === void 0 ? void 0 : _c.some(value => { var _a; return (_a = message.tags) === null || _a === void 0 ? void 0 : _a.includes(value); })))
-            return;
-        if (!collection.data.includes(message.messageId) && action === 'onCreate') {
-            collection.data = [...new Set([message.messageId, ...collection.data])];
-        }
-        pushToCache(cacheKey, collection);
-        responder(collection);
-    };
-    const onFetch = (initial = false) => {
-        var _a, _b, _c, _d, _e, _f, _g;
-        const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-        const messages = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
-        if (!initial && messages.length > 0 && !((_d = (_c = collection === null || collection === void 0 ? void 0 : collection.params) === null || _c === void 0 ? void 0 : _c.paging) === null || _d === void 0 ? void 0 : _d.next))
-            return;
-        const query = createQuery(queryMessages, Object.assign(Object.assign({}, queryParams), { page: (_e = (!initial ? collection === null || collection === void 0 ? void 0 : collection.params.page : undefined)) !== null && _e !== void 0 ? _e : { limit }, pageToken: (_g = (_f = collection === null || collection === void 0 ? void 0 : collection.params) === null || _f === void 0 ? void 0 : _f.paging) === null || _g === void 0 ? void 0 : _g.next }));
-        runQuery(query, ({ data: result, error, loading, nextPage: page, paging }) => {
-            const data = {
-                loading,
-                error,
-                params: { page, paging },
-                data: messages,
-            };
-            if (result) {
-                data.data = [...new Set([...messages, ...result.map(getResolver('message'))])];
-            }
-            pushToCache(cacheKey, data);
-            responder(data);
-        }, queryOptions(policy, CACHE_SHORTEN_LIFESPAN));
-    };
-    disposers.push(onMessageFetched(realtimeRouter('onFetch')), onMessageCreated(realtimeRouter('onCreate')), onMessageUpdated(realtimeRouter('onUpdate')), onMessageDeleted(realtimeRouter('onDelete')), onMessageFlagged(realtimeRouter('onFlagged')), onMessageUnflagged(realtimeRouter('onUnflagged')), onMessageFlagCleared(realtimeRouter('onFlagCleared')), onMessageReactionAdded(realtimeRouter('onReactionAdded')), onMessageReactionRemoved(realtimeRouter('onReactionRemoved')), convertEventPayload(onMessageMarkerFetched, 'contentId', 'message')(realtimeRouter('onUpdate')), convertEventPayload(onMessageMarked, 'contentId', 'message')(realtimeRouter('onUpdate')));
-    onFetch(true);
-    disposers.push(() => dropFromCache(cacheKey));
+    const messagesLiveCollection = new MessageLiveCollectionController(params, callback);
+    const disposers = messagesLiveCollection.startSubscription();
+    const cacheKey = messagesLiveCollection.getCacheKey();
+    disposers.push(() => {
+        dropFromCache(cacheKey);
+    });
     return () => {
         log(`getMessages(tmpid: ${timestamp}) > dispose`);
         disposers.forEach(fn => fn());
@@ -32942,7 +33208,7 @@ const getCategory = async (categoryId) => {
         ingestInCache(data, { cachedAt });
     const { categories } = data;
     return {
-        data: categoryLinkedObject(categories.find(category => category.categoryId === categoryId)),
+        data: LinkedObject.category(categories.find(category => category.categoryId === categoryId)),
         cachedAt,
     };
 };
@@ -32969,25 +33235,11 @@ getCategory.locally = (categoryId) => {
     if (!cached)
         return;
     return {
-        data: cached.data,
+        data: LinkedObject.category(cached.data),
         cachedAt: cached.cachedAt,
     };
 };
 
-/**
- * ```js
- * import { queryCategories } from '@amityco/ts-sdk'
- * const { data: categories, prevPage, nextPage } = await queryCategories()
- * ```
- *
- * Queries a paginable list of {@link Amity.Category} objects
- *
- * @param query The query parameters
- * @returns A page of {@link Amity.Category} objects
- *
- * @category Category API
- * @async
- * */
 const queryCategories = async (query) => {
     const client = getActiveClient();
     client.log('category/queryCategories', query);
@@ -33012,25 +33264,12 @@ const queryCategories = async (query) => {
     const nextPage = toPage(paging.next);
     const prevPage = toPage(paging.previous);
     return {
-        data: categories.map(category => LinkedObject.category(category)),
+        data: categories,
         cachedAt,
         prevPage,
         nextPage,
     };
 };
-/**
- * ```js
- * import { queryCategories } from '@amityco/ts-sdk'
- * const { data: categories, prevPage, nextPage } = queryCategories.locally()
- * ```
- *
- * Queries a paginable list of {@link Amity.Category} objects from cache
- *
- * @param query The query parameters
- * @returns categories
- *
- * @category category API
- */
 queryCategories.locally = (query) => {
     var _a, _b;
     const client = getActiveClient();