@stream-io/feeds-client 0.3.31 → 0.3.33

package/dist/{feeds-client-DYnxEI2D.mjs → feeds-client-C-6NrDBy.mjs}

@@ -3923,7 +3923,7 @@ const getRateLimitFromResponseHeader = (response_headers) => {
   };
   return result;
 };
-const version = "0.3.31";
+const version = "0.3.33";
 const axios = axiosImport.default ?? axiosImport;
 class ApiClient {
   constructor(apiKey, tokenManager, connectionIdManager, options) {
@@ -4785,7 +4785,6 @@ function updateEntityInArray({
   updatedEntities[index] = newEntity;
   return { changed: true, entities: updatedEntities };
 }
-const ownFeedFields = ["own_capabilities", "own_follows", "own_membership"];
 const updateStateFollowCreated = (follow, currentState, currentFeedId, connectedUserId) => {
   if (follow.status !== "accepted") {
     return { changed: false, data: currentState };
@@ -5536,10 +5535,6 @@ function handleActivityAdded(event) {
   if (result.changed) {
     const activity = event.activity;
     this.client.hydratePollCache([activity]);
-    const currentFeed = activity.current_feed;
-    if (currentFeed) {
-      this.client.hydrateCapabilitiesCache([currentFeed]);
-    }
     this.state.partialNext({ activities: result.activities });
   }
 }
@@ -5651,9 +5646,6 @@ function handleActivityUpdated(payload, fromWs) {
   ];
   if (result1?.changed || result2.changed) {
     this.client.hydratePollCache([payload.activity]);
-    if (payload.activity.current_feed) {
-      this.client.hydrateCapabilitiesCache([payload.activity.current_feed]);
-    }
     this.state.partialNext({
       activities: result1?.changed ? result1.entities : currentActivities,
       pinned_activities: result2.entities
@@ -6238,6 +6230,91 @@ const deepEqual = (x, y) => {
 function getOrCreateActiveFeed(...args) {
   return this.getOrCreateActiveFeed(...args);
 }
+const throttle = (fn, timeout = 200, {
+  leading = true,
+  trailing = false
+} = {}) => {
+  let timer = null;
+  let storedArgs = null;
+  let storedThis = null;
+  let lastInvokeTime;
+  const invoke = (args, thisArg) => {
+    lastInvokeTime = Date.now();
+    fn.apply(thisArg, args);
+  };
+  const scheduleTrailing = (delay) => {
+    if (timer) return;
+    timer = setTimeout(() => {
+      timer = null;
+      if (trailing && storedArgs) {
+        invoke(storedArgs, storedThis);
+        storedArgs = null;
+        storedThis = null;
+      }
+    }, delay);
+  };
+  return {
+    throttledFn: function(...args) {
+      const now = Date.now();
+      const hasBeenInvoked = lastInvokeTime != null;
+      if (!hasBeenInvoked && !leading) lastInvokeTime = now;
+      const timeSinceLast = hasBeenInvoked ? now - lastInvokeTime : timeout;
+      const remaining = timeout - timeSinceLast;
+      if (trailing) {
+        storedArgs = args;
+        storedThis = this;
+      }
+      if (remaining <= 0) {
+        if (timer) {
+          clearTimeout(timer);
+          timer = null;
+        }
+        if (leading) {
+          if (trailing) {
+            if (storedArgs === args) {
+              storedArgs = null;
+              storedThis = null;
+            }
+          }
+          invoke(args, this);
+        } else {
+          if (trailing) scheduleTrailing(timeout);
+        }
+        return;
+      }
+      if (trailing && !timer) {
+        scheduleTrailing(remaining);
+      }
+    },
+    cancelTimer: () => {
+      if (timer) {
+        clearTimeout(timer);
+        timer = null;
+      }
+    }
+  };
+};
+const BATCH_OWN_FIELDS_API_LIMIT = 100;
+const DEFAULT_BATCH_OWN_FIELDS_THROTTLING_INTERVAL = 2e3;
+const queuedFeeds = /* @__PURE__ */ new Set();
+function queueBatchedOwnFields({ feeds }) {
+  for (const feed of feeds) {
+    queuedFeeds.add(feed);
+  }
+  if (queuedFeeds.size > 0) {
+    this.throttledGetBatchOwnFields(
+      [...queuedFeeds].slice(0, BATCH_OWN_FIELDS_API_LIMIT),
+      (feedsToClear) => {
+        for (const feed of feedsToClear) {
+          queuedFeeds.delete(feed);
+        }
+      }
+    );
+  }
+}
+function clearQueuedFeeds() {
+  queuedFeeds.clear();
+}
 const _Feed = class _Feed extends FeedApi {
   constructor(client, groupId, id, data, watch = false, addNewActivitiesTo = "start", activityAddedEventFilter) {
     super(client, groupId, id);
@@ -6372,10 +6449,6 @@ const _Feed = class _Feed extends FeedApi {
           currentActivityFeeds.push(activity.current_feed);
         }
       }
-      this.client.hydrateCapabilitiesCache([
-        response.feed,
-        ...currentActivityFeeds
-      ]);
       if (request?.next) {
         const { activities: currentActivities = [] } = this.currentState;
         const result = addActivitiesToState.bind(this)(
@@ -6802,29 +6875,18 @@ const _Feed = class _Feed extends FeedApi {
       ...request,
       feeds: [this.feed]
     });
-    const currentFeed = response.activity.current_feed;
-    if (currentFeed) {
-      this.client.hydrateCapabilitiesCache([currentFeed]);
-    }
     return response;
   }
   handleWSEvent(event) {
     const eventHandler = this.eventHandlers[event.type];
     if (eventHandler !== _Feed.noop) {
-      if ("activity" in event && this.hasActivity(event.activity.id)) {
+      if ("activity" in event && event.activity.feeds.length > 1 && this.hasActivity(event.activity.id)) {
         const currentActivity = this.currentState.activities?.find(
           (a) => a.id === event.activity.id
         );
-        if (event.activity.feeds.length > 1 && !event.activity.current_feed && currentActivity?.current_feed) {
+        if (!event.activity.current_feed && currentActivity?.current_feed) {
           event.activity.current_feed = currentActivity.current_feed;
         }
-        if (event.activity.feeds.length === 1 && event.activity.current_feed && currentActivity?.current_feed) {
-          ownFeedFields.forEach((field) => {
-            if (field in currentActivity.current_feed) {
-              event.activity.current_feed[field] = currentActivity.current_feed[field];
-            }
-          });
-        }
       }
       eventHandler?.(event);
     }
@@ -6839,7 +6901,7 @@ const _Feed = class _Feed extends FeedApi {
   }
   getOrCreateFeeds(activities, options) {
     const enrichmentOptions = this.currentState.last_get_or_create_request_config?.enrichment_options;
-    if (!enrichmentOptions?.skip_activity_current_feed && !enrichmentOptions?.skip_all) {
+    if (this.shouldAddToActiveFeeds(enrichmentOptions)) {
       const feedsToGetOrCreate = /* @__PURE__ */ new Map();
       activities.forEach((activity) => {
         if (activity.current_feed && !feedsToGetOrCreate.has(activity.current_feed.feed)) {
@@ -6849,15 +6911,44 @@ const _Feed = class _Feed extends FeedApi {
           );
         }
       });
-      Array.from(feedsToGetOrCreate.values()).forEach((feed) => {
+      const newFeeds = Array.from(feedsToGetOrCreate.values());
+      const fieldsToUpdate = [];
+      if (!options.fromWebSocket) {
+        fieldsToUpdate.push(
+          "own_capabilities",
+          "own_follows",
+          "own_membership"
+        );
+        if (enrichmentOptions?.enrich_own_followings) {
+          fieldsToUpdate.push("own_followings");
+        }
+      }
+      newFeeds.forEach((feed) => {
         getOrCreateActiveFeed.bind(this.client)({
           group: feed.group_id,
           id: feed.id,
           data: feed,
-          fromWebSocket: options.fromWebSocket
+          fieldsToUpdate
         });
       });
+      if (options.fromWebSocket) {
+        const uninitializedFeeds = newFeeds.filter((feedResponse) => {
+          const feed = this.client.feed(feedResponse.group_id, feedResponse.id);
+          return feed.currentState.own_capabilities === void 0;
+        });
+        if (uninitializedFeeds.length > 0) {
+          queueBatchedOwnFields.bind(this.client)({
+            feeds: uninitializedFeeds.map((feed) => feed.feed)
+          });
+        }
+      }
+    }
+  }
+  shouldAddToActiveFeeds(enrichmentOptions) {
+    if (!enrichmentOptions) {
+      return true;
     }
+    return !enrichmentOptions?.skip_activity && !enrichmentOptions?.skip_activity_current_feed && !enrichmentOptions?.skip_all;
   }
 };
 _Feed.noop = () => {
@@ -6912,91 +7003,6 @@ function updateCommentCount({
     }, false);
   }
 }
-const throttle = (fn, timeout = 200, {
-  leading = true,
-  trailing = false
-} = {}) => {
-  let timer = null;
-  let storedArgs = null;
-  let storedThis = null;
-  let lastInvokeTime;
-  const invoke = (args, thisArg) => {
-    lastInvokeTime = Date.now();
-    fn.apply(thisArg, args);
-  };
-  const scheduleTrailing = (delay) => {
-    if (timer) return;
-    timer = setTimeout(() => {
-      timer = null;
-      if (trailing && storedArgs) {
-        invoke(storedArgs, storedThis);
-        storedArgs = null;
-        storedThis = null;
-      }
-    }, delay);
-  };
-  return {
-    throttledFn: function(...args) {
-      const now = Date.now();
-      const hasBeenInvoked = lastInvokeTime != null;
-      if (!hasBeenInvoked && !leading) lastInvokeTime = now;
-      const timeSinceLast = hasBeenInvoked ? now - lastInvokeTime : timeout;
-      const remaining = timeout - timeSinceLast;
-      if (trailing) {
-        storedArgs = args;
-        storedThis = this;
-      }
-      if (remaining <= 0) {
-        if (timer) {
-          clearTimeout(timer);
-          timer = null;
-        }
-        if (leading) {
-          if (trailing) {
-            if (storedArgs === args) {
-              storedArgs = null;
-              storedThis = null;
-            }
-          }
-          invoke(args, this);
-        } else {
-          if (trailing) scheduleTrailing(timeout);
-        }
-        return;
-      }
-      if (trailing && !timer) {
-        scheduleTrailing(remaining);
-      }
-    },
-    cancelTimer: () => {
-      if (timer) {
-        clearTimeout(timer);
-        timer = null;
-      }
-    }
-  };
-};
-const BATCH_OWN_CAPABILITIES_API_LIMIT = 100;
-const DEFAULT_BATCH_OWN_CAPABILITIES_THROTTLING_INTERVAL = 2e3;
-const queuedFeeds = /* @__PURE__ */ new Set();
-function queueBatchedOwnCapabilities({ feeds }) {
-  for (const feed of feeds) {
-    queuedFeeds.add(feed);
-  }
-  if (queuedFeeds.size > 0) {
-    this.throttledGetBatchOwnCapabilities(
-      [...queuedFeeds].slice(0, BATCH_OWN_CAPABILITIES_API_LIMIT),
-      (feedsToClear) => {
-        for (const feed of feedsToClear) {
-          queuedFeeds.delete(feed);
-        }
-      }
-    );
-  }
-}
-function clearQueuedFeeds() {
-  queuedFeeds.clear();
-}
 function connectActivityToFeed({
   fid
 }) {
@@ -7121,8 +7127,13 @@ class ActivityWithStateUpdates {
     initialState
   }) {
     this.feed = connectActivityToFeed.call(this.feedsClient, { fid });
+    const { activities } = addActivitiesToState.bind(this.feed)(
+      [initialState],
+      [],
+      "start"
+    );
     this.feed?.state.partialNext({
-      activities: [initialState]
+      activities
     });
   }
   subscribeToFeedState() {
@@ -7147,20 +7158,20 @@ class ActivityWithStateUpdates {
 function getFeed() {
   return this.feed;
 }
-const isOwnFollowsEqual = (currentState, newState) => {
+const areFollowArraysEqual = (currentFollows, newFollows) => {
   const existingFollows = new Set(
-    currentState.own_follows?.map(
+    currentFollows?.map(
       (f) => `${f.source_feed.feed}:${f.target_feed.feed}:${f.updated_at.getTime()}`
     )
   );
-  const newFollows = new Set(
-    newState.own_follows?.map(
+  const newFollowsSet = new Set(
+    newFollows?.map(
       (f) => `${f.source_feed.feed}:${f.target_feed.feed}:${f.updated_at.getTime()}`
     )
   );
-  if (existingFollows.size === newFollows.size) {
+  if (existingFollows.size === newFollowsSet.size) {
     const areEqual = Array.from(existingFollows).every(
-      (f) => newFollows.has(f)
+      (f) => newFollowsSet.has(f)
     );
     if (areEqual) {
       return true;
@@ -7168,9 +7179,21 @@ const isOwnFollowsEqual = (currentState, newState) => {
   }
   return false;
 };
+const isOwnFollowsEqual = (currentState, newState) => {
+  return areFollowArraysEqual(currentState.own_follows, newState.own_follows);
+};
 const isOwnMembershipEqual = (currentState, newState) => {
   return (currentState.own_membership?.updated_at.getTime() ?? 0) === (newState.own_membership?.updated_at.getTime() ?? 0);
 };
+const isOwnCapabilitiesEqual = (currentState, newState) => {
+  return [...currentState.own_capabilities ?? []].sort().join(",") === [...newState.own_capabilities ?? []].sort().join(",");
+};
+const isOwnFollowingsEqual = (currentState, newState) => {
+  return areFollowArraysEqual(
+    currentState.own_followings,
+    newState.own_followings
+  );
+};
 class FeedsClient extends FeedsApi {
   constructor(apiKey, options) {
     const tokenManager = new TokenManager();
@@ -7186,11 +7209,8 @@ class FeedsClient extends FeedsApi {
     this.activeActivities = {};
     this.activeFeeds = {};
     this.healthyConnectionChangedEventCount = 0;
-    this.setGetBatchOwnCapabilitiesThrottlingInterval = (throttlingMs) => {
-      const {
-        throttledFn: throttledGetBatchOwnCapabilities,
-        cancelTimer: cancel
-      } = throttle(
+    this.setGetBatchOwnFieldsThrottlingInterval = (throttlingMs) => {
+      const { throttledFn: throttledGetBatchOwnFields, cancelTimer: cancel } = throttle(
         (feeds, callback) => {
           this.ownBatch({
             feeds
@@ -7206,8 +7226,8 @@ class FeedsClient extends FeedsApi {
         throttlingMs,
         { trailing: true }
       );
-      this.throttledGetBatchOwnCapabilities = throttledGetBatchOwnCapabilities;
-      this.cancelGetBatchOwnCapabilitiesTimer = cancel;
+      this.throttledGetBatchOwnFields = throttledGetBatchOwnFields;
+      this.cancelGetBatchOwnFieldsTimer = cancel;
     };
     this.recoverOnReconnect = async () => {
       this.healthyConnectionChangedEventCount++;
@@ -7239,8 +7259,8 @@ class FeedsClient extends FeedsApi {
         throw new Error(`Can't connect a new user, call "disconnectUser" first`);
       }
       this.tokenManager.setTokenOrProvider(tokenProvider);
-      this.setGetBatchOwnCapabilitiesThrottlingInterval(
-        this.query_batch_own_capabilties_throttling_interval
+      this.setGetBatchOwnFieldsThrottlingInterval(
+        this.query_batch_own_fields_throttling_interval
       );
       try {
         addConnectionEventListeners(this.updateNetworkConnectionStatus);
@@ -7412,10 +7432,9 @@ class FeedsClient extends FeedsApi {
       this.activeFeeds = {};
       this.state.partialNext({
         connected_user: void 0,
-        is_ws_connection_healthy: false,
-        own_capabilities_by_fid: {}
+        is_ws_connection_healthy: false
       });
-      this.cancelGetBatchOwnCapabilitiesTimer();
+      this.cancelGetBatchOwnFieldsTimer();
       clearQueuedFeeds();
     };
     this.on = this.eventDispatcher.on;
@@ -7424,7 +7443,8 @@ class FeedsClient extends FeedsApi {
       return this.getOrCreateActiveFeed({
         group: groupId,
         id,
-        options: options2
+        options: options2,
+        fieldsToUpdate: []
       });
     };
     this.activityWithStateUpdates = (id) => {
@@ -7448,7 +7468,7 @@ class FeedsClient extends FeedsApi {
       data,
       watch,
       options: options2,
-      fromWebSocket = false
+      fieldsToUpdate
     }) => {
       const fid = `${group}:${id}`;
       let isCreated = false;
@@ -7477,23 +7497,28 @@ class FeedsClient extends FeedsApi {
         if (!isCreated && data) {
           if ((feed.currentState.updated_at?.getTime() ?? 0) < data.updated_at.getTime()) {
             handleFeedUpdated.call(feed, { feed: data });
-          } else if ((feed.currentState.updated_at?.getTime() ?? 0) === data.updated_at.getTime() && !fromWebSocket) {
-            const fieldsToUpdate = [];
-            if (!isOwnFollowsEqual(feed.currentState, data)) {
-              fieldsToUpdate.push("own_follows");
-            }
-            if (!isOwnMembershipEqual(feed.currentState, data)) {
-              fieldsToUpdate.push("own_membership");
-            }
-            if (fieldsToUpdate.length > 0) {
-              const fieldsToUpdateData = fieldsToUpdate.reduce(
+          } else if ((feed.currentState.updated_at?.getTime() ?? 0) === data.updated_at.getTime()) {
+            const fieldsToUpdateData = [];
+            const fieldChecks = [
+              ["own_capabilities", isOwnCapabilitiesEqual],
+              ["own_follows", isOwnFollowsEqual],
+              ["own_membership", isOwnMembershipEqual],
+              ["own_followings", isOwnFollowingsEqual]
+            ];
+            fieldChecks.forEach(([field, isEqual]) => {
+              if (fieldsToUpdate.includes(field) && !isEqual(feed.currentState, data)) {
+                fieldsToUpdateData.push(field);
+              }
+            });
+            if (fieldsToUpdateData.length > 0) {
+              const fieldsToUpdatePayload = fieldsToUpdateData.reduce(
                 (acc, field) => {
                   acc[field] = data[field];
                   return acc;
                 },
                 {}
               );
-              feed.state.partialNext(fieldsToUpdateData);
+              feed.state.partialNext(fieldsToUpdatePayload);
             }
           }
         }
@@ -7503,14 +7528,13 @@ class FeedsClient extends FeedsApi {
     };
     this.state = new StateStore({
       connected_user: void 0,
-      is_ws_connection_healthy: false,
-      own_capabilities_by_fid: {}
+      is_ws_connection_healthy: false
     });
     this.moderation = new ModerationClient(apiClient);
     this.tokenManager = tokenManager;
     this.connectionIdManager = connectionIdManager;
     this.polls_by_id = /* @__PURE__ */ new Map();
-    this.query_batch_own_capabilties_throttling_interval = options?.query_batch_own_capabilties_throttling_interval ?? DEFAULT_BATCH_OWN_CAPABILITIES_THROTTLING_INTERVAL;
+    this.query_batch_own_fields_throttling_interval = options?.query_batch_own_fields_throttling_interval ?? DEFAULT_BATCH_OWN_FIELDS_THROTTLING_INTERVAL;
     feedsLoggerSystem.configureLoggers(options?.configure_loggers_options);
     this.on("all", (event) => {
       const fid = event.fid;
@@ -7533,7 +7557,8 @@ class FeedsClient extends FeedsApi {
           this.getOrCreateActiveFeed({
             group: event.feed.group_id,
             id: event.feed.id,
-            data: event.feed
+            data: event.feed,
+            fieldsToUpdate: []
           });
           break;
         }
@@ -7651,25 +7676,6 @@ class FeedsClient extends FeedsApi {
       }
     }
   }
-  hydrateCapabilitiesCache(feedResponses) {
-    let ownCapabilitiesCache = this.state.getLatestValue().own_capabilities_by_fid;
-    const capabilitiesToFetchQueue = [];
-    for (const feedResponse of feedResponses) {
-      const { feed, own_capabilities } = feedResponse;
-      if (!Object.prototype.hasOwnProperty.call(ownCapabilitiesCache, feed)) {
-        if (own_capabilities) {
-          ownCapabilitiesCache = {
-            ...ownCapabilitiesCache,
-            [feed]: own_capabilities
-          };
-        } else {
-          capabilitiesToFetchQueue.push(feed);
-        }
-      }
-    }
-    queueBatchedOwnCapabilities.bind(this)({ feeds: capabilitiesToFetchQueue });
-    this.state.partialNext({ own_capabilities_by_fid: ownCapabilitiesCache });
-  }
   async queryFeeds(request) {
     const response = await this._queryFeeds(request);
     const feedResponses = response.feeds;
@@ -7678,10 +7684,15 @@ class FeedsClient extends FeedsApi {
         group: feedResponse.group_id,
         id: feedResponse.id,
         data: feedResponse,
-        watch: request?.watch
+        watch: request?.watch,
+        fieldsToUpdate: [
+          "own_capabilities",
+          "own_follows",
+          "own_membership",
+          "own_followings"
+        ]
       })
     );
-    this.hydrateCapabilitiesCache(feedResponses);
     return {
       feeds,
       next: response.next,
@@ -7692,13 +7703,12 @@ class FeedsClient extends FeedsApi {
   }
   async ownBatch(request) {
     const response = await super.ownBatch(request);
-    const feedResponses = Object.entries(response.data).map(
-      ([feed, ownFields]) => ({
-        feed,
-        own_capabilities: ownFields.own_capabilities
-      })
-    );
-    this.hydrateCapabilitiesCache(feedResponses);
+    Object.entries(response.data).forEach(([fid, ownFields]) => {
+      const feed = this.activeFeeds[fid];
+      if (feed) {
+        feed.state.partialNext(ownFields);
+      }
+    });
     return response;
   }
   async updateFollow(request) {
@@ -7757,7 +7767,6 @@ class FeedsClient extends FeedsApi {
   }
   async getOrCreateFeed(request) {
     const response = await super.getOrCreateFeed(request);
-    this.hydrateCapabilitiesCache([response.feed]);
     if (request.watch) {
       const feeds = this.findAllActiveFeedsByFid(
         `${request.feed_group_id}:${request.feed_id}`
@@ -7772,7 +7781,13 @@ class FeedsClient extends FeedsApi {
       this.getOrCreateActiveFeed({
         group: suggestion.group_id,
         id: suggestion.id,
-        data: suggestion
+        data: suggestion,
+        fieldsToUpdate: [
+          "own_capabilities",
+          "own_follows",
+          "own_membership",
+          "own_followings"
+        ]
       });
     });
     return response;
@@ -7854,9 +7869,8 @@ export {
   updateEntityInArray as l,
   feedsLoggerSystem as m,
   ensureExhausted as n,
-  ownFeedFields as o,
   replaceUniqueArrayMerge as r,
   shouldUpdateState as s,
   uniqueArrayMerge as u
 };
-//# sourceMappingURL=feeds-client-DYnxEI2D.mjs.map
+//# sourceMappingURL=feeds-client-C-6NrDBy.mjs.map