@stream-io/feeds-client 0.1.5 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stream-io/feeds-client",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "packageManager": "yarn@3.2.4",
   "main": "./dist/index.node.js",
   "exports": {
@@ -44,7 +44,9 @@
     "start": "rollup -w -c",
     "build": "yarn clean && rollup -c",
     "test": "vitest",
-    "test-ci": "vitest --coverage"
+    "test:unit": "vitest --exclude '__integration-tests__/**'",
+    "test-ci": "vitest --exclude '__integration-tests__/docs-snippets/**' --coverage",
+    "test-docs-snippets": "vitest __integration-tests__/docs-snippets/**"
   },
   "files": [
     "dist",
@@ -61,8 +63,9 @@
   "devDependencies": {
     "@rollup/plugin-replace": "^6.0.1",
     "@rollup/plugin-typescript": "^12.1.0",
-    "@stream-io/node-sdk": "https://github.com/GetStream/stream-node.git#feeds-api",
+    "@stream-io/node-sdk": "0.5.0",
     "@types/react": "^19.1.8",
+    "@vitest/coverage-v8": "3.2.4",
     "dotenv": "^16.4.5",
     "react": "19.0.0",
     "rimraf": "^6.0.1",

package/src/Feed.ts

@@ -155,7 +155,7 @@ export 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,
       );
@@ -171,7 +171,7 @@ export 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,
       );
@@ -344,7 +344,7 @@ export class Feed extends FeedApi {
         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 };
@@ -389,7 +389,7 @@ export class Feed extends FeedApi {
         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 };
