More work with node management

assets/.env.development

@@ -11,4 +11,5 @@ CARD_COLOR_TEXT=Ğ1 Wallet Dev
 # The duniter nodes are only used at boot time, later it tries to calculate periodically the nodes
 # that are available with the less latency
 DUNITER_NODES=https://g1.duniter.fr https://g1.le-sou.org https://g1.cgeek.fr https://g1.monnaielibreoccitanie.org https://g1.duniter.fr https://g1.le-sou.org https://g1.cgeek.fr
-CESIUM_PLUS_NODES=https://g1.data.le-sou.org https://g1.data.e-is.pro https://g1.data.presler.fr https://g1.data.mithril.re https://g1.data.adn.life
+CESIUM_PLUS_NODES=https://g1.data.le-sou.org https://g1.data.e-is.pro https://g1.data.presler.fr https://g1.data.mithril.re
+# not updated: https://g1.data.adn.life

assets/env.production.txt

@@ -10,5 +10,6 @@ CARD_COLOR_TEXT=Ğ1 Wallet Cop
 # The duniter nodes are only used at boot time, later it tries to calculate periodically the nodes
 # that are available with the less latency
 DUNITER_NODES=https://g1.duniter.fr https://g1.le-sou.org https://g1.cgeek.fr https://g1.monnaielibreoccitanie.org https://g1.duniter.fr https://g1.le-sou.org https://g1.cgeek.fr
-CESIUM_PLUS_NODES=https://g1.data.le-sou.org https://g1.data.e-is.pro https://g1.data.presler.fr https://g1.data.mithril.re https://g1.data.adn.life
+CESIUM_PLUS_NODES=https://g1.data.le-sou.org https://g1.data.e-is.pro https://g1.data.presler.fr https://g1.data.mithril.re
+# not updated: https://g1.data.adn.life
 

lib/data/models/node_list_cubit.dart

@@ -38,14 +38,6 @@ class NodeListCubit extends HydratedCubit<NodeListState> {
     emit(state.copyWith(duniterNodes: nodes));
   }
 
-  void setDuniterFetchTime(DateTime time) {
-    emit(state.copyWith(lastFetchDuniterNodesTime: time));
-  }
-
-  void setCesiumPluFetchTime(DateTime time) {
-    emit(state.copyWith(lastFetchCPlusNodesTime: time));
-  }
-
   void setCesiumPlusNodes(List<Node> nodes) {
     emit(state.copyWith(cesiumPlusNodes: nodes));
   }
