Fix sqlite web integration tests

Author: simolus3

sqlite3_web/lib/src/database.dart

@@ -184,6 +184,17 @@ abstract class WebSqlite {
     return DatabaseClient(worker, wasmModule);
   }
 
+  /// Connects to an endpoint previously obtained with [Database.additionalConnection].
+  ///
+  /// As a [SqliteWebEndpoint] record only consists of fields that are
+  /// transferrable in JavaScript, these endpoints can be sent to other workers,
+  /// which can then call [connectToPort] to open a database connection
+  /// originally established by another JavaScript connection.
+  ///
+  /// Note that, depending on the access mode, the returned [Database] may only
+  /// be valid as long as the original [Database] where [Database.additionalConnection]
+  /// was called. This limitation does not exist for databases hosted by shared
+  /// workers.
   static Future<Database> connectToPort(SqliteWebEndpoint endpoint) {
     final client = DatabaseClient(Uri.base, Uri.base);
     return client.connectToExisting(endpoint);

sqlite3_web/pubspec.yaml

@@ -1,6 +1,6 @@
 name: sqlite3_web
 description: Utilities to simplify accessing sqlite3 on the web, with automated feature detection.
-version: 0.1.2-wip
+version: 0.1.3
 homepage: https://github.com/simolus3/sqlite3.dart/tree/main/sqlite3_web
 repository: https://github.com/simolus3/sqlite3.dart
 

sqlite3_web/test/integration_test.dart

@@ -103,6 +103,10 @@ void main() {
           },
         );
 
+        rawDriver.logs.get(LogType.browser).listen((entry) {
+          print('[console]: ${entry.message}');
+        });
+
         driver = TestWebDriver(server, rawDriver);
         await driver.driver.get('http://localhost:8080/');
 
@@ -136,9 +140,9 @@ void main() {
         test('$storage through $access', () async {
           await driver.openDatabase((storage, access));
           await driver.execute('CREATE TABLE foo (bar TEXT);');
-          final event = driver.waitForUpdate();
+          expect(await driver.countUpdateEvents(), 0);
           await driver.execute("INSERT INTO foo (bar) VALUES ('hello');");
-          await event;
+          expect(await driver.countUpdateEvents(), 1);
         });
       }
     });

sqlite3_web/tool/server.dart

@@ -146,29 +146,33 @@ class TestWebDriver {
     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])
-      );
-    }
+    // 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 {
     await driver.executeAsync("close('', arguments[0])", []);
   }
 
-  Future<void> waitForUpdate() async {
-    await driver.executeAsync('wait_for_update("", arguments[0])', []);
+  Future<int> countUpdateEvents() async {
+    final result =
+        await driver.executeAsync('get_updates("", arguments[0])', []);
+    return result as int;
   }
 
   Future<void> execute(String sql) async {
     await driver.executeAsync('exec(arguments[0], arguments[1])', [sql]);
   }
+
+  Future<void> testSecond(String sql) async {
+    final res = await driver.executeAsync('test_second("", arguments[0])', []);
+    if (res != true) {
+      throw 'test_second failed! More information may be available in the console.';
+    }
+  }
 }

sqlite3_web/web/main.dart

@@ -3,7 +3,6 @@ import 'dart:html';
 import 'dart:js_interop';
 import 'dart:js_interop_unsafe';
 
-import 'package:async/async.dart';
 import 'package:sqlite3_web/sqlite3_web.dart';
 
 final sqlite3WasmUri = Uri.parse('sqlite3.wasm');
@@ -13,17 +12,27 @@ const databaseName = 'database';
 WebSqlite? webSqlite;
 
 Database? database;
-StreamQueue<void>? updates;
+int updates = 0;
 
 void main() {
   _addCallbackForWebDriver('detectImplementations', _detectImplementations);
   _addCallbackForWebDriver('close', (arg) async {
     await database?.dispose();
     return null;
   });
-  _addCallbackForWebDriver('wait_for_update', _waitForUpdate);
+  _addCallbackForWebDriver('get_updates', (arg) async {
+    return updates.toJS;
+  });
   _addCallbackForWebDriver('open', _open);
   _addCallbackForWebDriver('exec', _exec);
+  _addCallbackForWebDriver('test_second', (arg) async {
+    final endpoint = await database!.additionalConnection();
+    final second = await WebSqlite.connectToPort(endpoint);
+
+    await second.execute('SELECT 1');
+    await second.dispose();
+    return true.toJS;
+  });
 
   document.getElementById('selfcheck')?.onClick.listen((event) async {
     print('starting');
@@ -79,11 +88,6 @@ Future<JSString> _detectImplementations(String? _) async {
   }).toJS;
 }
 
-Future<JSAny?> _waitForUpdate(String? _) async {
-  await updates!.next;
-  return null;
-}
-
 Future<JSAny?> _open(String? implementationName) async {
   final sqlite = initializeSqlite();
   Database db;
@@ -103,7 +107,7 @@ Future<JSAny?> _open(String? implementationName) async {
   // Make sure it works!
   await db.select('SELECT database_host()');
 
-  updates = StreamQueue(db.updates);
+  db.updates.listen((_) => updates++);
   database = db;
   return returnValue?.toJS;
 }