Merge branch 'main' into yj-dartdevembedder-6

dart-lang · Jan 10, 2025 · 22cdf34 · 22cdf34
2 parents 344867d + a7c8fe7
commit 22cdf34
Show file tree

Hide file tree

Showing 18 changed files with 262 additions and 105 deletions.
diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md
@@ -1,4 +1,6 @@
-## 24.4.0-wip
+## 24.3.1
+
+- Add support for binding DDS to a custom port.
 - Added support for some debugging APIs with the DDC library bundle format. - [#2563](https://github.com/dart-lang/webdev/issues/2563)
 
 ## 24.3.0

diff --git a/dwds/lib/dart_web_debug_service.dart b/dwds/lib/dart_web_debug_service.dart
@@ -128,6 +128,7 @@ class Dwds {
       debugSettings.expressionCompiler,
       injected,
       debugSettings.spawnDds,
+      debugSettings.ddsPort,
       debugSettings.launchDevToolsInNewWindow,
     );
 

diff --git a/dwds/lib/data/build_result.g.dart b/dwds/lib/data/build_result.g.dart
diff --git a/dwds/lib/data/connect_request.g.dart b/dwds/lib/data/connect_request.g.dart
diff --git a/dwds/lib/data/debug_event.g.dart b/dwds/lib/data/debug_event.g.dart
diff --git a/dwds/lib/data/debug_info.g.dart b/dwds/lib/data/debug_info.g.dart
diff --git a/dwds/lib/data/devtools_request.g.dart b/dwds/lib/data/devtools_request.g.dart
diff --git a/dwds/lib/data/error_response.g.dart b/dwds/lib/data/error_response.g.dart
diff --git a/dwds/lib/data/extension_request.g.dart b/dwds/lib/data/extension_request.g.dart
diff --git a/dwds/lib/data/register_event.g.dart b/dwds/lib/data/register_event.g.dart
diff --git a/dwds/lib/src/config/tool_configuration.dart b/dwds/lib/src/config/tool_configuration.dart
@@ -61,6 +61,7 @@ class DebugSettings {
   final bool useSseForDebugBackend;
   final bool useSseForInjectedClient;
   final bool spawnDds;
+  final int? ddsPort;
   final bool enableDevToolsLaunch;
   final bool launchDevToolsInNewWindow;
   final bool emitDebugEvents;
@@ -75,6 +76,7 @@ class DebugSettings {
     this.useSseForDebugBackend = true,
     this.useSseForInjectedClient = true,
     this.spawnDds = true,
+    this.ddsPort,
     this.enableDevToolsLaunch = true,
     this.launchDevToolsInNewWindow = true,
     this.emitDebugEvents = true,

diff --git a/dwds/lib/src/handlers/dev_handler.dart b/dwds/lib/src/handlers/dev_handler.dart
@@ -66,6 +66,7 @@ class DevHandler {
   final bool _useSseForDebugProxy;
   final bool _useSseForInjectedClient;
   final bool _spawnDds;
+  final int? _ddsPort;
   final bool _launchDevToolsInNewWindow;
   final ExpressionCompiler? _expressionCompiler;
   final DwdsInjector _injected;
@@ -90,6 +91,7 @@ class DevHandler {
     this._expressionCompiler,
     this._injected,
     this._spawnDds,
+    this._ddsPort,
     this._launchDevToolsInNewWindow,
   ) {
     _subs.add(buildResults.listen(_emitBuildResults));
@@ -215,6 +217,7 @@ class DevHandler {
       useSse: false,
       expressionCompiler: _expressionCompiler,
       spawnDds: _spawnDds,
+      ddsPort: _ddsPort,
     );
   }
 
@@ -645,6 +648,7 @@ class DevHandler {
         useSse: _useSseForDebugProxy,
         expressionCompiler: _expressionCompiler,
         spawnDds: _spawnDds,
+        ddsPort: _ddsPort,
       );
       appServices = await _createAppDebugServices(
         debugService,