Add support for messages displayed in a window

Author: moisseev

background.js

@@ -25,19 +25,40 @@ browser.storage.local.get().then((res) => {
     }
 });
 
-browser.messageDisplay.onMessageDisplayed.addListener((tab, message) => {
-    browser.messages.getFull(message.id).then((messagepart) => {
+function displayReceivedHeader(tabId, messageId) {
+    browser.messages.getFull(messageId).then((messagepart) => {
         const headers = messagepart.headers.received;
         if (headers) {
             browser.storage.local.get().then((res) => {
                 const parsed = parseReceivedHeaders(headers, res.regexp);
-                browser.displayReceivedHeader.setReceivedHeaderValue(tab.id, parsed);
-                browser.displayReceivedHeader.setReceivedHeaderHidden(tab.id, !parsed.length);
+                browser.displayReceivedHeader.setReceivedHeaderValue(tabId, parsed);
+                browser.displayReceivedHeader.setReceivedHeaderHidden(tabId, !parsed.length);
             });
         } else {
-            browser.displayReceivedHeader.setReceivedHeaderHidden(tab.id, true);
+            browser.displayReceivedHeader.setReceivedHeaderHidden(tabId, true);
         }
     });
+}
+
+browser.windows.getAll({populate: true, windowTypes: ["normal", "messageDisplay"]}).then((windows) => {
+    windows.forEach(function (window) {
+        browser.displayReceivedHeader.addHeadersToWindowById(window.id);
+        window.tabs.filter((tab) => tab.active)
+            .forEach(function (tab) {
+                browser.messageDisplay.getDisplayedMessage(tab.id).then((message) => {
+                    if (!message) return;
+                    displayReceivedHeader(tab.id, message.id);
+                });
+            });
+    });
 });
 
-browser.displayReceivedHeader.init();
+browser.windows.onCreated.addListener((window) => {
+    // Skip popup, devtools, etc.
+    if (window.type !== "normal" && window.type !== "messageDisplay") return;
+    browser.displayReceivedHeader.addHeadersToWindowById(window.id);
+});
+
+browser.messageDisplay.onMessageDisplayed.addListener((tab, message) => {
+    displayReceivedHeader(tab.id, message.id);
+});

experiments/displayReceivedHeader.js

@@ -4,7 +4,6 @@
 "use strict";
 
 const {ExtensionCommon} = ChromeUtils.import("resource://gre/modules/ExtensionCommon.jsm");
-const {ExtensionSupport} = ChromeUtils.import("resource:///modules/ExtensionSupport.jsm");
 const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 // eslint-disable-next-line no-var
@@ -20,37 +19,32 @@ var displayReceivedHeader = class extends ExtensionCommon.ExtensionAPI {
         context.callOnClose(this);
         return {
             displayReceivedHeader: {
-                init() {
-                    // Listen for the main Thunderbird windows opening.
-                    ExtensionSupport.registerWindowListener("displayReceivedHeaderListener", {
-                        chromeURLs: ["chrome://messenger/content/messenger.xhtml"],
-                        onLoadWindow(window) {
-                            const {document} = window;
-                            const expandedHeaders2 = document.getElementById("expandedHeaders2");
+                addHeadersToWindowById(windowId) {
+                    const window = Services.wm.getOuterWindowWithId(windowId);
+                    const {document} = window;
+                    const expandedHeaders2 = document.getElementById("expandedHeaders2");
 
-                            if (expandedHeaders2) {
-                                const element = document.createElement("tr");
-                                element.id = "expandedReceivedRow";
+                    if (expandedHeaders2) {
+                        const element = document.createElement("tr");
+                        element.id = "expandedReceivedRow";
 
-                                const headerRowTitle = document.createElement("th");
-                                const headerRowTitleLabel = document.createXULElement("label");
-                                headerRowTitleLabel.id = "expandedReceivedLabel";
-                                headerRowTitleLabel.classList.add("headerName");
-                                headerRowTitleLabel.value = "Received";
-                                headerRowTitleLabel.control = "receivedReceivedHeader";
-                                headerRowTitle.appendChild(headerRowTitleLabel);
+                        const headerRowTitle = document.createElement("th");
+                        const headerRowTitleLabel = document.createXULElement("label");
+                        headerRowTitleLabel.id = "expandedReceivedLabel";
+                        headerRowTitleLabel.classList.add("headerName");
+                        headerRowTitleLabel.value = "Received";
+                        headerRowTitleLabel.control = "receivedReceivedHeader";
+                        headerRowTitle.appendChild(headerRowTitleLabel);
 
-                                const headerRowValue = document.createElement("td");
-                                headerRowValue.id = "receivedReceivedHeader";
+                        const headerRowValue = document.createElement("td");
+                        headerRowValue.id = "receivedReceivedHeader";
 
-                                element.appendChild(headerRowTitle);
-                                element.appendChild(headerRowValue);
-                                expandedHeaders2.appendChild(element);
-                            } else {
-                                throw Error("Could not find the expandedHeaders2 element");
-                            }
-                        },
-                    });
+                        element.appendChild(headerRowTitle);
+                        element.appendChild(headerRowValue);
+                        expandedHeaders2.appendChild(element);
+                    } else {
+                        throw Error("Could not find the expandedHeaders2 element");
+                    }
                 },
                 setReceivedHeaderHidden(tabId, hidden) {
                     const document = getDocumentByTabId(tabId);
@@ -84,12 +78,13 @@ var displayReceivedHeader = class extends ExtensionCommon.ExtensionAPI {
 
     // eslint-disable-next-line class-methods-use-this
     close() {
-        for (const window of Services.wm.getEnumerator("mail:3pane")) {
-            const expandedReceivedRow = window.document.getElementById("expandedReceivedRow");
-            if (expandedReceivedRow) {
-                expandedReceivedRow.remove();
+        ["mail:3pane", "mail:messageWindow"].forEach((windowType) => {
+            for (const window of Services.wm.getEnumerator(windowType)) {
+                const expandedReceivedRow = window.document.getElementById("expandedReceivedRow");
+                if (expandedReceivedRow) {
+                    expandedReceivedRow.remove();
+                }
             }
-        }
-        ExtensionSupport.unregisterWindowListener("displayReceivedHeaderListener");
+        });
     }
 };

experiments/displayReceivedHeader.json

@@ -3,9 +3,14 @@
     "namespace": "displayReceivedHeader",
     "functions": [
       {
-        "name": "init",
+        "name": "addHeadersToWindowById",
         "type": "function",
-        "parameters": []
+        "parameters": [
+          {
+            "name": "windowId",
+            "type": "integer"
+          }
+        ]
       },
       {
         "name": "setReceivedHeaderHidden",