cleanup

stevensJourney · stevensJourney · commit e05ce933c346 · 2024-07-09T11:28:33.000+02:00
diff --git a/README.md b/README.md
@@ -2,15 +2,15 @@
 
 High-performance asynchronous interface for SQLite on Dart & Flutter.
 
-| package            | build                                                                                                                                                                                            | pub                                                                                                                | likes                                                                                                                        | popularity                                                                                                                             | pub points                                                                                                                         |
-| ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- |
-| sqlite_async       | [![build](https://github.com/powersync-ja/sqlite_async.dart/actions/workflows/test.yaml/badge.svg?branch=main)](https://github.com/powersync-ja/sqlite_async.dart/actions?query=workflow%3Atest) | [![pub package](https://img.shields.io/pub/v/sqlite_async.svg)](https://pub.dev/packages/sqlite_async)             | [![likes](https://img.shields.io/pub/likes/powersync?logo=dart)](https://pub.dev/packages/sqlite_async/score)                | [![popularity](https://img.shields.io/pub/popularity/sqlite_async?logo=dart)](https://pub.dev/packages/sqlite_async/score)             | [![pub points](https://img.shields.io/pub/points/sqlite_async?logo=dart)](https://pub.dev/packages/sqlite_async/score)             |
-| drift_sqlite_async | [![build](https://github.com/powersync-ja/sqlite_async.dart/actions/workflows/test.yaml/badge.svg?branch=main)](https://github.com/powersync-ja/sqlite_async/actions?query=workflow%3Atest)      | [![pub package](https://img.shields.io/pub/v/drift_sqlite_async.svg)](https://pub.dev/packages/drift_sqlite_async) | [![likes](https://img.shields.io/pub/likes/drift_sqlite_async?logo=dart)](https://pub.dev/packages/drift_sqlite_async/score) | [![popularity](https://img.shields.io/pub/popularity/drift_sqlite_async?logo=dart)](https://pub.dev/packages/drift_sqlite_async/score) | [![pub points](https://img.shields.io/pub/points/drift_sqlite_async?logo=dart)](https://pub.dev/packages/drift_sqlite_async/score) |
+| package        | build                                                                                                                                                                                 | pub                                                                                                        | likes                                                                                                                | popularity | pub points |
+|----------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------| ------- | ------- |
+| sqlite_async         | [![build](https://github.com/powersync-ja/sqlite_async.dart/actions/workflows/test.yaml/badge.svg?branch=main)](https://github.com/powersync-ja/sqlite_async.dart/actions?query=workflow%3Atest)       | [![pub package](https://img.shields.io/pub/v/sqlite_async.svg)](https://pub.dev/packages/sqlite_async)                 | [![likes](https://img.shields.io/pub/likes/powersync?logo=dart)](https://pub.dev/packages/sqlite_async/score)                 | [![popularity](https://img.shields.io/pub/popularity/sqlite_async?logo=dart)](https://pub.dev/packages/sqlite_async/score) | [![pub points](https://img.shields.io/pub/points/sqlite_async?logo=dart)](https://pub.dev/packages/sqlite_async/score)
+| drift_sqlite_async | [![build](https://github.com/powersync-ja/sqlite_async.dart/actions/workflows/test.yaml/badge.svg?branch=main)](https://github.com/powersync-ja/sqlite_async/actions?query=workflow%3Atest) | [![pub package](https://img.shields.io/pub/v/drift_sqlite_async.svg)](https://pub.dev/packages/drift_sqlite_async) | [![likes](https://img.shields.io/pub/likes/drift_sqlite_async?logo=dart)](https://pub.dev/packages/drift_sqlite_async/score) | [![popularity](https://img.shields.io/pub/popularity/drift_sqlite_async?logo=dart)](https://pub.dev/packages/drift_sqlite_async/score) | [![pub points](https://img.shields.io/pub/points/drift_sqlite_async?logo=dart)](https://pub.dev/packages/drift_sqlite_async/score)
 
 ## Getting Started
 
 This monorepo uses [melos](https://melos.invertase.dev/) to handle command and package management.
 
 To configure the monorepo for development run `melos prepare` after cloning.
 
-For detailed usage, check out the inner [sqlite_async](https://github.com/powersync-ja/sqlite_async.dart/tree/main/packages/sqlite_async) and [drift_sqlite_async](https://github.com/powersync-ja/sqlite_async.dart/tree/main/packages/drift_sqlite_async) packages.
+For detailed usage, check out the inner [sqlite_async](https://github.com/powersync-ja/sqlite_async.dart/tree/main/packages/sqlite_async) and [drift_sqlite_async](https://github.com/powersync-ja/sqlite_async.dart/tree/main/packages/drift_sqlite_async) packages.
diff --git a/packages/drift_sqlite_async/pubspec_overrides.yaml b/packages/drift_sqlite_async/pubspec_overrides.yaml
diff --git a/packages/sqlite_async/lib/src/web/web_mutex.dart b/packages/sqlite_async/lib/src/web/web_mutex.dart
@@ -12,9 +12,6 @@ import 'package:web/web.dart';
 @JS('navigator')
 external Navigator get _navigator;
 
-@JS('AbortController')
-external AbortController get _abortController;
-
 /// Web implementation of [Mutex]
 class MutexImpl implements Mutex {
   late final mutex.Mutex fallback;
diff --git a/packages/sqlite_async/lib/src/web/web_sqlite_open_factory.dart b/packages/sqlite_async/lib/src/web/web_sqlite_open_factory.dart
@@ -55,7 +55,7 @@ class DefaultSqliteOpenFactory
     // cases, we need to implement a mutex locally.
     final mutex = connection.access == AccessMode.throughSharedWorker
         ? null
-        : MutexImpl();
+        : MutexImpl(identifier: path); // Use the DB path as a mutex identifier
 
     return WebDatabase(connection.database, options.mutex ?? mutex);
   }

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ class DefaultSqliteOpenFactory`
`55`	`55`	`// cases, we need to implement a mutex locally.`
`56`	`56`	`final mutex = connection.access == AccessMode.throughSharedWorker`
`57`	`57`	`? null`
`58`		`- : MutexImpl();`
	`58`	`+ : MutexImpl(identifier: path); // Use the DB path as a mutex identifier`
`59`	`59`
`60`	`60`	`return WebDatabase(connection.database, options.mutex ?? mutex);`
`61`	`61`	`}`