Allow skipping retries (only via main messenger function) (#196)

source/sender.ts

@@ -60,12 +60,12 @@ function makeMessage(
 // Do not turn this into an `async` function; Notifications must turn `void`
 function manageConnection(
   type: string,
-  { seq, isNotification }: Options,
+  { seq, isNotification, retry }: Options,
   target: AnyTarget,
   sendMessage: (attempt: number) => Promise<unknown>
 ): Promise<unknown> | void {
   if (!isNotification) {
-    return manageMessage(type, target, seq!, sendMessage);
+    return manageMessage(type, target, seq!, retry ?? true, sendMessage);
   }
 
   void sendMessage(1).catch((error: unknown) => {
@@ -77,8 +77,10 @@ async function manageMessage(
   type: string,
   target: AnyTarget,
   seq: number,
+  retry: boolean,
   sendMessage: (attempt: number) => Promise<unknown>
 ): Promise<unknown> {
+  // 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);
@@ -119,6 +121,8 @@ async function manageMessage(
     {
       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(

source/test/contentscript/api.test.ts

@@ -5,6 +5,7 @@ import {
   errorTabDoesntExist,
   errorTargetClosedEarly,
   getMethod,
+  messenger,
 } from "../../sender.js";
 import {
   expectRejection,
@@ -323,6 +324,27 @@ function additionalTests() {
     await closeTab(tabId);
   });
 
+  test("does not retry if specifically asked not to", async (t) => {
+    const tabId = await openTab(
+      "https://fregante.github.io/pixiebrix-testing-ground/No-static-content-scripts"
+    );
+
+    const request = messenger("getPageTitle", { retry: false }, { tabId });
+    const durationPromise = trackSettleTime(request);
+
+    await expectRejection(
+      t,
+      request,
+      new MessengerError(
+        `The target ${JSON.stringify({ tabId })} for getPageTitle was not found`
+      )
+    );
+
+    expectDuration(t, await durationPromise, 0);
+
+    await closeTab(tabId);
+  });
+
   test("retries until it times out even if webext-messenger was loaded (but nothing was registered)", async (t) => {
     const tabId = await openTab(
       "https://fregante.github.io/pixiebrix-testing-ground/webext-messenger-was-imported-but-not-executed"

source/types.ts

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