update sqlite_async.dart. Fix disconnectAndClear on web.

stevensJourney · stevensJourney · commit 56b814e1949a · 2024-03-05T14:26:12.000+02:00
diff --git a/demos/supabase-anonymous-auth/pubspec.lock b/demos/supabase-anonymous-auth/pubspec.lock
@@ -342,7 +342,7 @@ packages:
       path: "../../packages/powersync"
       relative: true
     source: path
-    version: "1.3.0-alpha.1"
+    version: "1.3.0-alpha.2"
   realtime_client:
     dependency: transitive
     description:
@@ -464,10 +464,10 @@ packages:
     dependency: "direct main"
     description:
       name: sqlite_async
-      sha256: "91f454cddc85617bea2c7c1544ff386887d0d2cf0ecdb3599015c05cc141ff4d"
+      sha256: "7a68036b2fc2fae5fc0efbc6bd436deb79e39090282348d979e6a7c38c8d067e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.0-alpha.1"
+    version: "0.7.0-alpha.2"
   stack_trace:
     dependency: transitive
     description:
diff --git a/demos/supabase-anonymous-auth/pubspec.yaml b/demos/supabase-anonymous-auth/pubspec.yaml
@@ -16,7 +16,7 @@ dependencies:
   supabase_flutter: ^2.0.2
   path: ^1.8.3
   logging: ^1.2.0
-  sqlite_async: ^0.7.0-alpha.1
+  sqlite_async: ^0.7.0-alpha.2
   universal_io: ^2.2.2
 
 dev_dependencies:
diff --git a/demos/supabase-edge-function-auth/pubspec.lock b/demos/supabase-edge-function-auth/pubspec.lock
@@ -342,7 +342,7 @@ packages:
       path: "../../packages/powersync"
       relative: true
     source: path
-    version: "1.3.0-alpha.1"
+    version: "1.3.0-alpha.2"
   realtime_client:
     dependency: transitive
     description:
@@ -464,10 +464,10 @@ packages:
     dependency: "direct main"
     description:
       name: sqlite_async
-      sha256: "91f454cddc85617bea2c7c1544ff386887d0d2cf0ecdb3599015c05cc141ff4d"
+      sha256: "7a68036b2fc2fae5fc0efbc6bd436deb79e39090282348d979e6a7c38c8d067e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.0-alpha.1"
+    version: "0.7.0-alpha.2"
   stack_trace:
     dependency: transitive
     description:
diff --git a/demos/supabase-edge-function-auth/pubspec.yaml b/demos/supabase-edge-function-auth/pubspec.yaml
@@ -16,7 +16,7 @@ dependencies:
   supabase_flutter: ^2.0.2
   path: ^1.8.3
   logging: ^1.2.0
-  sqlite_async: ^0.7.0-alpha.1
+  sqlite_async: ^0.7.0-alpha.2
   universal_io: ^2.2.2
 
 dev_dependencies:
diff --git a/demos/supabase-simple-chat/pubspec.lock b/demos/supabase-simple-chat/pubspec.lock
@@ -374,7 +374,7 @@ packages:
       path: "../../packages/powersync"
       relative: true
     source: path
-    version: "1.3.0-alpha.1"
+    version: "1.3.0-alpha.2"
   realtime_client:
     dependency: transitive
     description:
diff --git a/demos/supabase-todolist/pubspec.lock b/demos/supabase-todolist/pubspec.lock
@@ -430,7 +430,7 @@ packages:
       path: "../../packages/powersync"
       relative: true
     source: path
-    version: "1.3.0-alpha.1"
+    version: "1.3.0-alpha.2"
   powersync_attachments_helper:
     dependency: "direct main"
     description:
@@ -559,10 +559,10 @@ packages:
     dependency: "direct main"
     description:
       name: sqlite_async
-      sha256: "91f454cddc85617bea2c7c1544ff386887d0d2cf0ecdb3599015c05cc141ff4d"
+      sha256: "7a68036b2fc2fae5fc0efbc6bd436deb79e39090282348d979e6a7c38c8d067e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.0-alpha.1"
+    version: "0.7.0-alpha.2"
   stack_trace:
     dependency: transitive
     description:
diff --git a/demos/supabase-todolist/pubspec.yaml b/demos/supabase-todolist/pubspec.yaml
@@ -17,7 +17,7 @@ dependencies:
   supabase_flutter: ^2.0.1
   path: ^1.8.3
   logging: ^1.2.0
-  sqlite_async: ^0.7.0-alpha.1
+  sqlite_async: ^0.7.0-alpha.2
   camera: ^0.10.5+7
   image: ^4.1.3
   universal_io: ^2.2.2
