Update package:web in sqlite3_web

Author: simolus3

sqlite3_web/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.3
+
+- Support latest version of `package:web`.
+
 ## 0.1.2-wip
 
 - Fix preferred databases not being sorted correctly.

sqlite3_web/lib/src/client.dart

@@ -169,7 +169,7 @@ final class DatabaseClient implements WebSqlite {
 
       if (globalContext.has('Worker')) {
         final dedicated = Worker(
-          workerUri.toString(),
+          workerUri.toString().toJS,
           WorkerOptions(name: 'sqlite3_worker'),
         );
 
@@ -184,7 +184,7 @@ final class DatabaseClient implements WebSqlite {
       }
 
       if (globalContext.has('SharedWorker')) {
-        final shared = SharedWorker(workerUri.toString());
+        final shared = SharedWorker(workerUri.toString().toJS);
         shared.port.start();
 
         final (endpoint, channel) = await createChannel();

sqlite3_web/lib/src/worker.dart

@@ -282,7 +282,7 @@ final class DatabaseState {
       switch (mode) {
         case FileSystemImplementation.opfsLocks:
           final options = WasmVfs.createOptions(root: pathForOpfs(name));
-          final worker = Worker(Uri.base.toString());
+          final worker = Worker(Uri.base.toString().toJS);
 
           StartFileSystemServer(options: options).sendToWorker(worker);
 
@@ -474,7 +474,7 @@ final class WorkerRunner {
   }
 
   Worker useOrSpawnInnerWorker() {
-    return _innerWorker ??= Worker(Uri.base.toString());
+    return _innerWorker ??= Worker(Uri.base.toString().toJS);
   }
 }
 

sqlite3_web/pubspec.yaml

@@ -10,7 +10,7 @@ environment:
 dependencies:
   sqlite3: ^2.4.3
   stream_channel: ^2.1.2
-  web: ^0.5.0
+  web: ^1.0.0
 
 dev_dependencies:
   lints: ^2.1.0

sqlite3_web/test/integration_test.dart

@@ -14,16 +14,25 @@ enum Browser {
       (StorageMode.opfs, AccessMode.throughSharedWorker)
     },
     missingFeatures: {MissingBrowserFeature.dedicatedWorkersInSharedWorkers},
+    defaultImplementation: (
+      StorageMode.opfs,
+      AccessMode.throughDedicatedWorker
+    ),
   ),
-  firefox(driverUriString: 'http://localhost:4444/');
+  firefox(
+    driverUriString: 'http://localhost:4444/',
+    defaultImplementation: (StorageMode.opfs, AccessMode.throughSharedWorker),
+  );
 
   final bool isChromium;
   final String driverUriString;
   final Set<(StorageMode, AccessMode)> unsupportedImplementations;
   final Set<MissingBrowserFeature> missingFeatures;
+  final (StorageMode, AccessMode) defaultImplementation;
 
   const Browser({
     required this.driverUriString,
+    required this.defaultImplementation,
     this.isChromium = false,
     this.unsupportedImplementations = const {},
     this.missingFeatures = const {},
@@ -81,6 +90,17 @@ void main() {
         final rawDriver = await createDriver(
           spec: browser.isChromium ? WebDriverSpec.JsonWire : WebDriverSpec.W3c,
           uri: browser.driverUri,
+          desired: {
+            'goog:chromeOptions': {
+              'args': [
+                '--headless=new',
+                '--disable-search-engine-choice-screen',
+              ],
+            },
+            'moz:firefoxOptions': {
+              'args': ['-headless']
+            },
+          },
         );
 
         driver = TestWebDriver(server, rawDriver);
@@ -107,6 +127,11 @@ void main() {
         expect(result.impls, browser.availableImplementations);
       });
 
+      test('picks recommended option', () async {
+        final (storage, access) = await driver.openDatabase();
+        expect((storage, access), browser.defaultImplementation);
+      });
+
       for (final (storage, access) in browser.availableImplementations) {
         test('$storage through $access', () async {
           await driver.openDatabase((storage, access));

sqlite3_web/tool/server.dart

@@ -136,13 +136,28 @@ class TestWebDriver {
     );
   }
 
-  Future<void> openDatabase([(StorageMode, AccessMode)? implementation]) async {
+  Future<(StorageMode, AccessMode)> openDatabase(
+      [(StorageMode, AccessMode)? implementation]) async {
     final desc = switch (implementation) {
       null => null,
       (var storage, var access) => '${storage.name}:${access.name}'
     };
 
-    await driver.executeAsync('open(arguments[0], arguments[1])', [desc]);
+    final res = await driver
+        .executeAsync('open(arguments[0], arguments[1])', [desc]) as String?;
+
+    if (res == null) {
+      return implementation!;
+    } else {
+      // If we're using connectToRecommended, this returns the storage/access
+      // mode actually chosen.
+      final split = res.split(':');
+
+      return (
+        StorageMode.values.byName(split[0]),
+        AccessMode.values.byName(split[1])
+      );
+    }
   }
 
   Future<void> closeDatabase() async {

sqlite3_web/web/main.dart

@@ -8,7 +8,7 @@ import 'package:sqlite3_web/sqlite3_web.dart';
 
 final sqlite3WasmUri = Uri.parse('sqlite3.wasm');
 final workerUri = Uri.parse('worker.dart.js');
-const databasName = 'database';
+const databaseName = 'database';
 
 WebSqlite? webSqlite;
 
@@ -28,7 +28,7 @@ void main() {
   document.getElementById('selfcheck')?.onClick.listen((event) async {
     print('starting');
     final sqlite = initializeSqlite();
-    final database = await sqlite.connectToRecommended(databasName);
+    final database = await sqlite.connectToRecommended(databaseName);
 
     print('selected storage: ${database.storage} through ${database.access}');
     print('missing features: ${database.features.missingFeatures}');
@@ -87,23 +87,25 @@ Future<JSAny?> _waitForUpdate(String? _) async {
 Future<JSAny?> _open(String? implementationName) async {
   final sqlite = initializeSqlite();
   Database db;
+  var returnValue = implementationName;
 
   if (implementationName != null) {
     final split = implementationName.split(':');
 
-    db = await sqlite.connect(databasName, StorageMode.values.byName(split[0]),
+    db = await sqlite.connect(databaseName, StorageMode.values.byName(split[0]),
         AccessMode.values.byName(split[1]));
   } else {
-    final result = await sqlite.connectToRecommended(databasName);
+    final result = await sqlite.connectToRecommended(databaseName);
     db = result.database;
+    returnValue = '${result.storage.name}:${result.access.name}';
   }
 
   // Make sure it works!
   await db.select('SELECT database_host()');
 
   updates = StreamQueue(db.updates);
   database = db;
-  return null;
+  return returnValue?.toJS;
 }
 
 Future<JSAny?> _exec(String? sql) async {