Port custom wasm build example

Author: simolus3

sqlite3/build.yaml

@@ -1,46 +1,15 @@
-
 targets:
-  # This setup exists so that the main entrypoint (web/main.dart) gets compiled
-  # with dartdevc for debug builds while the worker is compiled with dart2js
-  # (since workers don't support the JS moduled emitted by dartdevc).
-  # In release builds (`--release` on the CLI), both entrypoints are compiled
-  # with dart2js.
-  #
-  # If you're ok with compiling everything with dart2js, just use
-  # `compiler: dartj2s` on the options of the default target and ignore the two
-  # additional targets here.
-  dart2js_archives:
-    auto_apply_builders: false
-    dependencies: [":$default", ":worker"]
-    builders:
-      build_web_compilers:dart2js_archive_extractor:
-        enabled: true
-  worker:
-    auto_apply_builders: false
-    dependencies: [":$default"]
-    builders:
-      build_web_compilers:entrypoint:
-        enabled: true
-        generate_for:
-          - example/web/worker.dart
-        options:
-          compiler: dart2js
-      build_web_compilers:dart2js_archive_extractor:
-        enabled: false
-
   $default:
     sources:
       include:
         - lib/**
         - example/web/**
+        - $package$
     builders:
       build_web_compilers:entrypoint:
+        options:
+          compilers:
+            dart2js:
         generate_for:
           include:
             - "example/web/**"
-          # This one is compiled in the other target
-          exclude:
-            - "example/web/worker.dart"
-      # We have a designated target for this step.
-      build_web_compilers:dart2js_archive_extractor:
-        enabled: false

sqlite3/example/custom_wasm_build/README.md

@@ -40,13 +40,13 @@ To download and compile sqlite3 as well as the patched `sqlite3_os_init` functio
 for this example, run
 
 ```
-WASI_SYSROOT=/path/to/wasi/ CC=/path/to/clang cargo build --target wasm32-wasi
+WASI_SYSROOT=/path/to/wasi/ CC=/path/to/clang cargo build --target wasm32-unknown-unknown
 ```
 
 Or, to compile a release build optimized for size:
 
 ```
-WASI_SYSROOT=/path/to/wasi/ CC=/path/to/clang cargo build --target wasm32-wasi --release
+WASI_SYSROOT=/path/to/wasi/ CC=/path/to/clang cargo build --target wasm32-unknown-unknown --release
 ```
 
 Cargo compiles sqlite3 to WASM object files, the Rust part is compiled into a static
@@ -55,8 +55,8 @@ A Dart script (`link.dart`) can be used to link them together into a `sqlite3.wa
 file loadable by the `sqlite3` package:
 
 ```
-CC=/path/to/clang dart run link.dart target/wasm32-wasi/debug
-CC=/path/to/clang dart run link.dart target/wasm32-wasi/release
+CC=/path/to/clang dart run link.dart target/wasm32-unknown-unknown/debug
+CC=/path/to/clang dart run link.dart target/wasm32-unknown-unknown/release
 ```
 
 As an additional transformation step, running `wasm-opt -O4` on the resulting

sqlite3/example/custom_wasm_build/build.rs

@@ -6,7 +6,7 @@ fn main() {
     let sysroot =
         env::var("WASI_SYSROOT").unwrap_or_else(|_| "/usr/share/wasi-sysroot".to_string());
 
-    let cmake_dir = Config::new("../../assets/wasm/")
+    let cmake_dir = Config::new("../../../sqlite3_wasm_build/src/")
         .define("wasi_sysroot", &sysroot)
         .define("CMAKE_C_COMPILER_WORKS", "1")
         .build_target("sqlite3_opt_lib")
@@ -18,13 +18,16 @@ fn main() {
     let objects = c_build
         .target("wasm32-unknown-wasi")
         .cargo_warnings(false)
+        .std("c23")
         .flag("--sysroot")
         .flag(&sysroot)
         .file(sqlite3_src.join("sqlite3.c"))
-        .file("../../assets/wasm/helpers.c")
+        .file("../../../sqlite3_wasm_build/src/helpers.c")
         .flag("-flto=thin")
         .include(&sqlite3_src)
-        .include("../../assets/wasm/")
+        .include("../../../sqlite3_wasm_build/src/")
+        .define("SQLITE_ENABLE_SESSION", None)
+        .define("SQLITE_ENABLE_PREUPDATE_HOOK", None)
         .define("_HAVE_SQLITE_CONFIG_H", None)
         .define("SQLITE_API", "__attribute__((visibility(\"default\")))")
         // Ideally we should be able to compile this into a static library and use that one, but

sqlite3/pubspec.yaml

@@ -52,3 +52,4 @@ dev_dependencies:
   test_descriptor: ^2.0.0
   pub_semver: ^2.1.5
   convert: ^3.1.2
+  package_config: ^2.2.0

sqlite3/tool/serve_web_example.dart

@@ -0,0 +1,74 @@
+import 'dart:io';
+import 'dart:isolate';
+
+import 'package:build_daemon/client.dart';
+import 'package:build_daemon/constants.dart';
+import 'package:build_daemon/data/build_status.dart';
+import 'package:build_daemon/data/build_target.dart';
+import 'package:collection/collection.dart';
+import 'package:package_config/package_config.dart';
+import 'package:path/path.dart' as p;
+import 'package:shelf/shelf_io.dart';
+import 'package:shelf_proxy/shelf_proxy.dart';
+
+/// Serves example/web under localhost.
+void main() async {
+  await TestAssetServer.start();
+  print('Serving on http://localhost:8080/');
+}
+
+class TestAssetServer {
+  final BuildDaemonClient buildRunner;
+  late final HttpServer server;
+
+  TestAssetServer(this.buildRunner);
+
+  Future<void> close() async {
+    await server.close(force: true);
+    await buildRunner.close();
+  }
+
+  static Future<TestAssetServer> start() async {
+    final packageConfig = await loadPackageConfigUri(
+      (await Isolate.packageConfig)!,
+    );
+    final ownPackage = packageConfig['sqlite3']!.root;
+    var packageDir = ownPackage.toFilePath(windows: Platform.isWindows);
+    if (packageDir.endsWith('/')) {
+      packageDir = packageDir.substring(0, packageDir.length - 1);
+    }
+
+    final buildRunner = await BuildDaemonClient.connect(packageDir, [
+      Platform.executable, // dart
+      'run',
+      'build_runner',
+      'daemon',
+    ], logHandler: (log) => print(log.message));
+
+    buildRunner
+      ..registerBuildTarget(DefaultBuildTarget((b) => b.target = 'example'))
+      ..startBuild();
+
+    // Wait for the build to complete, so that the server we return is ready to
+    // go.
+    await buildRunner.buildResults.firstWhere((b) {
+      final buildResult = b.results.firstWhereOrNull(
+        (r) => r.target == 'example',
+      );
+      return buildResult != null && buildResult.status != BuildStatus.started;
+    });
+
+    final assetServerPortFile = File(
+      p.join(daemonWorkspace(packageDir), '.asset_server_port'),
+    );
+    final assetServerPort = int.parse(await assetServerPortFile.readAsString());
+
+    final server = TestAssetServer(buildRunner);
+
+    final proxy = proxyHandler(
+      'http://localhost:$assetServerPort/example/web/',
+    );
+    server.server = await serve(proxy, 'localhost', 8080);
+    return server;
+  }
+}