Slightly better handling of connection initialization errors.

Author: rkistner

lib/src/port_channel.dart

@@ -18,7 +18,8 @@ abstract class PortClient {
 class ParentPortClient implements PortClient {
   late Future<SendPort> sendPortFuture;
   SendPort? sendPort;
-  ReceivePort receivePort = ReceivePort();
+  final ReceivePort _receivePort = ReceivePort();
+  final ReceivePort _errorPort = ReceivePort();
   bool closed = false;
   int _nextId = 1;
 
@@ -30,7 +31,7 @@ class ParentPortClient implements PortClient {
     sendPortFuture.then((value) {
       sendPort = value;
     });
-    receivePort.listen((message) {
+    _receivePort.listen((message) {
       if (message is _InitMessage) {
         assert(!initCompleter.isCompleted);
         initCompleter.complete(message.port);
@@ -57,6 +58,17 @@ class ParentPortClient implements PortClient {
       }
       close();
     });
+    _errorPort.listen((message) {
+      var [error, stackTrace] = message;
+      print('got an error ${initCompleter.isCompleted} $error');
+      if (!initCompleter.isCompleted) {
+        if (stackTrace == null) {
+          initCompleter.completeError(error);
+        } else {
+          initCompleter.completeError(error, StackTrace.fromString(stackTrace));
+        }
+      }
+    });
   }
 
   Future<void> get ready async {
@@ -94,20 +106,22 @@ class ParentPortClient implements PortClient {
   }
 
   RequestPortServer server() {
-    return RequestPortServer(receivePort.sendPort);
+    return RequestPortServer(_receivePort.sendPort);
   }
 
   void close() async {
     if (!closed) {
       closed = true;
 
-      receivePort.close();
+      _receivePort.close();
+      _errorPort.close();
       _cancelAll(const ClosedException());
     }
   }
 
   tieToIsolate(Isolate isolate) {
-    isolate.addOnExitListener(receivePort.sendPort, response: _closeMessage);
+    isolate.addErrorListener(_errorPort.sendPort);
+    isolate.addOnExitListener(_receivePort.sendPort, response: _closeMessage);
   }
 }
 

lib/src/sqlite_connection_impl.dart

@@ -88,6 +88,9 @@ class SqliteConnectionImpl with SqliteQueries implements SqliteConnection {
   @override
   Future<void> close() async {
     await _connectionMutex.lock(() async {
+      if (closed) {
+        return;
+      }
       if (readOnly) {
         await _isolateClient.post(const _SqliteIsolateConnectionClose());
       } else {
@@ -97,6 +100,7 @@ class SqliteConnectionImpl with SqliteQueries implements SqliteConnection {
           await _isolateClient.post(const _SqliteIsolateConnectionClose());
         });
       }
+      _isolateClient.close();
       _isolate.kill();
     });
   }

test/basic_test.dart

@@ -377,7 +377,6 @@ void main() {
       // 4. Now second connection is ready. Second query has two connections to choose from.
       // 5. However, first connection is closed, so it's removed from the pool.
       // 6. Triggers `Concurrent modification during iteration: Instance(length:1) of '_GrowableList'`
-
       final db =
           SqliteDatabase.withFactory(testFactory(path: path, initStatements: [
         // Second connection to sleep more than first connection
@@ -387,8 +386,9 @@ void main() {
 
       final future1 = db.get('SELECT test_sleep(10) as sleep');
       final future2 = db.get('SELECT test_sleep(10) as sleep');
-      final closeFuture = db.close();
-      await closeFuture;
+
+      await db.close();
+
       await future1;
       await future2;
     });