@amityco/ts-sdk-react-native 6.23.1-d8b4c4c.0 → 6.24.1-13ac472.0

package/dist/index.esm.js

@@ -83,8 +83,8 @@ const PostContentType = Object.freeze({
 
 function getVersion() {
     try {
-        // the string ''v6.23.0-esm'' should be replaced by actual value by @rollup/plugin-replace
-        return 'v6.23.0-esm';
+        // the string ''v6.24.0-esm'' should be replaced by actual value by @rollup/plugin-replace
+        return 'v6.24.0-esm';
     }
     catch (error) {
         return '__dev__';
@@ -512,7 +512,6 @@ const idResolvers = {
     reaction: ({ referenceType, referenceId }) => `${referenceType}#${referenceId}`,
     reactor: ({ reactionId }) => reactionId,
     stream: ({ streamId }) => streamId,
-    streamModeration: ({ streamId }) => streamId,
     follow: ({ from, to }) => `${from}#${to}`,
     followInfo: ({ userId }) => userId,
     followCount: ({ userId }) => userId,
@@ -562,7 +561,6 @@ const PAYLOAD2MODEL = {
     reactors: 'reactor',
     reactions: 'reaction',
     videoStreamings: 'stream',
-    videoStreamModerations: 'streamModeration',
     follows: 'follow',
     followCounts: 'followCount',
     feeds: 'feed',
@@ -21342,13 +21340,6 @@ const storyLinkedObject = (story) => {
         } });
 };
 
-const streamLinkedObject = (stream) => {
-    return Object.assign(Object.assign({}, stream), { get moderation() {
-            var _a;
-            return (_a = pullFromCache(['streamModeration', 'get', stream.streamId])) === null || _a === void 0 ? void 0 : _a.data;
-        } });
-};
-
 const categoryLinkedObject = (category) => {
     return Object.assign(Object.assign({}, category), { get avatar() {
             var _a;
@@ -21817,7 +21808,6 @@ const LinkedObject = {
     post: postLinkedObject,
     user: userLinkedObject,
     category: categoryLinkedObject,
-    stream: streamLinkedObject,
     story: storyLinkedObject,
     storyTarget: storyTargetLinkedObject,
     message: messageLinkedObject,
@@ -25187,7 +25177,7 @@ const createClient = (apiKey, apiRegion = API_REGIONS.SG, { debugSession = DEFAU
 */
 /**
  * ```js
- * import { Client } from '@amityco/ts-sdk-react-native'
+ * import { Client } from '@amityco/ts-sdk'
  * const success = await Client.secureLogout()
  * ```
  *
@@ -25543,9 +25533,6 @@ function isEqual(x, y) {
         }));
 }
 
-/**
- * @deprecated This function is deprecated
- */
 const liveObject = (id, callback, key, fetcher, eventHandlers, options) => {
     const { forceDispatch, callbackDataSelector, callbackFilter } = Object.assign({ forceDispatch: false, callbackDataSelector: (data) => data }, options);
     const { cache } = getActiveClient();
@@ -33620,7 +33607,7 @@ const getMembers$1 = (params, callback, config) => {
  *
  * @category Channel Live Collection
  */
-const searchMembers$1 = (params, callback, config) => {
+const searchMembers = (params, callback, config) => {
     return getMembers$1(params, callback);
 };
 /* end_public_function */
@@ -33631,7 +33618,7 @@ var index$d = /*#__PURE__*/Object.freeze({
   removeMembers: removeMembers$1,
   applyFilter: applyFilter$1,
   getMembers: getMembers$1,
-  searchMembers: searchMembers$1
+  searchMembers: searchMembers
 });
 
 /* begin_public_function
@@ -33874,30 +33861,12 @@ var index$b = /*#__PURE__*/Object.freeze({
   prepareChannelPayload: prepareChannelPayload
 });
 
-const saveCommunityUsers = (communities, communityUsers) => {
-    if (communities.length === 0 || communityUsers.length === 0)
-        return;
-    communities.forEach(({ communityId }) => {
-        const collection = communityUsers.filter(({ communityId: userCommunityId }) => communityId === userCommunityId);
-        pushToCache(['communityUsers', 'collection', communityId], collection);
-    });
-};
-
 const getMatchPostSetting = (value) => {
     var _a;
     return (_a = Object.keys(CommunityPostSettingMaps).find(key => value.needApprovalOnPostCreation ===
         CommunityPostSettingMaps[key].needApprovalOnPostCreation &&
         value.onlyAdminCanPost === CommunityPostSettingMaps[key].onlyAdminCanPost)) !== null && _a !== void 0 ? _a : DefaultCommunityPostSetting;
 };
-const convertCommunityUsersToUniqueObject = (communityUsers) => {
-    if (!communityUsers)
-        return communityUsers;
-    const result = {};
-    communityUsers.forEach(user => {
-        result[user.userId] = user;
-    });
-    return result;
-};
 const prepareCommunityPayload = (rawPayload) => {
     // Unpack community payload by mapping payload field to postSetting value.
     const communities = rawPayload.communities.map((_a) => {
@@ -33907,18 +33876,7 @@ const prepareCommunityPayload = (rawPayload) => {
                 onlyAdminCanPost,
             }) }, restCommunityPayload));
     });
-    const mergeCommunityUsers = communities.reduce((acc, { communityId }) => {
-        var _a;
-        const users = (_a = pullFromCache([
-            'communityUsers',
-            'collection',
-            communityId,
-        ])) === null || _a === void 0 ? void 0 : _a.data;
-        if (!users)
-            return acc;
-        return Object.assign(Object.assign({}, convertCommunityUsersToUniqueObject(users)), acc);
-    }, convertCommunityUsersToUniqueObject(rawPayload.communityUsers));
-    const communityUsers = withUsers(Object.values(mergeCommunityUsers));
+    const communityUsers = withUsers(rawPayload.communityUsers);
     const communityWithMembershipStatus = updateMembershipStatus(communities, communityUsers);
     return Object.assign(Object.assign({}, rawPayload), { communities: communityWithMembershipStatus, communityUsers });
 };
@@ -33952,10 +33910,8 @@ const getCommunities$1 = async (communityIds) => {
     });
     const data = prepareCommunityPayload(payload);
     const cachedAt = client.cache && Date.now();
-    if (client.cache) {
+    if (client.cache)
         ingestInCache(data, { cachedAt });
-        saveCommunityUsers(data.communities, data.communityUsers);
-    }
     return {
         data: data.communities,
         cachedAt,
@@ -34017,10 +33973,8 @@ const createCommunity = async (bundle) => {
     fireEvent('community.created', payload);
     const data = prepareCommunityPayload(payload);
     const cachedAt = client.cache && Date.now();
-    if (client.cache) {
+    if (client.cache)
         ingestInCache(data, { cachedAt });
-        saveCommunityUsers(data.communities, data.communityUsers);
-    }
     const { communities } = data;
     return {
         data: communities[0],
@@ -34054,10 +34008,8 @@ const updateCommunity = async (communityId, patch) => {
     fireEvent('community.updated', payload);
     const data = prepareCommunityPayload(payload);
     const cachedAt = client.cache && Date.now();
-    if (client.cache) {
+    if (client.cache)
         ingestInCache(data, { cachedAt });
-        saveCommunityUsers(data.communities, data.communityUsers);
-    }
     const { communities } = data;
     return {
         data: communities.find(community => community.communityId === communityId),
@@ -34087,10 +34039,8 @@ const getCommunity$1 = async (communityId) => {
     const { data: payload } = await client.http.get(`/api/v3/communities/${communityId}`);
     const data = prepareCommunityPayload(payload);
     const cachedAt = client.cache && Date.now();
-    if (client.cache) {
+    if (client.cache)
         ingestInCache(data, { cachedAt });
-        saveCommunityUsers(data.communities, data.communityUsers);
-    }
     const { communities } = data;
     return {
         data: communities.find(community => community.communityId === communityId),
@@ -34633,7 +34583,7 @@ const observeCommunity = (communityId, callback) => {
  * TODO: handle cache receive cache option, and cache policy
  * TODO: check if querybyIds is supported
  */
-class CommunitiesPaginationController$1 extends PaginationController {
+class CommunitiesPaginationController extends PaginationController {
     async getRequest(queryParams, token) {
         const { limit = COLLECTION_DEFAULT_PAGINATION_LIMIT } = queryParams, params = __rest(queryParams, ["limit"]);
         const options = token ? { token } : { limit };
@@ -34644,7 +34594,7 @@ class CommunitiesPaginationController$1 extends PaginationController {
     }
 }
 
-class CommunitiesQueryStreamController$1 extends QueryStreamController {
+class CommunitiesQueryStreamController extends QueryStreamController {
     constructor(query, cacheKey, notifyChange, preparePayload) {
         super(query, cacheKey);
         this.notifyChange = notifyChange;
@@ -34686,22 +34636,22 @@ class CommunitiesQueryStreamController$1 extends QueryStreamController {
     }
 }
 
-var EnumCommunityActions$1;
+var EnumCommunityActions;
 (function (EnumCommunityActions) {
     EnumCommunityActions["OnCommunityCreated"] = "onCommunityCreated";
     EnumCommunityActions["OnCommunityDeleted"] = "onCommunityDeleted";
     EnumCommunityActions["OnCommunityUpdated"] = "onCommunityUpdated";
-})(EnumCommunityActions$1 || (EnumCommunityActions$1 = {}));
+})(EnumCommunityActions || (EnumCommunityActions = {}));
 
 /* eslint-disable no-use-before-define */
 class SearchCommunityLiveCollectionController extends LiveCollectionController {
     constructor(query, callback) {
         const queryStreamId = hash(query);
         const cacheKey = ['community', 'collection', queryStreamId];
-        const paginationController = new CommunitiesPaginationController$1(query);
+        const paginationController = new CommunitiesPaginationController(query);
         super(paginationController, queryStreamId, cacheKey, callback);
         this.query = query;
-        this.queryStreamController = new CommunitiesQueryStreamController$1(this.query, this.cacheKey, this.notifyChange.bind(this), prepareCommunityPayload);
+        this.queryStreamController = new CommunitiesQueryStreamController(this.query, this.cacheKey, this.notifyChange.bind(this), prepareCommunityPayload);
         this.callback = callback.bind(this);
         this.loadPage({ initial: true });
     }
@@ -34723,8 +34673,8 @@ class SearchCommunityLiveCollectionController extends LiveCollectionController {
     }
     startSubscription() {
         return this.queryStreamController.subscribeRTE([
-            { fn: onCommunityDeleted, action: EnumCommunityActions$1.OnCommunityDeleted },
-            { fn: onCommunityUpdated, action: EnumCommunityActions$1.OnCommunityUpdated },
+            { fn: onCommunityDeleted, action: EnumCommunityActions.OnCommunityDeleted },
+            { fn: onCommunityUpdated, action: EnumCommunityActions.OnCommunityUpdated },
         ]);
     }
     notifyChange({ origin, loading, error }) {
@@ -34770,7 +34720,7 @@ class SearchCommunityLiveCollectionController extends LiveCollectionController {
 */
 /**
  * ```js
- * import { CommunityRepository } from '@amityco/ts-sdk-react-native'
+ * import { CommunityRepository } from '@amityco/ts-sdk'
  *
  * let communities = []
  * const unsub = CommunityRepository.searchCommunities({
@@ -34805,163 +34755,50 @@ const searchCommunities = (params, callback, config) => {
 /* end_public_function */
 
 /**
- * TODO: handle cache receive cache option, and cache policy
- * TODO: check if querybyIds is supported
+ * ```js
+ * import { queryCommunities } from '@amityco/ts-sdk-react-native'
+ * const communities = await queryCommunities()
+ * ```
+ *
+ * Queries a paginable list of {@link Amity.Community} objects
+ * Search is performed by displayName such as `.startsWith(search)`
+ *
+ * @param query The query parameters
+ * @returns A page of {@link Amity.Community} objects
+ *
+ * @category Community API
+ * @async
  */
-class CommunitiesPaginationController extends PaginationController {
-    async getRequest(queryParams, token) {
-        const { limit = COLLECTION_DEFAULT_PAGINATION_LIMIT } = queryParams, params = __rest(queryParams, ["limit"]);
-        const options = token ? { token } : { limit };
-        const { data: queryResponse } = await this.http.get(`/api/v3/communities`, {
-            params: Object.assign(Object.assign({}, params), { isDeleted: inferIsDeleted(params.includeDeleted), keyword: params.displayName, filter: params.membership, options }),
-        });
-        return queryResponse;
-    }
-}
-
-var EnumCommunityActions;
-(function (EnumCommunityActions) {
-    EnumCommunityActions["OnCommunityCreated"] = "onCommunityCreated";
-    EnumCommunityActions["OnCommunityDeleted"] = "onCommunityDeleted";
-    EnumCommunityActions["OnCommunityUpdated"] = "onCommunityUpdated";
-})(EnumCommunityActions || (EnumCommunityActions = {}));
-
-class CommunitiesQueryStreamController extends QueryStreamController {
-    constructor(query, cacheKey, notifyChange, preparePayload) {
-        super(query, cacheKey);
-        this.notifyChange = notifyChange;
-        this.preparePayload = preparePayload;
-    }
-    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.communities.map(getResolver('community')),
-            });
-        }
-        else {
-            const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-            const communities = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
-            pushToCache(this.cacheKey, Object.assign(Object.assign({}, collection), { data: [...new Set([...communities, ...response.communities.map(getResolver('community'))])] }));
-        }
-    }
-    reactor(action) {
-        return (community) => {
-            var _a;
-            const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-            if (!collection)
-                return;
-            if (this.query.displayName && action === EnumCommunityActions.OnCommunityCreated) {
-                return;
-            }
-            /*
-             * Simply update collection and let responder decide what to do with data
-             */
-            collection.data = [...new Set([community.communityId, ...collection.data])];
-            pushToCache(this.cacheKey, collection);
-            this.notifyChange({ origin: "event" /* Amity.LiveDataOrigin.EVENT */, loading: false });
-        };
-    }
-    subscribeRTE(createSubscriber) {
-        return createSubscriber.map(subscriber => subscriber.fn(this.reactor(subscriber.action)));
-    }
-}
-
-/* eslint-disable no-use-before-define */
-class CommunityLiveCollectionController extends LiveCollectionController {
-    constructor(query, callback) {
-        const queryStreamId = hash(query);
-        const cacheKey = ['community', 'collection', queryStreamId];
-        const paginationController = new CommunitiesPaginationController(query);
-        super(paginationController, queryStreamId, cacheKey, callback);
-        this.query = query;
-        this.queryStreamController = new CommunitiesQueryStreamController(this.query, this.cacheKey, this.notifyChange.bind(this), prepareCommunityPayload);
-        this.callback = callback.bind(this);
-        this.loadPage({ initial: true });
-    }
-    setup() {
-        var _a;
-        const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-        if (!collection) {
-            pushToCache(this.cacheKey, {
-                data: [],
-                params: {},
-            });
-        }
-    }
-    async persistModel(queryPayload) {
-        await this.queryStreamController.saveToMainDB(queryPayload);
-    }
-    persistQueryStream({ response, direction, refresh, }) {
-        this.queryStreamController.appendToQueryStream(response, direction, refresh);
-    }
-    startSubscription() {
-        return this.queryStreamController.subscribeRTE([
-            { fn: onCommunityCreated, action: EnumCommunityActions.OnCommunityCreated },
-            { fn: onCommunityDeleted, action: EnumCommunityActions.OnCommunityDeleted },
-            { fn: onCommunityUpdated, action: EnumCommunityActions.OnCommunityUpdated },
-        ]);
-    }
-    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(id => pullFromCache(['community', 'get', id]))
-            .filter(Boolean)
-            .map(({ data }) => data)) !== null && _b !== void 0 ? _b : []);
-        if (!this.shouldNotify(data) && origin === 'event')
-            return;
-        this.callback({
-            onNextPage: () => this.loadPage({ direction: "next" /* Amity.LiveCollectionPageDirection.NEXT */ }),
-            data,
-            hasNextPage: !!this.paginationController.getNextToken(),
-            loading,
-            error,
-        });
-    }
-    applyFilter(data) {
-        const { userId } = getActiveClient();
-        let communities = data;
-        if (this.query.includeDeleted) {
-            communities = filterByPropEquality(communities, 'isDeleted', false);
-        }
-        if (this.query.categoryId) {
-            communities = communities.filter(c => { var _a; return (_a = c.categoryIds) === null || _a === void 0 ? void 0 : _a.includes(this.query.categoryId); });
-        }
-        if (this.query.tags) {
-            communities = communities.filter(c => { var _a; return (_a = c.tags) === null || _a === void 0 ? void 0 : _a.some(t => { var _a; return (_a = this.query.tags) === null || _a === void 0 ? void 0 : _a.includes(t); }); });
-        }
-        if (this.query.membership && userId) {
-            communities = filterByCommunityMembership(communities, this.query.membership, userId);
-        }
-        if (!this.query.displayName) {
-            const sortFn = (() => {
-                switch (this.query.sortBy) {
-                    case 'firstCreated':
-                        return sortByFirstCreated;
-                    case 'lastCreated':
-                        return sortByLastCreated;
-                    case 'displayName':
-                        return sortByDisplayName;
-                    default:
-                        return sortByLastCreated;
-                }
-            })();
-            communities = communities.sort(sortFn);
-        }
-        return communities;
+const queryCommunities = async (query) => {
+    const client = getActiveClient();
+    client.log('channel/queryCommunities', query);
+    // safe decapsulation
+    const _a = query !== null && query !== void 0 ? query : {}, { page, limit = 10 } = _a, params = __rest(_a, ["page", "limit"]);
+    const _b = params !== null && params !== void 0 ? params : {}, { displayName, membership, includeDeleted } = _b, restParams = __rest(_b, ["displayName", "membership", "includeDeleted"]);
+    const options = (() => {
+        if (page)
+            return { token: page };
+        if (limit)
+            return { limit };
+        return undefined;
+    })();
+    // API-FIX: parameters should be querystring.
+    // API-FIX: backend doesn't answer Amity.Response
+    // const { data } = await client.http.get<Amity.Response<Amity.PagedResponse<CommunityPayload>>>(
+    const { data } = await client.http.get(`/api/v3/communities`, {
+        params: Object.assign(Object.assign({}, restParams), { isDeleted: inferIsDeleted(includeDeleted), keyword: displayName, filter: membership, options }),
+    });
+    const { paging } = data, payload = __rest(data, ["paging"]);
+    const unpackedPayload = prepareCommunityPayload(payload);
+    const { communities } = unpackedPayload;
+    const cachedAt = client.cache && Date.now();
+    if (client.cache) {
+        ingestInCache(unpackedPayload, { cachedAt });
+        const cacheKey = ['community', 'query', Object.assign(Object.assign({}, params), { options })];
+        pushToCache(cacheKey, { communities: communities.map(getResolver('community')), paging });
     }
-}
+    return { data: communities, cachedAt, paging };
+};
 
 /* begin_public_function
   id: community.query
@@ -34985,15 +34822,98 @@ class CommunityLiveCollectionController extends LiveCollectionController {
  * @category Community Live Collection
  */
 const getCommunities = (params, callback, config) => {
-    const { log, cache } = getActiveClient();
+    const { log, cache, userId } = getActiveClient();
     if (!cache) {
         console.log(ENABLE_CACHE_MESSAGE);
     }
     const timestamp = Date.now();
     log(`getCommunities(tmpid: ${timestamp}) > listen`);
-    const communitiesLiveCollection = new CommunityLiveCollectionController(params, callback);
-    const disposers = communitiesLiveCollection.startSubscription();
-    const cacheKey = communitiesLiveCollection.getCacheKey();
+    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 cacheKey = ['community', 'collection', queryParams];
+    const responder = (data) => {
+        var _a, _b;
+        let communities = (_a = data.data
+            .map(communityId => pullFromCache(['community', 'get', communityId]))
+            .filter(Boolean)
+            .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
+        communities = filterByStringComparePartially(communities, 'displayName', params.displayName);
+        if (!params.includeDeleted) {
+            communities = filterByPropEquality(communities, 'isDeleted', false);
+        }
+        if (params.categoryId) {
+            communities = communities.filter(c => { var _a; return (_a = c.categoryIds) === null || _a === void 0 ? void 0 : _a.includes(params.categoryId); });
+        }
+        if (params.tags) {
+            communities = communities.filter(c => { var _a; return (_a = c.tags) === null || _a === void 0 ? void 0 : _a.some(t => { var _a; return (_a = params.tags) === null || _a === void 0 ? void 0 : _a.includes(t); }); });
+        }
+        if (params.membership && userId) {
+            communities = filterByCommunityMembership(communities, params.membership, userId);
+        }
+        const sortBy = params.sortBy || 'lastCreated';
+        if (sortBy === 'lastCreated' || sortBy === 'firstCreated') {
+            communities = communities.sort(sortBy === 'lastCreated' ? sortByLastCreated : sortByFirstCreated);
+        }
+        /*
+         * The server returns communities with empty | null displayName's first before
+         * returning sorted list of communities with displayNames
+         *
+         * This section needs to be updated as displayNames can be null as well
+         */
+        if (sortBy === 'displayName') {
+            communities = communities
+                // this needs to be aligned with the backend data type
+                .map(c => (c.displayName ? c : Object.assign(Object.assign({}, c), { displayName: '' })))
+                // @ts-ignore
+                .sort(sortByDisplayName);
+        }
+        callback({
+            onNextPage: onFetch,
+            data: communities,
+            hasNextPage: !!((_b = data.params) === null || _b === void 0 ? void 0 : _b.page),
+            loading: data.loading,
+            error: data.error,
+        });
+    };
+    const realtimeRouter = (_) => (community) => {
+        var _a;
+        const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+        if (!collection)
+            return;
+        /*
+         * Simply update collection and let responder decide what to do with data
+         */
+        collection.data = [...new Set([community.communityId, ...collection.data])];
+        pushToCache(cacheKey, collection);
+        responder(collection);
+    };
+    const onFetch = (initial = false) => {
+        var _a, _b;
+        const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+        const communities = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
+        if (!initial && communities.length > 0 && !(collection === null || collection === void 0 ? void 0 : collection.params.page))
+            return;
+        const query = createQuery(queryCommunities, Object.assign(Object.assign({}, queryParams), { limit: initial ? limit : undefined, page: !initial ? collection === null || collection === void 0 ? void 0 : collection.params.page : undefined }));
+        runQuery(query, ({ data: result, error, loading, paging }) => {
+            const data = {
+                loading,
+                error,
+                params: { page: paging === null || paging === void 0 ? void 0 : paging.next },
+                data: communities,
+            };
+            if (result) {
+                data.data = initial
+                    ? result.map(getResolver('community'))
+                    : [...new Set([...communities, ...result.map(getResolver('community'))])];
+            }
+            pushToCache(cacheKey, data);
+            responder(data);
+        }, queryOptions(policy, CACHE_SHORTEN_LIFESPAN));
+    };
+    disposers.push(onCommunityCreated(realtimeRouter()), onCommunityDeleted(realtimeRouter()), onCommunityUpdated(realtimeRouter()), onCommunityJoined(realtimeRouter()), onCommunityLeft(realtimeRouter()), onCommunityUserChanged(realtimeRouter()));
+    onFetch(true);
     disposers.push(() => dropFromCache(cacheKey));
     return () => {
         log(`getCommunities(tmpid: ${timestamp}) > dispose`);
@@ -35522,187 +35442,87 @@ const removeMembers = async (communityId, userIds) => {
 /* end_public_function */
 
 /**
- * TODO: handle cache receive cache option, and cache policy
- * TODO: check if querybyIds is supported
- */
-class CommunityMembersPaginationController extends PaginationController {
-    async getRequest(queryParams, token) {
-        const { limit = COLLECTION_DEFAULT_PAGINATION_LIMIT } = queryParams, params = __rest(queryParams, ["limit"]);
-        const options = token ? { token } : { limit };
-        const { data: queryResponse } = await this.http.get(`/api/v3/communities/${params.communityId}/users`, {
-            params: Object.assign(Object.assign({}, params), { options }),
-        });
-        return queryResponse;
-    }
-}
-
-var EnumCommunityMemberActions$1;
-(function (EnumCommunityMemberActions) {
-    EnumCommunityMemberActions["OnCommunityJoined"] = "onCommunityJoined";
-    EnumCommunityMemberActions["OnCommunityLeft"] = "onCommunityLeft";
-    EnumCommunityMemberActions["OnCommunityUserBanned"] = "onCommunityUserBanned";
-    EnumCommunityMemberActions["OnCommunityUserChanged"] = "onCommunityUserChanged";
-    EnumCommunityMemberActions["OnCommunityUserRoleAdded"] = "onCommunityUserRoleAdded";
-    EnumCommunityMemberActions["OnCommunityUserRoleRemoved"] = "onCommunityUserRoleRemoved";
-    EnumCommunityMemberActions["OnCommunityUserUnbanned"] = "onCommunityUserUnbanned";
-})(EnumCommunityMemberActions$1 || (EnumCommunityMemberActions$1 = {}));
-
-class CommunityMembersQueryStreamController extends QueryStreamController {
-    constructor(query, cacheKey, notifyChange, preparePayload) {
-        super(query, cacheKey);
-        this.notifyChange = notifyChange;
-        this.preparePayload = preparePayload;
-    }
-    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.communityUsers.map(({ communityId, userId }) => getResolver('communityUsers')({ communityId, userId })),
-            });
-        }
-        else {
-            const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-            const communityUsers = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
-            pushToCache(this.cacheKey, Object.assign(Object.assign({}, collection), { data: [
-                    ...new Set([
-                        ...communityUsers,
-                        ...response.communityUsers.map(({ communityId, userId }) => getResolver('communityUsers')({ communityId, userId })),
-                    ]),
-                ] }));
-        }
-    }
-    reactor(action) {
-        return (community, communityMembers) => {
-            var _a;
-            const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-            if (!collection)
-                return;
-            if (action === EnumCommunityMemberActions$1.OnCommunityUserRoleAdded &&
-                this.query.sortBy === 'displayName') {
-                return;
-            }
-            communityMembers.forEach(communityMember => {
-                const communityMemberCacheId = getResolver('communityUsers')({
-                    communityId: this.query.communityId,
-                    userId: communityMember.userId,
-                });
-                if (communityMember.communityMembership === 'none') {
-                    collection.data = collection.data.filter(m => m !== communityMemberCacheId);
-                }
-                else if (!collection.data.includes(communityMemberCacheId)) {
-                    collection.data = [communityMemberCacheId, ...collection.data];
-                }
-            });
-            pushToCache(this.cacheKey, collection);
-            this.notifyChange({ origin: "event" /* Amity.LiveDataOrigin.EVENT */, loading: false });
-        };
-    }
-    subscribeRTE(createSubscriber) {
-        return createSubscriber.map(subscriber => subscriber.fn(this.reactor(subscriber.action)));
-    }
-}
-
-/* eslint-disable no-use-before-define */
-class CommunityMembersLiveCollectionController extends LiveCollectionController {
-    constructor(query, callback) {
-        const queryStreamId = hash(query);
-        const cacheKey = ['communityUsers', 'collection', queryStreamId];
-        const paginationController = new CommunityMembersPaginationController(query);
-        super(paginationController, queryStreamId, cacheKey, callback);
-        this.query = query;
-        this.queryStreamController = new CommunityMembersQueryStreamController(this.query, this.cacheKey, this.notifyChange.bind(this), prepareCommunityPayload);
-        this.callback = callback.bind(this);
-        this.loadPage({ initial: true });
-    }
-    setup() {
-        var _a;
-        const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-        if (!collection) {
-            pushToCache(this.cacheKey, {
-                data: [],
-                params: {},
-            });
-        }
-    }
-    async persistModel(queryPayload) {
-        await this.queryStreamController.saveToMainDB(queryPayload);
-    }
-    persistQueryStream({ response, direction, refresh, }) {
-        this.queryStreamController.appendToQueryStream(response, direction, refresh);
-    }
-    startSubscription() {
-        return this.queryStreamController.subscribeRTE([
-            { fn: onCommunityJoined, action: EnumCommunityMemberActions$1.OnCommunityJoined },
-            { fn: onCommunityLeft, action: EnumCommunityMemberActions$1.OnCommunityLeft },
-            { fn: onCommunityUserBanned, action: EnumCommunityMemberActions$1.OnCommunityUserBanned },
-            { fn: onCommunityUserChanged, action: EnumCommunityMemberActions$1.OnCommunityUserChanged },
-            { fn: onCommunityUserRoleAdded, action: EnumCommunityMemberActions$1.OnCommunityUserRoleAdded },
-            {
-                fn: onCommunityUserRoleRemoved,
-                action: EnumCommunityMemberActions$1.OnCommunityUserRoleRemoved,
-            },
-            { fn: onCommunityUserUnbanned, action: EnumCommunityMemberActions$1.OnCommunityUserUnbanned },
-        ]);
-    }
-    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(id => pullFromCache(['communityUsers', 'get', id]))
-            .filter(isNonNullable)
-            .map(({ data }) => data)) !== null && _b !== void 0 ? _b : []);
-        if (!this.shouldNotify(data) && origin === 'event')
-            return;
-        this.callback({
-            onNextPage: () => this.loadPage({ direction: "next" /* Amity.LiveCollectionPageDirection.NEXT */ }),
-            data,
-            hasNextPage: !!this.paginationController.getNextToken(),
-            loading,
-            error,
+ * ```js
+ * import { queryCommunityMembers } from '@amityco/ts-sdk-react-native'
+ * const communityMembers = await queryCommunityMembers({ communityId: 'foo' })
+ * ```
+ *
+ * Queries a paginable list of {@link Amity.CommunityUser} objects
+ *
+ * @param query The query parameters
+ * @returns A page of {@link Amity.CommunityUser} objects
+ *
+ * @category Community API
+ * @async
+ * */
+const queryCommunityMembers = async (query) => {
+    const client = getActiveClient();
+    client.log('community/queryCommunityMembers', query);
+    const _a = query !== null && query !== void 0 ? query : {}, { page, limit } = _a, params = __rest(_a, ["page", "limit"]);
+    const options = (() => {
+        if (page)
+            return { token: page };
+        if (limit)
+            return { limit };
+        return undefined;
+    })();
+    const { data: queryPayload } = await client.http.get(`/api/v3/communities/${params.communityId}/users`, {
+        params: Object.assign(Object.assign({}, params), { options }),
+    });
+    const { paging } = queryPayload, payload = __rest(queryPayload, ["paging"]);
+    const preparedPayload = prepareMembershipPayload(payload, 'communityUsers');
+    const { communityUsers } = preparedPayload;
+    const cachedAt = client.cache && Date.now();
+    if (client.cache) {
+        ingestInCache(preparedPayload, { cachedAt });
+        const cacheKey = ['communityUsers', 'query', Object.assign(Object.assign({}, params), { options })];
+        pushToCache(cacheKey, {
+            communityUsers: communityUsers.map(({ communityId, userId }) => getResolver('communityUsers')({ communityId, userId })),
+            paging,
         });
     }
-    applyFilter(data) {
-        let communityMembers = filterByPropIntersection(data, 'roles', this.query.roles);
-        if (this.query.memberships) {
-            communityMembers = communityMembers.filter(({ communityMembership }) => {
-                const memberships = this.query.memberships || [];
-                return memberships.includes(communityMembership);
-            });
-        }
-        if (this.query.search) {
-            communityMembers = filterBySearchTerm(communityMembers, this.query.search);
-        }
-        switch (this.query.sortBy) {
-            case 'firstCreated':
-                communityMembers = communityMembers.sort(sortByFirstCreated);
-                break;
-            case 'displayName':
-                communityMembers = communityMembers.sort((a, b) => {
-                    var _a, _b, _c, _d;
-                    if (((_a = a === null || a === void 0 ? void 0 : a.user) === null || _a === void 0 ? void 0 : _a.displayName) && ((_b = b === null || b === void 0 ? void 0 : b.user) === null || _b === void 0 ? void 0 : _b.displayName)) {
-                        return (_c = a === null || a === void 0 ? void 0 : a.user) === null || _c === void 0 ? void 0 : _c.displayName.localeCompare((_d = b === null || b === void 0 ? void 0 : b.user) === null || _d === void 0 ? void 0 : _d.displayName);
-                    }
-                    return 0;
-                });
-                break;
-            case 'lastCreated':
-            default:
-                communityMembers = communityMembers.sort(sortByLastCreated);
-                break;
-        }
-        return communityMembers;
-    }
-}
+    return { data: communityUsers, cachedAt, paging };
+};
+/**
+ * ```js
+ * import { queryCommunityMembers } from '@amityco/ts-sdk-react-native'
+ * const communityMembers = await queryCommunityMembers(query)
+ * ```
+ *
+ * Queries a paginable list of {@link Amity.InternalPost} objects from cache
+ *
+ * @param query The query parameters
+ * @returns posts
+ *
+ * @category Post API
+ */
+queryCommunityMembers.locally = (query) => {
+    var _a, _b;
+    const client = getActiveClient();
+    client.log('community/queryCommunityMembers', query);
+    if (!client.cache)
+        return;
+    const _c = query !== null && query !== void 0 ? query : {}, { page, limit } = _c, params = __rest(_c, ["page", "limit"]);
+    const options = (() => {
+        if (page)
+            return { token: page };
+        if (limit)
+            return { limit };
+        return undefined;
+    })();
+    const cacheKey = ['communityUsers', 'query', Object.assign(Object.assign({}, params), { options })];
+    const { data, cachedAt } = (_a = pullFromCache(cacheKey)) !== null && _a !== void 0 ? _a : {};
+    if (!(data === null || data === void 0 ? void 0 : data.communityUsers.length))
+        return;
+    const communityUsers = data.communityUsers
+        .map(key => pullFromCache(['communityUsers', 'get', key]))
+        .filter(Boolean)
+        .map(({ data }) => data);
+    const { paging } = data;
+    return communityUsers.length === ((_b = data === null || data === void 0 ? void 0 : data.communityUsers) === null || _b === void 0 ? void 0 : _b.length)
+        ? { data: communityUsers, cachedAt, paging }
+        : undefined;
+};
 
 /*
  * Exported for testing
@@ -35751,215 +35571,79 @@ const getMembers = (params, callback, config) => {
     }
     const timestamp = Date.now();
     log(`getMembers(tmpid: ${timestamp}) > listen`);
-    const communityMemberLiveCollection = new CommunityMembersLiveCollectionController(params, resp => {
-        console.log('resp', resp);
-        callback(resp);
-    });
-    const disposers = communityMemberLiveCollection.startSubscription();
-    const cacheKey = communityMemberLiveCollection.getCacheKey();
-    disposers.push(() => {
-        dropFromCache(cacheKey);
-    });
-    return () => {
-        log(`getMembers(tmpid: ${timestamp}) > dispose`);
-        disposers.forEach(fn => fn());
-    };
-};
-/* end_public_function */
-
-/**
- * TODO: handle cache receive cache option, and cache policy
- * TODO: check if querybyIds is supported
- */
-class SearchCommunityMembersPaginationController extends PaginationController {
-    async getRequest(queryParams, token) {
-        const { limit = COLLECTION_DEFAULT_PAGINATION_LIMIT } = queryParams, params = __rest(queryParams, ["limit"]);
-        const options = token ? { token } : { limit };
-        const { data: queryResponse } = await this.http.get(`/api/v3/communities/${params.communityId}/users`, {
-            params: Object.assign(Object.assign({}, params), { options }),
-        });
-        return queryResponse;
-    }
-}
-
-class SearchCommunityMembersQueryStreamController extends QueryStreamController {
-    constructor(query, cacheKey, notifyChange, preparePayload) {
-        super(query, cacheKey);
-        this.notifyChange = notifyChange;
-        this.preparePayload = preparePayload;
-    }
-    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) {
+    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 cacheKey = ['communityUsers', 'collection', queryParams];
+    const cacheByCommunityIdKey = [
+        'communityUsers',
+        'collection',
+        { communityId: params.communityId },
+    ];
+    const responder = (data, isEventModel = false) => {
         var _a, _b;
-        if (refresh) {
-            pushToCache(this.cacheKey, {
-                data: response.communityUsers.map(({ communityId, userId }) => getResolver('communityUsers')({ communityId, userId })),
-            });
-        }
-        else {
-            const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-            const communityUsers = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
-            pushToCache(this.cacheKey, Object.assign(Object.assign({}, collection), { data: [
-                    ...new Set([
-                        ...communityUsers,
-                        ...response.communityUsers.map(({ communityId, userId }) => getResolver('communityUsers')({ communityId, userId })),
-                    ]),
-                ] }));
-        }
-    }
-    reactor(action) {
-        return (community, communityMembers) => {
-            var _a;
-            const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-            if (!collection)
-                return;
-            communityMembers.forEach(communityMember => {
-                const communityMemberCacheId = getResolver('communityUsers')({
-                    communityId: this.query.communityId,
-                    userId: communityMember.userId,
-                });
-                if (communityMember.communityMembership === 'none') {
-                    collection.data = collection.data.filter(m => m !== communityMemberCacheId);
-                }
-            });
-            pushToCache(this.cacheKey, collection);
-            this.notifyChange({ origin: "event" /* Amity.LiveDataOrigin.EVENT */, loading: false });
-        };
-    }
-    subscribeRTE(createSubscriber) {
-        return createSubscriber.map(subscriber => subscriber.fn(this.reactor(subscriber.action)));
-    }
-}
-
-var EnumCommunityMemberActions;
-(function (EnumCommunityMemberActions) {
-    EnumCommunityMemberActions["OnCommunityJoined"] = "onCommunityJoined";
-    EnumCommunityMemberActions["OnCommunityLeft"] = "onCommunityLeft";
-    EnumCommunityMemberActions["OnCommunityUserBanned"] = "onCommunityUserBanned";
-    EnumCommunityMemberActions["OnCommunityUserChanged"] = "onCommunityUserChanged";
-    EnumCommunityMemberActions["OnCommunityUserRoleAdded"] = "onCommunityUserRoleAdded";
-    EnumCommunityMemberActions["OnCommunityUserRoleRemoved"] = "onCommunityUserRoleRemoved";
-    EnumCommunityMemberActions["OnCommunityUserUnbanned"] = "onCommunityUserUnbanned";
-})(EnumCommunityMemberActions || (EnumCommunityMemberActions = {}));
-
-/* eslint-disable no-use-before-define */
-class SearchCommunityMembersLiveCollectionController extends LiveCollectionController {
-    constructor(query, callback) {
-        const queryStreamId = hash(query);
-        const cacheKey = ['communityUsers', 'collection', queryStreamId];
-        const paginationController = new SearchCommunityMembersPaginationController(query);
-        super(paginationController, queryStreamId, cacheKey, callback);
-        this.query = query;
-        this.queryStreamController = new SearchCommunityMembersQueryStreamController(this.query, this.cacheKey, this.notifyChange.bind(this), prepareCommunityPayload);
-        this.callback = callback.bind(this);
-        this.loadPage({ initial: true });
-    }
-    setup() {
+        const communityMembers = (_a = data.data
+            .map(id => pullFromCache(['communityUsers', 'get', id]))
+            .filter(Boolean)
+            .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
+        callback({
+            onNextPage: onFetch,
+            data: isEventModel ? applyFilter(communityMembers, params) : communityMembers,
+            hasNextPage: !!((_b = data.params) === null || _b === void 0 ? void 0 : _b.page),
+            loading: data.loading,
+            error: data.error,
+        });
+    };
+    const realtimeRouter = (_) => (_, communityMembers) => {
         var _a;
-        const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+        const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
         if (!collection) {
-            pushToCache(this.cacheKey, {
-                data: [],
-                params: {},
-            });
+            return;
         }
-    }
-    async persistModel(queryPayload) {
-        await this.queryStreamController.saveToMainDB(queryPayload);
-    }
-    persistQueryStream({ response, direction, refresh, }) {
-        this.queryStreamController.appendToQueryStream(response, direction, refresh);
-    }
-    startSubscription() {
-        return this.queryStreamController.subscribeRTE([
-            { fn: onCommunityJoined, action: EnumCommunityMemberActions.OnCommunityJoined },
-            { fn: onCommunityLeft, action: EnumCommunityMemberActions.OnCommunityLeft },
-            { fn: onCommunityUserBanned, action: EnumCommunityMemberActions.OnCommunityUserBanned },
-            { fn: onCommunityUserChanged, action: EnumCommunityMemberActions.OnCommunityUserChanged },
-            {
-                fn: onCommunityUserRoleRemoved,
-                action: EnumCommunityMemberActions.OnCommunityUserRoleRemoved,
-            },
-            { fn: onCommunityUserUnbanned, action: EnumCommunityMemberActions.OnCommunityUserUnbanned },
-        ]);
-    }
-    notifyChange({ origin, loading, error }) {
+        const communityMemberCacheIds = communityMembers
+            .map(communityMember => {
+            if (params.communityId !== communityMember.communityId) {
+                return;
+            }
+            const communityMemberCacheId = getResolver('communityUsers')({
+                communityId: params.communityId,
+                userId: communityMember.userId,
+            });
+            return communityMemberCacheId;
+        })
+            .filter(isNonNullable);
+        collection.data = [...new Set([...communityMemberCacheIds, ...collection.data])];
+        pushToCache(cacheKey, collection);
+        pushToCache(cacheByCommunityIdKey, collection);
+        responder(collection, true);
+    };
+    const onFetch = (initial = false) => {
         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(id => pullFromCache(['communityUsers', 'get', id]))
-            .filter(isNonNullable)
-            .map(({ data }) => data)) !== null && _b !== void 0 ? _b : []);
-        if (!this.shouldNotify(data) && origin === 'event')
+        const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+        const communityMembers = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
+        if (!initial && communityMembers.length > 0 && !(collection === null || collection === void 0 ? void 0 : collection.params.page))
             return;
-        this.callback({
-            onNextPage: () => this.loadPage({ direction: "next" /* Amity.LiveCollectionPageDirection.NEXT */ }),
-            data,
-            hasNextPage: !!this.paginationController.getNextToken(),
-            loading,
-            error,
-        });
-    }
-    applyFilter(data) {
-        let communityMembers = filterByPropIntersection(data, 'roles', this.query.roles);
-        if (this.query.memberships) {
-            communityMembers = communityMembers.filter(({ communityMembership }) => {
-                const memberships = this.query.memberships || [];
-                return memberships.includes(communityMembership);
-            });
-        }
-        if (this.query.search) {
-            communityMembers = filterBySearchTerm(communityMembers, this.query.search);
-        }
-        return communityMembers;
-    }
-}
-
-/* begin_public_function
-  id: community.membership.query
-*/
-/**
- * ```js
- * import { searchMembers } from '@amityco/ts-sdk-react-native'
- *
- * let communityMembers = []
- * const unsub = searchMembers({
- *   communityId: Amity.Community['communityId'],
- * }, response => merge(communityMembers, response.data))
- * ```
- *
- * Observe all mutations on a list of {@link Amity.CommunityUser}s
- *
- * @param params for querying community users
- * @param callback the function to call when new data are available
- * @returns An {@link Amity.Unsubscriber} function to run when willing to stop observing the community users
- *
- * @category Community Live Collection
- */
-const searchMembers = (params, callback, config) => {
-    const { log, cache } = getActiveClient();
-    if (!cache) {
-        console.log(ENABLE_CACHE_MESSAGE);
-    }
-    const timestamp = Date.now();
-    log(`getMembers(tmpid: ${timestamp}) > listen`);
-    const searchCommunityMemberLiveCollection = new SearchCommunityMembersLiveCollectionController(params, resp => {
-        callback(resp);
-    });
-    const disposers = searchCommunityMemberLiveCollection.startSubscription();
-    const cacheKey = searchCommunityMemberLiveCollection.getCacheKey();
-    disposers.push(() => {
-        dropFromCache(cacheKey);
-    });
+        const query = createQuery(queryCommunityMembers, Object.assign(Object.assign({}, queryParams), { limit: initial ? limit : undefined, page: !initial ? collection === null || collection === void 0 ? void 0 : collection.params.page : undefined }));
+        runQuery(query, ({ data: result, error, loading, paging }) => {
+            const data = {
+                loading,
+                error,
+                params: { page: paging === null || paging === void 0 ? void 0 : paging.next },
+                data: communityMembers,
+            };
+            if (result) {
+                data.data = [
+                    ...new Set([...communityMembers, ...result.map(getResolver('communityUsers'))]),
+                ];
+            }
+            pushToCache(cacheKey, data);
+            pushToCache(cacheByCommunityIdKey, data);
+            responder(data);
+        }, queryOptions(policy));
+    };
+    disposers.push(onCommunityLeft(realtimeRouter()), onCommunityJoined(realtimeRouter()), onCommunityUserBanned(realtimeRouter()), onCommunityUserUnbanned(realtimeRouter()), onCommunityUserChanged(realtimeRouter()), onCommunityUserRoleAdded(realtimeRouter()), onCommunityUserRoleRemoved(realtimeRouter()));
+    onFetch(true);
     return () => {
         log(`getMembers(tmpid: ${timestamp}) > dispose`);
         disposers.forEach(fn => fn());
@@ -35973,7 +35657,6 @@ var index$9 = /*#__PURE__*/Object.freeze({
   removeMembers: removeMembers,
   applyFilter: applyFilter,
   getMembers: getMembers,
-  searchMembers: searchMembers,
   onCommunityUserAdded: onCommunityUserAdded,
   onCommunityUserRemoved: onCommunityUserRemoved,
   onCommunityUserBanned: onCommunityUserBanned,
@@ -38131,10 +37814,10 @@ var index$4 = /*#__PURE__*/Object.freeze({
  * const created = await createStream({ title: 'my stream', 'thumbnailFileId': fileId  })
  * ```
  *
- * Creates an {@link Amity.InternalStream}
+ * Creates an {@link Amity.Stream}
  *
- * @param bundle The data necessary to create a new {@link Amity.InternalStream}
- * @returns The newly created {@link Amity.InternalStream}
+ * @param bundle The data necessary to create a new {@link Amity.Stream}
+ * @returns The newly created {@link Amity.Stream}
  *
  * @category Stream API
  * @async
@@ -38148,7 +37831,7 @@ const createStream = async (bundle) => {
         ingestInCache(data, { cachedAt });
     const { videoStreamings } = data;
     return {
-        data: LinkedObject.stream(videoStreamings[0]),
+        data: videoStreamings[0],
         cachedAt,
     };
 };
@@ -38181,7 +37864,7 @@ const updateStream = async (streamId, patch) => {
         ingestInCache(data, { cachedAt });
     const { videoStreamings } = data;
     return {
-        data: LinkedObject.stream(videoStreamings.find(stream => stream.streamId === streamId)),
+        data: videoStreamings.find(stream => stream.streamId === streamId),
         cachedAt,
     };
 };
@@ -38255,10 +37938,10 @@ getStream.locally = (streamId) => {
  * const success = await deleteStream(streamId)
  * ```
  *
- * Deletes a {@link Amity.InternalStream}
+ * Deletes a {@link Amity.Stream}
  *
- * @param streamId The {@link Amity.InternalStream} ID to delete
- * @return A success boolean if the {@link Amity.InternalStream} was deleted
+ * @param streamId The {@link Amity.Stream} ID to delete
+ * @return A success boolean if the {@link Amity.Stream} was deleted
  *
  * @category Stream API
  * @async
@@ -38283,11 +37966,11 @@ const deleteStream = async (streamId) => {
  * const stream = await disposeStream(streamId)
  * ```
  *
- * Dispose a {@link Amity.InternalStream}.
+ * Dispose a {@link Amity.Stream}.
  * Streaming status will be updated to "ended" and streaming url will be invalidated
  *
- * @param streamId The {@link Amity.InternalStream} ID to dispose
- * @returns the associated {@link Amity.InternalStream} object
+ * @param streamId The {@link Amity.Stream} ID to dispose
+ * @returns the associated {@link Amity.Stream} object
  *
  * @category Stream API
  * @async
@@ -38318,15 +38001,15 @@ const disposeStream = async (streamId) => {
  * const streams = await getStreams()
  * ```
  *
- * Queries a paginable list of {@link Amity.InternalStream} objects
+ * Queries a paginable list of {@link Amity.Stream} objects
  *
  * @param query The query parameters
- * @returns A page of {@link Amity.InternalStream} objects
+ * @returns A page of {@link Amity.Stream} objects
  *
  * @category Stream API
  * @async
  */
-const queryStreams = async (query) => {
+const queryStreams$1 = async (query) => {
     const client = getActiveClient();
     client.log('stream/queryStreams', query);
     const _a = query !== null && query !== void 0 ? query : {}, { page } = _a, params = __rest(_a, ["page"]);
@@ -38356,7 +38039,7 @@ const queryStreams = async (query) => {
  * })
  * ```
  *
- * Fired when a {@link Amity.InternalStream} has started airing
+ * Fired when a {@link Amity.Stream} has started airing
  *
  * @param callback The function to call when the event was fired
  * @returns an {@link Amity.Unsubscriber} function to stop listening
@@ -38380,7 +38063,7 @@ const onStreamStarted = (callback) => {
  * })
  * ```
  *
- * Fired when a {@link Amity.InternalStream} has stopped airing
+ * Fired when a {@link Amity.Stream} has stopped airing
  *
  * @param callback The function to call when the event was fired
  * @returns an {@link Amity.Unsubscriber} function to stop listening
@@ -38404,7 +38087,7 @@ const onStreamStopped = (callback) => {
  * })
  * ```
  *
- * Fired when the recordings of a {@link Amity.InternalStream} are available
+ * Fired when the recordings of a {@link Amity.Stream} are available
  *
  * @param callback The function to call when the event was fired
  * @returns an {@link Amity.Unsubscriber} function to stop listening
@@ -38420,54 +38103,6 @@ const onStreamRecorded = (callback) => {
     return createEventSubscriber(client, 'stream/onStreamRecorded', 'v3.video-streaming.didRecord', filter);
 };
 
-/**
- * ```js
- * import { onStreamFlagged } from '@amityco/ts-sdk-react-native'
- * const dispose = onStreamFlagged(stream => {
- *   // ...
- * })
- * ```
- *
- * Fired when a {@link Amity.InternalStream} has started airing
- *
- * @param callback The function to call when the event was fired
- * @returns an {@link Amity.Unsubscriber} function to stop listening
- *
- * @category Stream Events
- */
-const onStreamFlagged = (callback) => {
-    const client = getActiveClient();
-    const filter = (payload) => {
-        ingestInCache(payload);
-        callback(payload.videoStreamings[0]);
-    };
-    return createEventSubscriber(client, 'stream/onStreamFlagged', 'v3.video-streaming.didFlag', filter);
-};
-
-/**
- * ```js
- * import { onStreamTerminated } from '@amityco/ts-sdk-react-native'
- * const dispose = onStreamTerminated(stream => {
- *   // ...
- * })
- * ```
- *
- * Fired when a {@link Amity.InternalStream} has started airing
- *
- * @param callback The function to call when the event was fired
- * @returns an {@link Amity.Unsubscriber} function to stop listening
- *
- * @category Stream Events
- */
-const onStreamTerminated = (callback) => {
-    const client = getActiveClient();
-    const filter = (payload) => {
-        ingestInCache(payload);
-        callback(payload.videoStreamings[0]);
-    };
-    return createEventSubscriber(client, 'stream/onStreamTerminated', 'v3.video-streaming.didTerminate', filter);
-};
-
 /* eslint-disable no-use-before-define */
 /* begin_public_function
   id: stream.get
@@ -38482,22 +38117,15 @@ const onStreamTerminated = (callback) => {
  * Fetches a {@link Amity.Stream} object
  *
  * @param streamId the ID of the {@link Amity.Stream} to get
- * @param callback
  * @returns the associated {@link Amity.Stream} object
  *
  * @category Stream Live Object
  */
 const getStreamById = (streamId, callback) => {
-    const reactor = (snapshot) => {
-        const { data } = snapshot;
-        callback(Object.assign(Object.assign({}, snapshot), { data: data ? LinkedObject.stream(snapshot.data) : data }));
-    };
-    return liveObject(streamId, reactor, 'streamId', getStream, [
+    return liveObject(streamId, callback, 'streamId', getStream, [
         onStreamRecorded,
         onStreamStarted,
         onStreamStopped,
-        onStreamFlagged,
-        onStreamTerminated,
     ]);
 };
 /* end_public_function */
@@ -38523,150 +38151,145 @@ getStreamById.locally = (streamId) => {
     if (!cached)
         return;
     return {
-        data: LinkedObject.stream(cached.data),
+        data: cached.data,
         cachedAt: cached.cachedAt,
     };
 };
 
-class GetStreamsPageController extends PaginationController {
-    async getRequest(queryParams, token) {
-        const { limit = COLLECTION_DEFAULT_PAGINATION_LIMIT } = queryParams, params = __rest(queryParams, ["limit"]);
-        const options = token ? { token } : { limit };
-        const { data: queryResponse } = await this.http.get(`/api/v3/video-streaming`, {
-            params: Object.assign(Object.assign({}, params), { options }),
-        });
-        return Object.assign(Object.assign({}, queryResponse.results), { paging: queryResponse.paging });
-    }
-}
-
-class GetStreamsQueryStreamController extends QueryStreamController {
-    constructor(query, cacheKey, notifyChange, paginationController) {
-        super(query, cacheKey);
-        this.notifyChange = notifyChange;
-        this.paginationController = paginationController;
-    }
-    // eslint-disable-next-line class-methods-use-this
-    saveToMainDB(response) {
-        const client = getActiveClient();
-        const cachedAt = client.cache && Date.now();
-        if (client.cache) {
-            ingestInCache(response, { cachedAt });
-        }
-    }
-    appendToQueryStream(response, direction, refresh = false) {
-        var _a, _b;
-        if (refresh) {
-            pushToCache(this.cacheKey, {
-                data: response.videoStreamings.map(getResolver('stream')),
-                query: this.query,
-            });
-        }
-        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.videoStreamings.map(getResolver('stream'))])]
-                    : [...new Set([...response.videoStreamings.map(getResolver('stream')), ...messages])] }));
-        }
-    }
-    reactor(action) {
-        return (payload) => {
-            var _a;
-            const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-            if (!collection)
-                return;
-            collection.data = [...new Set([payload.streamId, ...collection.data])];
-            pushToCache(this.cacheKey, collection);
-            this.notifyChange({ origin: "event" /* Amity.LiveDataOrigin.EVENT */, loading: false });
-        };
-    }
-    subscribeRTE(createSubscriber) {
-        return createSubscriber.map(subscriber => subscriber.fn(this.reactor(subscriber.action)));
-    }
-}
-
-class GetStreamsLiveCollectionController extends LiveCollectionController {
-    constructor(query, callback) {
-        const queryStreamId = hash(query);
-        const cacheKey = ['streams', 'collection', queryStreamId];
-        const paginationController = new GetStreamsPageController(query);
-        super(paginationController, queryStreamId, cacheKey, callback);
-        this.applyFilter = (data) => {
-            let streams = filterByPropEquality(data, 'isDeleted', this.query.isDeleted);
-            streams = streams.sort(this.query.sortBy === 'lastCreated' ? sortByLastCreated : sortByFirstCreated);
-            return streams;
-        };
-        this.query = query;
-        this.queryStreamController = new GetStreamsQueryStreamController(this.query, this.cacheKey, this.notifyChange.bind(this), paginationController);
-        this.paginationController = paginationController;
-        this.callback = callback.bind(this);
-        this.loadPage({ initial: true });
-    }
-    notifyChange({ origin, loading, error }) {
-        var _a;
-        const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-        if (!collection)
-            return;
-        let data = collection.data
-            .map(streamId => pullFromCache(['stream', 'get', streamId]))
-            .filter(Boolean)
-            .map(stream => LinkedObject.stream(stream.data));
-        if (!this.shouldNotify(data) && origin === 'event')
-            return;
-        data = this.applyFilter(data);
-        this.callback({
-            onNextPage: () => this.loadPage({ initial: false, direction: "next" /* Amity.LiveCollectionPageDirection.NEXT */ }),
-            data,
-            hasNextPage: !!this.paginationController.getNextToken(),
-            loading,
-            error,
-        });
-    }
-    startSubscription() {
-        return this.queryStreamController.subscribeRTE([
-            { fn: onStreamRecorded, action: 'onStreamRecorded' },
-            { fn: onStreamStarted, action: 'onStreamStarted' },
-            { fn: onStreamStopped, action: 'onStreamStopped' },
-            { fn: onStreamFlagged, action: 'onStreamFlagged' },
-            { fn: onStreamTerminated, action: 'onStreamTerminated' },
-        ]);
-    }
-    setup() {
-        var _a;
-        const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-        if (!collection) {
-            pushToCache(this.cacheKey, {
-                data: [],
-                params: {},
-            });
-        }
-    }
-    persistModel(response) {
-        this.queryStreamController.saveToMainDB(response);
-    }
-    persistQueryStream({ response, direction, refresh, }) {
-        this.queryStreamController.appendToQueryStream(response, direction, refresh);
-    }
-}
+/* begin_public_function
+  id: stream.query
+*/
+/**
+ * ```js
+ * import { getStreams } from '@amityco/ts-sdk-react-native'
+ * const streams = await getStreams()
+ * ```
+ *
+ * Queries a paginable list of {@link Amity.Stream} objects
+ *
+ * @param query The query parameters
+ * @returns A page of {@link Amity.Stream} objects
+ *
+ * @category Stream API
+ * @async
+ */
+const queryStreams = async (query) => {
+    const client = getActiveClient();
+    client.log('stream/queryStreams', query);
+    const _a = query !== null && query !== void 0 ? query : {}, { page, limit } = _a, params = __rest(_a, ["page", "limit"]);
+    const options = (() => {
+        if (page)
+            return { token: page };
+        if (limit)
+            return { limit };
+        return undefined;
+    })();
+    const { data } = await client.http.get(`/api/v3/video-streaming`, {
+        params: Object.assign(Object.assign({}, params), { options }),
+    });
+    // API-FIX: backend to response Amity.Response: const { paging, videoStreamings } = unwrapPayload(data)
+    // API-FIX: seems returned data has a results identifier on top of data, like no other apis, and this is beautiful
+    const { paging, results: payload } = data;
+    const { videoStreamings } = payload;
+    const cachedAt = client.cache && Date.now();
+    if (client.cache)
+        ingestInCache(payload, { cachedAt });
+    return { data: videoStreamings, cachedAt, paging };
+};
+/* end_public_function */
 
+/* begin_public_function
+  id: stream.query
+*/
+/**
+ * ```js
+ * import { StreamRepository } from '@amityco/ts-sdk-react-native'
+ * const streams = await StreamRepository.getStreams()
+ * ```
+ *
+ * Observe all mutations on a list of {@link Amity.Stream}s
+ *
+ * @param params for querying streams
+ * @param callback the function to call when new data are available
+ * @param config
+ * @returns An {@link Amity.Unsubscriber} function to run when willing to stop observing the streams
+ *
+ * @category Stream Live Collection
+ */
 const getStreams = (params, callback, config) => {
-    const { log, cache, userId } = getActiveClient();
+    const { log, cache } = getActiveClient();
     if (!cache) {
         console.log(ENABLE_CACHE_MESSAGE);
     }
     const timestamp = Date.now();
     log(`getStreams(tmpid: ${timestamp}) > listen`);
-    const liveCollection = new GetStreamsLiveCollectionController(params, callback);
-    const disposers = liveCollection.startSubscription();
-    const cacheKey = liveCollection.getCacheKey();
-    disposers.push(() => {
-        dropFromCache(cacheKey);
-    });
+    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 cacheKey = ['streams', 'collection', params];
+    const applyFilter = (data) => {
+        let streams = filterByPropEquality(data, 'isDeleted', params.isDeleted);
+        streams = streams.sort(params.sortBy === 'lastCreated' ? sortByLastCreated : sortByFirstCreated);
+        return streams;
+    };
+    const responder = (data, isEventModel = false) => {
+        var _a, _b;
+        const streams = (_a = data.data
+            .map(streamId => {
+            return pullFromCache(['stream', 'get', streamId]);
+        })
+            .filter(Boolean)
+            .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
+        callback({
+            onNextPage: onFetch,
+            /*
+             * Only apply filter to RTE Model
+             */
+            data: isEventModel ? applyFilter(streams) : streams,
+            hasNextPage: !!((_b = data.params) === null || _b === void 0 ? void 0 : _b.page),
+            loading: data.loading,
+            error: data.error,
+        });
+    };
+    const realtimeRouter = (_) => (stream) => {
+        var _a;
+        const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+        if (!collection)
+            return;
+        collection.data = [...new Set([stream.streamId, ...collection.data])];
+        pushToCache(cacheKey, collection);
+        responder(collection, true);
+    };
+    const onFetch = (initial = false) => {
+        var _a, _b;
+        const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+        const streams = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
+        if (!initial && streams.length > 0 && !(collection === null || collection === void 0 ? void 0 : collection.params.page))
+            return;
+        const query = createQuery(queryStreams, Object.assign(Object.assign({}, queryParams), { limit: initial ? limit : undefined, page: !initial ? collection === null || collection === void 0 ? void 0 : collection.params.page : undefined }));
+        runQuery(query, ({ data: result, error, loading, paging }) => {
+            const data = {
+                loading,
+                error,
+                params: { page: paging === null || paging === void 0 ? void 0 : paging.next },
+                data: streams,
+            };
+            if (result) {
+                data.data = [...new Set([...streams, ...result.map(getResolver('stream'))])];
+            }
+            pushToCache(cacheKey, data);
+            responder(data);
+        }, queryOptions(policy));
+    };
+    disposers.push(onStreamRecorded(realtimeRouter()), onStreamStarted(realtimeRouter()), onStreamStopped(realtimeRouter()));
+    onFetch(true);
     return () => {
         log(`getStreams(tmpid: ${timestamp}) > dispose`);
         disposers.forEach(fn => fn());
     };
-};
+};
+/* end_public_function */
 
 var index$3 = /*#__PURE__*/Object.freeze({
   __proto__: null,
@@ -38674,13 +38297,11 @@ var index$3 = /*#__PURE__*/Object.freeze({
   updateStream: updateStream,
   deleteStream: deleteStream,
   disposeStream: disposeStream,
-  queryStreams: queryStreams,
+  queryStreams: queryStreams$1,
   getStream: getStream,
   onStreamStarted: onStreamStarted,
   onStreamStopped: onStreamStopped,
   onStreamRecorded: onStreamRecorded,
-  onStreamFlagged: onStreamFlagged,
-  onStreamTerminated: onStreamTerminated,
   getStreamById: getStreamById,
   getStreams: getStreams
 });