Merge pull request #35 from relaystr/release-0.1.3

Release 0.1.3
relaystr · Nov 6, 2024 · f2dde58 · f2dde58
2 parents cee0003 + 5db3ab2
commit f2dde58
Show file tree

Hide file tree

Showing 18 changed files with 219 additions and 145 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 0.1.3
+
+- upgrade to flutter_rust_bridge 2.6.0
+- close usecase in requests
+- async cache manager
+- set contact list usecase
+- use broadcast usecase for other usecases
+-
+
 ## 0.1.2
 
 - upgrade to flutter_rust_bridge 2.5.0

diff --git a/lib/domain_layer/entities/broadcast_response.dart b/lib/domain_layer/entities/broadcast_response.dart
@@ -14,7 +14,7 @@ class NdkBroadcastResponse {
   /// a map of relays publishing to
   /// [String] is the relayUrl/identifier
   /// [Future<String>] is the relay response e.g. OK, err reason
-  Map<String, Completer<String>> _publishingRelays = {};
+  // Map<String, Completer<String>> _publishingRelays = {};
 
   NdkBroadcastResponse({
     required this.publishedEvent,

diff --git a/lib/domain_layer/usecases/follows/follows.dart b/lib/domain_layer/usecases/follows/follows.dart
@@ -5,24 +5,21 @@ import '../../entities/filter.dart';
 import '../../repositories/cache_manager.dart';
 import '../../repositories/event_signer.dart';
 import '../broadcast/broadcast.dart';
-import '../relay_manager.dart';
 import '../requests/requests.dart';
 
 /// Follows usecase
 class Follows {
   final Requests _requests;
   final Broadcast _broadcast;
   final CacheManager _cacheManager;
-  final RelayManager _relayManager;
   final EventSigner? _signer;
 
   Follows({
     required Requests requests,
     required Broadcast broadcast,
     required CacheManager cacheManager,
-    required RelayManager relayManager,
     required EventSigner? signer,
-  })  : _relayManager = relayManager,
+  })  :
         _cacheManager = cacheManager,
         _requests = requests,
         _signer = signer,
@@ -112,7 +109,8 @@ class Follows {
       contactList.loadedTimestamp = Helpers.now;
       contactList.createdAt = Helpers.now;
 
-      final bResult = _broadcast.broadcast(
+      // final bResult =
+      _broadcast.broadcast(
         nostrEvent: contactList.toEvent(),
         specificRelays: customRelays,
       );
@@ -129,7 +127,8 @@ class Follows {
     contactList.loadedTimestamp = Helpers.now;
     contactList.createdAt = Helpers.now;
 
-    final bResult = _broadcast.broadcast(
+    // final bResult =
+    _broadcast.broadcast(
       nostrEvent: contactList.toEvent(),
     );
     //await bResult.publishDone;
@@ -187,7 +186,8 @@ class Follows {
       contactList.loadedTimestamp = Helpers.now;
       contactList.createdAt = Helpers.now;
 
-      final bResult = _broadcast.broadcast(
+      // final bResult =
+      _broadcast.broadcast(
         nostrEvent: contactList.toEvent(),
         specificRelays: customRelays,
       );

diff --git a/lib/domain_layer/usecases/jit_engine.dart b/lib/domain_layer/usecases/jit_engine.dart
@@ -1,7 +1,5 @@
 import 'dart:async';
 
-import 'package:ndk/shared/nips/nip01/client_msg.dart';
-
 import '../../shared/helpers/relay_helper.dart';
 import '../../shared/logger/logger.dart';
 import '../entities/broadcast_response.dart';

diff --git a/lib/domain_layer/usecases/metadatas/metadatas.dart b/lib/domain_layer/usecases/metadatas/metadatas.dart
@@ -16,17 +16,15 @@ import '../requests/requests.dart';
 class Metadatas {
   final Requests _requests;
   final CacheManager _cacheManager;
-  final RelayManager _relayManager;
   final Broadcast _broadcast;
   final EventSigner? _signer;
 
   Metadatas({
     required Requests requests,
     required CacheManager cacheManager,
-    required RelayManager relayManager,
     required Broadcast broadcast,
     required EventSigner? signer,
-  })  : _relayManager = relayManager,
+  })  :
         _cacheManager = cacheManager,
         _requests = requests,
         _signer = signer,
@@ -156,7 +154,8 @@ class Metadatas {
     } else {
       event = metadata.toEvent();
     }
-    final bResult = _broadcast.broadcast(
+    // final bResult =
+    _broadcast.broadcast(
       nostrEvent: event,
       specificRelays: specificRelays,
     );

diff --git a/lib/domain_layer/usecases/relay_sets_engine.dart b/lib/domain_layer/usecases/relay_sets_engine.dart
@@ -29,18 +29,14 @@ class RelaySetsEngine implements NetworkEngine {
 
   final RelayManager _relayManager;
 
-  final EventSigner? _signer;
-
   final CacheManager _cacheManager;
 
   /// engine that pre-calculates relay sets for gossip
   RelaySetsEngine({
     required RelayManager relayManager,
     required CacheManager cacheManager,
-    EventSigner? signer,
     GlobalState? globalState,
   })  : _cacheManager = cacheManager,
-        _signer = signer,
         _relayManager = relayManager {
     _globalState = globalState ?? GlobalState();
     _relayManager.connect(urls: _relayManager.bootstrapRelays);

diff --git a/lib/presentation_layer/init.dart b/lib/presentation_layer/init.dart
@@ -63,7 +63,6 @@ class Initialization {
           cacheManager: ndkConfig.cache,
           globalState: globalState,
           relayManager: relayManager,
-          signer: ndkConfig.eventSigner,
         );
         break;
       case NdkEngine.JIT:
@@ -99,15 +98,13 @@ class Initialization {
     follows = Follows(
       requests: requests,
       cacheManager: ndkConfig.cache,
-      relayManager: relayManager,
       broadcast: broadcast,
       signer: ndkConfig.eventSigner,
     );
 
     metadatas = Metadatas(
       requests: requests,
       cacheManager: ndkConfig.cache,
-      relayManager: relayManager,
       broadcast: broadcast,
       signer: ndkConfig.eventSigner,
     );

diff --git a/lib/rust_bridge/api/event_verifier.dart b/lib/rust_bridge/api/event_verifier.dart
@@ -1,5 +1,5 @@
 // This file is automatically generated, so please do not edit it.
-// @generated by `flutter_rust_bridge`@ 2.5.0.
+// @generated by `flutter_rust_bridge`@ 2.6.0.
 
 // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import
 

diff --git a/lib/rust_bridge/frb_generated.dart b/lib/rust_bridge/frb_generated.dart
@@ -1,5 +1,5 @@
 // This file is automatically generated, so please do not edit it.
-// @generated by `flutter_rust_bridge`@ 2.5.0.
+// @generated by `flutter_rust_bridge`@ 2.6.0.
 
 // ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field
 
@@ -65,7 +65,7 @@ class RustLib extends BaseEntrypoint<RustLibApi, RustLibApiImpl, RustLibWire> {
       kDefaultExternalLibraryLoaderConfig;
 
   @override
-  String get codegenVersion => '2.5.0';
+  String get codegenVersion => '2.6.0';
 
   @override
   int get rustContentHash => 786322520;

diff --git a/lib/rust_bridge/frb_generated.io.dart b/lib/rust_bridge/frb_generated.io.dart
@@ -1,5 +1,5 @@
 // This file is automatically generated, so please do not edit it.
-// @generated by `flutter_rust_bridge`@ 2.5.0.
+// @generated by `flutter_rust_bridge`@ 2.6.0.
 
 // ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field
 

diff --git a/lib/rust_bridge/frb_generated.web.dart b/lib/rust_bridge/frb_generated.web.dart
@@ -1,5 +1,5 @@
 // This file is automatically generated, so please do not edit it.
-// @generated by `flutter_rust_bridge`@ 2.5.0.
+// @generated by `flutter_rust_bridge`@ 2.6.0.
 
 // ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field
 

diff --git a/lib/tag_count_event_filter.dart b/lib/tag_count_event_filter.dart
@@ -4,6 +4,7 @@ import 'package:ndk/domain_layer/entities/nip_01_event.dart';
 import 'domain_layer/entities/contact_list.dart';
 import 'domain_layer/entities/nip_65.dart';
 
+/// filter for too many tags
 class PTagCountEventFilter extends EventFilter {
   int maxTagCount;
 

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: ndk
 description: Nostr Development Kit - the most performant lib for all your nostr usecases
-version: 0.1.2
+version: 0.1.3
 homepage: https://github.com/relaystr/ndk
 
 environment:
@@ -32,8 +32,8 @@ dependencies:
   amberflutter: ^0.0.9
   logger: ^2.4.0
   rxdart: ^0.28.0
-  flutter_rust_bridge: ^2.5.0
-  rust_lib_ndk: ^0.1.2
+  flutter_rust_bridge: ^2.6.0
+  rust_lib_ndk: ^0.1.3
 
 #dependency_overrides:
 #  rust_lib_ndk:

diff --git a/rust_builder/CHANGELOG.md b/rust_builder/CHANGELOG.md
@@ -1,6 +1,10 @@
+## 0.1.3
+
+- upgrade to flutter_rust_bridge 2.6.0
+
 ## 0.1.2
 
-- upgrade to flutter_rust_bridge 2.5.0 
+- upgrade to flutter_rust_bridge 2.5.0
 
 ## 0.1.1
 

diff --git a/rust_builder/pubspec.yaml b/rust_builder/pubspec.yaml
@@ -1,6 +1,6 @@
 name: rust_lib_ndk
 description: "Utility to build Rust code"
-version: 0.1.2
+version: 0.1.3
 repository: https://github.com/relaystr/ndk
 
 environment: