Fix: Improve subscription management and event handling

.gitignore

@@ -54,13 +54,13 @@ web/.packages
 web/build/
 
 # Windows
-windows/flutter/generated_plugin_registrant.cc
+windows/flutter/generated_plugin_registrant.*
 windows/flutter/generated_plugins.cmake
 windows/.flutter-plugins
 windows/.flutter-plugins-dependencies
 
 # Linux
-linux/flutter/generated_plugin_registrant.cc
+linux/flutter/generated_plugin_registrant.*
 linux/flutter/generated_plugins.cmake
 linux/.flutter-plugins
 linux/.flutter-plugins-dependencies

analysis_options.yaml

@@ -9,6 +9,14 @@
 # packages, and plugins designed to encourage good coding practices.
 include: package:flutter_lints/flutter.yaml
 
+analyzer:
+  exclude:
+    - "**/*.mocks.dart"
+    - "**/*.g.dart"
+    - "**/*.freezed.dart"
+    - "**/*.gr.dart"
+    - "**/*.config.dart"
+
 linter:
   # The lint rules applied to this project can be customized in the
   # section below to disable rules from the `package:flutter_lints/flutter.yaml`

integration_test/test_helpers.dart

@@ -1,5 +1,5 @@
 import 'dart:async';
-import 'package:dart_nostr/nostr/model/request/filter.dart';
+import 'package:dart_nostr/dart_nostr.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
@@ -268,13 +268,7 @@ class FakeMostroService implements MostroService {
   final Ref ref;
 
   @override
-  void init() {}
-
-  @override
-  void subscribe(Session session) {}
-
-  @override
-  Session? getSessionByOrderId(String orderId) => null;
+  void init({List<NostrKeyPairs>? keys}) {}
 
   @override
   Future<void> submitOrder(MostroMessage order) async {
@@ -319,6 +313,11 @@ class FakeMostroService implements MostroService {
 
   @override
   void updateSettings(Settings settings) {}
+
+  @override
+  void dispose() {
+    // TODO: implement dispose
+  }
 }
 
 Future<void> pumpTestApp(WidgetTester tester) async {

lib/background/background.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:ui';
 import 'package:flutter/material.dart';
 import 'package:flutter_background_service/flutter_background_service.dart';
+import 'package:logger/logger.dart';
 import 'package:mostro_mobile/data/models/nostr_filter.dart';
 import 'package:mostro_mobile/data/repositories/event_storage.dart';
 import 'package:mostro_mobile/features/settings/settings.dart';
@@ -13,10 +14,6 @@ bool isAppForeground = true;
 
 @pragma('vm:entry-point')
 Future<void> serviceMain(ServiceInstance service) async {
-  // If on Android, set up a permanent notification so the OS won't kill it.
-  if (service is AndroidServiceInstance) {
-    service.setAsForegroundService();
-  }
 
   final Map<String, Map<String, dynamic>> activeSubscriptions = {};
   final nostrService = NostrService();
@@ -68,8 +65,12 @@ Future<void> serviceMain(ServiceInstance service) async {
     };
 
     subscription.listen((event) async {
-      if (await eventStore.hasItem(event.id!)) return;
-      await retryNotification(event);
+      try {
+        if (await eventStore.hasItem(event.id!)) return;
+        await retryNotification(event);
+      } catch (e) {
+        Logger().e('Error processing event', error: e);
+      }
     });
   });
 

lib/background/desktop_background_service.dart

@@ -4,10 +4,8 @@ import 'package:dart_nostr/dart_nostr.dart';
 import 'package:flutter/services.dart';
 import 'package:logger/logger.dart';
 import 'package:mostro_mobile/data/models/nostr_filter.dart';
-import 'package:mostro_mobile/data/repositories.dart';
 import 'package:mostro_mobile/features/settings/settings.dart';
 import 'package:mostro_mobile/services/nostr_service.dart';
-import 'package:mostro_mobile/shared/providers/mostro_database_provider.dart';
 import 'abstract_background_service.dart';
 
 class DesktopBackgroundService implements BackgroundService {
@@ -30,8 +28,6 @@ class DesktopBackgroundService implements BackgroundService {
     BackgroundIsolateBinaryMessenger.ensureInitialized(token);
 
     final nostrService = NostrService();
-    final db = await openMostroDatabase('events.db');
-    final backgroundStorage = EventStorage(db: db);
     final logger = Logger();
     bool isAppForeground = true;
 
@@ -67,10 +63,6 @@ class DesktopBackgroundService implements BackgroundService {
 
           final subscription = nostrService.subscribeToEvents(request);
           subscription.listen((event) async {
-            await backgroundStorage.putItem(
-              event.id!,
-              event,
-            );
             mainSendPort.send({
               'event': event.toMap(),
             });

lib/background/mobile_background_service.dart

@@ -24,15 +24,15 @@ class MobileBackgroundService implements BackgroundService {
   Future<void> init() async {
     await service.configure(
       iosConfiguration: IosConfiguration(
-        autoStart: true,
+        autoStart: false,
         onForeground: serviceMain,
         onBackground: onIosBackground,
       ),
       androidConfiguration: AndroidConfiguration(
           autoStart: false,
           onStart: serviceMain,
-          isForegroundMode: true,
-          autoStartOnBoot: true,
+          isForegroundMode: false,
+          autoStartOnBoot: false,
           initialNotificationTitle: "Mostro",
           initialNotificationContent: "Connected to Mostro service",
           foregroundServiceTypes: [

lib/core/config.dart

@@ -28,8 +28,11 @@ class Config {
   // Versión de Mostro
   static int mostroVersion = 1;
 
-  static int expirationSeconds = 900;
-  static int expirationHours = 24;
+  static const int expirationSeconds = 900;
+  static const int expirationHours = 24;
+  static const int cleanupIntervalMinutes = 30;
+  static const int sessionExpirationHours = 36;
+
 
   // Configuración de notificaciones
   static String notificationChannelId = 'mostro_mobile';

lib/data/models/amount.dart

@@ -3,7 +3,11 @@ import 'package:mostro_mobile/data/models/payload.dart';
 class Amount implements Payload {
   final int amount;
 
-  Amount({required this.amount});
+  Amount({required this.amount}) {
+    if (amount < 0) {
+      throw ArgumentError('Amount cannot be negative: $amount');
+    }
+  }
 
   @override
   Map<String, dynamic> toJson() {
@@ -12,6 +16,53 @@ class Amount implements Payload {
     };
   }
 
+  factory Amount.fromJson(dynamic json) {
+    try {
+      if (json == null) {
+        throw FormatException('Amount JSON cannot be null');
+      }
+
+      int amountValue;
+      if (json is Map<String, dynamic>) {
+        if (!json.containsKey('amount')) {
+          throw FormatException('Missing required field: amount');
+        }
+        final value = json['amount'];
+        if (value is int) {
+          amountValue = value;
+        } else if (value is String) {
+          amountValue = int.tryParse(value) ?? 
+            (throw FormatException('Invalid amount format: $value'));
+        } else {
+          throw FormatException('Invalid amount type: ${value.runtimeType}');
+        }
+      } else if (json is int) {
+        amountValue = json;
+      } else if (json is String) {
+        amountValue = int.tryParse(json) ?? 
+          (throw FormatException('Invalid amount format: $json'));
+      } else {
+        throw FormatException('Invalid JSON type for Amount: ${json.runtimeType}');
+      }
+
+      return Amount(amount: amountValue);
+    } catch (e) {
+      throw FormatException('Failed to parse Amount from JSON: $e');
+    }
+  }
+
   @override
   String get type => 'amount';
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+    return other is Amount && other.amount == amount;
+  }
+
+  @override
+  int get hashCode => amount.hashCode;
+
+  @override
+  String toString() => 'Amount(amount: $amount)';
 }

lib/data/models/cant_do.dart

@@ -4,24 +4,40 @@ import 'package:mostro_mobile/data/models/payload.dart';
 class CantDo implements Payload {
   final CantDoReason cantDoReason;
 
+  CantDo({required this.cantDoReason});
+
   factory CantDo.fromJson(Map<String, dynamic> json) {
-    if (json['cant_do'] is String) {
-      return CantDo(
-        cantDoReason: CantDoReason.fromString(
-          json['cant_do'],
-        ),
-      );
-    } else {
+    try {
+      final cantDoValue = json['cant_do'];
+      if (cantDoValue == null) {
+        throw FormatException('Missing required field: cant_do');
+      }
+
+      String reasonString;
+      if (cantDoValue is String) {
+        reasonString = cantDoValue;
+      } else if (cantDoValue is Map<String, dynamic>) {
+        final cantDoReason = cantDoValue['cant-do'];
+        if (cantDoReason == null) {
+          throw FormatException('Missing required field: cant-do in cant_do object');
+        }
+        reasonString = cantDoReason.toString();
+      } else {
+        throw FormatException('Invalid cant_do type: ${cantDoValue.runtimeType}');
+      }
+
+      if (reasonString.isEmpty) {
+        throw FormatException('CantDo reason cannot be empty');
+      }
+
       return CantDo(
-        cantDoReason: CantDoReason.fromString(
-          json['cant_do']['cant-do'],
-        ),
+        cantDoReason: CantDoReason.fromString(reasonString),
       );
+    } catch (e) {
+      throw FormatException('Failed to parse CantDo from JSON: $e');
     }
   }
 
-  CantDo({required this.cantDoReason});
-
   @override
   Map<String, dynamic> toJson() {
     return {
@@ -33,4 +49,16 @@ class CantDo implements Payload {
 
   @override
   String get type => 'cant_do';
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+    return other is CantDo && other.cantDoReason == cantDoReason;
+  }
+
+  @override
+  int get hashCode => cantDoReason.hashCode;
+
+  @override
+  String toString() => 'CantDo(cantDoReason: $cantDoReason)';
 }

lib/data/models/chat_model.dart

@@ -1,15 +1 @@
-class ChatModel {
-  final String id;
-  final String username;
-  final String lastMessage;
-  final String timeAgo;
-  final bool isUnread;
 
-  ChatModel({
-    required this.id,
-    required this.username,
-    required this.lastMessage,
-    required this.timeAgo,
-    this.isUnread = false,
-  });
-}

lib/data/models/chat_room.dart

@@ -5,6 +5,9 @@ class ChatRoom {
   final List<NostrEvent> messages;
 
   ChatRoom({required this.orderId, required this.messages}) {
+    if (orderId.isEmpty) {
+      throw ArgumentError('Order ID cannot be empty');
+    }
     messages.sort((a, b) => a.createdAt!.compareTo(b.createdAt!));
   }
 
@@ -16,4 +19,26 @@ class ChatRoom {
       messages: messages ?? this.messages,
     );
   }
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+    return other is ChatRoom &&
+        other.orderId == orderId &&
+        _listEquals(other.messages, messages);
+  }
+
+  bool _listEquals<T>(List<T> a, List<T> b) {
+    if (a.length != b.length) return false;
+    for (int i = 0; i < a.length; i++) {
+      if (a[i] != b[i]) return false;
+    }
+    return true;
+  }
+
+  @override
+  int get hashCode => Object.hash(orderId, Object.hashAll(messages));
+
+  @override
+  String toString() => 'ChatRoom(orderId: $orderId, messages: ${messages.length} messages)';
 }