Better isolates

Author: jerson

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.8.2
+
+- Updated Isolate spawn logic to close gracefully
+
 ## 3.8.1
 
 - Updated binaries to v1.10.3

lib/bridge/binding.dart

@@ -27,24 +27,40 @@ class Binding {
     _library = openLib();
   }
 
-  static callBridge(IsolateArguments args) async {
+  static void callBridge(IsolateArguments args) async {
     var result = await Binding().call(args.name, args.payload);
     args.port.send(result);
   }
 
   Future<Uint8List> callAsync(String name, Uint8List payload) async {
-    final port = ReceivePort();
+    final port = ReceivePort('${_libraryName}_port');
     final args = IsolateArguments(name, payload, port.sendPort);
+    final completer = new Completer<Uint8List>();
+
+    final isolate = await Isolate.spawn(
+      callBridge,
+      args,
+      errorsAreFatal: false,
+      debugName: '${_libraryName}_isolate',
+      onError: port.sendPort,
+    );
+
+    port.listen(
+      (message) async {
+        if (message is Uint8List) {
+          completer.complete(message);
+        } else if (message is List) {
+          completer.completeError(message.firstOrNull ?? "internal error");
+        } else {
+          completer.completeError(message ?? "spawn error");
+        }
+        port.close();
+      },
+      onDone: () {
+        isolate.kill(priority: Isolate.beforeNextEvent);
+      },
+    );
 
-    final isolate = await Isolate.spawn(callBridge, args);
-
-    Completer<Uint8List> completer = new Completer();
-
-    port.listen((message) async {
-      completer.complete(message);
-      port.close();
-      isolate.kill();
-    });
     return completer.future;
   }
 
@@ -66,7 +82,7 @@ class Binding {
     final result = callable(namePointer, payloadPointer, payload.length);
 
     malloc.free(namePointer);
-    malloc.free(payloadPointer);
+    malloc.free(pointer);
 
     handleError(result.ref.error, result);
 

lib/openpgp.dart

@@ -10,6 +10,11 @@ class OpenPGPException implements Exception {
   String cause;
 
   OpenPGPException(this.cause);
+
+  @override
+  String toString() {
+    return 'OpenPGPException: $cause';
+  }
 }
 
 enum Hash { SHA256, SHA224, SHA384, SHA512 }

pubspec.yaml

@@ -1,6 +1,6 @@
 name: openpgp
 description: library for use OpenPGP with support for android and ios, macOS, linux, windows and web
-version: 3.8.1
+version: 3.8.2
 homepage: https://github.com/jerson/flutter-openpgp
 
 environment: