@friggframework/core 2.0.0--canary.579.312fe8b.0 → 2.0.0--canary.580.1003d8d.0

package/modules/requester/requester.js

@@ -3,8 +3,6 @@ const { Delegate } = require('../../core');
 const { FetchError } = require('../../errors');
 const { get } = require('../../assertions');
 
-const DEFAULT_REQUEST_TIMEOUT_MS = 60_000;
-
 class Requester extends Delegate {
     constructor(params) {
         super(params);
@@ -15,30 +13,6 @@ class Requester extends Delegate {
         this.delegateTypes.push(this.DLGT_INVALID_AUTH);
         this.agent = get(params, 'agent', null);
 
-        // Per-attempt HTTP timeout. Without this the framework called fetch()
-        // with no AbortController and no timeout — a silently-hung TCP
-        // connection (server accepts but never responds) blocked the calling
-        // promise forever, cascading into stalled batches, stalled syncs,
-        // and worker-lambda timeouts.
-        //
-        // Configuration precedence:
-        //   1. Instance param:   new Requester({ requestTimeoutMs: 30_000 })
-        //   2. Class static:     static requestTimeoutMs = 30_000
-        //   3. Default:          DEFAULT_REQUEST_TIMEOUT_MS (60s)
-        //
-        // Pass 0 (or null) to disable the timeout entirely — reserved for
-        // test doubles and documented long-running endpoints.
-        // Intentionally NOT using `get(params, ...)` here — the Frigg
-        // `get` helper throws RequiredPropertyError if the key is missing
-        // and no default is provided, which would collide with the fall-
-        // through to the class-level static override.
-        const instanceTimeout = params?.requestTimeoutMs;
-        this.requestTimeoutMs =
-            instanceTimeout !== undefined && instanceTimeout !== null
-                ? instanceTimeout
-                : this.constructor.requestTimeoutMs ??
-                  DEFAULT_REQUEST_TIMEOUT_MS;
-
         // Allow passing in the fetch function
         // Instance methods can use this.fetch without differentiating
         this.fetch = get(params, 'fetch', fetch);
@@ -74,134 +48,52 @@ class Requester extends Delegate {
 
         if (this.agent) options.agent = this.agent;
 
-        // Per-attempt timeout — fresh AbortController per call so the retry
-        // recursion (with its own backoff sleeps) always gets a clean
-        // signal. Timer is cleared in the finally block regardless of
-        // outcome.
-        const timeoutMs = this.requestTimeoutMs;
-        const controller = timeoutMs > 0 ? new AbortController() : null;
-        const timeoutHandle = controller
-            ? setTimeout(() => controller.abort(), timeoutMs)
-            : null;
-        const fetchOptions = controller
-            ? { ...options, signal: controller.signal }
-            : options;
-
-        // Timer must stay active through body consumption. node-fetch v2
-        // resolves the fetch() promise when headers arrive, not when the
-        // body is fully read — so a server that sends headers and then
-        // stalls the body would still hang parsedBody() or
-        // FetchError.create()'s response.text() call. We clear the timer
-        // only after the body is fully consumed (success path) or
-        // deliberately before each recursive retry so the new attempt
-        // starts with its own fresh timer.
-        let timerCleared = false;
-        const clearRequestTimer = () => {
-            if (!timerCleared && timeoutHandle) {
-                clearTimeout(timeoutHandle);
-                timerCleared = true;
-            }
-        };
-
+        let response;
         try {
-            let response;
-            try {
-                response = await this.fetch(encodedUrl, fetchOptions);
-            } catch (e) {
-                // AbortController fires AbortError (name) / ETIMEDOUT-shaped
-                // errors (type on node-fetch) when we hit the timeout. No
-                // retry on timeout: a slow endpoint is a downstream problem,
-                // and each retry would wait another `timeoutMs` before giving
-                // up — amplifying the hang into a per-record multi-minute
-                // stall at batch scale.
-                const isTimeout =
-                    e?.name === 'AbortError' || e?.type === 'aborted';
-                if (e?.code === 'ECONNRESET' && i < this.backOff.length) {
-                    clearRequestTimer();
-                    const delay = this.backOff[i] * 1000;
-                    await new Promise((resolve) =>
-                        setTimeout(resolve, delay)
-                    );
-                    return this._request(url, options, i + 1);
-                }
-                const fetchError = await FetchError.create({
-                    resource: encodedUrl,
-                    init: options,
-                    responseBody: isTimeout
-                        ? `Request timed out after ${timeoutMs}ms`
-                        : e,
-                });
-                if (isTimeout) {
-                    // Flag + machine-readable fields so callers can
-                    // distinguish a timeout from a generic network error
-                    // without parsing the message (which FetchError
-                    // sanitizes outside of STAGE=dev).
-                    fetchError.isTimeout = true;
-                    fetchError.timeoutMs = timeoutMs;
-                }
-                throw fetchError;
-            }
-
-            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) {
-                clearRequestTimer();
+            response = await this.fetch(encodedUrl, options);
+        } catch (e) {
+            if (e.code === 'ECONNRESET' && i < this.backOff.length) {
                 const delay = this.backOff[i] * 1000;
                 await new Promise((resolve) => setTimeout(resolve, delay));
                 return this._request(url, options, i + 1);
-            } else if (status === 401) {
-                if (!this.isRefreshable || this.refreshCount > 0) {
-                    await this.notify(this.DLGT_INVALID_AUTH);
-                } else {
-                    this.refreshCount++;
-                    const refreshSucceeded = await this.refreshAuth();
-                    if (refreshSucceeded) {
-                        clearRequestTimer();
-                        return this._request(url, options, i + 1);
-                    }
-                }
             }
-
-            // If the error wasn't retried, throw. FetchError.create reads
-            // the response body (response.text()) — timer must still be
-            // alive to catch a stalled body stream.
-            if (status >= 400) {
-                const fetchError = await FetchError.create({
-                    resource: encodedUrl,
-                    init: options,
-                    response,
-                });
-                throw this._maybeFlagTimeoutDuringBodyRead(
-                    fetchError,
-                    timeoutMs
-                );
+            throw await FetchError.create({
+                resource: encodedUrl,
+                init: options,
+                responseBody: e,
+            });
+        }
+        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) {
+            const delay = this.backOff[i] * 1000;
+            await new Promise((resolve) => setTimeout(resolve, delay));
+            return this._request(url, options, i + 1);
+        } else if (status === 401) {
+            if (!this.isRefreshable || this.refreshCount > 0) {
+                await this.notify(this.DLGT_INVALID_AUTH);
+            } else {
+                this.refreshCount++;
+                const refreshSucceeded = await this.refreshAuth();
+                if (refreshSucceeded) {
+                    return this._request(url, options, i + 1);
+                }
             }
+        }
 
-            // parsedBody consumes the response body stream. If the server
-            // stalls mid-stream the timer (still armed) aborts it.
-            return options.returnFullRes
-                ? response
-                : await this.parsedBody(response);
-        } catch (e) {
-            // If the abort fired during body consumption, node-fetch emits
-            // the error as an AbortError on the body stream. Surface the
-            // same isTimeout flag callers use for header-phase timeouts.
-            throw this._maybeFlagTimeoutDuringBodyRead(e, timeoutMs);
-        } finally {
-            clearRequestTimer();
+        // If the error wasn't retried, throw.
+        if (status >= 400) {
+            throw await FetchError.create({
+                resource: encodedUrl,
+                init: options,
+                response,
+            });
         }
-    }
 
-    _maybeFlagTimeoutDuringBodyRead(err, timeoutMs) {
-        if (!err || typeof err !== 'object') return err;
-        if (err.isTimeout) return err;
-        const isAbort =
-            err.name === 'AbortError' || err.type === 'aborted';
-        if (!isAbort) return err;
-        err.isTimeout = true;
-        err.timeoutMs = timeoutMs;
-        return err;
+        return options.returnFullRes
+            ? response
+            : await this.parsedBody(response);
     }
 
     async _get(options) {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@friggframework/core",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0--canary.579.312fe8b.0",
+    "version": "2.0.0--canary.580.1003d8d.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.579.312fe8b.0",
-        "@friggframework/prettier-config": "2.0.0--canary.579.312fe8b.0",
-        "@friggframework/test": "2.0.0--canary.579.312fe8b.0",
+        "@friggframework/eslint-config": "2.0.0--canary.580.1003d8d.0",
+        "@friggframework/prettier-config": "2.0.0--canary.580.1003d8d.0",
+        "@friggframework/test": "2.0.0--canary.580.1003d8d.0",
         "@prisma/client": "^6.17.0",
         "@types/lodash": "4.17.15",
         "@typescript-eslint/eslint-plugin": "^8.0.0",
@@ -80,5 +80,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "312fe8be9f6afce4d78c1af5f13b03e0a5595cd6"
+    "gitHead": "1003d8deff8f587be3cd9210f1c35c5dc92531be"
 }