Support running without web workers

Author: simolus3

packages/sqlite_async/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.11.1
+
+- Remove remaining `dart:js_util` imports in favor of new interop APIs.
+- Add `WebSqliteOpenFactory` with web-specific behavior for open factories.
+
 ## 0.11.0
 
  - Automatically flush IndexedDB storage to fix durability issues

packages/sqlite_async/lib/src/web/web_mutex.dart

@@ -4,7 +4,6 @@ import 'dart:math';
 import 'package:meta/meta.dart';
 import 'package:mutex/mutex.dart' as mutex;
 import 'dart:js_interop';
-import 'dart:js_util' as js_util;
 // This allows for checking things like hasProperty without the need for depending on the `js` package
 import 'dart:js_interop_unsafe';
 import 'package:web/web.dart';
@@ -128,7 +127,7 @@ class MutexImpl implements Mutex {
         .request(resolvedIdentifier, lockOptions, jsCallback.toJS);
     // A timeout abort will throw an exception which needs to be handled.
     // There should not be any other unhandled lock errors.
-    js_util.promiseToFuture(promise).catchError((error) {});
+    promise.toDart.catchError((error) => null);
     return gotLock.future;
   }
 

packages/sqlite_async/lib/src/web/web_sqlite_open_factory.dart

@@ -5,33 +5,45 @@ import 'package:sqlite3_web/sqlite3_web.dart';
 import 'package:sqlite_async/sqlite_async.dart';
 import 'package:sqlite_async/src/web/database/broadcast_updates.dart';
 import 'package:sqlite_async/src/web/web_mutex.dart';
+import 'package:sqlite_async/web.dart';
 
 import 'database.dart';
+import 'worker/worker_utils.dart';
 
 Map<String, FutureOr<WebSqlite>> webSQLiteImplementations = {};
 
 /// Web implementation of [AbstractDefaultSqliteOpenFactory]
 class DefaultSqliteOpenFactory
-    extends AbstractDefaultSqliteOpenFactory<CommonDatabase> {
-  final Future<WebSqlite> _initialized;
+    extends AbstractDefaultSqliteOpenFactory<CommonDatabase>
+    implements WebSqliteOpenFactory {
+  late final Future<WebSqlite> _initialized = Future.sync(() {
+    final cacheKey = sqliteOptions.webSqliteOptions.wasmUri +
+        sqliteOptions.webSqliteOptions.workerUri;
+
+    if (webSQLiteImplementations.containsKey(cacheKey)) {
+      return webSQLiteImplementations[cacheKey]!;
+    }
+
+    webSQLiteImplementations[cacheKey] =
+        openWebSqlite(sqliteOptions.webSqliteOptions);
+    return webSQLiteImplementations[cacheKey]!;
+  });
 
   DefaultSqliteOpenFactory(
       {required super.path,
-      super.sqliteOptions = const SqliteOptions.defaults()})
-      : _initialized = Future.sync(() {
-          final cacheKey = sqliteOptions.webSqliteOptions.wasmUri +
-              sqliteOptions.webSqliteOptions.workerUri;
-
-          if (webSQLiteImplementations.containsKey(cacheKey)) {
-            return webSQLiteImplementations[cacheKey]!;
-          }
-
-          webSQLiteImplementations[cacheKey] = WebSqlite.open(
-            wasmModule: Uri.parse(sqliteOptions.webSqliteOptions.wasmUri),
-            worker: Uri.parse(sqliteOptions.webSqliteOptions.workerUri),
-          );
-          return webSQLiteImplementations[cacheKey]!;
-        });
+      super.sqliteOptions = const SqliteOptions.defaults()}) {
+    // Make sure initializer starts running immediately
+    _initialized;
+  }
+
+  @override
+  Future<WebSqlite> openWebSqlite(WebSqliteOptions options) async {
+    return WebSqlite.open(
+      wasmModule: Uri.parse(sqliteOptions.webSqliteOptions.wasmUri),
+      worker: Uri.parse(sqliteOptions.webSqliteOptions.workerUri),
+      controller: AsyncSqliteController(),
+    );
+  }
 
   @override
 

packages/sqlite_async/lib/src/web/worker/worker_utils.dart

@@ -1,5 +1,4 @@
 import 'dart:js_interop';
-import 'dart:js_util' as js_util;
 
 import 'package:mutex/mutex.dart';
 import 'package:sqlite3/wasm.dart';
@@ -73,7 +72,7 @@ class AsyncSqliteDatabase extends WorkerDatabase {
 
         var dartMap = resultSetToMap(res);
 
-        var jsObject = js_util.jsify(dartMap);
+        var jsObject = dartMap.jsify();
 
         return jsObject;
       case CustomDatabaseMessageKind.executeBatchInTransaction:

packages/sqlite_async/lib/web.dart

@@ -6,6 +6,8 @@ library sqlite_async.web;
 
 import 'package:sqlite3_web/sqlite3_web.dart';
 import 'package:web/web.dart';
+
+import 'sqlite3_common.dart';
 import 'sqlite_async.dart';
 import 'src/web/database.dart';
 
@@ -24,6 +26,22 @@ typedef WebDatabaseEndpoint = ({
   String? lockName,
 });
 
+/// An additional interface for [SqliteOpenFactory] exposing additional
+/// functionality that is only relevant when compiling to the web.
+///
+/// The [DefaultSqliteOpenFactory] class implements this interface only when
+/// compiling for the web.
+abstract interface class WebSqliteOpenFactory
+    implements SqliteOpenFactory<CommonDatabase> {
+  /// Opens a [WebSqlite] instance for the given [options].
+  ///
+  /// This method can be overriden in scenarios where the way [WebSqlite] is
+  /// opened needs to be customized. Implementers should be aware that the
+  /// result of this method is cached and will be re-used by the open factory
+  /// when provided with the same [options] again.
+  Future<WebSqlite> openWebSqlite(WebSqliteOptions options);
+}
+
 /// A [SqliteConnection] interface implemented by opened connections when
 /// running on the web.
 ///

packages/sqlite_async/pubspec.yaml

@@ -1,6 +1,6 @@
 name: sqlite_async
 description: High-performance asynchronous interface for SQLite on Dart and Flutter.
-version: 0.11.0
+version: 0.11.1
 repository: https://github.com/powersync-ja/sqlite_async.dart
 environment:
   sdk: ">=3.4.0 <4.0.0"
@@ -12,8 +12,8 @@ topics:
   - flutter
 
 dependencies:
-  sqlite3: "^2.4.7"
-  sqlite3_web: ^0.2.0
+  sqlite3: ^2.6.0
+  sqlite3_web: ^0.2.1
   async: ^2.10.0
   collection: ^1.17.0
   mutex: ^3.1.0