webext-messenger 0.25.0-0 → 0.25.1

package/distribution/events.d.ts

@@ -0,0 +1 @@
+export declare const events: EventTarget;

package/distribution/events.js

@@ -0,0 +1 @@
+export const events = new EventTarget();

package/distribution/index.d.ts

@@ -1,5 +1,6 @@
 export * from "./receiver.js";
 export * from "./sender.js";
 export * from "./types.js";
+export * from "./events.js";
 export { getThisFrame, getTopLevelFrame } from "./thisTarget.js";
 export { toggleLogging } from "./logging.js";

package/distribution/index.js

@@ -2,6 +2,7 @@
 export * from "./receiver.js";
 export * from "./sender.js";
 export * from "./types.js";
+export * from "./events.js";
 export { getThisFrame, getTopLevelFrame } from "./thisTarget.js";
 export { toggleLogging } from "./logging.js";
 import { initPrivateApi } from "./thisTarget.js";

package/distribution/sender.d.ts

@@ -1,5 +1,5 @@
 import { type PublicMethod, type PublicMethodWithTarget, type Options, type Target, type PageTarget } from "./types.js";
-import { type SetReturnType } from "type-fest";
+import { type Promisable, type SetReturnType } from "type-fest";
 export declare const errorTargetClosedEarly = "The target was closed before receiving a response";
 export declare const errorTabDoesntExist = "The tab doesn't exist";
 export declare const errorTabWasDiscarded = "The tab was discarded";
@@ -7,9 +7,9 @@ declare function messenger<Type extends keyof MessengerMethods, Method extends M
     isNotification: true;
 }, target: Target | PageTarget, ...args: Parameters<Method>): void;
 declare function messenger<Type extends keyof MessengerMethods, Method extends MessengerMethods[Type], ReturnValue extends Promise<ReturnType<Method>>>(type: Type, options: Options, target: Target | PageTarget, ...args: Parameters<Method>): ReturnValue;
-declare function getMethod<Type extends keyof MessengerMethods, Method extends MessengerMethods[Type], PublicMethodType extends PublicMethod<Method>>(type: Type, target: Target | PageTarget): PublicMethodType;
+declare function getMethod<Type extends keyof MessengerMethods, Method extends MessengerMethods[Type], PublicMethodType extends PublicMethod<Method>>(type: Type, target: Promisable<Target | PageTarget>): PublicMethodType;
 declare function getMethod<Type extends keyof MessengerMethods, Method extends MessengerMethods[Type], PublicMethodWithDynamicTarget extends PublicMethodWithTarget<Method>>(type: Type): PublicMethodWithDynamicTarget;
-declare function getNotifier<Type extends keyof MessengerMethods, Method extends MessengerMethods[Type], PublicMethodType extends SetReturnType<PublicMethod<Method>, void>>(type: Type, target: Target | PageTarget): PublicMethodType;
+declare function getNotifier<Type extends keyof MessengerMethods, Method extends MessengerMethods[Type], PublicMethodType extends SetReturnType<PublicMethod<Method>, void>>(type: Type, target: Promisable<Target | PageTarget>): PublicMethodType;
 declare function getNotifier<Type extends keyof MessengerMethods, Method extends MessengerMethods[Type], PublicMethodWithDynamicTarget extends SetReturnType<PublicMethodWithTarget<Method>, void>>(type: Type): PublicMethodWithDynamicTarget;
 export { messenger, getMethod, getNotifier };
 export declare const backgroundTarget: PageTarget;

package/distribution/sender.js

@@ -4,6 +4,7 @@ import { deserializeError } from "serialize-error";
 import { isObject, MessengerError, __webextMessenger } from "./shared.js";
 import { log } from "./logging.js";
 import { handlers } from "./handlers.js";
+import { events } from "./events.js";
 const _errorNonExistingTarget = "Could not establish connection. Receiving end does not exist.";
 // https://github.com/mozilla/webextension-polyfill/issues/384
 const _errorTargetClosedEarly = "A listener indicated an asynchronous response by returning true, but the message channel closed before a response was received";
