Merge branch 'master' into timeout-error

Author: sachaarbonel

.github/workflows/build.yaml

@@ -64,11 +64,11 @@ jobs:
       - uses: VeryGoodOpenSource/[email protected]
         with:
           path: packages/stream_feed/coverage/lcov.info
-          min_coverage: 81 
+          min_coverage: 80 
       - uses: VeryGoodOpenSource/[email protected]
         with:
           path: packages/faye_dart/coverage/lcov.info
-          min_coverage: 49
+          min_coverage: 48
       - uses: VeryGoodOpenSource/[email protected]
         with:
           path: packages/stream_feed_flutter_core/coverage/lcov.info

packages/faye_dart/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [0.1.1+1] - (25-02-2022)
+
+- fix: implement Equatable on `FayeClient`. With this change, if you fetch your client from an `InheritedWidget` for example, `updateShouldNotify` doesn't trigger every time.
+
+
+## [0.1.1] - (25-02-2022)
+
+- new: expose connexion status stream `Stream<FayeClientState>` via the `Subscription` class to check if the Faye client is unconnected, connecting, connected or disconnected, and act accordingly.
+
+
 ## [0.1.0] - (07-05-2021)
 
 * Initial release.

packages/faye_dart/lib/src/client.dart

@@ -2,10 +2,10 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:math' as math;
 
+import 'package:equatable/equatable.dart';
 import 'package:faye_dart/faye_dart.dart';
 import 'package:faye_dart/src/channel.dart';
 import 'package:faye_dart/src/message.dart';
-import 'package:faye_dart/src/subscription.dart';
 import 'package:faye_dart/src/timeout_helper.dart';
 import 'package:logging/logging.dart';
 import 'package:meta/meta.dart';
@@ -14,6 +14,7 @@ import 'package:web_socket_channel/web_socket_channel.dart';
 
 import 'package:faye_dart/src/extensible.dart';
 
