Added support for some debugging APIs with the DDC library bundle format

dwds/CHANGELOG.md

@@ -1,4 +1,5 @@
 ## 24.4.0-wip
+- Added support for some debugging APIs with the DDC library bundle format. - [#2563](https://github.com/dart-lang/webdev/issues/2563)
 
 ## 24.3.0
 

dwds/lib/src/debugging/dart_runtime_debugger.dart

@@ -18,11 +18,8 @@ class DartRuntimeDebugger {
   String _generateJsExpression(
     String ddcExpression,
     String libraryBundleExpression,
-  ) {
-    return _useLibraryBundleExpression
-        ? libraryBundleExpression
-        : ddcExpression;
-  }
+  ) =>
+      _useLibraryBundleExpression ? libraryBundleExpression : ddcExpression;
 
   /// Wraps a JS function call with SDK loader logic.
   String _wrapWithSdkLoader(String args, String functionCall) {
@@ -199,4 +196,11 @@ class DartRuntimeDebugger {
       ),
     );
   }
+
+  String invokeExtensionJsExpression(String methodName, String encodedJson) {
+    return _generateJsExpression(
+      "${_loadStrategy.loadModuleSnippet}('dart_sdk').developer.invokeExtension('$methodName', JSON.stringify($encodedJson));",
+      "dartDevEmbedder.debugger.invokeExtension('$methodName', JSON.stringify($encodedJson));",
+    );
+  }
 }

dwds/lib/src/services/chrome_proxy_service.dart

@@ -518,10 +518,8 @@ class ChromeProxyService implements VmServiceInterface {
         v is String ? v : jsonEncode(v),
       ),
     );
-    final expression = '''
-${globalToolConfiguration.loadStrategy.loadModuleSnippet}("dart_sdk").developer.invokeExtension(
-    "$method", JSON.stringify(${jsonEncode(stringArgs)}));
-''';
+    final expression = globalToolConfiguration.loadStrategy.dartRuntimeDebugger
+        .invokeExtensionJsExpression(method, jsonEncode(stringArgs));
     final result = await inspector.jsEvaluate(expression, awaitPromise: true);
     final decodedResponse =
         jsonDecode(result.value as String) as Map<String, dynamic>;

dwds/test/chrome_proxy_service_test.dart → dwds/test/chrome_proxy_service_amd_test.dart

@@ -11,6 +11,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:dwds/expression_compiler.dart';
 import 'package:dwds/src/services/chrome_proxy_service.dart';
 import 'package:dwds/src/utilities/dart_uri.dart';
 import 'package:dwds/src/utilities/shared.dart';
@@ -29,8 +30,14 @@ import 'fixtures/utilities.dart';
 void main() {
   // Change to true to see verbose output from the tests.
   final debug = false;
-
-  final provider = TestSdkConfigurationProvider(verbose: debug);
+  final moduleFormat = ModuleFormat.amd;
+  final canaryFeatures = false;
+
+  final provider = TestSdkConfigurationProvider(
+    verbose: debug,
+    ddcModuleFormat: moduleFormat,
+    canaryFeatures: canaryFeatures,
+  );
   tearDownAll(provider.dispose);
 
   final context = TestContext(TestProject.test, provider);
@@ -42,6 +49,8 @@ void main() {
         testSettings: TestSettings(
           enableExpressionEvaluation: true,
           verboseCompiler: false,
+          moduleFormat: provider.ddcModuleFormat,
+          canaryFeatures: provider.canaryFeatures,
         ),
       );
     });

dwds/test/chrome_proxy_service_ddc_library_bundle_test.dart

