Improve logging and local storage (#13)

* Improve logging and local storage * windows dependency sync * Bump version
rohitsangwan01 · Aug 4, 2024 · 1390b2c · 1390b2c
1 parent 1b78f90
commit 1390b2c
Show file tree

Hide file tree

Showing 26 changed files with 363 additions and 350 deletions.
diff --git a/lib/app/client/client.dart b/lib/app/client/client.dart
@@ -1,9 +1,9 @@
 import 'package:signals_flutter/signals_flutter.dart';
 import 'package:synergy_client_dart/synergy_client_dart.dart';
 import 'package:uni_control_hub/app/client/client_screen.dart';
+import 'package:uni_control_hub/app/data/dialog_handler.dart';
 import 'package:uni_control_hub/app/data/logger.dart';
 import 'package:uni_control_hub/app/models/client_alias.dart';
-import 'package:uni_control_hub/app/models/screen_link.dart';
 import 'package:uni_control_hub/app/models/synergy_client.dart';
 import 'package:uni_control_hub/app/services/storage_service.dart';
 import 'package:uni_control_hub/app/services/synergy_service.dart';
@@ -19,22 +19,20 @@ enum ClientType { ble, usb, uhid }
 class Client {
   String id;
   Function(bool)? onConnectionUpdate;
-  late final ScreenInterface screen;
-  late final StorageService storageService = StorageService.to;
-
+  late final ClientScreen screen;
+  late final StorageService _storageService = StorageService.to;
   final ClientType type;
 
   /// Signals
   Signal<bool> isConnected = Signal(false, autoDispose: true);
   Signal<String?> error = Signal<String?>(null, autoDispose: true);
-  Signal<(int x, int y)> mouseMovement = Signal((0, 0), autoDispose: true);
-  Signal<ClientAlias> clientAlias =
-      Signal(SynergyService.to.clientAliases.first, autoDispose: true);
+  Signal<ClientAlias> clientAlias = Signal(
+    SynergyService.to.clientAliases.first,
+    autoDispose: true,
+  );
 
   bool _lastConnectedValue = false;
-
-  SynergyClientDart? synergyClient;
-  Direction get direction => clientAlias.value.direction.value;
+  SynergyClientDart? _synergyClient;
 
   Client({
     required this.id,
@@ -43,20 +41,26 @@ class Client {
     this.onConnectionUpdate,
   }) {
     screen = ClientScreen(
-      this,
-      inputReportHandler,
-      onMouseMove: (x, y) => mouseMovement.value = (x, y),
+      direction: clientAlias.value.direction.value,
+      inputReportCallback: (report) => inputReportHandler(id, report),
+      onConnectCallback: () => _setConnected(true),
+      onDisconnectCallback: () => _setConnected(false),
+      onErrorCallback: (error) {
+        logError("$id: $error");
+        _setConnected(false);
+        DialogHandler.showError("Error connecting to Synergy Server: $error");
+      },
     );
 
     // Try to load alias from cache
-    String? clientAliasCache = storageService.getClientAlias(id);
+    String? clientAliasCache = _storageService.getClientAlias(id);
     clientAlias.value = SynergyService.to.clientAliases.firstWhere(
       (element) => element.name == clientAliasCache,
       orElse: () => SynergyService.to.clientAliases.first,
     );
   }
 
-  void setConnected(bool connected) {
+  void _setConnected(bool connected) {
     if (_lastConnectedValue == connected) return;
     _lastConnectedValue = connected;
     logInfo("Client $id is connected: $connected");
@@ -73,13 +77,13 @@ class Client {
     }
     if (!isConnected.value) return;
     clientAlias.value = alias;
-    storageService.setClientAlias(id, alias.name);
+    _storageService.setClientAlias(id, alias.name);
     reConnectClient();
   }
 
   void toggleConnection() {
     isConnected.value = !isConnected.value;
-    setConnected(isConnected.value);
+    _setConnected(isConnected.value);
     if (isConnected.value) {
       connectSynergySever();
     } else {
@@ -99,8 +103,8 @@ class Client {
       SynergyClient? synergyCl = await _getAddress();
       logInfo("Synergy Client: $synergyCl");
       if (synergyCl == null) return;
-      synergyClient = SynergyClientDart();
-      await synergyClient?.connect(
+      _synergyClient = SynergyClientDart();
+      await _synergyClient?.connect(
         screen: screen,
         synergyServer: SocketServer(
           synergyCl.serverAddress,
@@ -120,7 +124,7 @@ class Client {
       if (!SynergyService.to.isServerRunning.value) {
         logInfo("Synergy Server is not running");
         error.value = "Server is not running, please start the server.";
-        setConnected(false);
+        _setConnected(false);
         return null;
       }
     }
@@ -130,7 +134,7 @@ class Client {
       SynergyClient? synergyClient = StorageService.to.synergyClient;
       if (synergyClient == null) {
         error.value = "Please add a Synergy Server";
-        setConnected(false);
+        _setConnected(false);
         return null;
       }
       return synergyClient;
@@ -146,8 +150,8 @@ class Client {
   void disconnectSynergyServer({
     bool notifyConnectionState = true,
   }) {
-    synergyClient?.disconnect();
-    synergyClient = null;
-    if (notifyConnectionState) setConnected(false);
+    _synergyClient?.disconnect();
+    _synergyClient = null;
+    if (notifyConnectionState) _setConnected(false);
   }
 }
diff --git a/lib/app/client/client_screen.dart b/lib/app/client/client_screen.dart
@@ -4,20 +4,24 @@ import 'package:flutter/material.dart';
 import 'package:synergy_client_dart/synergy_client_dart.dart';
 import 'package:uni_control_hub/app/client/report_handler.dart';
 import 'package:uni_control_hub/app/data/logger.dart';
-import 'package:uni_control_hub/app/client/client.dart';
 import 'package:uni_control_hub/app/models/screen_link.dart';
-import 'package:uni_control_hub/app/data/dialog_handler.dart';
 import 'package:uni_control_hub/app/services/storage_service.dart';
 
 class ClientScreen extends ScreenInterface {
-  final Client client;
-  final InputReportHandler _inputReportHandler;
-  final Function(int x, int y)? onMouseMove;
-
-  ClientScreen(
-    this.client,
-    this._inputReportHandler, {
-    this.onMouseMove,
+  late final StorageService _storageService = StorageService.to;
+  Function(int x, int y)? onMouseMove;
+  final VoidCallback onConnectCallback;
+  final VoidCallback onDisconnectCallback;
+  final Function(String error) onErrorCallback;
+  final Function(List<int>) inputReportCallback;
+  final Direction direction;
+
+  ClientScreen({
+    required this.direction,
+    required this.inputReportCallback,
+    required this.onConnectCallback,
+    required this.onDisconnectCallback,
+    required this.onErrorCallback,
   });
 
   List<int> lastSent = List.filled(4, 0);
@@ -71,7 +75,7 @@ class ClientScreen extends ScreenInterface {
   void mouseWheel(int x, int y) {
     int wheel = x != 0 ? x : y;
     // convert wheel in +1 or -1
-    if (client.storageService.invertMouseScroll) {
+    if (_storageService.invertMouseScroll) {
       wheel = -wheel;
     }
 
@@ -95,7 +99,7 @@ class ClientScreen extends ScreenInterface {
 
   @override
   RectObj getShape() {
-    Size size = StorageService.to.clientDefaultSize;
+    Size size = _storageService.clientDefaultSize;
     return RectObj(width: size.width, height: size.height);
   }
 
@@ -152,7 +156,7 @@ class ClientScreen extends ScreenInterface {
   @override
   bool leave() {
     logInfo("ClientScreen: leave");
-    switch (client.direction) {
+    switch (direction) {
       case Direction.left:
         _moveMouseMultipleEvents(x: 4);
         break;
@@ -172,21 +176,13 @@ class ClientScreen extends ScreenInterface {
   }
 
   @override
-  void onConnect() {
-    client.setConnected(true);
-  }
+  void onConnect() => onConnectCallback();
 
   @override
-  void onDisconnect() {
-    client.setConnected(false);
-  }
+  void onDisconnect() => onDisconnectCallback();
 
   @override
-  void onError(String error) {
-    logError("${client.id}: $error");
-    client.setConnected(false);
-    DialogHandler.showError("Error connecting to Synergy Server: $error");
-  }
+  void onError(String error) => onErrorCallback(error);
 
   Future<void> _sendText(String text) async {
     final List<int> report = List<int>.filled(9, 0);
@@ -201,15 +197,7 @@ class ClientScreen extends ScreenInterface {
     }
   }
 
-  Future<void> _addInputReport(List<int> inputReport) async {
-    await _inputReportHandler(client.id, inputReport);
-  }
-
-  void _moveMouseMultipleEvents({
-    int? x,
-    int? y,
-    int count = 100,
-  }) {
+  void _moveMouseMultipleEvents({int? x, int? y, int count = 100}) {
     for (int i = 0; i < count; i++) {
       var reportData = Uint8List(5);
       reportData[0] = 0x02; // Report ID
@@ -220,4 +208,7 @@ class ClientScreen extends ScreenInterface {
       _addInputReport(reportData);
     }
   }
+
+  Future<void> _addInputReport(List<int> inputReport) =>
+      inputReportCallback(inputReport);
 }
diff --git a/lib/app/client/report_handler.dart b/lib/app/client/report_handler.dart
@@ -104,7 +104,6 @@ int? keyCodeToByte(final int keyCode) {
   try {
     return textToByte(utf8.decode([keyCode]));
   } catch (e) {
-    // print("keyCode: $keyCode");
     return null;
   }
 }

diff --git a/lib/app/communication/usb/usb_device_communication.dart b/lib/app/communication/usb/usb_device_communication.dart
@@ -2,7 +2,7 @@ import 'dart:developer';
 import 'dart:ffi';
 import 'dart:io';
 
-import 'package:uni_control_hub/app/data/file_manager.dart';
+import 'package:uni_control_hub/app/services/file_service.dart';
 import 'package:uni_control_hub/app/services/adb_service.dart';
 import 'package:uni_control_hub/app/services/communication_service.dart';
 import 'package:uni_control_hub/app/client/report_handler.dart';
@@ -21,7 +21,7 @@ class UsbDeviceCommunication {
 
   void setup() {
     try {
-      String? libUsbFile = FileManager.libUsbBinaryPath;
+      String? libUsbFile = FileService.to.libUsbBinaryPath;
       if (libUsbFile == null) {
         logError('LibUsb not found for this platform');
         return;

diff --git a/lib/app/data/app_data.dart b/lib/app/data/app_data.dart
@@ -1,5 +1,6 @@
 class AppData {
-  static String uniHubServerPath = "assets/UniHubServer_0.1.jar";
+  // App name without space
+  static const String appName = "UniControlHub";
 
   static const gitIssueUrl =
       "https://github.com/rohitsangwan01/uni_control_hub/issues";

diff --git a/lib/app/data/file_manager.dart b/lib/app/data/file_manager.dart