webext-messenger 0.15.0-2 → 0.15.0-3

package/distribution/receiver.js

@@ -17,7 +17,7 @@ function onMessageListener(message, sender) {
         return;
     }
     // Target check must be synchronous (`await` means we're handing the message)
-    const action = getActionForMessage(message.target);
+    const action = getActionForMessage(sender, message.target);
     if (action === "ignore") {
         return;
     }

package/distribution/thisTarget.d.ts

@@ -1,6 +1,10 @@
-import { Target, PageTarget, MessengerMeta } from "./types.js";
-declare type AnyTarget = Partial<Target & PageTarget>;
-export declare function getActionForMessage(target: AnyTarget): "respond" | "forward" | "ignore";
+import { MessengerMeta, Sender } from "./types.js";
+interface AnyTarget {
+    tabId?: number | "this";
+    frameId?: number;
+    page?: string;
+}
+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

@@ -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";
     }
+    // If requests "this" tab, then set it to allow the next condition
+    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;
     }
@@ -46,8 +53,9 @@ function __getTabData() {
     return { tabId: (_b = (_a = this.trace[0]) === null || _a === void 0 ? void 0 : _a.tab) === null || _b === void 0 ? void 0 : _b.id, frameId: (_c = this.trace[0]) === null || _c === void 0 ? void 0 : _c.frameId };
 }
 export function initPrivateApi() {
+    // Any context can handler this message
+    registerMethods({ __getTabData });
     if (isBackgroundPage()) {
         thisTarget = { page: "background" };
-        registerMethods({ __getTabData });
     }
 }

package/distribution/types.d.ts

@@ -50,7 +50,7 @@ export interface Target {
     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-3",
   "description": "Browser Extension component messaging framework",
   "keywords": [],
   "repository": "pixiebrix/webext-messenger",