one commit

Author: joshualitt

pkgs/test/lib/src/runner/browser/browser_manager.dart

@@ -155,6 +155,7 @@ class BrowserManager {
       ExecutableSettings settings, Configuration configuration) {
     switch (browser.root) {
       case Runtime.chrome:
+      case Runtime.chromeWasm:
         return Chrome(url, configuration, settings: settings);
       case Runtime.firefox:
         return Firefox(url, settings: settings);

pkgs/test/lib/src/runner/browser/dom.dart

@@ -21,7 +21,7 @@ extension WindowExtension on Window {
   void postMessage(Object message, String targetOrigin,
           [List<MessagePort>? messagePorts]) =>
       js_util.callMethod(this, 'postMessage', <Object?>[
-        message,
+        js_util.jsify(message),
         targetOrigin,
         if (messagePorts != null) js_util.jsify(messagePorts)
       ]);

pkgs/test/lib/src/runner/wasm/default_settings.dart

@@ -10,8 +10,13 @@ import '../executable_settings.dart';
 /// Default settings for starting browser executables with the wasm runtime.
 final defaultSettings = UnmodifiableMapView({
   Runtime.chromeWasm: ExecutableSettings(
-      linuxExecutable: 'google-chrome',
+      linuxExecutable: 'google-chrome-beta',
       macOSExecutable:
           '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
-      windowsExecutable: r'Google\Chrome\Application\chrome.exe'),
+      windowsExecutable: r'Google\Chrome\Application\chrome.exe',
+      arguments:[
+          '--js-flags=--experimental-wasm-gc --wasm-gc-js-interop '
+                      '--experimental-wasm-stack-switching '
+                      '--experimental-wasm-type-reflection'
+        ]),
 });

pkgs/test/lib/src/runner/wasm/platform.dart

@@ -52,6 +52,8 @@ class BrowserWasmPlatform extends PlatformPlugin
             Uri.parse('package:test/src/runner/browser/static/favicon.ico'))),
         p.fromUri(packageConfig.resolve(
             Uri.parse('package:test/src/runner/wasm/static/default.html.tpl'))),
+        p.fromUri(packageConfig.resolve(
+            Uri.parse('package:test/src/runner/wasm/static/run_wasm_chrome.js'))),
         root: root);
   }
 
@@ -117,8 +119,11 @@ class BrowserWasmPlatform extends PlatformPlugin
   /// The default template for html tests.
   final String _defaultTemplatePath;
 