@@ -59,10 +51,6 @@ class NodeListCubit extends HydratedCubit<NodeListState> {
 
   List<Node> get cesiumPlusNodes => state.cesiumPlusNodes;
 
-  DateTime get lastFetchDuniterNodesTime => state.lastFetchDuniterNodesTime;
-
-  DateTime get lastFetchCPlusNodesTime => state.lastFetchCPlusNodesTime;
-
   @override
   NodeListState? fromJson(Map<String, dynamic> json) =>
       NodeListState.fromJson(json);

lib/data/models/node_list_state.dart

@@ -9,23 +9,15 @@ part 'node_list_state.g.dart';
 @immutable
 @JsonSerializable()
 class NodeListState extends Equatable {
-  NodeListState(
-      {List<Node>? duniterNodes,
-      List<Node>? cesiumPlusNodes,
-      DateTime? lastFetchDuniterNodesTime,
-      DateTime? lastFetchCPlusNodesTime})
+  NodeListState({List<Node>? duniterNodes, List<Node>? cesiumPlusNodes})
       : duniterNodes = duniterNodes ?? defaultDuniterNodes,
-        cesiumPlusNodes = cesiumPlusNodes ?? defaultCesiumPlusNodes,
-        lastFetchDuniterNodesTime = lastFetchDuniterNodesTime ?? DateTime(1970),
-        lastFetchCPlusNodesTime = lastFetchCPlusNodesTime ?? DateTime(1970);
+        cesiumPlusNodes = cesiumPlusNodes ?? defaultCesiumPlusNodes;
 
   factory NodeListState.fromJson(Map<String, dynamic> json) =>
       _$NodeListStateFromJson(json);
 
   final List<Node> duniterNodes;
   final List<Node> cesiumPlusNodes;
-  final DateTime lastFetchDuniterNodesTime;
-  final DateTime lastFetchCPlusNodesTime;
 
   NodeListState copyWith(
       {List<Node>? duniterNodes,
@@ -35,20 +27,11 @@ class NodeListState extends Equatable {
     return NodeListState(
       duniterNodes: duniterNodes ?? this.duniterNodes,
       cesiumPlusNodes: cesiumPlusNodes ?? this.cesiumPlusNodes,
-      lastFetchDuniterNodesTime:
-          lastFetchDuniterNodesTime ?? lastFetchDuniterNodesTime,
-      lastFetchCPlusNodesTime:
-          lastFetchDuniterNodesTime ?? lastFetchCPlusNodesTime,
     );
   }
 
   @override
-  List<Object?> get props => <Object>[
-        duniterNodes,
-        cesiumPlusNodes,
-        lastFetchDuniterNodesTime,
-        lastFetchCPlusNodesTime
-      ];
+  List<Object?> get props => <Object>[duniterNodes, cesiumPlusNodes];
 
   Map<String, dynamic> toJson() => _$NodeListStateToJson(this);
 }

lib/data/models/node_list_state.g.dart

@@ -14,20 +14,10 @@ NodeListState _$NodeListStateFromJson(Map<String, dynamic> json) =>
       cesiumPlusNodes: (json['cesiumPlusNodes'] as List<dynamic>?)
           ?.map((e) => Node.fromJson(e as Map<String, dynamic>))
           .toList(),
-      lastFetchDuniterNodesTime: json['lastFetchDuniterNodesTime'] == null
-          ? null
-          : DateTime.parse(json['lastFetchDuniterNodesTime'] as String),
-      lastFetchCPlusNodesTime: json['lastFetchCPlusNodesTime'] == null
-          ? null
-          : DateTime.parse(json['lastFetchCPlusNodesTime'] as String),
     );
 
 Map<String, dynamic> _$NodeListStateToJson(NodeListState instance) =>
     <String, dynamic>{
       'duniterNodes': instance.duniterNodes,
       'cesiumPlusNodes': instance.cesiumPlusNodes,
-      'lastFetchDuniterNodesTime':
-          instance.lastFetchDuniterNodesTime.toIso8601String(),
-      'lastFetchCPlusNodesTime':
-          instance.lastFetchCPlusNodesTime.toIso8601String(),
     };

lib/data/models/node_manager.dart

@@ -23,13 +23,9 @@ class NodeManager {
 
   final List<Node> duniterNodes = <Node>[];
   final List<Node> cesiumPlusNodes = <Node>[];
-  DateTime lastDuniterFetchNodesTime = DateTime.now();
-  DateTime lastCPlusFetchNodesTime = DateTime.now();
 
   void loadFromCubit(NodeListCubit cubit) {
-    NodeManagerObserver.instance.setCubit(cubit);
-    lastDuniterFetchNodesTime = cubit.lastFetchDuniterNodesTime;
-    lastCPlusFetchNodesTime = cubit.lastFetchCPlusNodesTime;
+    NodeManagerObserver.instance.cubit = cubit;
     duniterNodes.clear();
     cesiumPlusNodes.clear();
     duniterNodes.addAll(cubit.duniterNodes);
@@ -48,16 +44,6 @@ class NodeManager {
   List<Node> _getList(NodeType type) =>
       type == NodeType.duniter ? duniterNodes : cesiumPlusNodes;
 
-  void updateLastFetchNodesTime(DateTime time) {
-    lastDuniterFetchNodesTime = time;
-    notifyObserver();
-  }
-
-  void updateLastCPlusFetchNodesTime(DateTime time) {
-    lastCPlusFetchNodesTime = time;
-    notifyObserver();
-  }
-
   void addNode(NodeType type, Node node) {
     final List<Node> nodes = _getList(type);
     _addNode(nodes, node);
@@ -97,7 +83,7 @@ class NodeManager {
 
   void _updateList(List<Node> list, Node updatedNode) {
     final int index =
-    list.indexWhere((Node node) => node.url == updatedNode.url);
+        list.indexWhere((Node node) => node.url == updatedNode.url);
     if (index != -1) {
       list.replaceRange(index, index + 1, <Node>[updatedNode]);
     }
@@ -108,7 +94,7 @@ class NodeManager {
     for (final NodeType type in NodeType.values) {
       final List<Node> nodes = _getList(type);
       final List<Node> newList =
-      nodes.map((Node node) => node.copyWith(errors: 0)).toList();
+          nodes.map((Node node) => node.copyWith(errors: 0)).toList();
       nodes.clear();
       nodes.addAll(newList);
     }
@@ -125,17 +111,10 @@ class NodeManagerObserver {
 
   static final NodeManagerObserver instance = NodeManagerObserver._internal();
 
-  late NodeListCubit _cubit;
-
-  void setCubit(NodeListCubit cubit) {
-    _cubit = cubit;
-  }
+  late NodeListCubit cubit;
 
   void update(NodeManager nodeManager) {
-    _cubit.setDuniterNodes(nodeManager.duniterNodes);
-    _cubit.setCesiumPlusNodes(nodeManager.cesiumPlusNodes);
-    _cubit.setDuniterFetchTime(nodeManager.lastDuniterFetchNodesTime);
-    _cubit.setCesiumPluFetchTime(nodeManager.lastCPlusFetchNodesTime);
+    cubit.setDuniterNodes(nodeManager.duniterNodes);
+    cubit.setCesiumPlusNodes(nodeManager.cesiumPlusNodes);
   }
-
 }

lib/g1/api.dart

@@ -118,7 +118,7 @@ Future<void> fetchDuniterNodes({bool force = false}) async {
       logger('Fetching nodes forced');
     } else {
       logger(
-          'Fetching nodes as we did it more than ${minutesToWait}min ago: ${NodeManager().lastDuniterFetchNodesTime.toIso8601String()} and we have only ${duniterNodesWorking()}');
+          'Fetching nodes as we did it more than ${minutesToWait}min ago and we have only ${duniterNodesWorking()}');
     }
     final List<Node> nodes = await _fetchDuniterNodesFromPeers();
     NodeManager().updateNodes(type, nodes);
@@ -310,6 +310,11 @@ Future<http.Response> requestCPlusWithRetry(String path,
 Future<http.Response> _requestWithRetry(
     NodeType type, String path, bool dontRecord, bool retryWith404) async {
   final List<Node> nodes = NodeManager().nodeList(type);
+  if (nodes.isEmpty) {
+    nodes.addAll(type == NodeType.duniter
+        ? defaultDuniterNodes
+        : defaultCesiumPlusNodes);
+  }
   for (int i = 0; i < nodes.length; i++) {
     final Node node = nodes[i];
     if (node.errors >= NodeManager.maxNodeErrors) {

lib/main.dart

@@ -220,17 +220,21 @@ class _GinkgoAppState extends State<GinkgoApp> {
         '$prefix with $nDuniterNodes duniter nodes and $nCesiumPlusNodes c+ nodes');
   }
 
+  @override
+  void initState() {
+    super.initState();
+    NodeManager().loadFromCubit(context.read<NodeListCubit>());
+  }
+
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<NodeListCubit, NodeListState>(
         builder: (BuildContext nodeContext, NodeListState state) {
-      NodeManager().loadFromCubit(nodeContext.read<NodeListCubit>());
       Once.runHourly('load_nodes',
           callback: () => _loadNodes(),
           fallback: () {
             _printNodeStatus(prefix: 'After once hourly having');
           });
-
       Once.runCustom('clear_errors', callback: () {
         NodeManager().cleanErrorStats();
       }, duration: const Duration(minutes: 90));

lib/ui/screens/fifth_screen.dart

-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
 
-import '../../data/models/node.dart';
-import '../../data/models/node_list_cubit.dart';
-import '../../data/models/node_list_state.dart';
 import '../../data/models/node_manager.dart';
-import '../../g1/api.dart';
 import '../../g1/export_import.dart';
-import '../../main.dart';
 import '../ui_helpers.dart';
 import '../widgets/bottom_widget.dart';
 import '../widgets/fifth_screen/grid_item.dart';
-import '../widgets/fifth_screen/info_card.dart';
 import '../widgets/fifth_screen/link_card.dart';
+import '../widgets/fifth_screen/node_info.dart';
 import '../widgets/fifth_screen/text_divider.dart';
 import '../widgets/header.dart';
 
@@ -22,84 +15,55 @@ class FifthScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<NodeListCubit, NodeListState>(
-        builder: (BuildContext nodeContext, NodeListState state) {
-      return Material(
-        color: Theme.of(context).colorScheme.background,
-        child: ListView(
-            padding: const EdgeInsets.symmetric(horizontal: 16),
-            physics: const BouncingScrollPhysics(),
-            children: <Widget>[
-              const Header(text: 'bottom_nav_fifth'),
-              const TextDivider(text: 'key_tools_title'),
-              GridView.count(
-                  physics: const NeverScrollableScrollPhysics(),
-                  crossAxisCount: 2,
-                  childAspectRatio: 2 / 1.15,
-                  crossAxisSpacing: 8,
-                  mainAxisSpacing: 8,
-                  shrinkWrap: true,
-                  padding: EdgeInsets.zero,
-                  children: <GridItem>[
-                    GridItem(
-                        title: 'export_key',
-                        icon: Icons.download,
-                        onTap: () {
-                          showDialog(
-                            context: context,
-                            builder: (BuildContext context) {
-                              return const ExportImportPage();
-                            },
-                          );
-                        }),
-                    GridItem(
-                        title: 'import_key',
-                        icon: Icons.upload,
-                        onTap: () {
-                          const ExportImportPage();
-                        }),
-                    GridItem(
-                      title: 'copy_your_key',
-                      icon: Icons.copy,
-                      onTap: () => copyPublicKeyToClipboard(context),
-                    )
-                  ]),
-              const TextDivider(text: 'technical_info_title'),
-              _buildNodeInfo(NodeType.duniter, state.duniterNodes, context),
-              _buildNodeInfo(
-                  NodeType.cesiumPlus, state.cesiumPlusNodes, context),
-              LinkCard(
-                  title: 'code_card_title',
-                  icon: Icons.code_rounded,
-                  url: Uri.parse('https://git.duniter.org/vjrj/ginkgo')),
-              const BottomWidget()
-            ]),
-      );
-    });
-  }
-
-  GestureDetector _buildNodeInfo(
-      NodeType type, List<Node> nodes, BuildContext context) {
-    return GestureDetector(
-        onTap: () => showTooltip(context, '', tr('long_press_to_refresh')),
-        onLongPress: () {
-          logger('On long press');
-          if (type == NodeType.duniter) {
-            fetchDuniterNodes(force: true);
-          } else {
-            fetchCesiumPlusNodes(force: true);
-          }
-        },
-        child: InfoCard(
-            title: tr('using_nodes', namedArgs: <String, String>{
-              'type': type.name,
-              'nodes': nodes.length.toString()
-            }),
-            translate: false,
-            subtitle: nodes.isNotEmpty
-                ? tr('using_nodes_first',
-                    namedArgs: <String, String>{'node': nodes.first.url})
-                : '',
-            icon: Icons.hub));
+    return Material(
+      color: Theme.of(context).colorScheme.background,
+      child: ListView(
+          padding: const EdgeInsets.symmetric(horizontal: 16),
+          physics: const BouncingScrollPhysics(),
+          children: <Widget>[
+            const Header(text: 'bottom_nav_fifth'),
+            const TextDivider(text: 'key_tools_title'),
+            GridView.count(
+                physics: const NeverScrollableScrollPhysics(),
+                crossAxisCount: 2,
+                childAspectRatio: 2 / 1.15,
+                crossAxisSpacing: 8,
+                mainAxisSpacing: 8,
+                shrinkWrap: true,
+                padding: EdgeInsets.zero,
+                children: <GridItem>[
+                  GridItem(
+                      title: 'export_key',
+                      icon: Icons.download,
+                      onTap: () {
+                        showDialog(
+                          context: context,
+                          builder: (BuildContext context) {
+                            return const ExportImportPage();
+                          },
+                        );
+                      }),
+                  GridItem(
+                      title: 'import_key',
+                      icon: Icons.upload,
+                      onTap: () {
+                        const ExportImportPage();
+                      }),
+                  GridItem(
+                    title: 'copy_your_key',
+                    icon: Icons.copy,
+                    onTap: () => copyPublicKeyToClipboard(context),
+                  )
+                ]),
+            const TextDivider(text: 'technical_info_title'),
+            const NodeInfoCard(type: NodeType.duniter),
+            const NodeInfoCard(type: NodeType.cesiumPlus),
+            LinkCard(
+                title: 'code_card_title',
+                icon: Icons.code_rounded,
+                url: Uri.parse('https://git.duniter.org/vjrj/ginkgo')),
+            const BottomWidget()
+          ]),
+    );
   }
 }