Register the VM service on DTD from DDS

Bug: #60540

Change-Id: Ib646f3bfc0aff079b0cd57dca71e9c3646919eca
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/429760
Reviewed-by: Ben Konyi <[email protected]>
Commit-Queue: Kenzie Davisson <[email protected]>

Author: kenzieschmoll

pkg/dds/lib/src/dds_impl.dart

@@ -11,6 +11,7 @@ import 'dart:typed_data';
 
 import 'package:devtools_shared/devtools_extensions_io.dart';
 import 'package:devtools_shared/devtools_shared.dart' show DtdInfo;
+import 'package:dtd/dtd.dart' hide RpcErrorCodes;
 import 'package:json_rpc_2/json_rpc_2.dart' as json_rpc;
 import 'package:meta/meta.dart';
 import 'package:shelf/shelf.dart';
@@ -271,6 +272,23 @@ class DartDevelopmentServiceImpl implements DartDevelopmentService {
     }
 
     _uri = tmpUri;
+
+    // If DDS is hosting the Dart Tooling Daemon, it needs to register the VM
+    // Service URI on DTD.
+    final hostedDtd = _hostedDartToolingDaemon;
+    if (hostedDtd != null && wsUri != null) {
+      final dtdClient = await DartToolingDaemon.connect(hostedDtd.localUri);
+      await dtdClient.registerVmService(
+        uri: wsUri!.toString(),
+        secret: hostedDtd.secret!,
+      );
+      // Immediately close this client after registering the VM service. The
+      // VM service will be automatically unregistered from DTD when the VM
+      // service shuts down. For this case, DTD will also be shut down as part
+      // of shutting down DDS & the VM Service so we do not need to worry about
+      // unregistering the VM service manually.
+      await dtdClient.close();
+    }
   }
 
   /// Stop accepting requests after gracefully handling existing requests.

pkg/dds/pubspec.yaml

@@ -16,6 +16,7 @@ dependencies:
   collection: ^1.15.0
   dds_service_extensions: ^2.0.0
   dap: ^1.4.0
+  dtd: ^3.0.0
   extension_discovery: ^2.0.0
   devtools_shared: ^11.0.0
   http_multi_server: ^3.0.0

pkg/dds/test/client_name_rpc_test.dart

@@ -10,7 +10,10 @@ import 'common/test_helper.dart';
 
 final tests = <VMTest>[
   (VmService service) async {
-    final defaultClientName = 'client1';
+    // This will be 'client2' instead of 'client1' because the Dart Tooling
+    // Daemon that is managed by DDS will connect the first client to this
+    // VM Service connection.
+    final defaultClientName = 'client2';
     final clientName = 'agent-007';
     var result = await service.getClientName();
     expect(result.name, defaultClientName);

pkg/dds/test/get_client_name_rpc_test.dart

@@ -15,7 +15,13 @@ final test = <IsolateTest>[
     // Each client has a default name based on the order of connection to the
     // service.
     var clientName = await service.getClientName();
-    expect(clientName.name, 'client1');
+
+    // This will be 'client2' instead of 'client1' because the Dart Tooling
+    // Daemon that is managed by DDS will connect the first client to this
+    // VM Service connection.
+    final defaultClientName = 'client2';
+
+    expect(clientName.name, defaultClientName);
 
     // Set a custom client name and check it was set properly.
     await service.setClientName('foobar');
@@ -25,7 +31,7 @@ final test = <IsolateTest>[
     // Clear the client name and check that we're using the default again.
     await service.setClientName();
     clientName = await service.getClientName();
-    expect(clientName.name, 'client1');
+    expect(clientName.name, defaultClientName);
   },
 ];