@stream-io/feeds-client 0.1.2 → 0.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stream-io/feeds-client",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "packageManager": "yarn@3.2.4",
   "main": "./dist/index.node.js",
   "exports": {

package/src/Feed.ts

@@ -106,6 +106,8 @@ export type FeedState = Omit<
   followers_pagination?: LoadingStates & { sort?: string };
 
   following_pagination?: LoadingStates & { sort?: string };
+
+  last_get_or_create_request_config?: GetOrCreateFeedRequest;
 };
 
 const END_OF_LIST = 'eol' as const;
@@ -555,6 +557,13 @@ export class Feed extends FeedApi {
     });
   }
 
+  async synchronize() {
+    const { last_get_or_create_request_config } = this.state.getLatestValue();
+    if (last_get_or_create_request_config?.watch) {
+      await this.getOrCreate(last_get_or_create_request_config);
+    }
+  }
+
   async getOrCreate(request?: GetOrCreateFeedRequest) {
     if (this.currentState.is_loading_activities) {
       throw new Error('Only one getOrCreate call is allowed at a time');
@@ -644,6 +653,8 @@ export class Feed extends FeedApi {
             delete nextState.following;
           }
 
+          nextState.last_get_or_create_request_config = request;
+
           return nextState;
         });
       }
@@ -1036,7 +1047,8 @@ export class Feed extends FeedApi {
 
   async getNextPage() {
     const currentState = this.currentState;
-    const response = await this.getOrCreate({
+
+    return await this.getOrCreate({
       member_pagination: {
         limit: 0,
       },
@@ -1047,9 +1059,8 @@ export class Feed extends FeedApi {
         limit: 0,
       },
       next: currentState.next,
+      limit: currentState.last_get_or_create_request_config?.limit ?? 20,
     });
-
-    return response;
   }
 
   addActivity(request: Omit<ActivityRequest, 'fids'>) {

package/src/FeedsClient.ts

@@ -56,6 +56,8 @@ export class FeedsClient extends FeedsApi {
 
   private activeFeeds: Record<FID, Feed> = {};
 
+  private healthyConnectionChangedEventCount = 0;
+
   constructor(apiKey: string, options?: FeedsClientOptions) {
     const tokenManager = new TokenManager();
     const connectionIdManager = new ConnectionIdManager();
@@ -84,6 +86,17 @@ export class FeedsClient extends FeedsApi {
         case 'connection.changed': {
           const { online } = event;
           this.state.partialNext({ isWsConnectionHealthy: online });
+
+          if (online) {
+            this.healthyConnectionChangedEventCount++;
+
+            // we skip the first event as we could potentially be querying twice
+            if (this.healthyConnectionChangedEventCount > 1) {
+              for (const activeFeed of Object.values(this.activeFeeds)) {
+                activeFeed.synchronize();
+              }
+            }
+          }
           break;
         }
         case 'feeds.feed.created': {

package/src/common/ApiClient.ts

@@ -13,6 +13,7 @@ import { ConnectionIdManager } from './ConnectionIdManager';
 export class ApiClient {
   public readonly baseUrl: string;
   private readonly axiosInstance: AxiosInstance;
+  private timeout: number;
 
   constructor(
     public readonly apiKey: string,
@@ -21,9 +22,9 @@ export class ApiClient {
     options?: FeedsClientOptions,
   ) {
     this.baseUrl = options?.base_url ?? 'https://video.stream-io-api.com';
+    this.timeout = options?.timeout ?? 3000;
     this.axiosInstance = axios.create({
       baseURL: this.baseUrl,
-      timeout: options?.timeout ?? 3000,
     });
   }
 
@@ -74,7 +75,10 @@ export class ApiClient {
       requestContentType === 'multipart/form-data' ? new FormData() : body;
     if (requestContentType === 'multipart/form-data') {
       Object.keys(body).forEach((key) => {
-        encodedBody.append(key, body[key]);
+        const value = body[key];
+        if (value != null) {
+          encodedBody.append(key, value);
+        }
       });
     }
 
@@ -84,8 +88,11 @@ export class ApiClient {
         method,
         headers,
         params: queryParams,
-        paramsSerializer: params => this.queryParamsStringify(params),
+        paramsSerializer: (params) => this.queryParamsStringify(params),
         data: encodedBody,
+        timeout:
+          // multipart/form-data requests should not have a timeout allowing ample time for file uploads
+          requestContentType === 'multipart/form-data' ? 0 : this.timeout,
       });
 
       const metadata: RequestMetadata = this.getRequestMetadata(