Skip to content

Commit 382ff42

Browse files
authored
[ DWDS ] Launch DDS when using the web socket proxy service (#2706)
DDS is needed to serve DevTools, so the web socket proxy service should be setup to launch DDS at startup. This change also includes some significant refactors to reduce the amount of duplicate code that could be shared by the Chrome and web socket service implementations.
1 parent b9c39c0 commit 382ff42

26 files changed

+1234
-1648
lines changed

dwds/CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
## 26.2.1-wip
2+
3+
- Add support for DDS APIs and serving Dart DevTools when no Chrome Debugger is available.
4+
15
## 26.2.0
26

3-
- Add support for more service APIs over websocket connections with no Chrome Debugger available.
7+
- Add support for more service APIs over websocket connections when no Chrome Debugger is available.
48

59
## 26.1.0
610

dwds/lib/dwds.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ export 'src/readers/frontend_server_asset_reader.dart'
3434
show FrontendServerAssetReader;
3535
export 'src/readers/proxy_server_asset_reader.dart' show ProxyServerAssetReader;
3636
export 'src/servers/devtools.dart';
37-
export 'src/services/chrome_debug_exception.dart' show ChromeDebugException;
37+
export 'src/services/chrome/chrome_debug_exception.dart'
38+
show ChromeDebugException;
3839
export 'src/services/expression_compiler.dart'
3940
show
4041
ExpressionCompilationResult,

dwds/lib/src/connections/debug_connection.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import 'dart:async';
66

77
import 'package:dwds/src/services/app_debug_services.dart';
8-
import 'package:dwds/src/services/chrome_proxy_service.dart';
8+
import 'package:dwds/src/services/chrome/chrome_proxy_service.dart';
99
import 'package:vm_service/vm_service.dart';
1010

1111
/// A debug connection between the application in the browser and DWDS.

dwds/lib/src/debugging/classes.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import 'package:dwds/src/config/tool_configuration.dart';
66
import 'package:dwds/src/debugging/chrome_inspector.dart';
77
import 'package:dwds/src/debugging/metadata/class.dart';
8-
import 'package:dwds/src/services/chrome_debug_exception.dart';
8+
import 'package:dwds/src/services/chrome/chrome_debug_exception.dart';
99
import 'package:dwds/src/utilities/shared.dart';
1010
import 'package:vm_service/vm_service.dart';
1111
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';

dwds/lib/src/debugging/debugger.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import 'package:dwds/src/debugging/inspector.dart';
1212
import 'package:dwds/src/debugging/location.dart';
1313
import 'package:dwds/src/debugging/remote_debugger.dart';
1414
import 'package:dwds/src/debugging/skip_list.dart';
15-
import 'package:dwds/src/services/chrome_debug_exception.dart';
15+
import 'package:dwds/src/services/chrome/chrome_debug_exception.dart';
1616
import 'package:dwds/src/utilities/dart_uri.dart';
1717
import 'package:dwds/src/utilities/domain.dart';
1818
import 'package:dwds/src/utilities/objects.dart' show Property;

dwds/lib/src/debugging/libraries.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import 'package:dwds/src/debugging/chrome_inspector.dart';
88
import 'package:dwds/src/debugging/inspector.dart';
99
import 'package:dwds/src/debugging/metadata/class.dart';
1010
import 'package:dwds/src/debugging/metadata/provider.dart';
11-
import 'package:dwds/src/services/chrome_debug_exception.dart';
11+
import 'package:dwds/src/services/chrome/chrome_debug_exception.dart';
1212
import 'package:logging/logging.dart';
1313
import 'package:meta/meta.dart';
1414
import 'package:vm_service/vm_service.dart';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import 'package:dwds/src/config/tool_configuration.dart';
66
import 'package:dwds/src/debugging/chrome_inspector.dart';
7-
import 'package:dwds/src/services/chrome_debug_exception.dart';
7+
import 'package:dwds/src/services/chrome/chrome_debug_exception.dart';
88
import 'package:logging/logging.dart';
99
import 'package:vm_service/vm_service.dart';
1010
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';

dwds/lib/src/debugging/web_socket_inspector.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import 'package:dwds/src/connections/app_connection.dart';
66
import 'package:dwds/src/debugging/inspector.dart';
77
import 'package:dwds/src/debugging/libraries.dart';
8-
import 'package:dwds/src/services/web_socket_proxy_service.dart';
8+
import 'package:dwds/src/services/web_socket/web_socket_proxy_service.dart';
99
import 'package:dwds/src/utilities/shared.dart';
1010
import 'package:vm_service/vm_service.dart';
1111

@@ -38,6 +38,7 @@ class WebSocketAppInspector extends AppInspector {
3838
breakpoints: [],
3939
isSystemIsolate: false,
4040
isolateFlags: [],
41+
extensionRPCs: [],
4142
);
4243
final inspector = WebSocketAppInspector._(
4344
appConnection,

0 commit comments

Comments
 (0)