Merge branch 'main' into interface-abstraction

Author: Craftplacer

packages/sane/lib/src/extensions.dart

@@ -1,4 +1,5 @@
 import 'package:meta/meta.dart';
+import 'package:logging/logging.dart';
 import 'package:sane/src/bindings.g.dart';
 import 'package:sane/src/exceptions.dart';
 
@@ -12,3 +13,16 @@ extension SaneStatusExtension on SANE_Status {
     }
   }
 }
+
+@internal
+extension LoggerExtension on Logger {
+  void redirect(LogRecord record) {
+    log(
+      record.level,
+      record.message,
+      record.error,
+      record.stackTrace,
+      record.zone,
+    );
+  }
+}

packages/sane/lib/src/isolate.dart

@@ -1,11 +1,15 @@
 import 'dart:async';
 import 'dart:isolate';
 
+import 'package:logging/logging.dart';
 import 'package:sane/src/exceptions.dart';
+import 'package:sane/src/extensions.dart';
 import 'package:sane/src/isolate_messages/exception.dart';
 import 'package:sane/src/isolate_messages/interface.dart';
 import 'package:sane/src/sane.dart';
 
+final _logger = Logger('sane.isolate');
+
 class SaneIsolate {
   SaneIsolate._(
     this._isolate,
@@ -36,7 +40,16 @@ class SaneIsolate {
       onExit: exitReceivePort.sendPort,
     );
 
-    final sendPort = await receivePort.first as SendPort;
+    final sendPortCompleter = Completer<SendPort>();
+    receivePort.listen((message) {
+      if (message is _SendPortMessage) {
+        sendPortCompleter.complete(message.sendPort);
+      } else if (message is _LogRecordMessage) {
+        _logger.redirect(message.record);
+      }
+    });
+
+    final sendPort = await sendPortCompleter.future;
     return SaneIsolate._(isolate, sendPort, exitReceivePort);
   }
 
@@ -106,6 +119,18 @@ class _IsolateMessageEnvelope {
   final IsolateMessage message;
 }
 
+class _SendPortMessage {
+  _SendPortMessage(this.sendPort);
+
+  final SendPort sendPort;
+}
+
+class _LogRecordMessage {
+  _LogRecordMessage(this.record);
+
+  final LogRecord record;
+}
+
 late Map<String, SaneDevice> _devices;
 
 SaneDevice getDevice(String name) => _devices[name]!;