webext-messenger 0.23.0 → 0.23.1

package/distribution/sender.d.ts

@@ -2,6 +2,7 @@ import { type PublicMethod, type PublicMethodWithTarget, type Options, type Targ
 import { 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";
 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,6 +1,5 @@
 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, log } from "./shared.js";
 import { handlers } from "./handlers.js";
@@ -9,6 +8,7 @@ const _errorNonExistingTarget = "Could not establish connection. Receiving end d
 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";
+export const errorTabWasDiscarded = "The tab was discarded";
 function isMessengerResponse(response) {
     return isObject(response) && response["__webextMessenger"] === true;
 }
@@ -65,23 +65,29 @@ async function manageMessage(type, target, seq, sendMessage) {
             if (error.message === _errorTargetClosedEarly) {
                 throw new Error(errorTargetClosedEarly);
             }
-            if (
+            if (!(
+            // If NONE of these conditions is true, stop retrying
             // Don't retry sending to the background page unless it really hasn't loaded yet
-            (target.page !== "background" && error instanceof MessengerError) ||
+            ((target.page !== "background" &&
+                error instanceof MessengerError) ||
                 // Page or its content script not yet loaded
                 error.message === _errorNonExistingTarget ||
                 // `registerMethods` not yet loaded
-                String(error.message).startsWith("No handlers registered in ")) {
-                if (browser.tabs &&
-                    typeof target.tabId === "number" &&
-                    !(await doesTabExist(target.tabId))) {
+                String(error.message).startsWith("No handlers registered in ")))) {
+                throw error;
+            }
+            if (browser.tabs && typeof target.tabId === "number") {
+                try {
+                    const tabInfo = await browser.tabs.get(target.tabId);
+                    if (tabInfo.discarded) {
+                        throw new Error(errorTabWasDiscarded);
+                    }
+                }
+                catch {
                     throw new Error(errorTabDoesntExist);
                 }
-                log.debug(type, seq, "will retry. Attempt", error.attemptNumber);
-            }
-            else {
-                throw error;
             }
+            log.debug(type, seq, "will retry. Attempt", error.attemptNumber);
         },
     }).catch((error) => {
         if (error?.message === _errorNonExistingTarget) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webext-messenger",
-  "version": "0.23.0",
+  "version": "0.23.1",
   "description": "Browser Extension component messaging framework",
   "keywords": [],
   "repository": "pixiebrix/webext-messenger",
@@ -22,8 +22,7 @@
     "p-retry": "^6.0.0",
     "serialize-error": "^11.0.2",
     "type-fest": "^4.3.1",
-    "webext-detect-page": "^4.1.1",
-    "webext-tools": "^1.1.3"
+    "webext-detect-page": "^4.1.1"
   },
   "devDependencies": {
     "@parcel/config-webextension": "^2.6.2",
@@ -32,7 +31,7 @@
     "@types/tape": "^5.6.1",
     "@types/webextension-polyfill": "^0.10.2",
     "buffer": "^6.0.3",
-    "eslint": "^8.29.0",
+    "eslint": "^8.50.0",
     "eslint-config-pixiebrix": "^0.27.2",
     "events": "^3.3.0",
     "npm-run-all": "^4.1.5",
@@ -40,7 +39,7 @@
     "path-browserify": "^1.0.1",
     "process": "^0.11.10",
     "stream-browserify": "^3.0.0",
-    "tape": "^5.6.6",
+    "tape": "^5.7.0",
     "typescript": "^5.2.2",
     "webext-content-scripts": "^2.5.5",
     "webextension-polyfill": "^0.10.0"