@amityco/ts-sdk-react-native 6.8.2-d546836.0 → 6.8.3-6df654f.0

package/dist/index.esm.js

@@ -82,8 +82,8 @@ const PostContentType = Object.freeze({
 
 function getVersion() {
     try {
-        // the string ''v6.8.0-esm'' should be replaced by actual value by @rollup/plugin-replace
-        return 'v6.8.0-esm';
+        // the string ''v6.8.2-esm'' should be replaced by actual value by @rollup/plugin-replace
+        return 'v6.8.2-esm';
     }
     catch (error) {
         return '__dev__';
@@ -22088,7 +22088,10 @@ const removeChannelMarkerCache = (channel) => {
  * than the one already connected, in which case the existing subscriptions need
  * to be cleared
  */
-const subscriptions = [];
+let subscriptions = [];
+async function runMqtt() {
+    await modifyMqttConnection();
+}
 /* begin_public_function
   id: client.login
 */
@@ -22122,6 +22125,7 @@ const login = async (params, sessionHandler, config) => {
         await logout();
         // Remove subscription to ban and delete
         subscriptions.forEach(fn => fn());
+        subscriptions = [];
     }
     // default values
     (_a = params.deviceId) !== null && _a !== void 0 ? _a : (params.deviceId = await getDeviceId());
@@ -22132,10 +22136,7 @@ const login = async (params, sessionHandler, config) => {
         // FIXME: events are duplicated if connectClient is called few times without disconnectClient
         // wire websocket events to our event emitter
         proxyWebsocketEvents(client.ws, client.emitter);
-        // TODO: in phase 2, this should not be necessary. we should have WS
-        // to be connected "on demand" rather than "by default"
-        await new Promise(resolve => {
-            client.ws.once('connect', resolve);
+        client.ws.once('connect', () => {
             client.ws.open();
         });
         client.userId = params.userId;
@@ -22157,34 +22158,36 @@ const login = async (params, sessionHandler, config) => {
         throw error;
     }
     if ((config === null || config === void 0 ? void 0 : config.disableRTE) !== true) {
-        await modifyMqttConnection();
+        runMqtt();
     }
-    subscriptions.push(
-    // GLOBAL_BAN
-    onClientBanned((_) => {
-        terminateClient("globalBan" /* Amity.TokenTerminationReason.GLOBAL_BAN */);
-        subscriptions.forEach(fn => fn());
-        unsubWatcher();
-    }), onTokenTerminated(_ => {
-        terminateClient();
-        subscriptions.forEach(fn => fn());
-        unsubWatcher();
-    }), onUserDeleted((user) => {
-        if (user.userId === client.userId) {
-            terminateClient("userDeleted" /* Amity.TokenTerminationReason.USER_DELETED */);
+    if (subscriptions.length === 0) {
+        subscriptions.push(
+        // GLOBAL_BAN
+        onClientBanned((_) => {
+            terminateClient("globalBan" /* Amity.TokenTerminationReason.GLOBAL_BAN */);
             subscriptions.forEach(fn => fn());
             unsubWatcher();
-        }
-    }), onTokenExpired(state => {
-        setSessionState(state);
-        logout();
-        subscriptions.forEach(fn => fn());
-    }), 
-    // NOTE: This is a temporary solution to handle the channel marker when the user is forced to leave
-    // the channel because currently backend can't handle this, so every time a user is banned from
-    // a channel or the channel is deleted the channel's unread count will not be reset to zero
-    onChannelDeleted(removeChannelMarkerCache), onChannelMemberBanned(removeChannelMarkerCache), markReadEngineOnLoginHandler());
-    return client.ws.connected;
+        }), onTokenTerminated(_ => {
+            terminateClient();
+            subscriptions.forEach(fn => fn());
+            unsubWatcher();
+        }), onUserDeleted((user) => {
+            if (user.userId === client.userId) {
+                terminateClient("userDeleted" /* Amity.TokenTerminationReason.USER_DELETED */);
+                subscriptions.forEach(fn => fn());
+                unsubWatcher();
+            }
+        }), onTokenExpired(state => {
+            setSessionState(state);
+            logout();
+            subscriptions.forEach(fn => fn());
+        }), 
+        // NOTE: This is a temporary solution to handle the channel marker when the user is forced to leave
+        // the channel because currently backend can't handle this, so every time a user is banned from
+        // a channel or the channel is deleted the channel's unread count will not be reset to zero
+        onChannelDeleted(removeChannelMarkerCache), onChannelMemberBanned(removeChannelMarkerCache), markReadEngineOnLoginHandler());
+    }
+    return true;
 };
 /* end_public_function */
 
@@ -22645,24 +22648,31 @@ const onMessageMarked = (callback) => {
         var _a, _b;
         ingestInCache(payload);
         const cacheCollection = queryCache(['message', 'collection']);
-        if (cacheCollection && (cacheCollection === null || cacheCollection === void 0 ? void 0 : cacheCollection.length) > 0) {
-            const contentMarker = payload.contentMarkers[0];
+        const { contentMarkers, feedMarkers } = payload;
+        if (cacheCollection && (cacheCollection === null || cacheCollection === void 0 ? void 0 : cacheCollection.length) > 0 && (feedMarkers === null || feedMarkers === void 0 ? void 0 : feedMarkers.length) > 0) {
+            /**
+             * in case of read the message collection,
+             * use feedId of the feedMarkers to check if it equal to subChannelId.
+             */
             const currentMessageCollection = cacheCollection.filter(currentMessage => {
-                if (!isObject(currentMessage.key[2]))
+                const cacheKey = currentMessage.key;
+                if (!isObject(cacheKey[2]))
                     return false;
-                return currentMessage.key[2].subChannelId === contentMarker.feedId;
+                const queryParams = cacheKey[2];
+                return queryParams.subChannelId === feedMarkers[0].feedId;
             });
-            if (currentMessageCollection.length > 0) {
+            if (currentMessageCollection.length > 0 && (contentMarkers === null || contentMarkers === void 0 ? void 0 : contentMarkers.length) > 0) {
                 const currentMessages = ((_b = (_a = currentMessageCollection[0].data) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.map(messageId => {
                     return pullFromCache(['message', 'get', messageId]);
                 })) || [];
                 currentMessages.forEach(message => {
-                    const isSameSubChannelId = contentMarker.feedId === (message === null || message === void 0 ? void 0 : message.data.subChannelId);
-                    const isReadCountLatest = contentMarker.readCount > (message === null || message === void 0 ? void 0 : message.data.readCount);
-                    const isDeliveredCountLatest = contentMarker.deliveredCount > (message === null || message === void 0 ? void 0 : message.data.deliveredCount);
+                    var _a;
+                    const isSameSubChannelId = contentMarkers[0].feedId === (message === null || message === void 0 ? void 0 : message.data.subChannelId);
+                    const isReadCountLatest = contentMarkers[0].readCount > (message === null || message === void 0 ? void 0 : message.data.readCount);
+                    const isDeliveredCountLatest = ((_a = contentMarkers[0]) === null || _a === void 0 ? void 0 : _a.deliveredCount) > (message === null || message === void 0 ? void 0 : message.data.deliveredCount);
                     if (isSameSubChannelId) {
-                        pushToCache(['message', 'get', message.data.messageId], Object.assign(Object.assign({}, message.data), { readCount: isReadCountLatest ? contentMarker.readCount : message === null || message === void 0 ? void 0 : message.data.readCount, deliveredCount: isDeliveredCountLatest
-                                ? contentMarker.deliveredCount
+                        pushToCache(['message', 'get', message.data.messageId], Object.assign(Object.assign({}, message.data), { readCount: isReadCountLatest ? contentMarkers[0].readCount : message === null || message === void 0 ? void 0 : message.data.readCount, deliveredCount: isDeliveredCountLatest
+                                ? contentMarkers[0].deliveredCount
                                 : message === null || message === void 0 ? void 0 : message.data.deliveredCount }));
                     }
                 });
@@ -23900,7 +23910,7 @@ queryChannelMembers.locally = (query) => {
  * Exported for testing
  * @hidden
  */
-const applyFilter$2 = (data, params) => {
+const applyFilter$3 = (data, params) => {
     let channelMembers = filterByPropIntersection(data, 'roles', params.roles);
     if (params.memberships) {
         /*
@@ -23975,7 +23985,7 @@ const getMembers$1 = (params, callback, config) => {
             /*
              * Only apply filter to RTE Model
              */
-            data: isEventModel ? applyFilter$2(channelMembers, params) : channelMembers,
+            data: isEventModel ? applyFilter$3(channelMembers, params) : channelMembers,
             hasNextPage: !!((_b = data.params) === null || _b === void 0 ? void 0 : _b.page),
             loading: data.loading,
             error: data.error,
@@ -24065,7 +24075,7 @@ var index$i = /*#__PURE__*/Object.freeze({
   __proto__: null,
   addMembers: addMembers$1,
   removeMembers: removeMembers$1,
-  applyFilter: applyFilter$2,
+  applyFilter: applyFilter$3,
   getMembers: getMembers$1,
   searchMembers: searchMembers
 });
@@ -26390,7 +26400,7 @@ queryUsers.locally = (query = {}) => {
  * Exported for testing
  * @hidden
  */
-const applyFilter$1 = (data, params) => {
+const applyFilter$2 = (data, params) => {
     let users = filterByStringComparePartially(data, 'displayName', params.displayName);
     switch (params.sortBy) {
         case 'firstCreated':
@@ -26439,7 +26449,7 @@ const getUsers = (params, callback, config) => {
     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 = ['user', 'collection', queryParams];
+    const cacheKey = ['user', 'collection', uuid()];
     const responder = (data, isEventModel = false) => {
         var _a, _b;
         const users = (_a = data.data
@@ -26451,7 +26461,7 @@ const getUsers = (params, callback, config) => {
             /*
              * Only apply filter to RTE Model
              */
-            data: isEventModel ? applyFilter$1(users, params) : users,
+            data: isEventModel ? applyFilter$2(users, params) : users,
             hasNextPage: !!((_b = data.params) === null || _b === void 0 ? void 0 : _b.page),
             loading: data.loading,
             error: data.error,
@@ -29261,6 +29271,50 @@ const queryMessages = async (query) => {
 };
 /* end_public_function */
 
+/*
+ * 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);
+            });
+        }
+        return true;
+    });
+    messages = messages.filter(m => {
+        if (params.excludeTags) {
+            return (params.excludeTags || []).find(value => {
+                if (!m.tags)
+                    return true;
+                return !m.tags.includes(value);
+            });
+        }
+        return true;
+    });
+    /*
+     * for cases when message is deleted via RTE, this flag is used to get
+     * items from cache that are !deleted
+     */
+    if (!params.includeDeleted) {
+        messages = filterByPropEquality(messages, 'isDeleted', false);
+    }
+    messages = messages.sort((message1, message2) => {
+        if (params.sortBy === 'segmentAsc') {
+            return message1.channelSegment - message2.channelSegment;
+        }
+        if (params.sortBy === 'segmentDesc') {
+            return message2.channelSegment - message1.channelSegment;
+        }
+        return 0;
+    });
+    return messages;
+};
 /* begin_public_function
   id: message.query
 */
@@ -29294,30 +29348,14 @@ const getMessages = (params, callback, config) => {
     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 = ['message', 'collection', params, uuid()];
+    const uniqueId = uuid();
+    const cacheKey = ['message', 'collection', params, uniqueId];
     const responder = (data) => {
         var _a, _b;
-        let messages = (_a = data.data
+        const messages = applyFilter$1((_a = data.data
             .map(messageId => pullFromCache(['message', 'get', messageId]))
             .filter(Boolean)
-            .filter(item => {
-            if (!params.tags)
-                return true;
-            return params.tags.find(value => {
-                var _a;
-                if (!((_a = item.data) === null || _a === void 0 ? void 0 : _a.tags))
-                    return false;
-                return item.data.tags.includes(value);
-            });
-        })
-            .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
-        /*
-         * 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);
-        }
+            .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [], params);
         callback({
             onNextPage: onFetch,
             data: messages,
@@ -29327,10 +29365,28 @@ const getMessages = (params, callback, config) => {
         });
     };
     const realtimeRouter = (action) => (message) => {
-        var _a;
+        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);
     };
@@ -29355,7 +29411,7 @@ const getMessages = (params, callback, config) => {
             responder(data);
         }, queryOptions(policy, CACHE_SHORTEN_LIFESPAN));
     };
-    disposers.push(onMessageFetched(realtimeRouter()), onMessageCreated(realtimeRouter()), onMessageUpdated(realtimeRouter()), onMessageDeleted(realtimeRouter()), onMessageFlagged(realtimeRouter()), onMessageUnflagged(realtimeRouter()), onMessageFlagCleared(realtimeRouter()), onMessageReactionAdded(realtimeRouter()), onMessageReactionRemoved(realtimeRouter()), convertEventPayload(onMessageMarkerFetched, 'contentId', 'message')(realtimeRouter()), convertEventPayload(onMessageMarked, 'contentId', 'message')(realtimeRouter()));
+    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));
     return () => {
@@ -33379,8 +33435,10 @@ const getComments = (params, callback, config) => {
         const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
         if (params.referenceId !== comment.referenceId ||
             params.referenceType !== comment.referenceType ||
-            !collection)
+            params.parentId !== comment.parentId ||
+            !collection) {
             return;
+        }
         if (action === 'onCreate') {
             collection.data = [...new Set([comment.commentId, ...collection.data])];
         }
@@ -34253,4 +34311,4 @@ const createUserToken = async (apiKey, apiRegion, params) => {
     return { accessToken: data.accessToken };
 };
 
-export { API_REGIONS, index$5 as CategoryRepository, index$g as ChannelRepository, index$f as Client, index$2 as CommentRepository, CommunityPostSettingMaps, CommunityPostSettings, index$6 as CommunityRepository, ContentFeedType, DefaultCommunityPostSetting, index$4 as FeedRepository, index$c as FileRepository, FileType, MessageContentType, index$a as MessageRepository, index as PollRepository, PostContentType, index$3 as PostRepository, index$b as ReactionRepository, index$1 as StreamRepository, index$9 as SubChannelRepository, SubscriptionLevels, index$d as UserRepository, VERSION, VideoResolution, VideoSize, VideoTranscodingStatus, backupCache, createQuery, createReport, createUserToken, deleteReport, disableCache, dropFromCache, enableCache, filterByChannelMembership, filterByCommunityMembership, filterByFeedType, filterByPostDataTypes, filterByPropEquality, filterByPropInclusion, filterByPropIntersection, filterBySearchTerm, filterByStringComparePartially, getChannelMarkers, getChannelTopic, getCommentTopic, getCommunityTopic, getDeviceId, getDeviceInfo, getDeviceModel, getMQTTClientId, getMarkedMessageTopic, getMessageMarkers, getMessageTopic, getMyFollowersTopic, getMyFollowingsTopic, getNetworkTopic, getPostTopic, getRole, getSmartFeedChannelTopic, getSmartFeedMessageTopic, getSmartFeedSubChannelTopic, getSubChannelMarkers, getSubChannelTopic, getUserMarker, getUserTopic, isAfterBefore, isAfterBeforeRaw, isCachable, isFetcher, isFresh, isLocal, isMutator, isOffline, isPaged, isReportedByMe, isSkip, mergeInCache, onChannelMarkerFetched, onFeedMarkerFetched, onFeedMarkerUpdated, onMessageMarked, onMessageMarkerFetched, onSubChannelMarkerFetched, onSubChannelMarkerUpdated, onUserMarkerFetched, pullFromCache, pushToCache, queryCache, queryOptions, queryRoles, restoreCache, runQuery, sortByChannelSegment, sortByDisplayName, sortByFirstCreated, sortByLastActivity, sortByLastCreated, sortByName, sortBySegmentNumber, subscribeTopic, toPage, toPageRaw, toToken, upsertInCache, wipeCache };
+export { API_REGIONS, index$5 as CategoryRepository, index$g as ChannelRepository, index$f as Client, index$2 as CommentRepository, CommunityPostSettingMaps, CommunityPostSettings, index$6 as CommunityRepository, ContentFeedType, DefaultCommunityPostSetting, index$4 as FeedRepository, index$c as FileRepository, FileType, MessageContentType, index$a as MessageRepository, index as PollRepository, PostContentType, index$3 as PostRepository, index$b as ReactionRepository, index$1 as StreamRepository, index$9 as SubChannelRepository, SubscriptionLevels, index$d as UserRepository, VERSION, VideoResolution, VideoSize, VideoTranscodingStatus, backupCache, createQuery, createReport, createUserToken, deleteReport, disableCache, dropFromCache, enableCache, filterByChannelMembership, filterByCommunityMembership, filterByFeedType, filterByPostDataTypes, filterByPropEquality, filterByPropInclusion, filterByPropIntersection, filterBySearchTerm, filterByStringComparePartially, getChannelMarkers, getChannelTopic, getCommentTopic, getCommunityTopic, getMarkedMessageTopic, getMessageMarkers, getMessageTopic, getMyFollowersTopic, getMyFollowingsTopic, getNetworkTopic, getPostTopic, getRole, getSmartFeedChannelTopic, getSmartFeedMessageTopic, getSmartFeedSubChannelTopic, getSubChannelMarkers, getSubChannelTopic, getUserMarker, getUserTopic, isAfterBefore, isAfterBeforeRaw, isCachable, isFetcher, isFresh, isLocal, isMutator, isOffline, isPaged, isReportedByMe, isSkip, mergeInCache, onChannelMarkerFetched, onFeedMarkerFetched, onFeedMarkerUpdated, onMessageMarked, onMessageMarkerFetched, onSubChannelMarkerFetched, onSubChannelMarkerUpdated, onUserMarkerFetched, pullFromCache, pushToCache, queryCache, queryOptions, queryRoles, restoreCache, runQuery, sortByChannelSegment, sortByDisplayName, sortByFirstCreated, sortByLastActivity, sortByLastCreated, sortByName, sortBySegmentNumber, subscribeTopic, toPage, toPageRaw, toToken, upsertInCache, wipeCache };