+  /// The `package:test` side wrapper for the Dart2Wasm runtime.
+  final String _jsRuntimeWrapper;
+
   BrowserWasmPlatform._(this._server, Configuration config, String faviconPath,
-      this._defaultTemplatePath,
+      this._defaultTemplatePath, this._jsRuntimeWrapper,
       {String? root})
       : _config = config,
         _root = root ?? p.current {
@@ -159,9 +164,13 @@ class BrowserWasmPlatform extends PlatformPlugin
       var testName = htmlEscape.convert(test);
       var template = _config.customHtmlTemplatePath ?? _defaultTemplatePath;
       var contents = File(template).readAsStringSync();
+      var jsRuntime = 'dart2wasm_runtime.mjs';
       var processedContents = contents
           // Checked during loading phase that there is only one {{testScript}} placeholder.
           .replaceFirst('{{testScript}}', link)
+          .replaceFirst('{{jsRuntimeUrl}}', jsRuntime)
+          .replaceFirst('{{wasmUrl}}',
+              p.basename('$test.browser_test.dart.wasm'))
           .replaceAll('{{testName}}', testName);
       return shelf.Response.ok(processedContents,
           headers: {'Content-Type': 'text/html'});
@@ -235,13 +244,14 @@ class BrowserWasmPlatform extends PlatformPlugin
     return _compileFutures.putIfAbsent(dartPath, () async {
       var dir = Directory(_compiledDir).createTempSync('test_').path;
 
-      // TODO: Update this path to the actual wasm output file path.
-      var wasmCompiledPath =
-          p.join(dir, '${p.basename(dartPath)}.browser_test.dart.js');
-      // TODO: Update this to the actual url we want to serve the compiled WASM
-      // file(s).
-      var wasmUrl = '${p.toUri(p.relative(dartPath, from: _root)).path}'
-          '.browser_test.dart.js';
+      var baseCompiledPath =
+          p.join(dir, '${p.basename(dartPath)}.browser_test.dart');
+      var baseUrl =
+          '${p.toUri(p.relative(dartPath, from: _root)).path}.browser_test.dart';
+      var wasmUrl = '$baseUrl.wasm';
+      var jsRuntimeWrapperUrl = '$baseUrl.js';
+      var jsRuntimeUrl = p.join(p.dirname(dartPath), 'dart2wasm_runtime.mjs');
+      var htmlUrl = '$baseUrl.html';
 
       // TODO: This may need to be specialized, or it may just work. Not sure.
       var bootstrapContent = '''
@@ -255,21 +265,31 @@ class BrowserWasmPlatform extends PlatformPlugin
         }
       ''';
 
-      await _compilers.compile(bootstrapContent, wasmCompiledPath, suiteConfig);
+      await _compilers.compile(bootstrapContent, baseCompiledPath, suiteConfig);
       if (_closed) return;
 
-      var bootstrapUrl = '${p.toUri(p.relative(dartPath, from: _root)).path}'
-          '.browser_test.dart';
-      _wasmHandler.add(bootstrapUrl, (request) {
-        return shelf.Response.ok(bootstrapContent,
-            headers: {'Content-Type': 'application/dart'});
+      var wasmPath = '$baseCompiledPath.wasm';
+      _wasmHandler.add(wasmUrl, (request) {
+        return shelf.Response.ok(File(wasmPath).readAsBytesSync(),
+            headers: {'Content-Type': 'application/wasm'});
       });
 
-      _wasmHandler.add(wasmUrl, (request) {
-        // TODO: Update this with proper headers at a minimum.
-        return shelf.Response.ok(File(wasmCompiledPath).readAsBytesSync(),
+      _wasmHandler.add(jsRuntimeWrapperUrl, (request) {
+        return shelf.Response.ok(File(_jsRuntimeWrapper).readAsBytesSync(),
             headers: {'Content-Type': 'application/javascript'});
       });
+
+      var jsRuntimePath = p.join(dir, 'dart2wasm_runtime.mjs');
+      _wasmHandler.add(jsRuntimeUrl, (request) {
+        return shelf.Response.ok(File(jsRuntimePath).readAsBytesSync(),
+            headers: {'Content-Type': 'application/javascript'});
+      });
+
+      var htmlPath = '$baseCompiledPath.html';
+      _wasmHandler.add(htmlUrl, (request) {
+        return shelf.Response.ok(File(htmlPath).readAsBytesSync(),
+            headers: {'Content-Type': 'text/html'});
+      });
     });
   }
 

pkgs/test/lib/src/runner/wasm/static/default.html.tpl

@@ -3,6 +3,8 @@
   <head>
     <title>{{testName}} Test</title>
     {{testScript}}
+    <div id="WasmUrl">{{wasmUrl}}</div>
+    <div id="JSRuntimeUrl">{{jsRuntimeUrl}}</div>
     <script src="packages/test/dart.js"></script>
   </head>
 </html>

pkgs/test/lib/src/runner/wasm/static/run_wasm_chrome.js

@@ -0,0 +1,24 @@
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+// TODO(joshualitt): Investigate making this a module. Currently, Dart2Wasm is
+// borken in D8 with modules because of an issue with async. This may or may not
+// affect chrome.
+const main = async () => {
+  // Fetch and compile Wasm binary.
+  let wasmUrl = document.getElementById('WasmUrl').textContent;
+  let modulePromise = WebAssembly.compileStreaming(fetch(wasmUrl));
+
+  // Instantiate the Dart module, importing from the global scope.
+  let jsRuntimeUrl = document.getElementById('JSRuntimeUrl').textContent;
+  let dart2wasm = await import('./' + jsRuntimeUrl);
+  let dartInstance = await dart2wasm.instantiate(modulePromise, {});
+
+  // Call `main`. If tasks are placed into the event loop (by scheduling tasks
+  // explicitly or awaiting Futures), these will automatically keep the script
+  // alive even after `main` returns.
+  await dart2wasm.invoke(dartInstance);
+};
+main();
+

pkgs/test_api/lib/src/backend/remote_listener.dart

@@ -94,7 +94,7 @@ class RemoteListener {
 
           assert(message['type'] == 'suiteChannel');
           suiteChannelManager.connectIn(message['name'] as String,
-              channel.virtualChannel(message['id'] as int));
+              channel.virtualChannel((message['id'] as num).toInt()));
         });
 
         if ((message['asciiGlyphs'] as bool?) ?? false) glyph.ascii = true;
@@ -218,7 +218,7 @@ class RemoteListener {
     testChannel.stream.listen((message) {
       assert(message['command'] == 'run');
       _runLiveTest(test.load(_suite, groups: groups),
-          channel.virtualChannel(message['channel'] as int));
+          channel.virtualChannel((message['channel'] as num).toInt()));
     });
 
     return {

pkgs/test_core/lib/src/runner/wasm_compiler_pool.dart

@@ -24,29 +24,35 @@ class WasmCompilerPool extends CompilerPool {
   ///
   /// This wraps the Dart code in the standard browser-testing wrapper.
   ///
-  /// The returned [Future] will complete once the `dart2js` process completes
+  /// The returned [Future] will complete once the `dart2wasm` process completes
   /// *and* all its output has been printed to the command line.
   @override
   Future compileInternal(
       String code, String path, SuiteConfiguration suiteConfig) {
     return withTempDir((dir) async {
-      var wrapperPath = p.join(dir, 'runInBrowser.dart');
+      var wrapperPath = p.join(dir, 'main.dart');
       File(wrapperPath).writeAsStringSync(code);
-
-      // TODO: Update args to be appropriate, just a starting point.
+      var outWasmPath = '$path.wasm';
+      var outJSPath = p.join(p.dirname(path), 'dart2wasm_runtime.mjs');
+      var dartBinPath = Platform.resolvedExecutable;
+      var sdkRoot = p.join(p.dirname(dartBinPath), '../');
+      var platformRoot = p.join(sdkRoot, '../');
+      var jsRuntimePath = p.join(sdkRoot, 'bin', 'dart2wasm_runtime.mjs');
+      File(jsRuntimePath).copy(outJSPath);
+      var platformDill = p.join(platformRoot, 'dart2wasm_platform.dill');
+      var dartPrecompiledRuntimePath = p.join(platformRoot,
+          'dart_precompiled_runtime');
+      var dart2wasmSnapshotPath = p.join(sdkRoot, 'bin/snapshots',
+          'dart2wasm.snapshot');
       var process = await Process.start(
-          // This is the Dart executable, you may want to change it if dart2wasm
-          // is spawned a different way.
-          Platform.resolvedExecutable,
+          dartPrecompiledRuntimePath,
           [
-            // These are just some likely args you will want, in no particular
-            // order and also total guesses.
-            for (var experiment in enabledExperiments)
-              '--enable-experiment=$experiment',
-            '--enable-asserts',
-            '--out=$path',
-            '--packages=${await packageConfigUri}',
-            wrapperPath, // Path of the thing to actually compile
+            dart2wasmSnapshotPath,
+            '--dart-sdk=$sdkRoot',
+            '--platform=$platformDill',
+            '--packages=${(await packageConfigUri).path}',
+            wrapperPath,
+            outWasmPath,
           ]);
       if (closed) {
         process.kill();