From 552bdd8977b60f9d1eecc4c0dc92edbb93c3a6bf Mon Sep 17 00:00:00 2001
From: Elliott Brooks <21270878+elliette@users.noreply.github.com>
Date: Wed, 23 Nov 2022 17:56:04 -0800
Subject: [PATCH 1/2] Handle detecting Dart app when tab changes

---
 dwds/debug_extension_mv3/web/background.dart |  55 ++++++++++++++-----
 dwds/debug_extension_mv3/web/chrome_api.dart |  22 ++++++++
 dwds/debug_extension_mv3/web/dart_grey.png   | Bin 0 -> 2814 bytes
 3 files changed, 64 insertions(+), 13 deletions(-)
 create mode 100644 dwds/debug_extension_mv3/web/dart_grey.png

diff --git a/dwds/debug_extension_mv3/web/background.dart b/dwds/debug_extension_mv3/web/background.dart
index b74913654..d99486159 100644
--- a/dwds/debug_extension_mv3/web/background.dart
+++ b/dwds/debug_extension_mv3/web/background.dart
@@ -26,6 +26,16 @@ void _registerListeners() {
   chrome.runtime.onMessage.addListener(allowInterop(_handleRuntimeMessages));
   chrome.tabs.onRemoved
       .addListener(allowInterop((tabId, _) => maybeRemoveLifelinePort(tabId)));
+  // Update the extension icon on tab navigation:
+  chrome.tabs.onActivated.addListener(allowInterop((ActiveInfo info) {
+    _updateIcon(info.tabId);
+  }));
+  chrome.windows.onFocusChanged.addListener(allowInterop((_) async {
+    final currentTab = await _getTab();
+    if (currentTab?.id != null) {
+      _updateIcon(currentTab!.id);
+    }
+  }));
 
   // Detect clicks on the Dart Debug Extension icon.
   chrome.action.onClicked.addListener(allowInterop(_startDebugSession));
@@ -50,27 +60,46 @@ void _handleRuntimeMessages(
       expectedSender: Script.detector,
       expectedRecipient: Script.background,
       messageHandler: (DebugInfo debugInfo) async {
-        final currentTab = await _getTab();
-        final currentUrl = currentTab?.url ?? '';
-        final appUrl = debugInfo.appUrl ?? '';
-        if (currentTab == null ||
-            currentUrl.isEmpty ||
-            appUrl.isEmpty ||
-            currentUrl != appUrl) {
-          console.warn(
-              'Dart app detected at $appUrl but current tab is $currentUrl.');
+        final dartTab = await sender.tab;
+        if (dartTab == null) {
+          console.warn('Received debug info but tab is missing.');
           return;
         }
         // Save the debug info for the Dart app in storage:
         await setStorageObject<DebugInfo>(
-            type: StorageObject.debugInfo,
-            value: debugInfo,
-            tabId: currentTab.id);
+            type: StorageObject.debugInfo, value: debugInfo, tabId: dartTab.id);
         // Update the icon to show that a Dart app has been detected:
-        chrome.action.setIcon(IconInfo(path: 'dart.png'), /*callback*/ null);
+        final currentTab = await _getTab();
+        if (currentTab?.id == dartTab.id) {
+          _setDebuggableIcon();
+        }
       });
 }
 
+void _updateIcon(int activeTabId) async {
+  final debugInfo = await _fetchDebugInfo(activeTabId);
+  if (debugInfo != null) {
+    _setDebuggableIcon();
+  } else {
+    _setDefaultIcon();
+  }
+}
+
+void _setDebuggableIcon() {
+  chrome.action.setIcon(IconInfo(path: 'dart.png'), /*callback*/ null);
+}
+
+void _setDefaultIcon() {
+  chrome.action.setIcon(IconInfo(path: 'dart_grey.png'), /*callback*/ null);
+}
+
+Future<DebugInfo?> _fetchDebugInfo(int tabId) {
+  return fetchStorageObject<DebugInfo>(
+    type: StorageObject.debugInfo,
+    tabId: tabId,
+  );
+}
+
 Future<Tab?> _getTab() async {
   final query = QueryInfo(active: true, currentWindow: true);
   final tabs = List<Tab>.from(await promiseToFuture(chrome.tabs.query(query)));
diff --git a/dwds/debug_extension_mv3/web/chrome_api.dart b/dwds/debug_extension_mv3/web/chrome_api.dart
index de0250499..7b66939c8 100644
--- a/dwds/debug_extension_mv3/web/chrome_api.dart
+++ b/dwds/debug_extension_mv3/web/chrome_api.dart
@@ -155,15 +155,29 @@ class Tabs {
 
   external Object create(TabInfo tabInfo);
 
+  external OnActivatedHandler get onActivated;
+
   external OnRemovedHandler get onRemoved;
 }
 
+@JS()
+@anonymous
+class OnActivatedHandler {
+  external void addListener(void Function(ActiveInfo activeInfo) callback);
+}
+
 @JS()
 @anonymous
 class OnRemovedHandler {
   external void addListener(void Function(int tabId, dynamic info) callback);
 }
 
+@JS()
+@anonymous
+class ActiveInfo {
+  external int get tabId;
+}
+
 @JS()
 @anonymous
 class TabInfo {
@@ -196,6 +210,14 @@ class Tab {
 @anonymous
 class Windows {
   external Object create(WindowInfo? createData);
+
+  external OnFocusChangedHandler get onFocusChanged;
+}
+
+@JS()
+@anonymous
+class OnFocusChangedHandler {
+  external void addListener(void Function(int windowId) callback);
 }
 
 @JS()
diff --git a/dwds/debug_extension_mv3/web/dart_grey.png b/dwds/debug_extension_mv3/web/dart_grey.png
new file mode 100644
index 0000000000000000000000000000000000000000..3afba3fbe6b8d6f6a0bc29d792eef61aaab215a3
GIT binary patch
literal 2814
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
EKmQQ<9RL6T

literal 0
HcmV?d00001


From da7e1e146780c065f88abe278ffbaabd7ee317f5 Mon Sep 17 00:00:00 2001
From: Elliott Brooks <21270878+elliette@users.noreply.github.com>
Date: Wed, 23 Nov 2022 19:29:55 -0800
Subject: [PATCH 2/2] Fix analyzer errors

---
 dwds/debug_extension_mv3/web/background.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dwds/debug_extension_mv3/web/background.dart b/dwds/debug_extension_mv3/web/background.dart
index d99486159..ac602785b 100644
--- a/dwds/debug_extension_mv3/web/background.dart
+++ b/dwds/debug_extension_mv3/web/background.dart
@@ -60,7 +60,7 @@ void _handleRuntimeMessages(
       expectedSender: Script.detector,
       expectedRecipient: Script.background,
       messageHandler: (DebugInfo debugInfo) async {
-        final dartTab = await sender.tab;
+        final dartTab = sender.tab;
         if (dartTab == null) {
           console.warn('Received debug info but tab is missing.');
           return;