[dds] update dds and dtd to be forward compatible with an upcoming release of package:shelf_web_socket

Change-Id: I7bcbacaad44358759d8856b0bcf0b99120e79e89
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/398584
Reviewed-by: Ben Konyi <[email protected]>
Commit-Queue: Devon Carew <[email protected]>

Author: devoncarew

pkg/dds/CHANGELOG.md

@@ -10,6 +10,7 @@
 - Updated `vm_service` constraint to ^14.3.0.
 - [DAP] Updated `dap` constraint to ^1.4.0.
 - [DAP] Set `supportsANSIStyling` to `true` in debug adapter capabilities to indicate that `Output` events might contain ansi color codes.
+- Update to be forward compatible with `package:shelf_web_socket` version `3.x`.
 
 # 4.2.7
 - Added a new constant `RpcErrorCodes.kConnectionDisposed = -32010` for requests

pkg/dds/lib/src/dds_impl.dart

@@ -343,7 +343,9 @@ class DartDevelopmentServiceImpl implements DartDevelopmentService {
         .add(_httpHandler());
   }
 
-  Handler _webSocketHandler() => webSocketHandler((WebSocketChannel ws) {
+  // Note: the WebSocketChannel type below is needed for compatibility with
+  // package:shelf_web_socket v2.
+  Handler _webSocketHandler() => webSocketHandler((WebSocketChannel ws, _) {
         final client = DartDevelopmentServiceClient.fromWebSocket(
           this,
           ws,

pkg/dtd_impl/lib/src/dart_tooling_daemon.dart

@@ -313,7 +313,9 @@ class DartToolingDaemon {
         return innerHandler(request);
       };
 
-  Handler _webSocketHandler() => webSocketHandler((WebSocketChannel ws) {
+  // Note: the WebSocketChannel type below is needed for compatibility with
+  // package:shelf_web_socket v2.
+  Handler _webSocketHandler() => webSocketHandler((WebSocketChannel ws, _) {
         final client = DTDClient.fromWebSocket(
           this,
           ws,