[ DWDS ] Expose dtdUri via DebugConnection (#2694)

This is needed to access the DTD instance spawned by DDS.

Author: bkonyi

dwds/CHANGELOG.md

@@ -1,8 +1,9 @@
-## 25.1.0+1-wip
+## 25.1.0+1
 
 - Bump SDK constraint to ^3.10.0
 - Added 'scriptUri' parameter to compileExpressionToJs
 - Fix an issue in `reloadSources` where a `PauseInterrupted` event was sent. - [#61560](https://github.com/dart-lang/sdk/issues/61560)
+- Expose `dtdUri` via `DebugConnection`.
 
 ## 25.1.0
 

dwds/lib/src/connections/debug_connection.dart

@@ -41,6 +41,9 @@ class DebugConnection {
   /// The endpoint of the Dart DevTools instance.
   String? get devToolsUri => _appDebugServices.devToolsUri?.toString();
 
+  /// The endpoint of the Dart Tooling Daemon (DTD).
+  String? get dtdUri => _appDebugServices.dtdUri?.toString();
+
   /// A client of the Dart VM Service with DWDS specific extensions.
   VmService get vmService => _appDebugServices.dwdsVmClient.client;
 

dwds/lib/src/handlers/dev_handler.dart

@@ -869,6 +869,7 @@ class DevHandler {
       dwdsStats,
       dds?.wsUri,
       dds?.devToolsUri,
+      dds?.dtdUri,
     );
     final encodedUri = await debugService.encodedUri;
     _logger.info('Debug service listening on $encodedUri\n');

dwds/lib/src/services/app_debug_services.dart

@@ -14,6 +14,7 @@ abstract class AppDebugServices {
   DwdsStats? get dwdsStats;
   Uri? get ddsUri;
   Uri? get devToolsUri;
+  Uri? get dtdUri;
   String? get connectedInstanceId;
   set connectedInstanceId(String? id);
   Future<void> close();
@@ -27,6 +28,7 @@ class ChromeAppDebugServices implements AppDebugServices {
   final DwdsStats _dwdsStats;
   final Uri? _ddsUri;
   final Uri? _devToolsUri;
+  final Uri? _dtdUri;
   Future<void>? _closed;
   String? _connectedInstanceId;
 
@@ -36,6 +38,7 @@ class ChromeAppDebugServices implements AppDebugServices {
     this._dwdsStats,
     this._ddsUri,
     this._devToolsUri,
+    this._dtdUri,
   );
 
   @override
@@ -53,6 +56,9 @@ class ChromeAppDebugServices implements AppDebugServices {
   @override
   Uri? get devToolsUri => _devToolsUri;
 
+  @override
+  Uri? get dtdUri => _dtdUri;
+
   @override
   String? get connectedInstanceId => _connectedInstanceId;
 
@@ -86,12 +92,17 @@ class WebSocketAppDebugServices implements AppDebugServices {
   // WebSocket-only service - Chrome/DDS features not available
   @override
   DwdsStats? get dwdsStats => null;
+
   @override
   // TODO(bkonyi): DDS should still start in WebSocket mode.
   Uri? get ddsUri => null;
+
   @override
   Uri? get devToolsUri => null;
 
+  @override
+  Uri? get dtdUri => null;
+
   @override
   ProxyService get proxyService => _debugService.webSocketProxyService;
 

dwds/lib/src/version.dart

@@ -1,6 +1,6 @@
 name: dwds
 # Every time this changes you need to run `dart run build_runner build`.
-version: 25.1.0+1-wip
+version: 25.1.0+1
 
 description: >-
   A service that proxies between the Chrome debug protocol and the Dart VM
@@ -15,8 +15,8 @@ dependencies:
   built_value: ^8.3.0
   collection: ^1.15.0
   crypto: ^3.0.2
-  dds: '>=4.2.5 <6.0.0'
-  file: '>=6.1.4 <8.0.0'
+  dds: ">=4.2.5 <6.0.0"
+  file: ">=6.1.4 <8.0.0"
   http: ^1.0.0
   http_multi_server: ^3.2.0
   logging: ^1.0.2
@@ -29,15 +29,15 @@ dependencies:
   shelf_packages_handler: ^3.0.0
   shelf_proxy: ^1.0.4
   shelf_static: ^1.1.0
-  shelf_web_socket: '>=2.0.0 <4.0.0'
+  shelf_web_socket: ">=2.0.0 <4.0.0"
   source_maps: ^0.10.10
   stack_trace: ^1.10.0
   stream_channel: ^2.1.2
   sse: ^4.1.2
   uuid: ^4.0.0
-  vm_service: '>=14.2.4 <16.0.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_socket_channel: ">=2.2.0 <4.0.0"
   web: ^1.1.0
   webkit_inspection_protocol: ^1.0.1
 
@@ -55,7 +55,7 @@ dev_dependencies:
   frontend_server_common:
     path: ../frontend_server_common
   io: ^1.0.5
-  js: '>=0.6.4 <0.8.0'
+  js: ">=0.6.4 <0.8.0"
   pubspec_parse: ^1.2.0
   puppeteer: ^3.1.1
   test: ^1.21.6

dwds/pubspec.yaml

@@ -42,6 +42,7 @@ void main() {
       ),
     );
     expect(Uri.parse(context.debugConnection.ddsUri!).port, expectedPort);
+    expect(context.debugConnection.dtdUri, isNotNull);
   });
 
   test('DWDS starts DDS with a specified port', () async {
@@ -58,5 +59,6 @@ void main() {
       ),
     );
     expect(Uri.parse(context.debugConnection.ddsUri!).port, expectedPort);
+    expect(context.debugConnection.dtdUri, isNotNull);
   });
 }