webext-messenger 0.25.1 → 0.26.0

package/distribution/sender.js

@@ -128,9 +128,16 @@ async function manageMessage(type, target, seq, retry, sendMessage) {
     log.debug(type, seq, "↘️ replied successfully", response.value);
     return response.value;
 }
+// Not a UID nor a truly global sequence. Signal / console noise compromise.
+// The time part is a pseudo-random number between 0 and 99 that helps visually
+// group messages from the same context. Keeping it a number also gives it a different
+// color in the console log.
+// Example log when seen in the background page:
+// Tab 1 sends: 33000, 33001, 33002
+// Tab 2 sends: 12000, 12001, 12002
+let globalSeq = (Date.now() % 100) * 10000;
 function messenger(type, options, target, ...args) {
-    // Not a UID. Signal / console noise compromise. They repeat every 100 seconds
-    options.seq = Date.now() % 100000;
+    options.seq = globalSeq++;
     const { seq } = options;
     // Message goes to extension page
     if ("page" in target) {
@@ -160,9 +167,11 @@ function messenger(type, options, target, ...args) {
     // Message tab directly
     return manageConnection(type, options, target, async (attemptCount) => {
         log.debug(type, seq, "↗️ sending message to tab", tabId, "frame", frameId, attemptLog(attemptCount));
-        return browser.tabs.sendMessage(tabId, makeMessage(type, args, target, options), {
-            frameId,
-        });
+        return browser.tabs.sendMessage(tabId, makeMessage(type, args, target, options), frameId === "allFrames"
+            ? {}
+            : {
+                frameId,
+            });
     });
 }
 function getMethod(type, target) {

package/distribution/thisTarget.js

@@ -1,4 +1,4 @@
-import { isBackground, isContentScript, isExtensionContext, } from "webext-detect-page";
+import { getContextName, isBackground, isContentScript, isExtensionContext, } from "webext-detect-page";
 import { messenger } from "./sender.js";
 import { registerMethods } from "./receiver.js";
 import { MessengerError, once } from "./shared.js";
@@ -112,11 +112,17 @@ const storeTabData = once(async () => {
 export function __getTabData() {
     return { tabId: this.trace[0]?.tab?.id, frameId: this.trace[0]?.frameId };
 }
+// TODO: Add tests
 export async function getThisFrame() {
     await storeTabData(); // It should already have been called but we still need to await it
     const { tabId, frameId } = thisTarget;
     if (typeof tabId !== "number" || typeof frameId !== "number") {
-        throw new TypeError("This target is not in a frame");
+        let moreInfo = "(error retrieving context information)";
+        try {
+            moreInfo = `(context: ${getContextName()}, url: ${globalThis.location?.href})`;
+        }
+        catch { }
+        throw new TypeError(`This target is not in a frame ${moreInfo}`);
     }
     // Rebuild object to return exactly these two properties and nothing more
     return { tabId, frameId };

package/distribution/types.d.ts

@@ -57,7 +57,7 @@ export type MessengerMessage = Message & {
 };
 export interface AnyTarget {
     tabId?: number | "this";
-    frameId?: number;
+    frameId?: number | "allFrames";
     page?: string;
 }
 export interface TopLevelFrame {
@@ -75,7 +75,7 @@ export interface KnownTarget {
 }
 export interface Target {
     tabId: number;
-    frameId?: number;
+    frameId?: number | "allFrames";
 }
 export interface PageTarget {
     tabId?: number | "this";

package/package.json

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