@@ -16,6 +17,9 @@ function isMessengerResponse(response) {
 function attemptLog(attemptCount) {
     return attemptCount > 1 ? `(try: ${attemptCount})` : "";
 }
+function wasContextInvalidated() {
+    return !chrome.runtime?.id;
+}
 function makeMessage(type, args, target, options) {
     return {
         __webextMessenger,
@@ -26,15 +30,16 @@ function makeMessage(type, args, target, options) {
     };
 }
 // Do not turn this into an `async` function; Notifications must turn `void`
-function manageConnection(type, { seq, isNotification }, target, sendMessage) {
+function manageConnection(type, { seq, isNotification, retry }, target, sendMessage) {
     if (!isNotification) {
-        return manageMessage(type, target, seq, sendMessage);
+        return manageMessage(type, target, seq, retry ?? true, sendMessage);
     }
     void sendMessage(1).catch((error) => {
         log.debug(type, seq, "notification failed", { error });
     });
 }
-async function manageMessage(type, target, seq, sendMessage) {
+async function manageMessage(type, target, seq, retry, sendMessage) {
+    // TODO: Split this up a bit because it's too long. Probably drop p-retry
     const response = await pRetry(async (attemptCount) => {
         const response = await sendMessage(attemptCount);
         if (isMessengerResponse(response)) {
@@ -61,8 +66,25 @@ async function manageMessage(type, target, seq, sendMessage) {
     }, {
         minTimeout: 100,
         factor: 1.3,
+        // Do not set this to undefined or Infinity, it doesn't work the same way
+        ...(retry ? {} : { retries: 0 }),
         maxRetryTime: 4000,
         async onFailedAttempt(error) {
+            events.dispatchEvent(new CustomEvent("failed-attempt", {
+                detail: {
+                    type,
+                    seq,
+                    target,
+                    error,
+                    attemptCount: error.attemptNumber,
+                },
+            }));
+            if (wasContextInvalidated()) {
+                // The error matches the native context invalidated error
+                // *.sendMessage() might fail with a message-specific error that is less useful,
+                // like "Sender closed without responding"
+                throw new Error("Extension context invalidated.");
+            }
             if (error.message === _errorTargetClosedEarly) {
                 throw new Error(errorTargetClosedEarly);
             }
@@ -94,6 +116,9 @@ async function manageMessage(type, target, seq, sendMessage) {
         if (error?.message === _errorNonExistingTarget) {
             throw new MessengerError(`The target ${JSON.stringify(target)} for ${type} was not found`);
         }
+        events.dispatchEvent(new CustomEvent("attempts-exhausted", {
+            detail: { type, seq, target, error },
+        }));
         throw error;
     });
     if ("error" in response) {
@@ -141,20 +166,21 @@ function messenger(type, options, target, ...args) {
     });
 }
 function getMethod(type, target) {
-    if (arguments.length === 1) {
+    if (!target) {
         return messenger.bind(undefined, type, {});
     }
-    // @ts-expect-error `bind` types are junk
-    return messenger.bind(undefined, type, {}, target);
+    return (async (...args) => messenger(type, {}, await target, ...args));
 }
 function getNotifier(type, target) {
     const options = { isNotification: true };
-    if (arguments.length === 1) {
+    if (!target) {
         // @ts-expect-error `bind` types are junk
         return messenger.bind(undefined, type, options);
     }
-    // @ts-expect-error `bind` types are junk
-    return messenger.bind(undefined, type, options, target);
+    return ((...args) => {
+        // Async wrapper needed to use `await` while preserving a non-Promise return type
+        (async () => messenger(type, options, await target, ...args))();
+    });
 }
 export { messenger, getMethod, getNotifier };
 export const backgroundTarget = { page: "background" };

package/distribution/types.d.ts

@@ -37,6 +37,7 @@ export interface Options {
      */
     isNotification?: boolean;
     trace?: Sender[];
+    retry?: boolean;
     /** Automatically generated internally */
     seq?: number;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webext-messenger",
-  "version": "0.25.0-0",
+  "version": "0.25.1",
   "description": "Browser Extension component messaging framework",
   "keywords": [],
   "repository": "pixiebrix/webext-messenger",
@@ -17,7 +17,7 @@
   "scripts": {
     "build": "tsc",
     "demo:watch": "parcel watch --no-cache --no-hmr",
-    "demo:build": "parcel build --no-cache",
+    "demo:build": "parcel build --no-cache --no-scope-hoist",
     "prepack": "tsc --sourceMap false",
     "test": "eslint . && tsc --noEmit",
     "lint": "eslint .",
@@ -25,38 +25,40 @@
     "watch": "tsc --watch"
   },
   "dependencies": {
-    "p-retry": "^6.0.0",
+    "p-retry": "^6.2.0",
     "serialize-error": "^11.0.2",
-    "type-fest": "^4.6.0",
-    "webext-detect-page": "^4.1.1"
+    "type-fest": "^4.10.2",
+    "webext-detect-page": "^5.0.0"
+  },
+  "@parcel/resolver-default": {
+    "packageExports": true
   },
   "devDependencies": {
-    "@parcel/config-webextension": "^2.6.2",
+    "@parcel/config-webextension": "^2.11.0",
     "@sindresorhus/tsconfig": "^5.0.0",
-    "@types/chrome": "^0.0.248",
-    "@types/tape": "^5.6.3",
-    "@types/webextension-polyfill": "^0.10.5",
+    "@types/chrome": "^0.0.259",
+    "@types/tape": "^5.6.4",
+    "@types/webextension-polyfill": "^0.10.7",
     "buffer": "^6.0.3",
-    "eslint": "^8.52.0",
-    "eslint-config-pixiebrix": "^0.29.1",
+    "eslint": "^8.56.0",
+    "eslint-config-pixiebrix": "^0.34.1",
     "events": "^3.3.0",
     "npm-run-all": "^4.1.5",
-    "parcel": "^2.6.2",
+    "parcel": "^2.11.0",
     "path-browserify": "^1.0.1",
     "process": "^0.11.10",
     "stream-browserify": "^3.0.0",
-    "tape": "^5.7.2",
-    "typescript": "^5.2.2",
-    "webext-content-scripts": "^2.5.5",
+    "tape": "^5.7.4",
+    "typescript": "^5.3.3",
+    "webext-content-scripts": "^2.6.1",
     "webextension-polyfill": "^0.10.0"
   },
-  "alias": {
-    "./this-stuff-is-just-for-local-parcel-tests": "https://github.com/parcel-bundler/parcel/issues/4936",
-    "./source/**/*.js": "./source/$1/$2.ts"
-  },
   "targets": {
     "main": false,
     "default": {
+      "engines": {
+        "browsers": "Chrome 110"
+      },
       "source": "source/test/manifest.json",
       "sourceMap": {
         "inline": true