webext-messenger 0.18.0 → 0.19.0

package/distribution/sender.d.ts

@@ -1,6 +1,7 @@
 import { PublicMethod, PublicMethodWithTarget, Options, Target, PageTarget } from "./types.js";
 import { SetReturnType } from "type-fest";
-export declare const errorNonExistingTarget = "Could not establish connection. Receiving end does not exist.";
+export declare const errorTargetClosedEarly = "The target was closed before receiving a response";
+export declare const errorTabDoesntExist = "The tab doesn't exist";
 declare function messenger<Type extends keyof MessengerMethods, Method extends MessengerMethods[Type]>(type: Type, options: {
     isNotification: true;
 }, target: Target | PageTarget, ...args: Parameters<Method>): void;

package/distribution/sender.js

@@ -1,8 +1,13 @@
 import pRetry from "p-retry";
 import { isBackground } from "webext-detect-page";
+import { doesTabExist } from "webext-tools";
 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.";
+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";
+export const errorTargetClosedEarly = "The target was closed before receiving a response";
+export const errorTabDoesntExist = "The tab doesn't exist";
 function isMessengerResponse(response) {
     return isObject(response) && response["__webextMessenger"] === true;
 }
@@ -35,11 +40,19 @@ async function manageMessage(type, target, sendMessage) {
         minTimeout: 100,
         factor: 1.3,
         maxRetryTime: 4000,
-        onFailedAttempt(error) {
+        async onFailedAttempt(error) {
+            if (error.message === _errorTargetClosedEarly) {
+                throw new Error(errorTargetClosedEarly);
+            }
             if (
             // Don't retry sending to the background page unless it really hasn't loaded yet
             (target.page !== "background" && error instanceof MessengerError) ||
-                String(error.message).startsWith(errorNonExistingTarget)) {
+                String(error.message).startsWith(_errorNonExistingTarget)) {
+                if (browser.tabs &&
+                    typeof target.tabId === "number" &&
+                    !(await doesTabExist(target.tabId))) {
+                    throw new Error(errorTabDoesntExist);
+                }
                 debug(type, "will retry. Attempt", error.attemptNumber);
             }
             else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webext-messenger",
-  "version": "0.18.0",
+  "version": "0.19.0",
   "description": "Browser Extension component messaging framework",
   "keywords": [],
   "repository": "pixiebrix/webext-messenger",
@@ -98,9 +98,10 @@
   },
   "dependencies": {
     "p-retry": "^5.1.0",
-    "serialize-error": "^9.1.1",
+    "serialize-error": "^11.0.0",
     "type-fest": "^2.12.1",
-    "webext-detect-page": "^4.0.1"
+    "webext-detect-page": "^4.0.1",
+    "webext-tools": "^1.1.0"
   },
   "devDependencies": {
     "@parcel/config-webextension": "^2.4.0",

package/readme.md

@@ -14,3 +14,7 @@ npm install webext-messenger
 ```js
 import messenger from "webext-messenger";
 ```
+
+## Context
+
+- [Initial considerations for this library](https://github.com/pixiebrix/webext-messenger/issues/1)