From a935bd38335966105006a62516ac701af669d796 Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Mon, 9 Dec 2024 12:26:46 -0800 Subject: [PATCH 1/2] updates to be forward compatible with changes to package:shelf_web_socket --- dwds/CHANGELOG.md | 4 ++++ dwds/lib/src/handlers/socket_connections.dart | 2 +- dwds/lib/src/services/debug_service.dart | 4 ++-- dwds/pubspec.yaml | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md index 4a350e7fe..3ad574c28 100644 --- a/dwds/CHANGELOG.md +++ b/dwds/CHANGELOG.md @@ -1,3 +1,7 @@ +## 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) diff --git a/dwds/lib/src/handlers/socket_connections.dart b/dwds/lib/src/handlers/socket_connections.dart index 8caea4362..8046e019e 100644 --- a/dwds/lib/src/handlers/socket_connections.dart +++ b/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)), ); } diff --git a/dwds/lib/src/services/debug_service.dart b/dwds/lib/src/services/debug_service.dart index e7fd46492..de7772ef0 100644 --- a/dwds/lib/src/services/debug_service.dart +++ b/dwds/lib/src/services/debug_service.dart @@ -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)? onRequest, void Function(Map)? onResponse, }) { - return (webSocket) { + return (webSocket, subprotocol) { final responseController = StreamController>(); webSocket.sink.addStream( responseController.stream.map((response) { diff --git a/dwds/pubspec.yaml b/dwds/pubspec.yaml index 1a7a808ca..b5464a28a 100644 --- a/dwds/pubspec.yaml +++ b/dwds/pubspec.yaml @@ -1,6 +1,6 @@ name: dwds # Every time this changes you need to run `dart run build_runner build`. -version: 24.2.0 +version: 24.2.1-wip description: >- A service that proxies between the Chrome debug protocol and the Dart VM service protocol. From 0f51dfe1f1100e4e3b497f61d9af5cc144551003 Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Mon, 9 Dec 2024 13:11:55 -0800 Subject: [PATCH 2/2] update built artifacts --- dwds/lib/src/version.dart | 2 +- dwds/test/build/ensure_version_test.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dwds/lib/src/version.dart b/dwds/lib/src/version.dart index 7bac1eac2..f3fd99e9d 100644 --- a/dwds/lib/src/version.dart +++ b/dwds/lib/src/version.dart @@ -1,2 +1,2 @@ // Generated code. Do not modify. -const packageVersion = '24.2.0'; +const packageVersion = '24.2.1-wip'; diff --git a/dwds/test/build/ensure_version_test.dart b/dwds/test/build/ensure_version_test.dart index ea98c70eb..26bda6fd6 100644 --- a/dwds/test/build/ensure_version_test.dart +++ b/dwds/test/build/ensure_version_test.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.', ); });