webext-messenger 0.29.0-0 → 0.29.0

package/distribution/thisTarget.js

@@ -26,22 +26,24 @@ import { pEvent } from "p-event";
 // Soft warning: Race conditions are possible.
 // This CANNOT be awaited because waiting for it means "I will handle the message."
 // If a message is received before this is ready, it will just have to be ignored.
-export const thisTarget = isBackground()
-    ? { page: "background" }
-    : (isOffscreenDocument()
-        ? { page: "offscreen" }
-        : {
-            get page() {
-                // Extension pages have relative URLs to simplify comparison
-                const origin = location.protocol.startsWith("http")
-                    ? location.origin
-                    : "";
-                // Don't use the hash
-                return origin + location.pathname + location.search;
-            },
-        });
+export const thisTarget = (() => {
+    if (isBackground())
+        return { page: "background" };
+    if (isOffscreenDocument())
+        return { page: "offscreen" };
+    return {
+        get page() {
+            // Extension pages have relative URLs to simplify comparison
+            const origin = location.protocol.startsWith("http")
+                ? location.origin
+                : "";
+            // Don't use the hash
+            return origin + location.pathname + location.search;
+        },
+    };
+})();
 let tabDataStatus = 
-// The background page doesn't have a tab
+// Exclude contexts that don't have a tab associated to them
 isBackground() || isOffscreenDocument() ? "not-needed" : "needed";
 export function getTabDataStatus() {
     return tabDataStatus;
@@ -53,7 +55,7 @@ const storeTabData = once(async () => {
     // If the page is prerendering, wait for the change to be able to get the tab data so the frameId is correct
     // https://developer.mozilla.org/en-US/docs/Web/API/Document/prerenderingchange_event
     if ("prerendering" in document && Boolean(document.prerendering)) {
-        await pEvent(document, 'prerenderingchange');
+        await pEvent(document, "prerenderingchange");
     }
     try {
         tabDataStatus = "pending";
@@ -75,8 +77,7 @@ export async function getThisFrame() {
     if (typeof tabId !== "number" || typeof frameId !== "number") {
         let moreInfo = "(error retrieving context information)";
         try {
-            moreInfo = `(context: ${getContextName()}, url: ${globalThis.location
-                ?.href})`;
+            moreInfo = `(context: ${getContextName()}, url: ${globalThis.location?.href})`;
         }
         catch { }
         throw new TypeError(`This target is not in a frame ${moreInfo}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webext-messenger",
-  "version": "0.29.0-0",
+  "version": "0.29.0",
   "description": "Browser Extension component messaging framework",
   "keywords": [],
   "repository": "pixiebrix/webext-messenger",

package/readme.md

@@ -19,7 +19,6 @@ import messenger from "webext-messenger";
 
 - [Initial considerations for this library](https://github.com/pixiebrix/webext-messenger/issues/1)
 
-
 ## npm publishing
 
 Collaborators can publish a new version of what's on main [via "workflow_dispatch"](https://github.blog/changelog/2020-07-06-github-actions-manual-triggers-with-workflow_dispatch/) under [Actions » Publish](https://github.com/pixiebrix/webext-messenger/actions/workflows/npm-publish.yml)