webext-messenger 0.15.0-5 → 0.17.0-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, isBackgroundPage } from "webext-detect-page";
+import { getContextName, isBackground } from "webext-detect-page";
 import { getActionForMessage, nameThisTarget } from "./thisTarget.js";
 export function isMessengerMessage(message) {
     return (isObject(message) &&
@@ -16,7 +16,7 @@ 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)
+    // Target check must be synchronous (`await` means we're handling the message)
     const action = getActionForMessage(sender, message.target);
     if (action === "ignore") {
         return;
@@ -26,37 +26,36 @@ 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, 
-// Once messages reach handleMessage they cannot be "ignored", they're already being handled
+// 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 });
+    const { type, target, args, options = {} } = message;
+    const { trace = [] } = options;
+    trace.push(sender);
+    const meta = { trace };
+    debug(type, "↘️ received", { sender, args, wasForwarded: trace.length > 1 });
     let handleMessage;
     if (action === "forward") {
         debug(type, "🔀 forwarded", { sender, target });
-        handleMessage = async () => messenger(type, { trace }, target, ...args);
+        handleMessage = async () => messenger(type, meta, target, ...args);
     }
     else {
         const localHandler = handlers.get(type);
         if (!localHandler) {
             throw new MessengerError(`No handler registered for ${type} in ${getContextName()}`);
         }
-        debug(type, "➡️ will be handled here");
-        const meta = { trace: [sender] };
+        debug(type, "➡️ will be handled here,", getContextName());
         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) {
-    if (!isBackgroundPage()) {
+    if (!isBackground()) {
         void nameThisTarget();
     }
     for (const [type, method] of Object.entries(methods)) {

package/distribution/sender.js

@@ -1,6 +1,6 @@
 import browser from "webextension-polyfill";
 import pRetry from "p-retry";
-import { isBackgroundPage } from "webext-detect-page";
+import { isBackground } from "webext-detect-page";
 import { deserializeError } from "serialize-error";
 import { isObject, MessengerError, __webextMessenger, handlers, debug, warn, } from "./shared.js";
 export const errorNonExistingTarget = "Could not establish connection. Receiving end does not exist.";
@@ -58,7 +58,7 @@ async function manageMessage(type, target, sendMessage) {
 function messenger(type, options, target, ...args) {
     // Message goes to extension page
     if ("page" in target) {
-        if (target.page === "background" && isBackgroundPage()) {
+        if (target.page === "background" && isBackground()) {
             const handler = handlers.get(type);
             if (handler) {
                 warn(type, "is being handled locally");

package/distribution/thisTarget.js

@@ -1,4 +1,4 @@
-import { isBackgroundPage, isContentScript, isExtensionContext, } from "webext-detect-page";
+import { isBackground, isContentScript, isExtensionContext, } from "webext-detect-page";
 import { messenger } from "./sender.js";
 import { registerMethods } from "./receiver.js";
 import { debug } from "./shared.js";
@@ -6,6 +6,27 @@ 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;
+function compareTargets(to, thisTarget) {
+    for (const [key, value] of Object.entries(to)) {
+        if (thisTarget[key] === value) {
+            continue;
+        }
+        if (key !== "page") {
+            return false;
+        }
+        const toUrl = new URL(to.page, location.origin);
+        const thisUrl = new URL(thisTarget.page, location.origin);
+        if (toUrl.pathname !== thisUrl.pathname) {
+            return false;
+        }
+        for (const [parameterKey, parameterValue] of toUrl.searchParams) {
+            if (thisUrl.searchParams.get(parameterKey) !== parameterValue) {
+                return false;
+            }
+        }
+    }
+    return true;
+}
 export function getActionForMessage(from, { ...to } // Clone object because we're editing it
 ) {
     var _a;
@@ -26,14 +47,12 @@ export function getActionForMessage(from, { ...to } // Clone object because we'r
         // 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
+    // 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(to).every(
-    // @ts-expect-error Optional properties
-    ([key, value]) => thisTarget[key] === value);
+    const isThisTarget = compareTargets(to, thisTarget);
     if (!isThisTarget) {
         debug("The message’s target is", to, "but this is", thisTarget);
     }
@@ -45,7 +64,7 @@ export async function nameThisTarget() {
     if (!nameRequested && !thisTarget && !isContentScript()) {
         nameRequested = true;
         thisTarget = await messenger("__getTabData", {}, { page: "any" });
-        thisTarget.page = location.pathname;
+        thisTarget.page = location.pathname + location.search;
     }
 }
 function __getTabData() {
@@ -53,7 +72,7 @@ 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() {
-    if (isBackgroundPage()) {
+    if (isBackground()) {
         thisTarget = { page: "background" };
     }
     if (isExtensionContext()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webext-messenger",
-  "version": "0.15.0-5",
+  "version": "0.17.0-0",
   "description": "Browser Extension component messaging framework",
   "keywords": [],
   "repository": "pixiebrix/webext-messenger",
@@ -107,19 +107,19 @@
   "dependencies": {
     "p-retry": "^5.0.0",
     "serialize-error": "^9.0.0",
-    "type-fest": "^2.6.0",
-    "webext-detect-page": "^3.1.0",
+    "type-fest": "^2.8.0",
+    "webext-detect-page": "^4.0.0",
     "webextension-polyfill": "^0.8.0"
   },
   "devDependencies": {
     "@parcel/config-webextension": "^2.0.1",
     "@sindresorhus/tsconfig": "^2.0.0",
-    "@types/chrome": "^0.0.164",
+    "@types/chrome": "^0.0.171",
     "@types/tape": "^4.13.2",
     "@types/webextension-polyfill": "^0.8.2",
-    "@typescript-eslint/eslint-plugin": "^5.4.0",
-    "@typescript-eslint/parser": "^5.4.0",
-    "eslint": "^8.3.0",
+    "@typescript-eslint/eslint-plugin": "^5.7.0",
+    "@typescript-eslint/parser": "^5.7.0",
+    "eslint": "^8.4.1",
     "eslint-config-prettier": "^8.3.0",
     "eslint-config-xo": "^0.39.0",
     "eslint-config-xo-typescript": "^0.47.1",
@@ -128,8 +128,8 @@
     "npm-run-all": "^4.1.5",
     "parcel": "^2.0.1",
     "tape": "^5.3.2",
-    "typescript": "^4.5.2",
-    "webext-content-scripts": "^0.10.1"
+    "typescript": "^4.5.4",
+    "webext-content-scripts": "^0.12.0"
   },
   "targets": {
     "main": false,