@@ -27,24 +27,40 @@ class Binding {
2727 _library = openLib ();
2828 }
2929
30- static callBridge (IsolateArguments args) async {
30+ static void callBridge (IsolateArguments args) async {
3131 var result = await Binding ().call (args.name, args.payload);
3232 args.port.send (result);
3333 }
3434
3535 Future <Uint8List > callAsync (String name, Uint8List payload) async {
36- final port = ReceivePort ();
36+ final port = ReceivePort ('${ _libraryName }_port'
3737 final args = IsolateArguments (name, payload, port.sendPort);
38+ final completer = new Completer <Uint8List >();
39+
40+ final isolate = await Isolate .spawn (
41+ callBridge,
42+ args,
43+ errorsAreFatal: false ,
44+ debugName: '${_libraryName }_isolate' ,
45+ onError: port.sendPort,
46+ );
47+
48+ port.listen (
49+ (message) async {
50+ if (message is Uint8List ) {
51+ completer.complete (message);
52+ } else if (message is List ) {
53+ completer.completeError (message.firstOrNull ?? "internal error" );
54+ } else {
55+ completer.completeError (message ?? "spawn error" );
56+ }
57+ port.close ();
58+ },
59+ onDone: () {
60+ isolate.kill (priority: Isolate .beforeNextEvent);
61+ },
62+ );
3863
39- final isolate = await Isolate .spawn (callBridge, args);
40-
41- Completer <Uint8List > completer = new Completer ();
42-
43- port.listen ((message) async {
44- completer.complete (message);
45- port.close ();
46- isolate.kill ();
47- });
4864 return completer.future;
4965 }
5066
@@ -66,7 +82,7 @@ class Binding {
6682 final result = callable (namePointer, payloadPointer, payload.length);
6783
6884 malloc.free (namePointer);
69- malloc.free (payloadPointer );
85+ malloc.free (pointer );
7086
7187 handleError (result.ref.error, result);
7288
@@ -189,8 +205,11 @@ class Binding {
189205
190206 if (Platform .isWindows) {
191207 if (isFlutterTest) {
192- var ffiFile = Path .canonicalize (
193- Path .join (r'build\windows\runner\Debug' , '$_libraryName .dll' ));
208+ var arch =
209+ Platform .resolvedExecutable.contains ("x64" ) ? "x64" : "arm64" ;
210+
211+ var ffiFile = Path .canonicalize (Path .join (
212+ r'build\windows' , arch, r'runner\Debug' , '$_libraryName .dll' ));
194213 validateTestFFIFile (ffiFile);
195214 return ffi.DynamicLibrary .open (ffiFile);
196215 }
0 commit comments