@friggframework/core 2.0.0-next.100 → 2.0.0-next.101

package/integrations/integration-base.js

@@ -220,11 +220,11 @@ class IntegrationBase {
     /**
      * Returns the modules as object with keys as module names.
      * Uses the keys from Definition.modules to attach modules correctly.
-     * 
+     *
      * Example:
      *   Definition.modules = { attio: {...}, quo: { definition: { getName: () => 'quo-attio' } } }
      *   Module with getName()='quo-attio' gets attached as this.quo (not this['quo-attio'])
-     * 
+     *
      * @private
      * @param {Array} integrationModules - Array of module instances
      * @returns {Object} The modules object
@@ -791,8 +791,18 @@ class IntegrationBase {
         if (!this.id) return;
 
         if (delegateString === 'CREDENTIAL_INVALIDATED') {
+            const detail =
+                object?.reason || object?.statusCode
+                    ? ` (status ${object?.statusCode ?? '?'}: ${
+                          object?.reason ?? 'no reason given'
+                      })`
+                    : '';
             console.log(
-                `[Frigg] Module ${notifier?.name || '?'} reported invalid credentials for integration ${this.id} — marking ERROR`
+                `[Frigg] Module ${
+                    notifier?.name || '?'
+                } reported invalid credentials for integration ${
+                    this.id
+                } — marking ERROR${detail}`
             );
             await this.persistStatus('ERROR');
             return;
@@ -801,7 +811,11 @@ class IntegrationBase {
         if (delegateString === 'CREDENTIAL_VALIDATED') {
             if (this.status !== 'ERROR') return;
             console.log(
-                `[Frigg] Module ${notifier?.name || '?'} reported valid credentials for integration ${this.id} — clearing ERROR → ENABLED`
+                `[Frigg] Module ${
+                    notifier?.name || '?'
+                } reported valid credentials for integration ${
+                    this.id
+                } — clearing ERROR → ENABLED`
             );
             await this.persistStatus('ENABLED');
         }

package/modules/module.js

@@ -147,15 +147,24 @@ class Module extends Delegate {
         } else if (delegateString === this.api.DLGT_TOKEN_DEAUTHORIZED) {
             await this.deauthorize();
         } else if (delegateString === this.api.DLGT_INVALID_AUTH) {
-            await this.markCredentialsInvalid();
+            await this.markCredentialsInvalid(object);
         }
     }
 
-    async markCredentialsInvalid() {
+    async markCredentialsInvalid(diagnosticInfo = null) {
         if (!this.credential) return;
 
         if (!this.credential.id) return;
 
+        if (diagnosticInfo) {
+            console.error(
+                `[Frigg] Module ${this.name} credentials rejected (status ${
+                    diagnosticInfo.statusCode ?? '?'
+                }):`,
+                diagnosticInfo.message ?? diagnosticInfo
+            );
+        }
+
         await this.credentialRepository.updateAuthenticationStatus(
             this.credential.id,
             false
@@ -181,6 +190,10 @@ class Module extends Delegate {
             await this.notify(this.DLGT_CREDENTIAL_INVALIDATED, {
                 credentialId: this.credential.id,
                 moduleName: this.name,
+                ...(diagnosticInfo && {
+                    reason: diagnosticInfo.message,
+                    statusCode: diagnosticInfo.statusCode,
+                }),
             });
         } catch (err) {
             console.error(

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,6 +12,7 @@ class Requester extends Delegate {
         this.backOff = get(params, 'backOff', [1, 3, 10, 30, 60, 180]);
         this.isRefreshable = false;
         this.refreshCount = 0;
+        this.authGraceRetryCount = 0;
         this.DLGT_INVALID_AUTH = 'INVALID_AUTH';
         this.delegateTypes.push(this.DLGT_INVALID_AUTH);
         this.agent = get(params, 'agent', null);
@@ -58,7 +60,16 @@ class Requester extends Delegate {
         return resp.text();
     };
 
-    async _request(url, options, i = 0) {
+    /**
+     * @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.
+     */
+    async _request(url, options, attempt = 0) {
         let encodedUrl = encodeURI(url);
         if (options.query) {
             let queryBuild = '?';
@@ -116,11 +127,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,
@@ -143,30 +154,57 @@ 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) {
-                    await this.notify(this.DLGT_INVALID_AUTH);
-                    return;
+                    // 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 &&
+                        this.authGraceRetryCount < this.backOff.length
+                    ) {
+                        const delay =
+                            this.backOff[this.authGraceRetryCount] * 1000;
+                        this.authGraceRetryCount++;
+                        clearRequestTimer();
+                        await new Promise((resolve) =>
+                            setTimeout(resolve, delay)
+                        );
+                        return this._request(url, options, attempt + 1);
+                    }
+
+                    throw await this._invalidateAuth(
+                        encodedUrl,
+                        options,
+                        response
+                    );
                 }
 
-                if (this.refreshCount === 0) {
+                if (this.refreshCount < MAX_AUTH_RETRIES) {
                     this.refreshCount++;
                     const refreshSucceeded = await this.refreshAuth();
                     if (refreshSucceeded) {
                         clearRequestTimer();
-                        return this._request(url, options, i + 1);
+                        return this._request(url, options, attempt + 1);
                     }
 
-                    await this.notify(this.DLGT_INVALID_AUTH);
-                    return;
+                    throw await this._invalidateAuth(
+                        encodedUrl,
+                        options,
+                        response
+                    );
                 }
+
+                throw await this._invalidateAuth(encodedUrl, options, response);
             }
 
             // If the error wasn't retried, throw. FetchError.create reads
@@ -188,6 +226,7 @@ class Requester extends Delegate {
             // a later 401 in the same Requester lifetime can attempt refresh
             // again instead of silently falling through.
             this.refreshCount = 0;
+            this.authGraceRetryCount = 0;
 
             // parsedBody consumes the response body stream. If the server
             // stalls mid-stream the timer (still armed) aborts it.
@@ -204,6 +243,16 @@ class Requester extends Delegate {
         }
     }
 
+    async _invalidateAuth(encodedUrl, options, response) {
+        const fetchError = await FetchError.create({
+            resource: encodedUrl,
+            init: options,
+            response,
+        });
+        await this.notify(this.DLGT_INVALID_AUTH, fetchError);
+        return fetchError;
+    }
+
     _maybeFlagTimeoutDuringBodyRead(err, timeoutMs) {
         if (!err || typeof err !== 'object') return err;
         if (err.isTimeout) return err;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@friggframework/core",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0-next.100",
+    "version": "2.0.0-next.101",
     "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-next.100",
-        "@friggframework/prettier-config": "2.0.0-next.100",
-        "@friggframework/test": "2.0.0-next.100",
+        "@friggframework/eslint-config": "2.0.0-next.101",
+        "@friggframework/prettier-config": "2.0.0-next.101",
+        "@friggframework/test": "2.0.0-next.101",
         "@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": "a44d68e8abdcc9dcae8fb6c97ad9c8c602317711"
+    "gitHead": "63e9d85c59dc39bb745091911c8149a0de2b3cff"
 }