webext-messenger 0.16.0 → 0.17.0-0

package/distribution/thisTarget.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;
@@ -31,9 +52,7 @@ export function getActionForMessage(from, { ...to } // Clone object because we'r
         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() {

package/package.json

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