webext-messenger 0.15.0-2 → 0.15.0

package/distribution/receiver.js

@@ -2,7 +2,7 @@ import browser from "webextension-polyfill";
 import { serializeError } from "serialize-error";
 import { messenger } from "./sender.js";
 import { handlers, isObject, MessengerError, debug, __webextMessenger, } from "./shared.js";
-import { getContextName } from "webext-detect-page";
+import { getContextName, isBackgroundPage } from "webext-detect-page";
 import { getActionForMessage, nameThisTarget } from "./thisTarget.js";
 export function isMessengerMessage(message) {
     return (isObject(message) &&
@@ -16,8 +16,8 @@ function onMessageListener(message, sender) {
         // TODO: Add test for this eventuality: ignore unrelated messages
         return;
     }
-    // Target check must be synchronous (`await` means we're handing the message)
-    const action = getActionForMessage(message.target);
+    // Target check must be synchronous (`await` means we're handling the message)
+    const action = getActionForMessage(sender, message.target);
     if (action === "ignore") {
         return;
     }
@@ -25,7 +25,9 @@ function onMessageListener(message, sender) {
 }
 // This function can only be called when the message *will* be handled locally.
 // Returning "undefined" or throwing an error will still handle it.
-async function handleMessage(message, sender, action) {
+async function handleMessage(message, sender, 
+// Once messages reach this function they cannot be "ignored", they're already being handled
+action) {
     const { type, target, args, options: { trace } = {} } = message;
     debug(type, "↘️ received", { sender, args });
     let handleMessage;
@@ -42,19 +44,18 @@ async function handleMessage(message, sender, action) {
         const meta = { trace: [sender] };
         handleMessage = async () => localHandler.apply(meta, args);
     }
-    return handleMessage()
-        .then((value) => ({ value }), (error) => ({
-        // Errors must be serialized because the stacktraces are currently lost on Chrome
+    const response = await handleMessage().then((value) => ({ value }), (error) => ({
+        // Errors must be serialized because the stack traces are currently lost on Chrome
         // and https://github.com/mozilla/webextension-polyfill/issues/210
         error: serializeError(error),
-    }))
-        .then((response) => {
-        debug(type, "↗️ responding", response);
-        return { ...response, __webextMessenger };
-    });
+    }));
+    debug(type, "↗️ responding", response);
+    return { ...response, __webextMessenger };
 }
 export function registerMethods(methods) {
-    void nameThisTarget();
+    if (!isBackgroundPage()) {
+        void nameThisTarget();
+    }
     for (const [type, method] of Object.entries(methods)) {
         if (handlers.has(type)) {
             throw new MessengerError(`Handler already set for ${type}`);

package/distribution/sender.js

@@ -17,15 +17,15 @@ function makeMessage(type, args, target, options) {
     };
 }
 // Do not turn this into an `async` function; Notifications must turn `void`
-function manageConnection(type, options, sendMessage) {
+function manageConnection(type, options, target, sendMessage) {
     if (!options.isNotification) {
-        return manageMessage(type, sendMessage);
+        return manageMessage(type, target, sendMessage);
     }
     void sendMessage().catch((error) => {
         debug(type, "notification failed", { error });
     });
 }
-async function manageMessage(type, sendMessage) {
+async function manageMessage(type, target, sendMessage) {
     const response = await pRetry(async () => {
         const response = await sendMessage();
         if (!isMessengerResponse(response)) {
@@ -37,7 +37,9 @@ async function manageMessage(type, sendMessage) {
         factor: 1.3,
         maxRetryTime: 4000,
         onFailedAttempt(error) {
-            if (error instanceof MessengerError ||
+            if (
+            // Don't retry sending to the background page unless it really hasn't loaded yet
+            (target.page !== "background" && error instanceof MessengerError) ||
                 String(error.message).startsWith(errorNonExistingTarget)) {
                 debug(type, "will retry. Attempt", error.attemptNumber);
             }
@@ -68,11 +70,11 @@ function messenger(type, options, target, ...args) {
             debug(type, "↗️ sending message to runtime");
             return browser.runtime.sendMessage(makeMessage(type, args, target, options));
         };
-        return manageConnection(type, options, sendMessage);
+        return manageConnection(type, options, target, sendMessage);
     }
     // Contexts without direct Tab access must go through background
     if (!browser.tabs) {
-        return manageConnection(type, options, async () => {
+        return manageConnection(type, options, target, async () => {
             debug(type, "↗️ sending message to runtime");
             return browser.runtime.sendMessage(makeMessage(type, args, target, options));
         });
@@ -80,7 +82,7 @@ function messenger(type, options, target, ...args) {
     // `frameId` must be specified. If missing, the message is sent to every frame
     const { tabId, frameId = 0 } = target;
     // Message tab directly
-    return manageConnection(type, options, async () => {
+    return manageConnection(type, options, target, async () => {
         debug(type, "↗️ sending message to tab", tabId, "frame", frameId);
         return browser.tabs.sendMessage(tabId, makeMessage(type, args, target, options), {
             frameId,

package/distribution/thisTarget.d.ts

@@ -1,6 +1,5 @@
-import { Target, PageTarget, MessengerMeta } from "./types.js";
-declare type AnyTarget = Partial<Target & PageTarget>;
-export declare function getActionForMessage(target: AnyTarget): "respond" | "forward" | "ignore";
+import { AnyTarget, MessengerMeta, Sender } from "./types.js";
+export declare function getActionForMessage(from: Sender, { ...to }: AnyTarget): "respond" | "forward" | "ignore";
 export declare function nameThisTarget(): Promise<void>;
 declare function __getTabData(this: MessengerMeta): AnyTarget;
 declare global {

package/distribution/thisTarget.js

@@ -1,4 +1,4 @@
-import { isBackgroundPage, isContentScript } from "webext-detect-page";
+import { isBackgroundPage, isContentScript, isExtensionContext, } from "webext-detect-page";
 import { messenger } from "./sender.js";
 import { registerMethods } from "./receiver.js";
 import { debug } from "./shared.js";
@@ -6,9 +6,10 @@ import { debug } from "./shared.js";
 // 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.
 let thisTarget;
-//
-export function getActionForMessage(target) {
-    if (target.page === "any") {
+export function getActionForMessage(from, { ...to } // Clone object because we're editing it
+) {
+    var _a;
+    if (to.page === "any") {
         return "respond";
     }
     // Content scripts only receive messages that are meant for them. In the future
@@ -17,7 +18,7 @@ export function getActionForMessage(target) {
         return "respond";
     }
     // We're in an extension page, but the target is not one.
-    if (!("page" in target)) {
+    if (!to.page) {
         return "forward";
     }
     if (!thisTarget) {
@@ -25,18 +26,24 @@ export function getActionForMessage(target) {
         // If this *was* the target, then probably no one else answered
         return "ignore";
     }
+    // Set "this" tab to the current tabId
+    if (to.tabId === "this" && thisTarget.tabId === ((_a = from.tab) === null || _a === void 0 ? void 0 : _a.id)) {
+        to.tabId = thisTarget.tabId;
+    }
     // Every `target` key must match `thisTarget`
-    const isThisTarget = Object.entries(target).every(
+    const isThisTarget = Object.entries(to).every(
     // @ts-expect-error Optional properties
     ([key, value]) => thisTarget[key] === value);
     if (!isThisTarget) {
-        debug("The message’s target is", target, "but this is", thisTarget);
+        debug("The message’s target is", to, "but this is", thisTarget);
     }
     return isThisTarget ? "respond" : "ignore";
 }
+let nameRequested = false;
 export async function nameThisTarget() {
     // Same as above: CS receives messages correctly
-    if (!thisTarget && !isContentScript()) {
+    if (!nameRequested && !thisTarget && !isContentScript()) {
+        nameRequested = true;
         thisTarget = await messenger("__getTabData", {}, { page: "any" });
         thisTarget.page = location.pathname;
     }
@@ -48,6 +55,9 @@ function __getTabData() {
 export function initPrivateApi() {
     if (isBackgroundPage()) {
         thisTarget = { page: "background" };
+    }
+    if (isExtensionContext()) {
+        // Any context can handler this message
         registerMethods({ __getTabData });
     }
 }

package/distribution/types.d.ts

@@ -45,12 +45,17 @@ export declare type MessengerMessage = Message & {
     /** Guarantees that a message is meant to be handled by this library */
     __webextMessenger: true;
 };
+export interface AnyTarget {
+    tabId?: number | "this";
+    frameId?: number;
+    page?: string;
+}
 export interface Target {
     tabId: number;
     frameId?: number;
 }
 export interface PageTarget {
-    tabId?: number;
+    tabId?: number | "this";
     page: string;
 }
 export {};

package/package.json

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