@friggframework/core 2.0.0--canary.623.ee3bde8.0 → 2.0.0--canary.623.ce8e6ae.0

package/modules/requester/requester.js

@@ -11,10 +11,8 @@ class Requester extends Delegate {
         this.backOff = get(params, 'backOff', [1, 3, 10, 30, 60, 180]);
         this.isRefreshable = false;
         this.refreshCount = 0;
-        // Independent from the `i` backoff-attempt counter passed through
-        // _request's recursion — a 429/5xx retry earlier in the same call
-        // already advances `i`, and gating the 401 grace retry on `i === 0`
-        // would skip it whenever a 401 follows any prior backoff response.
+        // 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);
@@ -63,7 +61,7 @@ class Requester extends Delegate {
         return resp.text();
     };
 
-    async _request(url, options, i = 0) {
+    async _request(url, options, attempt = 0) {
         let encodedUrl = encodeURI(url);
         if (options.query) {
             let queryBuild = '?';
@@ -121,11 +119,11 @@ class Requester extends Delegate {
                 // stall at batch scale.
                 const isTimeout =
                     e?.name === 'AbortError' || e?.type === 'aborted';
-                if (e?.code === 'ECONNRESET' && i < this.backOff.length) {
+                if (e?.code === 'ECONNRESET' && attempt < this.backOff.length) {
                     clearRequestTimer();
-                    const delay = this.backOff[i] * 1000;
+                    const delay = this.backOff[attempt] * 1000;
                     await new Promise((resolve) => setTimeout(resolve, delay));
-                    return this._request(url, options, i + 1);
+                    return this._request(url, options, attempt + 1);
                 }
                 const fetchError = await FetchError.create({
                     resource: encodedUrl,
@@ -148,25 +146,20 @@ class Requester extends Delegate {
             const { status } = response;
 
             // If the status is retriable and there are back off requests left, retry the request
-            if ((status === 429 || status >= 500) && i < this.backOff.length) {
+            if (
+                (status === 429 || status >= 500) &&
+                attempt < this.backOff.length
+            ) {
                 clearRequestTimer();
-                const delay = this.backOff[i] * 1000;
+                const delay = this.backOff[attempt] * 1000;
                 await new Promise((resolve) => setTimeout(resolve, delay));
-                return this._request(url, options, i + 1);
+                return this._request(url, options, attempt + 1);
             }
 
             if (status === 401) {
                 if (!this.isRefreshable) {
-                    // A non-refreshable requester (ApiKeyRequester,
-                    // BasicAuthRequester) has no token to renew, but a single
-                    // 401 is not necessarily proof the credential itself is
-                    // bad — it may be a transient edge/gateway hiccup. Grant
-                    // one grace retry of the same request before concluding
-                    // the credential is truly invalid, mirroring the single
-                    // refresh attempt OAuth2Requester gets below. Gated on
-                    // authGraceRetryCount rather than `i` so an earlier
-                    // 429/5xx backoff on the same call doesn't consume the
-                    // grace retry before a 401 is even seen.
+                    // One grace retry before invalidating — a single 401
+                    // isn't proof the credential is bad.
                     if (this.authGraceRetryCount === 0) {
                         this.authGraceRetryCount++;
                         clearRequestTimer();
@@ -174,7 +167,7 @@ class Requester extends Delegate {
                         await new Promise((resolve) =>
                             setTimeout(resolve, delay)
                         );
-                        return this._request(url, options, i + 1);
+                        return this._request(url, options, attempt + 1);
                     }
 
                     throw await this._invalidateAuth(
@@ -189,7 +182,7 @@ class Requester extends Delegate {
                     const refreshSucceeded = await this.refreshAuth();
                     if (refreshSucceeded) {
                         clearRequestTimer();
-                        return this._request(url, options, i + 1);
+                        return this._request(url, options, attempt + 1);
                     }
 
                     throw await this._invalidateAuth(
@@ -215,10 +208,9 @@ class Requester extends Delegate {
                 );
             }
 
-            // Successful response: reset the per-instance refresh/grace
-            // budgets so a later 401 in the same Requester lifetime can
-            // attempt refresh (or another grace retry) again instead of
-            // silently falling through.
+            // Successful response: reset the per-instance refresh budget so
+            // a later 401 in the same Requester lifetime can attempt refresh
+            // again instead of silently falling through.
             this.refreshCount = 0;
             this.authGraceRetryCount = 0;
 
@@ -237,12 +229,6 @@ class Requester extends Delegate {
         }
     }
 
-    // Builds a diagnostic FetchError from the failed 401 response, notifies
-    // delegates with it attached (so the credential-invalidation chain can
-    // log real detail instead of a bare "invalid credentials" with no
-    // evidence), and returns the error for the caller to throw. Notifying
-    // and throwing are split so notify() always fires even though `await`ing
-    // it happens before the throw.
     async _invalidateAuth(encodedUrl, options, response) {
         const fetchError = await FetchError.create({
             resource: encodedUrl,

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@friggframework/core",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0--canary.623.ee3bde8.0",
+    "version": "2.0.0--canary.623.ce8e6ae.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.ee3bde8.0",
-        "@friggframework/prettier-config": "2.0.0--canary.623.ee3bde8.0",
-        "@friggframework/test": "2.0.0--canary.623.ee3bde8.0",
+        "@friggframework/eslint-config": "2.0.0--canary.623.ce8e6ae.0",
+        "@friggframework/prettier-config": "2.0.0--canary.623.ce8e6ae.0",
+        "@friggframework/test": "2.0.0--canary.623.ce8e6ae.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": "ee3bde8d1adc7e90a424a26429ce4b4d612ff52f"
+    "gitHead": "ce8e6ae7f60121290cc48fd3f36653fd18790204"
 }