@@ -0,0 +1,135 @@
+// Copyright (c) 2025, 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.
+
+@TestOn('vm')
+@Tags(['daily'])
+@Timeout(Duration(minutes: 2))
+library;
+
+import 'dart:convert';
+
+import 'package:dwds/expression_compiler.dart';
+import 'package:dwds/src/services/chrome_proxy_service.dart';
+import 'package:test/test.dart';
+import 'package:test_common/logging.dart';
+import 'package:test_common/test_sdk_configuration.dart';
+import 'package:vm_service/vm_service.dart';
+
+import 'fixtures/context.dart';
+import 'fixtures/project.dart';
+import 'fixtures/utilities.dart';
+
+void main() {
+  // Change to true to see verbose output from the tests.
+  final debug = false;
+  final moduleFormat = ModuleFormat.ddc;
+  final canaryFeatures = true;
+  final compilationMode = CompilationMode.frontendServer;
+
+  final provider = TestSdkConfigurationProvider(
+    verbose: debug,
+    ddcModuleFormat: moduleFormat,
+    canaryFeatures: canaryFeatures,
+  );
+  tearDownAll(provider.dispose);
+
+  final context = TestContext(TestProject.testDdcLibraryBundle, provider);
+
+  group('shared context', () {
+    setUpAll(() async {
+      setCurrentLogWriter(debug: debug);
+      await context.setUp(
+        testSettings: TestSettings(
+          enableExpressionEvaluation: true,
+          verboseCompiler: false,
+          moduleFormat: provider.ddcModuleFormat,
+          canaryFeatures: provider.canaryFeatures,
+          compilationMode: compilationMode,
+        ),
+      );
+    });
+
+    tearDownAll(() async {
+      await context.tearDown();
+    });
+
+    group('callServiceExtension', () {
+      late ChromeProxyService service;
+
+      setUp(() {
+        setCurrentLogWriter(debug: debug);
+        service = context.service;
+      });
+
+      test(
+        'success',
+        () async {
+          final serviceMethod = 'ext.test.callServiceExtension';
+          await context.tabConnection.runtime
+              .evaluate('registerExtension("$serviceMethod");');
+
+          // The non-string keys/values get auto json-encoded to match the vm
+          // behavior.
+          final args = {
+            'bool': true,
+            'list': [1, '2', 3],
+            'map': {'foo': 'bar'},
+            'num': 1.0,
+            'string': 'hello',
+            1: 2,
+            false: true,
+          };
+
+          final result =
+              await service.callServiceExtension(serviceMethod, args: args);
+          expect(
+            result.json,
+            args.map(
+              (k, v) => MapEntry(
+                k is String ? k : jsonEncode(k),
+                v is String ? v : jsonEncode(v),
+              ),
+            ),
+          );
+        },
+        onPlatform: {
+          'windows':
+              const Skip('https://github.com/dart-lang/webdev/issues/711'),
+        },
+      );
+
+      test(
+        'failure',
+        () async {
+          final serviceMethod = 'ext.test.callServiceExtensionWithError';
+          await context.tabConnection.runtime
+              .evaluate('registerExtensionWithError("$serviceMethod");');
+
+          final errorDetails = {'intentional': 'error'};
+          expect(
+            service.callServiceExtension(
+              serviceMethod,
+              args: {
+                'code': '-32001',
+                'details': jsonEncode(errorDetails),
+              },
+            ),
+            throwsA(
+              predicate(
+                (dynamic error) =>
+                    error is RPCError &&
+                    error.code == -32001 &&
+                    error.details == jsonEncode(errorDetails),
+              ),
+            ),
+          );
+        },
+        onPlatform: {
+          'windows':
+              const Skip('https://github.com/dart-lang/webdev/issues/711'),
+        },
+      );
+    });
+  });
+}

dwds/test/fixtures/project.dart

@@ -102,6 +102,14 @@ class TestProject {
     htmlEntryFileName: 'index.html',
   );
 
+  static const testDdcLibraryBundle = TestProject._(
+    packageName: '_test_sound',
+    packageDirectory: '_testSound',
+    webAssetsPath: 'example/hello_world',
+    dartEntryFileName: 'main_ddc_library_bundle.dart',
+    htmlEntryFileName: 'index.html',
+  );
+
   static final testScopes = TestProject._(
     packageName: '_test_sound',
     packageDirectory: '_testSound',

fixtures/_testSound/example/hello_world/main_ddc_library_bundle.dart

@@ -0,0 +1,27 @@
+// Copyright (c) 2025, 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.
+
+import 'dart:convert';
+import 'dart:developer';
+import 'dart:js';
+
+// Create a series of top level objects for tests in
+// dwds/test/chrome_proxy_service_ddc_library_bundle_test.dart
+
+void main() async {
+  context['registerExtension'] = (String method) {
+    registerExtension(method,
+        (String method, Map<String, String> parameters) async {
+      return ServiceExtensionResponse.result(jsonEncode(parameters));
+    });
+  };
+
+  context['registerExtensionWithError'] = (String method) {
+    registerExtension(method,
+        (String method, Map<String, String> parameters) async {
+      return ServiceExtensionResponse.error(
+          int.parse(parameters['code']!), parameters['details']!);
+    });
+  };
+}