Merge remote-tracking branch 'origin/fix-update-ids'

Author: simolus3

Diff for: sqlite3_web/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.1
+
+- Fix hooks not being delivered to all databases.
+
 ## 0.3.0
 
 - Allow passing data to worker when opening databases.

Diff for: sqlite3_web/lib/src/worker.dart

@@ -249,26 +249,24 @@ final class _ClientConnection extends ProtocolChannel
         return await subscribe(database!.updates, () async {
           final rawDatabase = await database.database.opened;
           return rawDatabase.database.updates.listen((event) {
-            sendNotification(UpdateNotification(
-                update: event, databaseId: database.database.id));
+            sendNotification(
+                UpdateNotification(update: event, databaseId: database.id));
           });
         }, request);
       case StreamRequest(action: true, type: MessageType.commitRequest):
         return await subscribe(database!.commits, () async {
           final rawDatabase = await database.database.opened;
           return rawDatabase.database.commits.listen((event) {
             sendNotification(EmptyNotification(
-                type: MessageType.notifyCommit,
-                databaseId: database.database.id));
+                type: MessageType.notifyCommit, databaseId: database.id));
           });
         }, request);
       case StreamRequest(action: true, type: MessageType.rollbackRequest):
         return await subscribe(database!.rollbacks, () async {
           final rawDatabase = await database.database.opened;
           return rawDatabase.database.rollbacks.listen((event) {
             sendNotification(EmptyNotification(
-                type: MessageType.notifyRollback,
-                databaseId: database.database.id));
+                type: MessageType.notifyRollback, databaseId: database.id));
           });
         }, request);
       case StreamRequest(action: false):

Diff for: 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.3.0
+version: 0.3.1
 homepage: https://github.com/simolus3/sqlite3.dart/tree/main/sqlite3_web
 repository: https://github.com/simolus3/sqlite3.dart
 

Diff for: sqlite3_web/test/integration_test.dart

@@ -258,5 +258,9 @@ final class _TestConfiguration {
         await driver.checkReadWrite();
       });
     }
+
+    test('can share databases', () async {
+      await driver.testSecond();
+    });
   }
 }

Diff for: sqlite3_web/tool/server.dart

@@ -187,7 +187,7 @@ class TestWebDriver {
     await driver.executeAsync('exec(arguments[0], arguments[1])', [sql]);
   }
 
-  Future<void> testSecond(String sql) async {
+  Future<void> testSecond() 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.';

Diff for: sqlite3_web/web/main.dart

@@ -4,6 +4,7 @@ import 'dart:js_interop_unsafe';
 import 'dart:typed_data';
 
 import 'package:sqlite3_web/sqlite3_web.dart';
+import 'package:sqlite3_web/src/client.dart';
 import 'package:web/web.dart';
 
 import 'controller.dart';
@@ -43,12 +44,43 @@ void main() {
   _addCallbackForWebDriver('open_only_vfs', (arg) => _open(arg, true));
   _addCallbackForWebDriver('exec', _exec);
   _addCallbackForWebDriver('test_second', (arg) async {
-    final endpoint = await database!.additionalConnection();
-    final second = await WebSqlite.connectToPort(endpoint);
+    final sqlite = initializeSqlite();
+    // Open one database to occupy the database id of zero in the worker
+    final unused = await sqlite.connect(
+        'a', StorageMode.inMemory, AccessMode.throughSharedWorker);
+    await unused.execute('CREATE TABLE unused (bar TEXT);');
+
+    // Then open another one
+    final first = await sqlite.connect(
+            'b', StorageMode.inMemory, AccessMode.throughSharedWorker)
+        as RemoteDatabase;
+    await first.execute('CREATE TABLE foo (bar TEXT);');
+
+    final endpoint = await first.additionalConnection();
+    final second = await WebSqlite.connectToPort(endpoint) as RemoteDatabase;
+
+    // First and second should have different internal ids (that's what the
+    // setup with the unused database was trying to accomplish).
+    if (first.databaseId == second.databaseId) {
+      return 'Unexpected same id'.toJS;
+    }
+
+    await second.execute('SELECT * FROM foo;');
+
+    var receivedUpdates = 0;
+    second.updates.listen((_) => receivedUpdates++);
 
-    await second.execute('SELECT 1');
+    await first.execute('INSERT INTO foo VALUES (?)', ['a']);
+    await unused.execute('INSERT INTO unused VALUES (?)', ['a']);
+
+    await Future.delayed(const Duration(milliseconds: 200));
+
+    await unused.dispose();
+    await first.dispose();
     await second.dispose();
-    return true.toJS;
+    // This should have received the update from the first database without
+    // receiving the one from the unrelated database.
+    return (receivedUpdates == 1).toJS;
   });
   _addCallbackForWebDriver('assert_file', (arg) async {
     final vfs = database!.fileSystem;