Simplify/improve casting across library (#27)

ubuntu-flutter-community · Nov 6, 2024 · 36f77b5 · 36f77b5
1 parent 03edaef
commit 36f77b5
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 56 deletions.
diff --git a/packages/sane/lib/src/isolate_messages/control_button_option.dart b/packages/sane/lib/src/isolate_messages/control_button_option.dart
@@ -2,7 +2,8 @@ import 'package:sane/src/isolate_messages/interface.dart';
 import 'package:sane/src/sane.dart';
 import 'package:sane/src/structures.dart';
 
-class ControlButtonOptionMessage implements IsolateMessage {
+class ControlButtonOptionMessage
+    implements IsolateMessage<ControlButtonOptionResponse> {
   ControlButtonOptionMessage({
     required this.saneHandle,
     required this.index,

diff --git a/packages/sane/lib/src/isolate_messages/control_option.dart b/packages/sane/lib/src/isolate_messages/control_option.dart
@@ -2,7 +2,8 @@ import 'package:sane/src/isolate_messages/interface.dart';
 import 'package:sane/src/sane.dart';
 import 'package:sane/src/structures.dart';
 
-class ControlValueOptionMessage<T> implements IsolateMessage {
+class ControlValueOptionMessage<T>
+    implements IsolateMessage<ControlValueOptionResponse<T>> {
   ControlValueOptionMessage({
     required this.saneHandle,
     required this.index,
@@ -16,7 +17,7 @@ class ControlValueOptionMessage<T> implements IsolateMessage {
   final T? value;
 
   @override
-  Future<ControlValueOptionResponse> handle(Sane sane) async {
+  Future<ControlValueOptionResponse<T>> handle(Sane sane) async {
     switch (value) {
       case final bool value:
         return ControlValueOptionResponse<bool>(
@@ -26,7 +27,7 @@ class ControlValueOptionMessage<T> implements IsolateMessage {
             action: action,
             value: value,
           ),
-        );
+        ) as ControlValueOptionResponse<T>;
       case final int value:
         return ControlValueOptionResponse<int>(
           result: await sane.controlIntOption(
@@ -35,7 +36,7 @@ class ControlValueOptionMessage<T> implements IsolateMessage {
             action: action,
             value: value,
           ),
-        );
+        ) as ControlValueOptionResponse<T>;
       case final double value:
         return ControlValueOptionResponse<double>(
           result: await sane.controlFixedOption(
@@ -44,7 +45,7 @@ class ControlValueOptionMessage<T> implements IsolateMessage {
             action: action,
             value: value,
           ),
-        );
+        ) as ControlValueOptionResponse<T>;
       case final String value:
         return ControlValueOptionResponse<String>(
           result: await sane.controlStringOption(
@@ -53,7 +54,7 @@ class ControlValueOptionMessage<T> implements IsolateMessage {
             action: action,
             value: value,
           ),
-        );
+        ) as ControlValueOptionResponse<T>;
       default:
         throw Exception('Invalid value type.');
     }

diff --git a/packages/sane/lib/src/isolate_messages/get_all_option_descriptors.dart b/packages/sane/lib/src/isolate_messages/get_all_option_descriptors.dart
@@ -2,7 +2,8 @@ import 'package:sane/src/isolate_messages/interface.dart';
 import 'package:sane/src/sane.dart';
 import 'package:sane/src/structures.dart';
 
-class GetAllOptionDescriptorsMessage implements IsolateMessage {
+class GetAllOptionDescriptorsMessage
+    implements IsolateMessage<GetAllOptionDescriptorsResponse> {
   GetAllOptionDescriptorsMessage({required this.saneHandle});
 
   final SaneHandle saneHandle;

diff --git a/packages/sane/lib/src/isolate_messages/get_devices.dart b/packages/sane/lib/src/isolate_messages/get_devices.dart
@@ -2,7 +2,7 @@ import 'package:sane/src/isolate_messages/interface.dart';
 import 'package:sane/src/sane.dart';
 import 'package:sane/src/structures.dart';
 
-class GetDevicesMessage implements IsolateMessage {
+class GetDevicesMessage implements IsolateMessage<GetDevicesResponse> {
   GetDevicesMessage({required this.localOnly});
 
   final bool localOnly;

diff --git a/packages/sane/lib/src/isolate_messages/get_option_descriptor.dart b/packages/sane/lib/src/isolate_messages/get_option_descriptor.dart
@@ -2,7 +2,8 @@ import 'package:sane/src/isolate_messages/interface.dart';
 import 'package:sane/src/sane.dart';
 import 'package:sane/src/structures.dart';
 
-class GetOptionDescriptorMessage implements IsolateMessage {
+class GetOptionDescriptorMessage
+    implements IsolateMessage<GetOptionDescriptorResponse> {
   GetOptionDescriptorMessage({
     required this.saneHandle,
     required this.index,

diff --git a/packages/sane/lib/src/isolate_messages/get_parameters.dart b/packages/sane/lib/src/isolate_messages/get_parameters.dart
@@ -2,7 +2,7 @@ import 'package:sane/src/isolate_messages/interface.dart';
 import 'package:sane/src/sane.dart';
 import 'package:sane/src/structures.dart';
 
-class GetParametersMessage implements IsolateMessage {
+class GetParametersMessage implements IsolateMessage<GetParametersResponse> {
   GetParametersMessage({required this.saneHandle});
 
   final SaneHandle saneHandle;

diff --git a/packages/sane/lib/src/isolate_messages/init.dart b/packages/sane/lib/src/isolate_messages/init.dart
@@ -1,7 +1,7 @@
 import 'package:sane/src/isolate_messages/interface.dart';
 import 'package:sane/src/sane.dart';
 
-class InitMessage implements IsolateMessage {
+class InitMessage implements IsolateMessage<InitResponse> {
   @override
   Future<InitResponse> handle(Sane sane) async {
     return InitResponse(

diff --git a/packages/sane/lib/src/isolate_messages/interface.dart b/packages/sane/lib/src/isolate_messages/interface.dart
@@ -1,7 +1,7 @@
 import 'package:sane/src/sane.dart';
 
-abstract interface class IsolateMessage {
-  Future<IsolateResponse> handle(Sane sane);
+abstract interface class IsolateMessage<T extends IsolateResponse> {
+  Future<T> handle(Sane sane);
 }
 
 abstract interface class IsolateResponse {}
diff --git a/packages/sane/lib/src/isolate_messages/open.dart b/packages/sane/lib/src/isolate_messages/open.dart
@@ -2,7 +2,7 @@ import 'package:sane/src/isolate_messages/interface.dart';
 import 'package:sane/src/sane.dart';
 import 'package:sane/src/structures.dart';
 
-class OpenMessage implements IsolateMessage {
+class OpenMessage implements IsolateMessage<OpenResponse> {
   OpenMessage({required this.deviceName});
 
   final String deviceName;

diff --git a/packages/sane/lib/src/isolate_messages/read.dart b/packages/sane/lib/src/isolate_messages/read.dart
@@ -4,7 +4,7 @@ import 'package:sane/src/isolate_messages/interface.dart';
 import 'package:sane/src/sane.dart';
 import 'package:sane/src/structures.dart';
 
-class ReadMessage implements IsolateMessage {
+class ReadMessage implements IsolateMessage<ReadResponse> {
   ReadMessage({
     required this.saneHandle,
     required this.bufferSize,

diff --git a/packages/sane/lib/src/sane_isolate.dart b/packages/sane/lib/src/sane_isolate.dart
@@ -45,11 +45,13 @@ class SaneIsolate implements Sane {
     _isolate.kill(priority: Isolate.immediate);
   }
 
-  Future<dynamic> _sendMessage(IsolateMessage message) async {
+  Future<T> _sendMessage<T extends IsolateResponse>(
+    IsolateMessage<T> message,
+  ) async {
     final replyPort = ReceivePort();
 
     _sendPort.send(
-      _IsolateMessageEnveloppe(
+      _IsolateMessageEnvelope(
         replyPort: replyPort.sendPort,
         message: message,
       ),
@@ -65,14 +67,14 @@ class SaneIsolate implements Sane {
       );
     }
 
-    return response;
+    return response as T;
   }
 
   @override
   Future<int> init({
     AuthCallback? authCallback,
   }) async {
-    final response = await _sendMessage(InitMessage()) as InitResponse;
+    final response = await _sendMessage(InitMessage());
     return response.versionCode;
   }
 
@@ -86,21 +88,17 @@ class SaneIsolate implements Sane {
     required bool localOnly,
   }) async {
     final response = await _sendMessage(
-      GetDevicesMessage(
-        localOnly: localOnly,
-      ),
-    ) as GetDevicesResponse;
+      GetDevicesMessage(localOnly: localOnly),
+    );
 
     return response.devices;
   }
 
   @override
   Future<SaneHandle> open(String deviceName) async {
     final response = await _sendMessage(
-      OpenMessage(
-        deviceName: deviceName,
-      ),
-    ) as OpenResponse;
+      OpenMessage(deviceName: deviceName),
+    );
 
     return response.handle;
   }
@@ -113,9 +111,7 @@ class SaneIsolate implements Sane {
   @override
   Future<void> close(SaneHandle handle) async {
     await _sendMessage(
-      CloseMessage(
-        saneHandle: handle,
-      ),
+      CloseMessage(saneHandle: handle),
     );
   }
 
@@ -129,7 +125,7 @@ class SaneIsolate implements Sane {
         saneHandle: handle,
         index: index,
       ),
-    ) as GetOptionDescriptorResponse;
+    );
 
     return response.optionDescriptor;
   }
@@ -139,10 +135,8 @@ class SaneIsolate implements Sane {
     SaneHandle handle,
   ) async {
     final response = await _sendMessage(
-      GetAllOptionDescriptorsMessage(
-        saneHandle: handle,
-      ),
-    ) as GetAllOptionDescriptorsResponse;
+      GetAllOptionDescriptorsMessage(saneHandle: handle),
+    );
 
     return response.optionDescriptors;
   }
@@ -161,7 +155,7 @@ class SaneIsolate implements Sane {
         action: action,
         value: value,
       ),
-    ) as ControlValueOptionResponse<bool>;
+    );
 
     return response.result;
   }
@@ -180,7 +174,7 @@ class SaneIsolate implements Sane {
         action: action,
         value: value,
       ),
-    ) as ControlValueOptionResponse<int>;
+    );
 
     return response.result;
   }
@@ -199,7 +193,7 @@ class SaneIsolate implements Sane {
         action: action,
         value: value,
       ),
-    ) as ControlValueOptionResponse<double>;
+    );
 
     return response.result;
   }
@@ -218,7 +212,7 @@ class SaneIsolate implements Sane {
         action: action,
         value: value,
       ),
-    ) as ControlValueOptionResponse<String>;
+    );
 
     return response.result;
   }
@@ -233,7 +227,7 @@ class SaneIsolate implements Sane {
         saneHandle: handle,
         index: index,
       ),
-    ) as ControlButtonOptionResponse;
+    );
 
     return response.result;
   }
@@ -244,17 +238,15 @@ class SaneIsolate implements Sane {
       GetParametersMessage(
         saneHandle: handle,
       ),
-    ) as GetParametersResponse;
+    );
 
     return response.parameters;
   }
 
   @override
   Future<void> start(SaneHandle handle) async {
     await _sendMessage(
-      StartMessage(
-        saneHandle: handle,
-      ),
+      StartMessage(saneHandle: handle),
     );
   }
 
@@ -265,17 +257,15 @@ class SaneIsolate implements Sane {
         saneHandle: handle,
         bufferSize: bufferSize,
       ),
-    ) as ReadResponse;
+    );
 
     return response.bytes;
   }
 
   @override
   Future<void> cancel(SaneHandle handle) async {
     await _sendMessage(
-      CancelMessage(
-        saneHandle: handle,
-      ),
+      CancelMessage(saneHandle: handle),
     );
   }
 
@@ -305,25 +295,24 @@ void _isolateEntryPoint(_IsolateEntryPointArgs args) {
   args.mainSendPort.send(isolateReceivePort.sendPort);
 
   final sane = args.sane;
-  isolateReceivePort.listen((envellope) async {
-    envellope = envellope as _IsolateMessageEnveloppe;
-
+  isolateReceivePort.cast<_IsolateMessageEnvelope>().listen((envelope) async {
     late IsolateResponse response;
+
     try {
-      response = await envellope.message.handle(sane);
+      response = await envelope.message.handle(sane);
     } on SaneException catch (exception, stackTrace) {
       response = ExceptionResponse(
         exception: exception,
         stackTrace: stackTrace,
       );
     }
 
-    envellope.replyPort.send(response);
+    envelope.replyPort.send(response);
   });
 }
 
-class _IsolateMessageEnveloppe {
-  _IsolateMessageEnveloppe({
+class _IsolateMessageEnvelope {
+  _IsolateMessageEnvelope({
     required this.replyPort,
     required this.message,
   });