compile worker only once

powersync-ja · Feb 1, 2024 · e591cdc · e591cdc
1 parent 23e211a
commit e591cdc
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 24 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -59,6 +59,8 @@ jobs:
           ./scripts/install_sqlite.sh ${{ matrix.sqlite_version }} ${{ matrix.sqlite_url }}
           mkdir -p assets && curl -LJ https://github.com/simolus3/sqlite3.dart/releases/download/sqlite3-2.3.0/sqlite3.wasm -o assets/sqlite3.wasm
 
+      - name: Compile WebWorker
+        run:  dart compile -o assets/drift_worker.js -O0 lib/src/web/worker/drift_worker.dart
 
       - name: Run Tests
         run: |

diff --git a/test/server/worker_server.dart b/test/server/worker_server.dart
@@ -16,26 +16,24 @@ Future<void> hybridMain(StreamChannel<Object?> channel) async {
 
   // Copy sqlite3.wasm file expected by the worker
   final sqliteOutputPath = p.join(directory, 'sqlite3.wasm');
-  if (!(await File(sqliteOutputPath).exists())) {
-    await File('assets/sqlite3.wasm').copy(sqliteOutputPath);
-  }
+  await File('assets/sqlite3.wasm').copy(sqliteOutputPath);
 
   final driftWorkerPath = p.join(directory, 'drift_worker.js');
-  if (!(await File(driftWorkerPath).exists())) {
-    // And compile worker code
-    final process = await Process.run(Platform.executable, [
-      'compile',
-      'js',
-      '-o',
-      driftWorkerPath,
-      '-O0',
-      'lib/src/web/worker/drift_worker.dart',
-    ]);
-    if (process.exitCode != 0) {
-      fail('Could not compile worker');
-    }
+  // And compile worker code
+  final process = await Process.run(Platform.executable, [
+    'compile',
+    'js',
+    '-o',
+    driftWorkerPath,
+    '-O0',
+    'lib/src/web/worker/drift_worker.dart',
+  ]);
+  if (process.exitCode != 0) {
+    fail('Could not compile worker');
   }
 
+  print('compiled worker');
+
   final server = await HttpServer.bind('localhost', 0);
 
   final handler = const Pipeline()
@@ -45,6 +43,7 @@ Future<void> hybridMain(StreamChannel<Object?> channel) async {
 
   channel.sink.add(server.port);
   await channel.stream.listen(null).asFuture<void>().then<void>((_) async {
+    print('closing server');
     await server.close();
     await Directory(directory).delete();
   });

diff --git a/test/utils/web_test_utils.dart b/test/utils/web_test_utils.dart
@@ -18,22 +18,20 @@ class TestUtils extends AbstractTestUtils {
   }
 
   Future<void> _init() async {
-    final channel = spawnHybridUri('/test/server/worker_server.dart');
+    final channel = spawnHybridUri('/test/server/asset_server.dart');
     final port = await channel.stream.first as int;
-    print('configure tests');
-    final sqliteWasmUri = Uri.parse('http://localhost:$port/sqlite3.wasm');
-
+    final sqliteWasmUri = 'http://localhost:$port/sqlite3.wasm';
     // Cross origin workers are not supported, but we can supply a Blob
-    var sqliteDriftUri =
-        Uri.parse('http://localhost:$port/drift_worker.js').toString();
+    var sqliteDriftUri = 'http://localhost:$port/drift_worker.js';
+
+    print('Using $sqliteDriftUri and $sqliteDriftUri');
     final blob = Blob(<String>['importScripts("$sqliteDriftUri");'],
         'application/javascript');
     sqliteDriftUri = _createObjectURL(blob);
 
     webOptions = SqliteOptions(
         webSqliteOptions: WebSqliteOptions(
-            wasmUri: sqliteWasmUri.toString(),
-            workerUri: sqliteDriftUri.toString()));
+            wasmUri: sqliteWasmUri.toString(), workerUri: sqliteDriftUri));
   }
 
   @override