diff --git a/dwds/debug_extension_mv3/pubspec.yaml b/dwds/debug_extension_mv3/pubspec.yaml index 9ff1938e3..4e4590924 100644 --- a/dwds/debug_extension_mv3/pubspec.yaml +++ b/dwds/debug_extension_mv3/pubspec.yaml @@ -1,6 +1,6 @@ name: mv3_extension publish_to: none -version: 2.1.0 +version: 2.1.1 homepage: https://github.com/dart-lang/webdev description: >- A Chrome extension for Dart debugging. diff --git a/dwds/debug_extension_mv3/web/cider_connection.dart b/dwds/debug_extension_mv3/web/cider_connection.dart index 5ddd9b063..8dbda4b4a 100644 --- a/dwds/debug_extension_mv3/web/cider_connection.dart +++ b/dwds/debug_extension_mv3/web/cider_connection.dart @@ -26,6 +26,7 @@ const _ciderDartMessageKey = 'CIDER_DART'; /// The types must match those defined by ChromeExtensionMessageType in the /// Cider extension. enum CiderMessageType { + connected, error, inspectorUrlResponse, inspectorUrlRequest, @@ -54,11 +55,14 @@ Port? _ciderPort; /// URIs for Cider are set in the externally_connectable field in the manifest. void handleCiderConnectRequest(Port port) { if (port.name == _ciderPortName) { + debugLog('Received connect request from Cider', verbose: true); _ciderPort = port; port.onMessage.addListener( allowInterop(_handleMessageFromCider), ); + + sendMessageToCider(messageType: CiderMessageType.connected); } } @@ -130,6 +134,7 @@ Future _startDebugging({String? appId}) async { final tabId = _tabId(appId); // TODO(https://github.com/dart-lang/webdev/issues/2198): When debugging // with Cider, disable debugging with DevTools. + debugLog('Attach debugger to Cider', verbose: true); await attachDebugger(tabId, trigger: Trigger.cider); } diff --git a/dwds/debug_extension_mv3/web/debug_session.dart b/dwds/debug_extension_mv3/web/debug_session.dart index 991f37937..93609ac3e 100644 --- a/dwds/debug_extension_mv3/web/debug_session.dart +++ b/dwds/debug_extension_mv3/web/debug_session.dart @@ -115,7 +115,7 @@ Future attachDebugger( forwardErrorsToCider: trigger == Trigger.cider, ); if (!tabIsDebuggable) return; - + debugLog('Attaching to tab $dartAppTabId', verbose: true); _tabIdToTrigger[dartAppTabId] = trigger; _registerDebugEventListeners(); chrome.debugger.attach( @@ -357,6 +357,7 @@ Future _connectToDwds({ ? WebSocketClient(WebSocketChannel.connect(uri)) : SseSocketClient(SseClient(uri.toString(), debugKey: 'DebugExtension')); final trigger = _tabIdToTrigger[dartAppTabId]; + debugLog('Connecting to DWDS...', verbose: true); final debugSession = _DebugSession( client: client, appTabId: dartAppTabId, @@ -418,6 +419,7 @@ void _routeDwdsEvent(String eventData, SocketClient client, int tabId) { } } if (message.method == 'dwds.debugUri') { + debugLog('Sending debug URI to Cider ${message.params}', verbose: true); sendMessageToCider( messageType: CiderMessageType.startDebugResponse, messageBody: message.params, diff --git a/dwds/debug_extension_mv3/web/manifest_mv3.json b/dwds/debug_extension_mv3/web/manifest_mv3.json index de8c490cf..ea731a775 100644 --- a/dwds/debug_extension_mv3/web/manifest_mv3.json +++ b/dwds/debug_extension_mv3/web/manifest_mv3.json @@ -1,6 +1,6 @@ { "name": "Dart Debug Extension", - "version": "2.1", + "version": "2.1.1", "manifest_version": 3, "devtools_page": "static_assets/devtools.html", "action": {