@friggframework/core 2.0.0--canary.623.0155fc6.0 → 2.0.0--canary.623.92936ad.0

package/modules/requester/requester.js

@@ -4,6 +4,7 @@ const { FetchError } = require('../../errors');
 const { get } = require('../../assertions');
 
 const DEFAULT_REQUEST_TIMEOUT_MS = 60_000;
+const MAX_AUTH_RETRIES = 3;
 
 class Requester extends Delegate {
     constructor(params) {
@@ -11,8 +12,6 @@ class Requester extends Delegate {
         this.backOff = get(params, 'backOff', [1, 3, 10, 30, 60, 180]);
         this.isRefreshable = false;
         this.refreshCount = 0;
-        // Deliberately separate from `i` — a 429/5xx retry must not consume
-        // the 401 grace retry budget below.
         this.authGraceRetryCount = 0;
         this.DLGT_INVALID_AUTH = 'INVALID_AUTH';
         this.delegateTypes.push(this.DLGT_INVALID_AUTH);
@@ -62,6 +61,10 @@ class Requester extends Delegate {
     };
 
     /**
+     * @param {string} url - The request URL, relative or absolute.
+     * @param {Object} options - Fetch options (method, headers, body, query,
+     *   returnFullRes, etc.) built by the `_get`/`_post`/`_patch`/`_put`/
+     *   `_delete` wrappers.
      * @param {number} attempt - 0-based count of retries already made for
      *   this call. Indexes `this.backOff` for the next delay and is passed
      *   back in on each recursive retry.
@@ -163,12 +166,13 @@ class Requester extends Delegate {
 
             if (status === 401) {
                 if (!this.isRefreshable) {
-                    // One grace retry before invalidating — a single 401
-                    // isn't proof the credential is bad.
-                    if (this.authGraceRetryCount === 0) {
+                    // Up to MAX_AUTH_RETRIES grace retries before invalidating
+                    // — a 401 alone isn't proof the credential is bad.
+                    if (this.authGraceRetryCount < MAX_AUTH_RETRIES) {
+                        const delay =
+                            this.backOff[this.authGraceRetryCount] * 1000;
                         this.authGraceRetryCount++;
                         clearRequestTimer();
-                        const delay = this.backOff[0] * 1000;
                         await new Promise((resolve) =>
                             setTimeout(resolve, delay)
                         );
@@ -182,7 +186,7 @@ class Requester extends Delegate {
                     );
                 }
 
-                if (this.refreshCount === 0) {
+                if (this.refreshCount < MAX_AUTH_RETRIES) {
                     this.refreshCount++;
                     const refreshSucceeded = await this.refreshAuth();
                     if (refreshSucceeded) {
@@ -196,6 +200,8 @@ class Requester extends Delegate {
                         response
                     );
                 }
+
+                throw await this._invalidateAuth(encodedUrl, options, response);
             }
 
             // If the error wasn't retried, throw. FetchError.create reads

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@friggframework/core",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0--canary.623.0155fc6.0",
+    "version": "2.0.0--canary.623.92936ad.0",
     "dependencies": {
         "@aws-sdk/client-apigatewaymanagementapi": "^3.588.0",
         "@aws-sdk/client-kms": "^3.588.0",
@@ -38,9 +38,9 @@
         }
     },
     "devDependencies": {
-        "@friggframework/eslint-config": "2.0.0--canary.623.0155fc6.0",
-        "@friggframework/prettier-config": "2.0.0--canary.623.0155fc6.0",
-        "@friggframework/test": "2.0.0--canary.623.0155fc6.0",
+        "@friggframework/eslint-config": "2.0.0--canary.623.92936ad.0",
+        "@friggframework/prettier-config": "2.0.0--canary.623.92936ad.0",
+        "@friggframework/test": "2.0.0--canary.623.92936ad.0",
         "@prisma/client": "^6.19.3",
         "@types/lodash": "4.17.15",
         "@typescript-eslint/eslint-plugin": "^8.0.0",
@@ -80,5 +80,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "0155fc63dbd76e4e6fad4f53abdbbf9b18f7c6bd"
+    "gitHead": "92936ad4239d3ba8127bc1f5f1066deaf60ae62e"
 }