@stream-io/feeds-client 0.1.5 → 0.1.6

package/dist/index.node.cjs

@@ -2791,7 +2791,7 @@ class TokenManager {
                         }
                         catch (e) {
                             const numberOfFailures = ++previousFailuresCount;
-                            await sleep(retryInterval(numberOfFailures));
+                            await sleep(1000);
                             if (numberOfFailures === 3) {
                                 this.loadTokenPromise = null;
                                 return reject(new Error(`Stream error: tried to get token ${numberOfFailures} times, but it failed with ${e}. Check your token provider`, { cause: e }));
@@ -3639,7 +3639,7 @@ class ApiClient {
                 rate_limit: getRateLimitFromResponseHeader(response_headers),
             };
         };
-        this.baseUrl = options?.base_url ?? 'https://video.stream-io-api.com';
+        this.baseUrl = options?.base_url ?? 'https://feeds.stream-io-api.com';
         this.timeout = options?.timeout ?? 3000;
         this.axiosInstance = axios.create({
             baseURL: this.baseUrl,
@@ -3933,6 +3933,13 @@ const removeReactionFromActivities = (event, activities, isCurrentUser) => {
     return updateActivityInActivities$1(updatedActivity, activities);
 };
 
+// Helper function to check if two bookmarks are the same
+// A bookmark is identified by activity_id + folder_id + user_id
+const isSameBookmark = (bookmark1, bookmark2) => {
+    return (bookmark1.user.id === bookmark2.user.id &&
+        bookmark1.activity.id === bookmark2.activity.id &&
+        bookmark1.folder?.id === bookmark2.folder?.id);
+};
 const updateActivityInActivities = (updatedActivity, activities) => {
     const index = activities.findIndex((a) => a.id === updatedActivity.id);
     if (index !== -1) {
@@ -3959,8 +3966,7 @@ const addBookmarkToActivity = (event, activity, isCurrentUser) => {
 const removeBookmarkFromActivity = (event, activity, isCurrentUser) => {
     // Update own_bookmarks if the bookmark is from the current user
     const ownBookmarks = isCurrentUser
-        ? (activity.own_bookmarks || []).filter((bookmark) => bookmark.user.id !== event.bookmark.user.id ||
-            bookmark.activity.id !== event.bookmark.activity.id)
+        ? (activity.own_bookmarks || []).filter((bookmark) => !isSameBookmark(bookmark, event.bookmark))
         : activity.own_bookmarks;
     return {
         ...activity,
@@ -3972,8 +3978,7 @@ const updateBookmarkInActivity = (event, activity, isCurrentUser) => {
     // Update own_bookmarks if the bookmark is from the current user
     let ownBookmarks = activity.own_bookmarks || [];
     if (isCurrentUser) {
-        const bookmarkIndex = ownBookmarks.findIndex((bookmark) => bookmark.user.id === event.bookmark.user.id &&
-            bookmark.activity.id === event.bookmark.activity.id);
+        const bookmarkIndex = ownBookmarks.findIndex((bookmark) => isSameBookmark(bookmark, event.bookmark));
         if (bookmarkIndex !== -1) {
             ownBookmarks = [...ownBookmarks];
             ownBookmarks[bookmarkIndex] = event.bookmark;
@@ -4062,7 +4067,7 @@ class Feed extends FeedApi {
             },
             'feeds.activity.reaction.added': (event) => {
                 const currentActivities = this.currentState.activities;
-                const connectedUser = this.client.state.getLatestValue().connectedUser;
+                const connectedUser = this.client.state.getLatestValue().connected_user;
                 const isCurrentUser = Boolean(connectedUser && event.reaction.user.id === connectedUser.id);
                 const result = addReactionToActivities(event, currentActivities, isCurrentUser);
                 if (result.changed) {
@@ -4071,7 +4076,7 @@ class Feed extends FeedApi {
             },
             'feeds.activity.reaction.deleted': (event) => {
                 const currentActivities = this.currentState.activities;
-                const connectedUser = this.client.state.getLatestValue().connectedUser;
+                const connectedUser = this.client.state.getLatestValue().connected_user;
                 const isCurrentUser = Boolean(connectedUser && event.reaction.user.id === connectedUser.id);
                 const result = removeReactionFromActivities(event, currentActivities, isCurrentUser);
                 if (result.changed) {
@@ -4210,7 +4215,7 @@ class Feed extends FeedApi {
                 // someone followed this feed
                 event.follow.target_feed.fid === this.fid) {
                     const source = event.follow.source_feed;
-                    const connectedUser = this.client.state.getLatestValue().connectedUser;
+                    const connectedUser = this.client.state.getLatestValue().connected_user;
                     this.state.next((currentState) => {
                         const newState = { ...currentState, ...event.follow.target_feed };
                         if (source.created_by.id === connectedUser?.id) {
@@ -4243,7 +4248,7 @@ class Feed extends FeedApi {
                 // someone unfollowed this feed
                 event.follow.target_feed.fid === this.fid) {
                     const source = event.follow.source_feed;
-                    const connectedUser = this.client.state.getLatestValue().connectedUser;
+                    const connectedUser = this.client.state.getLatestValue().connected_user;
                     this.state.next((currentState) => {
                         const newState = { ...currentState, ...event.follow.target_feed };
                         if (source.created_by.id === connectedUser?.id) {
@@ -4259,7 +4264,7 @@ class Feed extends FeedApi {
             'feeds.comment.reaction.deleted': this.handleCommentReactionEvent.bind(this),
             'feeds.comment.reaction.updated': Feed.noop,
             'feeds.feed_member.added': (event) => {
-                const { connectedUser } = this.client.state.getLatestValue();
+                const { connected_user: connectedUser } = this.client.state.getLatestValue();
                 this.state.next((currentState) => {
                     let newState;
                     if (!checkHasAnotherPage(currentState.members, currentState.member_pagination?.next)) {
@@ -4280,7 +4285,7 @@ class Feed extends FeedApi {
                 });
             },
             'feeds.feed_member.removed': (event) => {
-                const { connectedUser } = this.client.state.getLatestValue();
+                const { connected_user: connectedUser } = this.client.state.getLatestValue();
                 this.state.next((currentState) => {
                     const newState = {
                         ...currentState,
@@ -4293,7 +4298,7 @@ class Feed extends FeedApi {
                 });
             },
             'feeds.feed_member.updated': (event) => {
-                const { connectedUser } = this.client.state.getLatestValue();
+                const { connected_user: connectedUser } = this.client.state.getLatestValue();
                 this.state.next((currentState) => {
                     const memberIndex = currentState.members?.findIndex((member) => member.user.id === event.member.user.id) ?? -1;
                     let newState;
@@ -4358,7 +4363,7 @@ class Feed extends FeedApi {
     }
     handleCommentReactionEvent(event) {
         const { comment, reaction } = event;
-        const connectedUser = this.client.state.getLatestValue().connectedUser;
+        const connectedUser = this.client.state.getLatestValue().connected_user;
         this.state.next((currentState) => {
             const forId = comment.parent_id ?? comment.object_id;
             const entityState = currentState.comments_by_entity_id[forId];
@@ -4460,7 +4465,7 @@ class Feed extends FeedApi {
     }
     handleBookmarkAdded(event) {
         const currentActivities = this.currentState.activities;
-        const { connectedUser } = this.client.state.getLatestValue();
+        const { connected_user: connectedUser } = this.client.state.getLatestValue();
         const isCurrentUser = event.bookmark.user.id === connectedUser?.id;
         const result = addBookmarkToActivities(event, currentActivities, isCurrentUser);
         if (result.changed) {
@@ -4469,7 +4474,7 @@ class Feed extends FeedApi {
     }
     handleBookmarkDeleted(event) {
         const currentActivities = this.currentState.activities;
-        const { connectedUser } = this.client.state.getLatestValue();
+        const { connected_user: connectedUser } = this.client.state.getLatestValue();
         const isCurrentUser = event.bookmark.user.id === connectedUser?.id;
         const result = removeBookmarkFromActivities(event, currentActivities, isCurrentUser);
         if (result.changed) {
@@ -4478,7 +4483,7 @@ class Feed extends FeedApi {
     }
     handleBookmarkUpdated(event) {
         const currentActivities = this.currentState.activities;
-        const { connectedUser } = this.client.state.getLatestValue();
+        const { connected_user: connectedUser } = this.client.state.getLatestValue();
         const isCurrentUser = event.bookmark.user.id === connectedUser?.id;
         const result = updateBookmarkInActivities(event, currentActivities, isCurrentUser);
         if (result.changed) {
@@ -5033,7 +5038,8 @@ class StreamPoll {
             if (!isPollVoteCastedEvent(event))
                 return;
             const currentState = this.data;
-            const isOwnVote = event.poll_vote.user_id === this.client.state.getLatestValue().connectedUser?.id;
+            const isOwnVote = event.poll_vote.user_id ===
+                this.client.state.getLatestValue().connected_user?.id;
             let latestAnswers = [...currentState.latest_answers];
             let ownAnswer = currentState.own_answer;
             const ownVotesByOptionId = currentState.own_votes_by_option_id;
@@ -5057,7 +5063,7 @@ class StreamPoll {
             else {
                 maxVotedOptionIds = getMaxVotedOptionIds(event.poll.vote_counts_by_option);
             }
-            const { answers_count, latest_votes_by_option, vote_count, vote_counts_by_option } = event.poll;
+            const { answers_count, latest_votes_by_option, vote_count, vote_counts_by_option, } = event.poll;
             this.state.partialNext({
                 answers_count,
                 // @ts-expect-error Incompatibility between PollResponseData and Poll due to teams_role, remove when OpenAPI spec is fixed
@@ -5078,7 +5084,8 @@ class StreamPoll {
             if (!isPollVoteChangedEvent(event))
                 return;
             const currentState = this.data;
-            const isOwnVote = event.poll_vote.user_id === this.client.state.getLatestValue().connectedUser?.id;
+            const isOwnVote = event.poll_vote.user_id ===
+                this.client.state.getLatestValue().connected_user?.id;
             let latestAnswers = [...currentState.latest_answers];
             let ownAnswer = currentState.own_answer;
             let ownVotesByOptionId = currentState.own_votes_by_option_id;
@@ -5125,7 +5132,7 @@ class StreamPoll {
             else {
                 maxVotedOptionIds = getMaxVotedOptionIds(event.poll.vote_counts_by_option);
             }
-            const { answers_count, latest_votes_by_option, vote_count, vote_counts_by_option } = event.poll;
+            const { answers_count, latest_votes_by_option, vote_count, vote_counts_by_option, } = event.poll;
             this.state.partialNext({
                 answers_count,
                 // @ts-expect-error Incompatibility between PollResponseData and Poll due to teams_role, remove when OpenAPI spec is fixed
@@ -5145,7 +5152,8 @@ class StreamPoll {
             if (!isPollVoteRemovedEvent(event))
                 return;
             const currentState = this.data;
-            const isOwnVote = event.poll_vote.user_id === this.client.state.getLatestValue().connectedUser?.id;
+            const isOwnVote = event.poll_vote.user_id ===
+                this.client.state.getLatestValue().connected_user?.id;
             let latestAnswers = [...currentState.latest_answers];
             let ownAnswer = currentState.own_answer;
             const ownVotesByOptionId = { ...currentState.own_votes_by_option_id };
@@ -5163,7 +5171,7 @@ class StreamPoll {
                     delete ownVotesByOptionId[event.poll_vote.option_id];
                 }
             }
-            const { answers_count, latest_votes_by_option, vote_count, vote_counts_by_option } = event.poll;
+            const { answers_count, latest_votes_by_option, vote_count, vote_counts_by_option, } = event.poll;
             this.state.partialNext({
                 answers_count,
                 // @ts-expect-error Incompatibility between PollResponseData and Poll due to teams_role, remove when OpenAPI spec is fixed
@@ -5221,7 +5229,7 @@ class FeedsClient extends FeedsApi {
         this.healthyConnectionChangedEventCount = 0;
         this.pollFromState = (id) => this.polls_by_id.get(id);
         this.connectUser = async (user, tokenProvider) => {
-            if (this.state.getLatestValue().connectedUser !== undefined ||
+            if (this.state.getLatestValue().connected_user !== undefined ||
                 this.wsConnection) {
                 throw new Error(`Can't connect a new user, call "disconnectUser" first`);
             }
@@ -5235,8 +5243,8 @@ class FeedsClient extends FeedsApi {
                 this.wsConnection.on('all', (event) => this.eventDispatcher.dispatch(event));
                 const connectedEvent = await this.wsConnection.connect();
                 this.state.partialNext({
-                    connectedUser: connectedEvent?.me,
-                    isWsConnectionHealthy: this.wsConnection.isHealthy,
+                    connected_user: connectedEvent?.me,
+                    is_ws_connection_healthy: !!this.wsConnection?.isHealthy,
                 });
             }
             catch (err) {
@@ -5295,7 +5303,10 @@ class FeedsClient extends FeedsApi {
             removeConnectionEventListeners(this.updateNetworkConnectionStatus);
             this.connectionIdManager.reset();
             this.tokenManager.reset();
-            this.state.partialNext({ connectedUser: undefined, isWsConnectionHealthy: false });
+            this.state.partialNext({
+                connected_user: undefined,
+                is_ws_connection_healthy: false,
+            });
         };
         this.on = this.eventDispatcher.on;
         this.off = this.eventDispatcher.off;
@@ -5321,8 +5332,8 @@ class FeedsClient extends FeedsApi {
             }
         };
         this.state = new StateStore({
-            connectedUser: undefined,
-            isWsConnectionHealthy: false,
+            connected_user: undefined,
+            is_ws_connection_healthy: false,
         });
         this.moderation = new ModerationClient(apiClient);
         this.tokenManager = tokenManager;
@@ -5334,7 +5345,7 @@ class FeedsClient extends FeedsApi {
             switch (event.type) {
                 case 'connection.changed': {
                     const { online } = event;
-                    this.state.partialNext({ isWsConnectionHealthy: online });
+                    this.state.partialNext({ is_ws_connection_healthy: online });
                     if (online) {
                         this.healthyConnectionChangedEventCount++;
                         // we skip the first event as we could potentially be querying twice
@@ -5792,7 +5803,7 @@ class ActivitySearchSource extends BaseSearchSource {
         this.client = client;
     }
     async query(searchQuery) {
-        const { connectedUser } = this.client.state.getLatestValue();
+        const { connected_user: connectedUser } = this.client.state.getLatestValue();
         if (!connectedUser)
             return { items: [] };
         const { activities: items, next } = await this.client.queryActivities({
@@ -5807,10 +5818,10 @@ class ActivitySearchSource extends BaseSearchSource {
         return items;
     }
 }
-// filter: { 
-//   'feed.name': { $autocomplete: searchQuery } 
-//   'feed.description': { $autocomplete: searchQuery } 
-//   'created_by.name': { $autocomplete: searchQuery } 
+// filter: {
+//   'feed.name': { $autocomplete: searchQuery }
+//   'feed.description': { $autocomplete: searchQuery }
+//   'created_by.name': { $autocomplete: searchQuery }
 // },
 
 class UserSearchSource extends BaseSearchSource {
@@ -5826,7 +5837,7 @@ class UserSearchSource extends BaseSearchSource {
         this.client = client;
     }
     async query(searchQuery) {
-        const { connectedUser } = this.client.state.getLatestValue();
+        const { connected_user: connectedUser } = this.client.state.getLatestValue();
         if (!connectedUser)
             return { items: [] };
         // const channelFilters: ChannelFilters = {
@@ -5903,7 +5914,7 @@ class FeedSearchSource extends BaseSearchSource {
         this.client = client;
     }
     async query(searchQuery) {
-        const { connectedUser } = this.client.state.getLatestValue();
+        const { connected_user: connectedUser } = this.client.state.getLatestValue();
         if (!connectedUser)
             return { items: [] };
         // const channelFilters: ChannelFilters = {