@stream-io/feeds-client 0.1.4 → 0.1.5

package/dist/index.browser.js

@@ -2686,6 +2686,13 @@ function removeConnectionEventListeners(cb) {
         window.removeEventListener('online', cb);
     }
 }
+const streamDevToken = (userId) => {
+    return [
+        'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9', // {"alg": "HS256", "typ": "JWT"}
+        window.btoa(JSON.stringify({ user_id: userId })),
+        'devtoken', // hardcoded signature
+    ].join('.');
+};
 const debounce = (fn, timeout = 0, { leading = false, trailing = true, } = {}) => {
     let runningTimeout = null;
     let argsForTrailingExecution = null;
@@ -2995,7 +3002,10 @@ class StableWSConnection {
         this.onmessage = (wsID, event) => {
             if (this.wsID !== wsID)
                 return;
-            this._log('onmessage() - onmessage callback', { event, wsID });
+            this._log('onmessage() - onmessage callback', {
+                event: { ...event, data: JSON.parse(event.data) },
+                wsID,
+            });
             let data = typeof event.data === 'string' ? JSON.parse(event.data) : null;
             this.decoders.forEach((decode) => {
                 data = decode(data);
@@ -4010,8 +4020,22 @@ const updateBookmarkInActivities = (event, activities, isCurrentUser) => {
     return updateActivityInActivities(updatedActivity, activities);
 };
 
-const END_OF_LIST = 'eol';
-const DEFAULT_COMMENT_PAGINATION = 'first';
+const isImageFile = (file) => {
+    // photoshop files begin with 'image/'
+    return file.type.startsWith('image/') && !file.type.endsWith('.photoshop');
+};
+const isVideoFile = (file) => {
+    return file.type.startsWith('video/');
+};
+const checkHasAnotherPage = (v, cursor) => (typeof v === 'undefined' && typeof cursor === 'undefined') ||
+    typeof cursor === 'string';
+const isCommentResponse = (entity) => {
+    return typeof entity?.object_id === 'string';
+};
+const Constants = {
+    DEFAULT_COMMENT_PAGINATION: 'first',
+};
+
 class Feed extends FeedApi {
     constructor(client, groupId, id, data) {
         // Need this ugly cast because fileUpload endpoints :(
@@ -4084,7 +4108,7 @@ class Feed extends FeedApi {
                     const entityState = currentState.comments_by_entity_id[forId];
                     const newComments = entityState?.comments?.concat([]) ?? [];
                     if (entityState?.pagination?.sort === 'last' &&
-                        entityState?.pagination.next === END_OF_LIST) {
+                        !checkHasAnotherPage(entityState.comments, entityState?.pagination.next)) {
                         newComments.unshift(comment);
                     }
                     else if (entityState?.pagination?.sort === 'first') {
@@ -4171,7 +4195,7 @@ class Feed extends FeedApi {
                             ...currentState,
                             ...event.follow.source_feed,
                         };
-                        if (currentState.following_pagination?.next === END_OF_LIST) {
+                        if (!checkHasAnotherPage(currentState.following, currentState.following_pagination?.next)) {
                             // TODO: respect sort
                             newState.following = currentState.following
                                 ? currentState.following.concat(event.follow)
@@ -4192,7 +4216,7 @@ class Feed extends FeedApi {
                                 ? currentState.own_follows.concat(event.follow)
                                 : [event.follow];
                         }
-                        if (currentState.followers_pagination?.next === END_OF_LIST) {
+                        if (!checkHasAnotherPage(currentState.followers, currentState.followers_pagination?.next)) {
                             // TODO: respect sort
                             newState.followers = currentState.followers
                                 ? currentState.followers.concat(event.follow)
@@ -4233,40 +4257,60 @@ class Feed extends FeedApi {
             'feeds.comment.reaction.deleted': this.handleCommentReactionEvent.bind(this),
             'feeds.comment.reaction.updated': Feed.noop,
             'feeds.feed_member.added': (event) => {
-                const { member } = event;
-                // do not add a member if the pagination has reached the end of the list
-                if (this.currentState.member_pagination?.next !== END_OF_LIST)
-                    return;
+                const { connectedUser } = this.client.state.getLatestValue();
                 this.state.next((currentState) => {
-                    return {
-                        ...currentState,
-                        // TODO: respect sort
-                        members: currentState.members
-                            ? currentState.members.concat(member)
-                            : [member],
-                    };
+                    let newState;
+                    if (!checkHasAnotherPage(currentState.members, currentState.member_pagination?.next)) {
+                        newState ?? (newState = {
+                            ...currentState,
+                        });
+                        newState.members = newState.members?.concat(event.member) ?? [
+                            event.member,
+                        ];
+                    }
+                    if (connectedUser?.id === event.member.user.id) {
+                        newState ?? (newState = {
+                            ...currentState,
+                        });
+                        newState.own_membership = event.member;
+                    }
+                    return newState ?? currentState;
                 });
             },
             'feeds.feed_member.removed': (event) => {
+                const { connectedUser } = this.client.state.getLatestValue();
                 this.state.next((currentState) => {
-                    return {
+                    const newState = {
                         ...currentState,
                         members: currentState.members?.filter((member) => member.user.id !== event.user?.id),
                     };
+                    if (connectedUser?.id === event.member_id) {
+                        delete newState.own_membership;
+                    }
+                    return newState;
                 });
             },
             'feeds.feed_member.updated': (event) => {
+                const { 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;
                     if (memberIndex !== -1) {
+                        // if there's an index, there's a member to update
                         const newMembers = [...currentState.members];
                         newMembers[memberIndex] = event.member;
-                        return {
+                        newState ?? (newState = {
                             ...currentState,
-                            members: newMembers,
-                        };
+                        });
+                        newState.members = newMembers;
                     }
-                    return currentState;
+                    if (connectedUser?.id === event.member.user.id) {
+                        newState ?? (newState = {
+                            ...currentState,
+                        });
+                        newState.own_membership = event.member;
+                    }
+                    return newState ?? currentState;
                 });
             },
             // the poll events should be removed from here
@@ -4392,29 +4436,6 @@ class Feed extends FeedApi {
                         ...currentState,
                         ...responseCopy,
                     };
-                    // if there is no next cursor, set it to END_OF_LIST
-                    // request has to have a limit set for this to work
-                    if ((request?.followers_pagination?.limit ?? 0) > 0 &&
-                        typeof nextState.followers_pagination?.next === 'undefined') {
-                        nextState.followers_pagination = {
-                            ...nextState.followers_pagination,
-                            next: END_OF_LIST,
-                        };
-                    }
-                    if ((request?.following_pagination?.limit ?? 0) > 0 &&
-                        typeof nextState.following_pagination?.next === 'undefined') {
-                        nextState.following_pagination = {
-                            ...nextState.following_pagination,
-                            next: END_OF_LIST,
-                        };
-                    }
-                    if ((request?.member_pagination?.limit ?? 0) > 0 &&
-                        typeof nextState.member_pagination?.next === 'undefined') {
-                        nextState.member_pagination = {
-                            ...nextState.member_pagination,
-                            next: END_OF_LIST,
-                        };
-                    }
                     if (!request?.followers_pagination?.limit) {
                         delete nextState.followers;
                     }
@@ -4505,6 +4526,7 @@ class Feed extends FeedApi {
         });
     }
     async loadNextPageComments({ forId, base, sort, parentId, }) {
+        let error;
         try {
             this.state.next((currentState) => ({
                 ...currentState,
@@ -4519,7 +4541,7 @@ class Feed extends FeedApi {
                     },
                 },
             }));
-            const { next: newNextCursor = END_OF_LIST, comments } = await base();
+            const { next: newNextCursor, comments } = await base();
             this.state.next((currentState) => {
                 const newPagination = {
                     ...currentState.comments_by_entity_id[forId]?.pagination,
@@ -4544,9 +4566,8 @@ class Feed extends FeedApi {
                 };
             });
         }
-        catch (error) {
-            console.error(error);
-            // TODO: figure out how to handle errorss
+        catch (e) {
+            error = e;
         }
         finally {
             this.state.next((currentState) => ({
@@ -4563,15 +4584,21 @@ class Feed extends FeedApi {
                 },
             }));
         }
+        if (error) {
+            throw error;
+        }
     }
     async loadNextPageActivityComments(activity, request) {
-        const pagination = this.currentState.comments_by_entity_id[activity.id]?.pagination;
-        const currentNextCursor = pagination?.next;
-        const currentSort = pagination?.sort;
-        const isLoading = pagination?.loading_next_page;
-        const sort = currentSort ?? request?.sort ?? DEFAULT_COMMENT_PAGINATION;
-        if (isLoading || currentNextCursor === END_OF_LIST)
+        const currentEntityState = this.currentState.comments_by_entity_id[activity.id];
+        const currentPagination = currentEntityState?.pagination;
+        const currentNextCursor = currentPagination?.next;
+        const currentSort = currentPagination?.sort;
+        const isLoading = currentPagination?.loading_next_page;
+        const sort = currentSort ?? request?.sort ?? Constants.DEFAULT_COMMENT_PAGINATION;
+        if (isLoading ||
+            !checkHasAnotherPage(currentEntityState?.comments, currentNextCursor)) {
             return;
+        }
         await this.loadNextPageComments({
             forId: activity.id,
             base: () => this.client.getComments({
@@ -4585,20 +4612,25 @@ class Feed extends FeedApi {
         });
     }
     async loadNextPageCommentReplies(comment, request) {
-        const pagination = this.currentState.comments_by_entity_id[comment.id]?.pagination;
-        const currentNextCursor = pagination?.next;
-        const currentSort = pagination?.sort;
-        const isLoading = pagination?.loading_next_page;
-        const sort = currentSort ?? request?.sort ?? DEFAULT_COMMENT_PAGINATION;
-        if (isLoading || currentNextCursor === END_OF_LIST)
+        const currentEntityState = this.currentState.comments_by_entity_id[comment.id];
+        const currentPagination = currentEntityState?.pagination;
+        const currentNextCursor = currentPagination?.next;
+        const currentSort = currentPagination?.sort;
+        const isLoading = currentPagination?.loading_next_page;
+        const sort = currentSort ?? request?.sort ?? Constants.DEFAULT_COMMENT_PAGINATION;
+        if (isLoading ||
+            !checkHasAnotherPage(currentEntityState?.comments, currentNextCursor)) {
             return;
+        }
         await this.loadNextPageComments({
             forId: comment.id,
             base: () => this.client.getCommentReplies({
                 ...request,
                 comment_id: comment.id,
                 // use known sort first (prevents broken pagination)
-                sort: currentSort ?? request?.sort ?? DEFAULT_COMMENT_PAGINATION,
+                sort: currentSort ??
+                    request?.sort ??
+                    Constants.DEFAULT_COMMENT_PAGINATION,
                 next: currentNextCursor,
             }),
             parentId: comment.parent_id ?? comment.object_id,
@@ -4608,10 +4640,14 @@ class Feed extends FeedApi {
     async loadNextPageFollows(type, request) {
         const paginationKey = `${type}_pagination`;
         const method = `query${capitalize(type)}`;
+        const currentFollows = this.currentState[type];
         const currentNextCursor = this.currentState[paginationKey]?.next;
         const isLoading = this.currentState[paginationKey]?.loading_next_page;
-        if (isLoading || currentNextCursor === END_OF_LIST)
+        const sort = this.currentState[paginationKey]?.sort ?? request.sort;
+        let error;
+        if (isLoading || !checkHasAnotherPage(currentFollows, currentNextCursor)) {
             return;
+        }
         try {
             this.state.next((currentState) => {
                 return {
@@ -4622,9 +4658,10 @@ class Feed extends FeedApi {
                     },
                 };
             });
-            const { next: newNextCursor = END_OF_LIST, follows } = await this[method]({
+            const { next: newNextCursor, follows } = await this[method]({
                 ...request,
                 next: currentNextCursor,
+                sort,
             });
             this.state.next((currentState) => ({
                 ...currentState,
@@ -4634,12 +4671,12 @@ class Feed extends FeedApi {
                 [paginationKey]: {
                     ...currentState[paginationKey],
                     next: newNextCursor,
+                    sort,
                 },
             }));
         }
-        catch (error) {
-            console.error(error);
-            // TODO: figure out how to handle errorss
+        catch (e) {
+            error = e;
         }
         finally {
             this.state.next((currentState) => {
@@ -4652,6 +4689,9 @@ class Feed extends FeedApi {
                 };
             });
         }
+        if (error) {
+            throw error;
+        }
     }
     async loadNextPageFollowers(request) {
         await this.loadNextPageFollows('followers', request);
@@ -4659,6 +4699,59 @@ class Feed extends FeedApi {
     async loadNextPageFollowing(request) {
         await this.loadNextPageFollows('following', request);
     }
+    async loadNextPageMembers(request) {
+        const currentMembers = this.currentState.members;
+        const currentNextCursor = this.currentState.member_pagination?.next;
+        const isLoading = this.currentState.member_pagination?.loading_next_page;
+        const sort = this.currentState.member_pagination?.sort ?? request.sort;
+        let error;
+        if (isLoading || !checkHasAnotherPage(currentMembers, currentNextCursor)) {
+            return;
+        }
+        try {
+            this.state.next((currentState) => ({
+                ...currentState,
+                member_pagination: {
+                    ...currentState.member_pagination,
+                    loading_next_page: true,
+                },
+            }));
+            const { next: newNextCursor, members } = await this.client.queryFeedMembers({
+                ...request,
+                sort,
+                feed_id: this.id,
+                feed_group_id: this.group,
+                next: currentNextCursor,
+            });
+            this.state.next((currentState) => ({
+                ...currentState,
+                members: currentState.members
+                    ? currentState.members.concat(members)
+                    : members,
+                member_pagination: {
+                    ...currentState.member_pagination,
+                    next: newNextCursor,
+                    // set sort if not defined yet
+                    sort: currentState.member_pagination?.sort ?? request.sort,
+                },
+            }));
+        }
+        catch (e) {
+            error = e;
+        }
+        finally {
+            this.state.next((currentState) => ({
+                ...currentState,
+                member_pagination: {
+                    ...currentState.member_pagination,
+                    loading_next_page: false,
+                },
+            }));
+        }
+        if (error) {
+            throw error;
+        }
+    }
     /**
      * Method which queries followers of this feed (feeds which target this feed).
      *
@@ -5149,6 +5242,9 @@ class FeedsClient extends FeedsApi {
                 throw err;
             }
         };
+        this.devToken = (userId) => {
+            return streamDevToken(userId);
+        };
         this.closePoll = async (request) => {
             return await this.updatePollPartial({
                 poll_id: request.poll_id,
@@ -5870,10 +5966,5 @@ class FeedSearchSource extends BaseSearchSource {
     }
 }
 
-const isImageFile = (file) => {
-    // photoshop files begin with 'image/'
-    return file.type.startsWith('image/') && !file.type.endsWith('.photoshop');
-};
-
-export { ActivitySearchSource, BaseSearchSource, ChannelOwnCapability, Feed, FeedOwnCapability, FeedSearchSource, FeedsClient, MergedStateStore, SearchController, StateStore, StreamApiError, StreamPoll, UserSearchSource, isImageFile, isPatch, isVoteAnswer };
+export { ActivitySearchSource, BaseSearchSource, ChannelOwnCapability, Constants, Feed, FeedOwnCapability, FeedSearchSource, FeedsClient, MergedStateStore, SearchController, StateStore, StreamApiError, StreamPoll, UserSearchSource, checkHasAnotherPage, isCommentResponse, isImageFile, isPatch, isVideoFile, isVoteAnswer };
 //# sourceMappingURL=index.browser.js.map