Merge branch 'main' into misc/dwds-build-deps

Author: parlough

dwds/CHANGELOG.md

@@ -1,10 +1,14 @@
-## 26.2.1-wip
+## 26.2.2-wip
 
 - Update `package:built_value` dependency constraint to `^8.11.2`.
 
+## 26.2.1
+
+- Add support for DDS APIs and serving Dart DevTools when no Chrome Debugger is available.
+
 ## 26.2.0
 
-- Add support for more service APIs over websocket connections with no Chrome Debugger available.
+- Add support for more service APIs over websocket connections when no Chrome Debugger is available.
 
 ## 26.1.0
 

dwds/lib/dwds.dart

@@ -34,7 +34,8 @@ export 'src/readers/frontend_server_asset_reader.dart'
     show FrontendServerAssetReader;
 export 'src/readers/proxy_server_asset_reader.dart' show ProxyServerAssetReader;
 export 'src/servers/devtools.dart';
-export 'src/services/chrome_debug_exception.dart' show ChromeDebugException;
+export 'src/services/chrome/chrome_debug_exception.dart'
+    show ChromeDebugException;
 export 'src/services/expression_compiler.dart'
     show
         ExpressionCompilationResult,

dwds/lib/src/connections/debug_connection.dart

@@ -5,7 +5,7 @@
 import 'dart:async';
 
 import 'package:dwds/src/services/app_debug_services.dart';
-import 'package:dwds/src/services/chrome_proxy_service.dart';
+import 'package:dwds/src/services/chrome/chrome_proxy_service.dart';
 import 'package:vm_service/vm_service.dart';
 
 /// A debug connection between the application in the browser and DWDS.

dwds/lib/src/debugging/classes.dart

@@ -5,7 +5,7 @@
 import 'package:dwds/src/config/tool_configuration.dart';
 import 'package:dwds/src/debugging/chrome_inspector.dart';
 import 'package:dwds/src/debugging/metadata/class.dart';
-import 'package:dwds/src/services/chrome_debug_exception.dart';
+import 'package:dwds/src/services/chrome/chrome_debug_exception.dart';
 import 'package:dwds/src/utilities/shared.dart';
 import 'package:vm_service/vm_service.dart';
 import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';

dwds/lib/src/debugging/debugger.dart

@@ -12,7 +12,7 @@ import 'package:dwds/src/debugging/inspector.dart';
 import 'package:dwds/src/debugging/location.dart';
 import 'package:dwds/src/debugging/remote_debugger.dart';
 import 'package:dwds/src/debugging/skip_list.dart';
-import 'package:dwds/src/services/chrome_debug_exception.dart';
+import 'package:dwds/src/services/chrome/chrome_debug_exception.dart';
 import 'package:dwds/src/utilities/dart_uri.dart';
 import 'package:dwds/src/utilities/domain.dart';
 import 'package:dwds/src/utilities/objects.dart' show Property;

dwds/lib/src/debugging/libraries.dart

@@ -8,7 +8,7 @@ import 'package:dwds/src/debugging/chrome_inspector.dart';
 import 'package:dwds/src/debugging/inspector.dart';
 import 'package:dwds/src/debugging/metadata/class.dart';
 import 'package:dwds/src/debugging/metadata/provider.dart';
-import 'package:dwds/src/services/chrome_debug_exception.dart';
+import 'package:dwds/src/services/chrome/chrome_debug_exception.dart';
 import 'package:logging/logging.dart';
 import 'package:meta/meta.dart';
 import 'package:vm_service/vm_service.dart';

dwds/lib/src/debugging/metadata/class.dart

@@ -4,7 +4,7 @@
 
 import 'package:dwds/src/config/tool_configuration.dart';
 import 'package:dwds/src/debugging/chrome_inspector.dart';
-import 'package:dwds/src/services/chrome_debug_exception.dart';
+import 'package:dwds/src/services/chrome/chrome_debug_exception.dart';
 import 'package:logging/logging.dart';
 import 'package:vm_service/vm_service.dart';
 import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';

dwds/lib/src/debugging/web_socket_inspector.dart

@@ -5,7 +5,7 @@
 import 'package:dwds/src/connections/app_connection.dart';
 import 'package:dwds/src/debugging/inspector.dart';
 import 'package:dwds/src/debugging/libraries.dart';
-import 'package:dwds/src/services/web_socket_proxy_service.dart';
+import 'package:dwds/src/services/web_socket/web_socket_proxy_service.dart';
 import 'package:dwds/src/utilities/shared.dart';
 import 'package:vm_service/vm_service.dart';
 
@@ -38,6 +38,7 @@ class WebSocketAppInspector extends AppInspector {
       breakpoints: [],
       isSystemIsolate: false,
       isolateFlags: [],
+      extensionRPCs: [],
     );
     final inspector = WebSocketAppInspector._(
       appConnection,