Add support for search parameters in named targets (?id=UUID)

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",

source/thisTarget.ts

@@ -7,12 +7,39 @@ import { messenger } from "./sender.js";
 import { registerMethods } from "./receiver.js";
 import { AnyTarget, MessengerMeta, Sender } from "./types.js";
 import { debug } from "./shared.js";
+import { Entries } from "type-fest";
 
 // Soft warning: Race conditions are possible.
 // 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: AnyTarget | undefined;
 
+function compareTargets(to: AnyTarget, thisTarget: AnyTarget): boolean {
+  for (const [key, value] of Object.entries(to) as Entries<typeof 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: Sender,
   { ...to }: AnyTarget // Clone object because we're editing it
@@ -44,10 +71,7 @@ export function getActionForMessage(
   }
 
   // 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);
@@ -62,7 +86,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;
   }
 }