@@ -415,7 +415,8 @@ export class Feed extends FeedApi {
       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: FeedState | undefined;
@@ -447,7 +448,8 @@ export 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 = {
@@ -465,7 +467,8 @@ export 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 =
@@ -559,7 +562,7 @@ export class Feed extends FeedApi {
     },
   ) {
     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;
@@ -693,7 +696,8 @@ export class Feed extends FeedApi {
 
   private handleBookmarkAdded(event: BookmarkAddedEvent) {
     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(
@@ -708,7 +712,8 @@ export class Feed extends FeedApi {
 
   private handleBookmarkDeleted(event: BookmarkDeletedEvent) {
     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(
@@ -723,7 +728,8 @@ export class Feed extends FeedApi {
 
   private handleBookmarkUpdated(event: BookmarkUpdatedEvent) {
     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(

package/src/FeedsClient.ts

@@ -35,8 +35,8 @@ import { ModerationClient } from './ModerationClient';
 import { StreamPoll } from './common/Poll';
 
 export type FeedsClientState = {
-  connectedUser: OwnUser | undefined;
-  isWsConnectionHealthy: boolean;
+  connected_user: OwnUser | undefined;
+  is_ws_connection_healthy: boolean;
 };
 
 type FID = string;
@@ -70,8 +70,8 @@ export class FeedsClient extends FeedsApi {
     );
     super(apiClient);
     this.state = new StateStore<FeedsClientState>({
-      connectedUser: undefined,
-      isWsConnectionHealthy: false,
+      connected_user: undefined,
+      is_ws_connection_healthy: false,
     });
     this.moderation = new ModerationClient(apiClient);
     this.tokenManager = tokenManager;
@@ -86,7 +86,7 @@ export 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++;
@@ -211,7 +211,7 @@ export class FeedsClient extends FeedsApi {
 
   connectUser = async (user: UserRequest, tokenProvider: TokenOrProvider) => {
     if (
-      this.state.getLatestValue().connectedUser !== undefined ||
+      this.state.getLatestValue().connected_user !== undefined ||
       this.wsConnection
     ) {
       throw new Error(`Can't connect a new user, call "disconnectUser" first`);
@@ -235,8 +235,8 @@ export class FeedsClient extends FeedsApi {
       );
       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) {
       await this.disconnectUser();
@@ -260,7 +260,9 @@ export class FeedsClient extends FeedsApi {
   };
 
   // @ts-expect-error API spec says file should be a string
-  uploadFile = (request: Omit<FileUploadRequest, 'file'> & { file: StreamFile }) => {
+  uploadFile = (
+    request: Omit<FileUploadRequest, 'file'> & { file: StreamFile },
+  ) => {
     return super.uploadFile({
       // @ts-expect-error API spec says file should be a string
       file: request.file,
@@ -316,7 +318,10 @@ export class FeedsClient extends FeedsApi {
 
     this.connectionIdManager.reset();
     this.tokenManager.reset();
-    this.state.partialNext({ connectedUser: undefined, isWsConnectionHealthy: false });
+    this.state.partialNext({
+      connected_user: undefined,
+      is_ws_connection_healthy: false,
+    });
   };
 
   on = this.eventDispatcher.on;

package/src/common/ActivitySearchSource.ts

@@ -20,7 +20,7 @@ export class ActivitySearchSource extends BaseSearchSource<ActivityResponse> {
   }
 
   protected async query(searchQuery: string) {
-    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({
@@ -39,8 +39,8 @@ export class ActivitySearchSource extends BaseSearchSource<ActivityResponse> {
 }
 
 
-  // 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 }
   // },

package/src/common/ApiClient.ts

@@ -21,7 +21,7 @@ export class ApiClient {
     private readonly connectionIdManager: ConnectionIdManager,
     options?: FeedsClientOptions,
   ) {
-    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,

package/src/common/FeedSearchSource.ts

@@ -20,7 +20,7 @@ export class FeedSearchSource extends BaseSearchSource<Feed> {
   }
 
   protected async query(searchQuery: string) {
-    const { connectedUser } = this.client.state.getLatestValue();
+    const { connected_user: connectedUser } = this.client.state.getLatestValue();
     if (!connectedUser) return { items: [] };
 
     // const channelFilters: ChannelFilters = {

package/src/common/Poll.ts

@@ -36,7 +36,10 @@ const isPollVoteRemovedEvent = (
 
 export const isVoteAnswer = (vote: PollVote) => !!vote?.answer_text;
 
-export type PollAnswersQueryParams = QueryPollVotesRequest & { poll_id: string; user_id?: string };
+export type PollAnswersQueryParams = QueryPollVotesRequest & {
+  poll_id: string;
+  user_id?: string;
+};
 
 type OptionId = string;
 
@@ -66,7 +69,9 @@ export class StreamPoll {
     );
   }
 
-  private readonly getInitialStateFromPollResponse = (poll: PollInitOptions['poll']) => {
+  private readonly getInitialStateFromPollResponse = (
+    poll: PollInitOptions['poll'],
+  ) => {
     const { own_votes, id, ...pollResponseForState } = poll;
     const { ownAnswer, ownVotes } = own_votes?.reduce<{
       ownVotes: PollVote[];
@@ -126,7 +131,9 @@ export class StreamPoll {
     if (event.poll?.id && event.poll.id !== this.id) return;
     if (!isPollVoteCastedEvent(event as WSEvent)) 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;
@@ -153,7 +160,12 @@ export class StreamPoll {
       );
     }
 
-    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
@@ -173,7 +185,9 @@ export class StreamPoll {
     if (event.poll?.id && event.poll.id !== this.id) return;
     if (!isPollVoteChangedEvent(event as WSEvent)) 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;
@@ -227,7 +241,12 @@ export class StreamPoll {
       );
     }
 
-    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
@@ -237,7 +256,7 @@ export class StreamPoll {
       latest_answers: latestAnswers,
       last_activity_at: new Date(event.created_at),
       own_answer: ownAnswer,
-      own_votes_by_option_id:ownVotesByOptionId,
+      own_votes_by_option_id: ownVotesByOptionId,
       max_voted_option_ids: maxVotedOptionIds,
     });
   };
@@ -246,7 +265,9 @@ export class StreamPoll {
     if (event.poll?.id && event.poll.id !== this.id) return;
     if (!isPollVoteRemovedEvent(event as WSEvent)) 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 };
@@ -265,12 +286,16 @@ export class StreamPoll {
         event.poll.vote_counts_by_option,
       );
       if (isOwnVote && event.poll_vote.option_id) {
-
         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

package/src/common/TokenManager.ts

@@ -1,4 +1,4 @@
-import { isFunction, retryInterval, sleep } from './utils';
+import { isFunction, sleep } from './utils';
 
 /**
  * TokenManager
@@ -67,12 +67,11 @@ export class TokenManager {
             this.token = await tokenProvider();
           } 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 },
                 ),

package/src/common/UserSearchSource.ts

@@ -20,7 +20,7 @@ export class UserSearchSource extends BaseSearchSource<UserResponse> {
   }
 
   protected async query(searchQuery: string) {
-    const { connectedUser } = this.client.state.getLatestValue();
+    const { connected_user: connectedUser } = this.client.state.getLatestValue();
     if (!connectedUser) return { items: [] };
 
     // const channelFilters: ChannelFilters = {

package/src/state-updates/bookmark-utils.test.ts

@@ -37,6 +37,7 @@ const createMockActivity = (id: string): ActivityResponse => ({
   visibility: 'public',
   bookmark_count: 0,
   comment_count: 0,
+  reaction_count: 0,
   share_count: 0,
   attachments: [],
   comments: [],
@@ -181,6 +182,71 @@ describe('bookmark-utils', () => {
       expect(result.own_bookmarks).toHaveLength(1);
       expect(result.own_bookmarks[0]).toEqual(bookmark2);
     });
+
+    it('should correctly identify bookmarks by activity_id + folder_id + user_id', () => {
+      const activity = createMockActivity('activity1');
+      const user = createMockUser('user1');
+
+      // Create two bookmarks with same activity and user but different folders
+      const bookmark1 = {
+        ...createMockBookmark(user, activity),
+        folder: {
+          id: 'folder1',
+          name: 'Folder 1',
+          created_at: new Date(),
+          updated_at: new Date(),
+          custom: {},
+        },
+      };
+      const bookmark2 = {
+        ...createMockBookmark(user, activity),
+        folder: {
+          id: 'folder2',
+          name: 'Folder 2',
+          created_at: new Date(),
+          updated_at: new Date(),
+          custom: {},
+        },
+      };
+
+      activity.own_bookmarks = [bookmark1, bookmark2];
+
+      // Try to remove bookmark1
+      const event = createMockDeletedEvent(bookmark1);
+      const result = removeBookmarkFromActivity(event, activity, true);
+
+      expect(result.changed).toBe(true);
+      expect(result.own_bookmarks).toHaveLength(1);
+      expect(result.own_bookmarks[0]).toEqual(bookmark2);
+    });
+
+    it('should handle bookmarks without folders correctly', () => {
+      const activity = createMockActivity('activity1');
+      const user = createMockUser('user1');
+
+      // Create two bookmarks: one with folder, one without
+      const bookmarkWithFolder = {
+        ...createMockBookmark(user, activity),
+        folder: {
+          id: 'folder1',
+          name: 'Folder 1',
+          created_at: new Date(),
+          updated_at: new Date(),
+          custom: {},
+        },
+      };
+      const bookmarkWithoutFolder = createMockBookmark(user, activity);
+
+      activity.own_bookmarks = [bookmarkWithFolder, bookmarkWithoutFolder];
+
+      // Try to remove bookmark without folder
+      const event = createMockDeletedEvent(bookmarkWithoutFolder);
+      const result = removeBookmarkFromActivity(event, activity, true);
+
+      expect(result.changed).toBe(true);
+      expect(result.own_bookmarks).toHaveLength(1);
+      expect(result.own_bookmarks[0]).toEqual(bookmarkWithFolder);
+    });
   });
 
   describe('updateBookmarkInActivity', () => {
@@ -220,20 +286,80 @@ describe('bookmark-utils', () => {
       expect(result.own_bookmarks[0]).toEqual(bookmark); // unchanged
     });
 
-    it('should not update bookmark if it does not exist', () => {
+    // Test for the bug: updating bookmarks with same activity_id but different folder_id
+    it('should correctly update bookmark by activity_id + folder_id + user_id', () => {
       const activity = createMockActivity('activity1');
       const user = createMockUser('user1');
-      const bookmark = createMockBookmark(user, activity);
-      activity.own_bookmarks = [bookmark];
 
-      const differentUser = createMockUser('user2');
-      const differentBookmark = createMockBookmark(differentUser, activity);
-      const event = createMockUpdatedEvent(differentBookmark);
+      // Create two bookmarks with same activity and user but different folders
+      const bookmark1 = {
+        ...createMockBookmark(user, activity),
+        folder: {
+          id: 'folder1',
+          name: 'Folder 1',
+          created_at: new Date(),
+          updated_at: new Date(),
+          custom: {},
+        },
+      };
+      const bookmark2 = {
+        ...createMockBookmark(user, activity),
+        folder: {
+          id: 'folder2',
+          name: 'Folder 2',
+          created_at: new Date(),
+          updated_at: new Date(),
+          custom: {},
+        },
+      };
+
+      activity.own_bookmarks = [bookmark1, bookmark2];
+
+      // Update bookmark1
+      const updatedBookmark1 = {
+        ...bookmark1,
+        custom: { updated: true },
+      };
+      const event = createMockUpdatedEvent(updatedBookmark1);
       const result = updateBookmarkInActivity(event, activity, true);
 
       expect(result.changed).toBe(true);
-      expect(result.own_bookmarks).toHaveLength(1);
-      expect(result.own_bookmarks[0]).toEqual(bookmark); // unchanged
+      expect(result.own_bookmarks).toHaveLength(2);
+      expect(result.own_bookmarks).toContain(updatedBookmark1);
+      expect(result.own_bookmarks).toContain(bookmark2);
+    });
+
+    it('should handle updating bookmarks without folders correctly', () => {
+      const activity = createMockActivity('activity1');
+      const user = createMockUser('user1');
+
+      // Create two bookmarks: one with folder, one without
+      const bookmarkWithFolder = {
+        ...createMockBookmark(user, activity),
+        folder: {
+          id: 'folder1',
+          name: 'Folder 1',
+          created_at: new Date(),
+          updated_at: new Date(),
+          custom: {},
+        },
+      };
+      const bookmarkWithoutFolder = createMockBookmark(user, activity);
+
+      activity.own_bookmarks = [bookmarkWithFolder, bookmarkWithoutFolder];
+
+      // Update bookmark without folder
+      const updatedBookmarkWithoutFolder = {
+        ...bookmarkWithoutFolder,
+        custom: { updated: true },
+      };
+      const event = createMockUpdatedEvent(updatedBookmarkWithoutFolder);
+      const result = updateBookmarkInActivity(event, activity, true);
+
+      expect(result.changed).toBe(true);
+      expect(result.own_bookmarks).toHaveLength(2);
+      expect(result.own_bookmarks).toContain(bookmarkWithFolder);
+      expect(result.own_bookmarks).toContain(updatedBookmarkWithoutFolder);
     });
   });
 

package/src/state-updates/bookmark-utils.ts

@@ -3,9 +3,23 @@ import {
   BookmarkDeletedEvent,
   BookmarkUpdatedEvent,
   ActivityResponse,
+  BookmarkResponse,
 } from '../gen/models';
 import { UpdateStateResult } from '../types-internal';
 
+// Helper function to check if two bookmarks are the same
+// A bookmark is identified by activity_id + folder_id + user_id
+const isSameBookmark = (
+  bookmark1: BookmarkResponse,
+  bookmark2: BookmarkResponse,
+): boolean => {
+  return (
+    bookmark1.user.id === bookmark2.user.id &&
+    bookmark1.activity.id === bookmark2.activity.id &&
+    bookmark1.folder?.id === bookmark2.folder?.id
+  );
+};
+
 const updateActivityInActivities = (
   updatedActivity: ActivityResponse,
   activities: ActivityResponse[],
@@ -46,9 +60,7 @@ export const removeBookmarkFromActivity = (
   // 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,
+        (bookmark) => !isSameBookmark(bookmark, event.bookmark),
       )
     : activity.own_bookmarks;
 
@@ -67,10 +79,8 @@ export const updateBookmarkInActivity = (
   // 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];