Merge branch 'main' into fix/upcoming-lint-fixes

Author: parlough

dwds/CHANGELOG.md

@@ -1,4 +1,8 @@
-## 24.2.0-wip
+## 24.2.1-wip
+
+- Update to be forward compatible with changes to `package:shelf_web_socket`.
+
+## 24.2.0
 
 - Consolidate `FrontendServerDdcStrategyProvider` and `FrontendServerRequireStrategyProvider` under a shared parent class. - [#2517](https://github.com/dart-lang/webdev/issues/2517)
 - Remove `build_daemon_ddc_and_canary_evaluate_test`. - [2512](https://github.com/dart-lang/webdev/issues/2512)
@@ -11,7 +15,9 @@
   to use the provided `name` in a `ModuleMetadata`. Metadata provided by DDC
   when using the library bundle format does not provide a useful bundle name.
 - Migrate to `package:web` v1.1.0.
-- Added support for some debugging APIs with the DDC library bundle format. - [#2488](https://github.com/dart-lang/webdev/issues/2488)
+- Added support for some debugging APIs with the DDC library bundle format. - [#2488](https://github.com/dart-lang/webdev/issues/2488), [#2534](https://github.com/dart-lang/webdev/issues/2534)
+- Update `package:vm_service` to '>=14.2.4 <16.0.0'.
+- Update `package:vm_service_interface` to '2.0.1'.
 
 ## 24.1.0
 

dwds/lib/src/debugging/classes.dart

@@ -77,14 +77,8 @@ class ClassHelper extends Domain {
 
     if (libraryUri == null || classId == null || className == null) return null;
 
-    final expression = '''
-      (function() {
-        const sdk = ${globalToolConfiguration.loadStrategy.loadModuleSnippet}('dart_sdk');
-        const dart = sdk.dart;
-        return dart.getClassMetadata('$libraryUri', '$className');
-      })()
-    ''';
-
+    final expression = globalToolConfiguration.loadStrategy.dartRuntimeDebugger
+        .getClassMetadataJsExpression(libraryUri, className);
     RemoteObject result;
     try {
       result = await inspector.remoteDebugger.evaluate(

dwds/lib/src/debugging/dart_runtime_debugger.dart

@@ -14,6 +14,7 @@ class DartRuntimeDebugger {
   })  : _loadStrategy = loadStrategy,
         _useLibraryBundleExpression = useLibraryBundleExpression;
 
+  /// Generates a JS expression based on DDC module format.
   String _generateJsExpression(
     String ddcExpression,
     String libraryBundleExpression,
@@ -23,16 +24,18 @@ class DartRuntimeDebugger {
         : ddcExpression;
   }
 
+  /// Wraps a JS function call with SDK loader logic.
   String _wrapWithSdkLoader(String args, String functionCall) {
     return '''
       function($args) {
-        const sdk = ${_loadStrategy.loadModuleSnippet}("dart_sdk");
+        const sdk = ${_loadStrategy.loadModuleSnippet}('dart_sdk');
         const dart = sdk.dart;
         return dart.$functionCall;
       }
     ''';
   }
 
+  /// Wraps a JS function call with DDC library bundle loader logic.
   String _wrapWithBundleLoader(String args, String functionCall) {
     return '''
       function($args) {
@@ -41,6 +44,12 @@ class DartRuntimeDebugger {
     ''';
   }
 
+  /// Wraps an expression in an Immediately Invoked Function Expression (IIFE).
+  String _wrapInIIFE(String expression) {
+    return '($expression)()';
+  }
+
+  /// Builds a JS expression based on the loading strategy.
   String _buildExpression(
     String args,
     String ddcFunction,
@@ -52,6 +61,7 @@ class DartRuntimeDebugger {
     );
   }
 
+  /// Generates a JS expression for retrieving object metadata.
   String getObjectMetadataJsExpression() {
     return _buildExpression(
       'arg',
@@ -60,6 +70,7 @@ class DartRuntimeDebugger {
     );
   }
 
+  /// Generates a JS expression for retrieving object field names.
   String getObjectFieldNamesJsExpression() {
     return _buildExpression(
       '',
@@ -68,6 +79,7 @@ class DartRuntimeDebugger {
     );
   }
 
+  /// Generates a JS expression for retrieving function metadata.
   String getFunctionMetadataJsExpression() {
     return _buildExpression(
       '',
@@ -76,11 +88,23 @@ class DartRuntimeDebugger {
     );
   }
 
+  /// Generates a JS expression for retrieving a subrange of elements.
   String getSubRangeJsExpression() {
     return _buildExpression(
       'offset, count',
       'getSubRange(this, offset, count)',
       'getSubRange(this, offset, count)',
     );
   }
+
+  /// Generates a JS expression for retrieving class metadata.
+  String getClassMetadataJsExpression(String libraryUri, String className) {
+    final expression = _buildExpression(
+      '',
+      "getClassMetadata('$libraryUri', '$className')",
+      "getClassMetadata('$libraryUri', '$className')",
+    );
+    // Use the helper method to wrap this in an IIFE
+    return _wrapInIIFE(expression);
+  }
 }

dwds/lib/src/handlers/socket_connections.dart

@@ -104,7 +104,7 @@ class WebSocketSocketHandler extends SocketHandler {
 
   WebSocketSocketHandler() {
     _handler = webSocketHandler(
-      (WebSocketChannel channel) =>
+      (WebSocketChannel channel, _) =>
           _connectionsStream.add(WebSocketConnection(channel)),
     );
   }

dwds/lib/src/injected/client.js

@@ -34,13 +34,13 @@ int _clientsConnected = 0;
 
 Logger _logger = Logger('DebugService');
 
-void Function(WebSocketChannel) _createNewConnectionHandler(
+void Function(WebSocketChannel, String?) _createNewConnectionHandler(
   ChromeProxyService chromeProxyService,
   ServiceExtensionRegistry serviceExtensionRegistry, {
   void Function(Map<String, Object>)? onRequest,
   void Function(Map<String, Object?>)? onResponse,
 }) {
-  return (webSocket) {
+  return (webSocket, subprotocol) {
     final responseController = StreamController<Map<String, Object?>>();
     webSocket.sink.addStream(
       responseController.stream.map((response) {

dwds/lib/src/services/debug_service.dart

@@ -1,6 +1,6 @@
 name: dwds
 # Every time this changes you need to run `dart run build_runner build`.
-version: 24.2.0-wip
+version: 24.2.1-wip
 description: >-
   A service that proxies between the Chrome debug protocol and the Dart VM
   service protocol.
@@ -15,7 +15,7 @@ dependencies:
   collection: ^1.15.0
   crypto: ^3.0.2
   dds: ^4.2.5
-  file: ">=6.1.4 <8.0.0"
+  file: '>=6.1.4 <8.0.0'
   http: ^1.0.0
   http_multi_server: ^3.2.0
   logging: ^1.0.2
@@ -33,8 +33,8 @@ dependencies:
   stack_trace: ^1.10.0
   sse: ^4.1.2
   uuid: ^4.0.0
-  vm_service: ^14.2.4
-  vm_service_interface: 1.1.0
+  vm_service: '>=14.2.4 <16.0.0'
+  vm_service_interface: 2.0.1
   web_socket_channel: '>=2.2.0 <4.0.0'
   web: ^1.1.0
   webkit_inspection_protocol: ^1.0.1
@@ -52,7 +52,7 @@ dev_dependencies:
   graphs: ^2.1.0
   frontend_server_common:
     path: ../frontend_server_common
-  js: ">=0.6.4 <0.8.0"
+  js: '>=0.6.4 <0.8.0'
   lints: ^4.0.0
   pubspec_parse: ^1.2.0
   puppeteer: ^3.1.1

dwds/lib/src/version.dart

@@ -18,7 +18,7 @@ void main() {
     expect(
       Version.parse(packageVersion),
       pubspec.version,
-      reason: 'Please run `pub run build_runner build '
+      reason: 'Please run `dart run build_runner build '
           '--build-filter=lib/src/version.dart` to update the version.',
     );
   });