+/// Connexion status of the client
 enum FayeClientState {
   unconnected,
   connecting,
@@ -46,7 +47,7 @@ const defaultConnectionTimeout = 60;
 const defaultConnectionInterval = 0;
 const bayeuxVersion = '1.0';
 
-class FayeClient with Extensible, TimeoutHelper {
+class FayeClient with Extensible, TimeoutHelper, EquatableMixin {
   FayeClient(
     this.baseUrl, {
     this.protocols,
@@ -436,4 +437,14 @@ class FayeClient with Extensible, TimeoutHelper {
     }
     setTimeout(Duration(milliseconds: _advice.interval), () => connect());
   }
+
+  @override
+  List<Object?> get props => [
+        _clientId,
+        _advice,
+        _channels,
+        _responseCallbacks,
+        _connectRequestInProgress,
+        _manuallyClosed,
+      ];
 }

packages/faye_dart/lib/src/subscription.dart

@@ -1,5 +1,5 @@
-import 'client.dart';
-import 'message.dart';
+import 'package:faye_dart/src/client.dart';
+import 'package:faye_dart/src/message.dart';
 
 typedef Callback = void Function(Map<String, dynamic>? data);
 typedef WithChannelCallback = void Function(String, Map<String, dynamic>?);
@@ -11,6 +11,9 @@ class Subscription {
   WithChannelCallback? _withChannel;
   bool _cancelled = false;
 
+  /// Connexion status stream
+  Stream<FayeClientState> get stateStream => _client.stateStream;
+
   Subscription(
     this._client,
     this._channel, {
@@ -32,4 +35,7 @@ class Subscription {
     _client.unsubscribe(_channel, this);
     _cancelled = true;
   }
+
+  @override
+  List<Object?> get props => [_client, _channel, _callback, _withChannel];
 }

packages/faye_dart/pubspec.yaml

@@ -1,6 +1,6 @@
 name: faye_dart
 description: Faye is a publish/subscribe messaging protocol that is built on the Bayeux protocol, a messaging system utilized for transporting asynchronous messages over HTTP.
-version: 0.1.0
+version: 0.1.1+1
 homepage: https://github.com/GetStream/stream-feed-flutter/blob/master/packages/faye_dart
 repository: https://github.com/GetStream/stream-feed-flutter/blob/master/packages/faye_dart
 issue_tracker: https://github.com/GetStream/stream-feed-flutter/issues

packages/faye_dart/test/mock.dart

@@ -1,4 +1,6 @@
 import 'package:faye_dart/src/client.dart';
 import 'package:mocktail/mocktail.dart';
 
-class MockClient extends Mock implements FayeClient {}
+class MockClient extends Mock implements FayeClient {
+  bool operator ==(Object? other) => true;
+}

packages/stream_feed/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 0.5.1+1: 24/03/2022
+
+- fix: the `JsonConverter<DateTime,String>` implemented in 0.4.0+1 that was supposed to handle utc dates parsing wasn't working properly. Now that it is actually fixed you can convert dates in the user's local timezone.
+- depedencies bumps
+  
+## 0.5.1: 12/01/2022
+
+- upstream(realtime): version bump. You can now listen to connexion status in the `Subscription` class. For example:
+  
+```dart
+final subscription = await feed.subscribe();
+final subscriptionStatus = subscription.stateStream;
+```
+- new(realtime): you can now adjust log level when subscribing
+- fix: implement Equatable on `StreamFeedClient`. With this change, if you fetch your client from an `InheritedWidget` for example, `updateShouldNotify` doesn't trigger every time.
+
+
 ## 0.5.0: 12/01/2022
 
 - BREAKING: we no longer accept a token in the constructor. This change is inspired by Stream Chat, and allows for use cases like multi account management. It allows to instantiate `StreamFeedClient` at the top of your widget tree for example, and connecting the user later.
@@ -17,21 +34,25 @@
 +    frontendToken,
 +  );
 ```
-  
+
+
 ## 0.4.0+3: 27/12/2021
 
 - fix: call profile in setUser, so that currentUser data is not null
-  
-  ## 0.4.0+2: 22/12/2021
+
+
+## 0.4.0+2: 22/12/2021
 
 - fix: export image_storage_client.dart
-  
+
+
 ## 0.4.0+1: 07/12/2021
 
 - fix: support null values `extraData`'s map
 - fix: utc date parsing with a `JsonConverter<DateTime,String>` and `intl`
 - fix: unread/unseen count in `NotificationFeedMeta` model
-  
+
+
 ## 0.4.0: 29/10/2021
 
 - breaking: `StreamFeedClient.connect` is now `StreamFeedClient` for better user session handling.

packages/stream_feed/lib/src/client/aggregated_feed.dart

@@ -1,12 +1,6 @@
 import 'package:stream_feed/src/client/feed.dart';
 import 'package:stream_feed/src/core/api/feed_api.dart';
-import 'package:stream_feed/src/core/http/token.dart';
 import 'package:stream_feed/src/core/index.dart';
-import 'package:stream_feed/src/core/models/activity.dart';
-import 'package:stream_feed/src/core/models/activity_marker.dart';
-import 'package:stream_feed/src/core/models/feed_id.dart';
-import 'package:stream_feed/src/core/models/filter.dart';
-import 'package:stream_feed/src/core/models/group.dart';
 import 'package:stream_feed/src/core/util/default.dart';
 import 'package:stream_feed/src/core/util/token_helper.dart';
 

packages/stream_feed/lib/src/client/analytics_client.dart

@@ -1,3 +1,4 @@
+import 'package:equatable/equatable.dart';
 import 'package:stream_feed/src/core/api/analytics_api.dart';
 import 'package:stream_feed/src/core/http/stream_http_client.dart';
 import 'package:stream_feed/src/core/http/token.dart';
@@ -15,7 +16,7 @@ import 'package:stream_feed/src/core/util/token_helper.dart';
 /// - Viewing another user's profile page
 /// - Searching for a certain user/content/topic/etc.
 /// {@endtemplate}
-class StreamAnalytics {
+class StreamAnalytics extends Equatable {
   /// [StreamAnalytics] constructor:
   ///
   /// {@macro analytics}
@@ -121,4 +122,11 @@ class StreamAnalytics {
         userToken ?? TokenHelper.buildAnalytics(secret!, TokenAction.write);
     return _analytics.trackEngagements(token, engagementDataList);
   }
+
+  @override
+  List<Object?> get props => [
+        secret,
+        userToken,
+        userData,
+      ];
 }

packages/stream_feed/lib/src/client/flat_feed.dart

@@ -9,7 +9,9 @@ import 'package:stream_feed/src/core/models/feed_id.dart';
 import 'package:stream_feed/src/core/models/filter.dart';
 import 'package:stream_feed/src/core/models/personalized_feed.dart';
 import 'package:stream_feed/src/core/util/default.dart';
+import 'package:stream_feed/src/core/util/parse_next.dart';
 import 'package:stream_feed/src/core/util/token_helper.dart';
+import 'package:stream_feed/stream_feed.dart';
 
 /// {@template flatFeed}
 /// Flat is the default feed type - and the only feed type that you can follow.
@@ -82,6 +84,7 @@ class FlatFeed extends Feed {
     final token = userToken ??
         TokenHelper.buildFeedToken(secret!, TokenAction.read, feedId);
     final result = await feed.getActivities(token, feedId, options);
+    print(result);
     final data = (result.data!['results'] as List)
         .map((e) => Activity.fromJson(e))
         .toList(growable: false);
@@ -137,6 +140,34 @@ class FlatFeed extends Feed {
     return data;
   }
 
+  /// ```dart
+  ///  final paginated = await getPaginatedEnrichedActivities();
+  /// final nextParams = parseNext(paginated.next!);
+  /// await getPaginatedEnrichedActivities(limit: nextParams.limit,filter: nextParams.idLT);
+  /// ```
+  Future<PaginatedActivities<A, Ob, T, Or>>
+      getPaginatedEnrichedActivities<A, Ob, T, Or>({
+    int? limit,
+    int? offset,
+    String? session,
+    Filter? filter,
+    EnrichmentFlags? flags,
+    String? ranking, //TODO: no way to parameterized marker?
+  }) {
+    final options = {
+      'limit': limit ?? Default.limit,
+      'offset': offset ?? Default.offset, //TODO:add session everywhere
+      ...filter?.params ?? Default.filter.params,
+      ...Default.marker.params,
+      if (flags != null) ...flags.params,
+      if (ranking != null) 'ranking': ranking,
+      if (session != null) 'session': session,
+    };
+    final token = userToken ??
+        TokenHelper.buildFeedToken(secret!, TokenAction.read, feedId);
+    return feed.paginatedActivities(token, feedId, options);
+  }
+
   /// {@template personalizedFeed}
   /// Retrieve a personalized feed for the currentUser
   /// i.e. a feed of based on user's activities.