diff --git a/packages/powersync/lib/src/database/native/native_powersync_database.dart b/packages/powersync/lib/src/database/native/native_powersync_database.dart
@@ -332,7 +332,7 @@ Future<void> _powerSyncDatabaseIsolate(
         updateStream: updateController.stream,
         retryDelay: args.retryDelay,
         client: http.Client());
-    sync.streamingSync();
+    sync.streamingSync(null);
     sync.statusStream.listen((event) {
       sPort.send(['status', event]);
     });
diff --git a/packages/powersync/lib/src/database/powersync_db_mixin.dart b/packages/powersync/lib/src/database/powersync_db_mixin.dart
@@ -125,7 +125,16 @@ mixin PowerSyncDatabaseMixin implements SqliteConnection {
   /// Use [connect] to connect again.
   Future<void> disconnect() async {
     if (disconnecter != null) {
-      await disconnecter!.abort();
+      /// Checking `disconnecter.aborted` prevents race conditions
+      /// where multiple calls to `disconnect` can attempt to abort
+      /// the controller more than once before it has finished aborting.
+      if (disconnecter!.aborted == false) {
+        await disconnecter!.abort();
+        disconnecter = null;
+      } else {
+        /// Wait for the abort to complete. Continue updating the sync status after completed
+        await disconnecter!.onAbort;
+      }
     }
     setStatus(
         SyncStatus(connected: false, lastSyncedAt: currentStatus.lastSyncedAt));
diff --git a/packages/powersync/lib/src/database/web/web_powersync_database.dart b/packages/powersync/lib/src/database/web/web_powersync_database.dart
@@ -124,8 +124,7 @@ class PowerSyncDatabaseImpl
 
     // Disconnect if connected
     await disconnect();
-    final disconnector = AbortController();
-    disconnecter = disconnector;
+    disconnecter = AbortController();
 
     await isInitialized;
 
@@ -145,7 +144,7 @@ class PowerSyncDatabaseImpl
     sync.statusStream.listen((event) {
       setStatus(event);
     });
-    sync.streamingSync();
+    sync.streamingSync(disconnecter);
   }
 
   /// Takes a read lock, without starting a transaction.
diff --git a/packages/powersync/lib/src/streaming_sync.dart b/packages/powersync/lib/src/streaming_sync.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:convert' as convert;
 import 'package:http/http.dart' as http;
+import 'package:powersync/src/abort_controller.dart';
 import 'package:powersync/src/exceptions.dart';
 import 'package:powersync/src/log_internal.dart';
 
@@ -48,10 +49,13 @@ class StreamingSyncImplementation {
     statusStream = _statusStreamController.stream;
   }
 
-  Future<void> streamingSync() async {
+  Future<void> streamingSync(AbortController? abortController) async {
     crudLoop();
     var invalidCredentials = false;
     while (true) {
+      if (abortController?.aborted == true) {
+        return;
+      }
       _updateStatus(connecting: true);
       try {
         if (invalidCredentials && invalidCredentialsCallback != null) {
@@ -60,7 +64,7 @@ class StreamingSyncImplementation {
           await invalidCredentialsCallback!();
           invalidCredentials = false;
         }
-        await streamingSyncIteration();
+        await streamingSyncIteration(abortController);
         // Continue immediately
       } catch (e, stacktrace) {
         final message = _syncErrorMessage(e);
@@ -173,7 +177,7 @@ class StreamingSyncImplementation {
     _statusStreamController.add(newStatus);
   }
 
-  Future<bool> streamingSyncIteration() async {
+  Future<bool> streamingSyncIteration(AbortController? abortController) async {
     adapter.startSession();
     final bucketEntries = await adapter.getBucketStates();
 
@@ -201,6 +205,9 @@ class StreamingSyncImplementation {
     bool haveInvalidated = false;
 
     await for (var line in merged) {
+      if (abortController?.aborted == true) {
+        return false;
+      }
       _updateStatus(connected: true, connecting: false);
       if (line is Checkpoint) {
         targetCheckpoint = line;
diff --git a/packages/powersync_attachments_helper/pubspec.yaml b/packages/powersync_attachments_helper/pubspec.yaml
@@ -13,7 +13,7 @@ dependencies:
   powersync: ^1.3.0-alpha.2
   logging: ^1.2.0
   sqlite3: ^2.3.0
-  sqlite_async: ^0.7.0-alpha.1
+  sqlite_async: ^0.7.0-alpha.2
   path_provider: ^2.1.1
 
 dev_dependencies:
