thatgfsj-code 3.0.17 → 3.0.19

package/dist/utils/net.js

@@ -0,0 +1,230 @@
+/**
+ * Network utilities shared by LLM providers.
+ *
+ * v3.0.19 hardening after live reports of bare "Error: fetch failed" on
+ * SiliconFlow (intermittent resets of the local Clash/mihomo TUN tunnel —
+ * DNS hands out fake-IP 198.18.0.0/15 addresses, so when the tunnel core
+ * hiccups Node's fetch dies with an opaque TypeError whose real reason
+ * hides in `e.cause`):
+ *
+ * 1. Cause transparency — the wrapped TypeError("fetch failed") is re-thrown
+ *    as `fetch failed (ECONNRESET)` etc. so users finally see WHY.
+ * 2. Automatic retry — network-layer failures only (see isRetryableError),
+ *    exponential backoff 500ms / 1500ms. HTTP 4xx/5xx are NOT retried; they
+ *    resolve normally and the caller decides what to do with them.
+ * 3. Proxy support — Node's global fetch ignores the system proxy. When
+ *    HTTPS_PROXY / https_proxy / HTTP_PROXY / http_proxy is set we route
+ *    requests through undici's EnvHttpProxyAgent (honors NO_PROXY as well;
+ *    falls back to ProxyAgent on undici builds without it). Set
+ *    THATGFSJ_NO_PROXY=1 to force direct connections even when proxy env
+ *    vars are present.
+ */
+/** Non-retryable transport failures: retrying a broken certificate chain cannot succeed. */
+const NON_RETRYABLE_CODE_PATTERNS = [/^CERT_[A-Z_]+$/, /^ERR_TLS/, /^ERR_SSL/, /^UNABLE_TO_VERIFY_LEAF_SIGNATURE$/];
+/** Transient socket/DNS level codes worth a second attempt. */
+const RETRYABLE_NET_CODES = new Set([
+    'ECONNRESET',
+    'ETIMEDOUT',
+    'ECONNREFUSED',
+    'EPIPE',
+    'EAI_AGAIN',
+    'ENOTFOUND',
+    'EHOSTUNREACH',
+    'ENETUNREACH',
+]);
+/**
+ * Decide whether an error thrown by fetch is a transient network-layer
+ * failure worth retrying. HTTP 4xx/5xx never reach this function (fetch
+ * resolves those), so "API error 401" style Errors from callers are
+ * naturally not retryable.
+ *
+ * Note: AbortError is treated as retryable here (it usually means our own
+ * per-attempt timeout fired); genuine external cancellation is filtered out
+ * by fetchWithRetry BEFORE this check runs.
+ */
+export function isRetryableError(err) {
+    if (!(err instanceof Error))
+        return false;
+    if (err.name === 'AbortError' || err.name === 'TimeoutError')
+        return true;
+    if (err instanceof TypeError && /fetch failed/i.test(err.message)) {
+        const code = err.cause?.code;
+        if (typeof code === 'string') {
+            if (NON_RETRYABLE_CODE_PATTERNS.some(re => re.test(code)))
+                return false;
+            return true; // ECONNRESET / ETIMEDOUT / UND_ERR_* / unknown socket errors
+        }
+        return true; // bare "fetch failed" with no cause detail: assume transient
+    }
+    const code = err.code ?? err.cause?.code;
+    if (typeof code === 'string') {
+        if (NON_RETRYABLE_CODE_PATTERNS.some(re => re.test(code)))
+            return false;
+        if (code.startsWith('UND_ERR'))
+            return true; // undici connect/headers/body timeouts
+        return RETRYABLE_NET_CODES.has(code);
+    }
+    return false;
+}
+/**
+ * Human-readable reason for a failed fetch, taken from the underlying cause
+ * (Node puts the real error there — ECONNRESET, ETIMEDOUT, certificate
+ * failures, ...). Returns '' when nothing useful is attached.
+ */
+export function describeFetchCause(err) {
+    if (!(err instanceof Error))
+        return '';
+    const cause = (err.cause ?? err.cause);
+    if (!cause)
+        return '';
+    if (typeof cause === 'string')
+        return cause;
+    return String(cause.code || cause.message || cause);
+}
+/**
+ * Wrap the infamous TypeError("fetch failed") into an Error that surfaces
+ * the underlying cause, e.g. `fetch failed (ECONNRESET) after 3 attempts`.
+ * The original error is preserved on `.cause`. Any other error is returned
+ * untouched.
+ */
+export function enrichFetchError(err, attempts = 1) {
+    if (err instanceof TypeError && /fetch failed/i.test(err.message)) {
+        const detail = describeFetchCause(err);
+        const suffix = attempts > 1 ? ` after ${attempts} attempts` : '';
+        const wrapped = new Error(`fetch failed${detail ? ` (${detail})` : ''}${suffix}`);
+        wrapped.cause = err;
+        return wrapped;
+    }
+    return err;
+}
+function backoffDelayMs(attempt) {
+    // 500ms, 1500ms, 4500ms... (spec: 500/1500 for the default 2 retries)
+    return 500 * Math.pow(3, attempt);
+}
+function sleep(ms, signal) {
+    return new Promise((resolve, reject) => {
+        const timer = setTimeout(resolve, ms);
+        signal?.addEventListener('abort', () => {
+            clearTimeout(timer);
+            reject(new DOMException('Aborted', 'AbortError'));
+        }, { once: true });
+    });
+}
+function externalAbortError(signal) {
+    const reason = signal.reason;
+    if (reason instanceof Error)
+        return reason;
+    return new DOMException('This operation was aborted', 'AbortError');
+}
+// ---------------------------------------------------------------------------
+// Proxy dispatcher (undici EnvHttpProxyAgent / ProxyAgent)
+// ---------------------------------------------------------------------------
+let dispatcherPromise;
+/** Drop the cached dispatcher so the next request re-reads proxy env vars. Exported for tests. */
+export function resetProxyDispatcherCache() {
+    dispatcherPromise = undefined;
+}
+function firstProxyEnvValue() {
+    for (const key of ['HTTPS_PROXY', 'https_proxy', 'HTTP_PROXY', 'http_proxy']) {
+        const v = process.env[key];
+        if (v && v.trim())
+            return v.trim();
+    }
+    return undefined;
+}
+/**
+ * Resolve the undici dispatcher for the current proxy env vars.
+ * Returns undefined when no proxy is configured, the user opted out via
+ * THATGFSJ_NO_PROXY, or undici is unavailable (fail-open to direct fetch).
+ */
+async function resolveProxyDispatcher() {
+    if (process.env.THATGFSJ_NO_PROXY && process.env.THATGFSJ_NO_PROXY !== '0')
+        return undefined;
+    const proxyUrl = firstProxyEnvValue();
+    if (!proxyUrl)
+        return undefined;
+    if (!dispatcherPromise) {
+        dispatcherPromise = (async () => {
+            try {
+                const mod = await import('undici');
+                const self = mod.default ?? mod;
+                // EnvHttpProxyAgent reads HTTP_PROXY/HTTPS_PROXY/NO_PROXY itself and
+                // handles per-host NO_PROXY exceptions; ProxyAgent is the plain fallback.
+                const AgentCtor = self.EnvHttpProxyAgent ?? mod.EnvHttpProxyAgent;
+                if (typeof AgentCtor === 'function')
+                    return new AgentCtor();
+                const ProxyAgentCtor = self.ProxyAgent ?? mod.ProxyAgent;
+                if (typeof ProxyAgentCtor === 'function')
+                    return new ProxyAgentCtor(proxyUrl);
+                return undefined;
+            }
+            catch {
+                return undefined; // undici missing → direct connection, best effort
+            }
+        })();
+    }
+    return dispatcherPromise;
+}
+/**
+ * fetch() with automatic retry for network-layer failures and proxy support.
+ *
+ * - Retries: TypeError("fetch failed") / AbortError from our own timeout /
+ *   undici UND_ERR_* / transient socket codes. Exponential backoff 500ms,
+ *   1500ms. HTTP 4xx/5xx resolve normally and are NEVER retried here.
+ * - External signal: passed through untouched; aborting it cancels the
+ *   in-flight attempt and any pending backoff without retrying.
+ * - Timeout: per-attempt (each try gets a fresh timeoutMs window).
+ * - init.body must be a string/Buffer/URLSearchParams (reusable across
+ *   attempts) — required for the POST JSON bodies LLM providers send.
+ *
+ * On final failure a TypeError("fetch failed") is re-thrown via
+ * enrichFetchError so the user sees `fetch failed (ECONNRESET)` instead of
+ * a bare "fetch failed".
+ */
+export async function fetchWithRetry(url, init = {}, options = {}) {
+    const retries = options.retries ?? 2;
+    for (let attempt = 0;; attempt++) {
+        if (options.signal?.aborted)
+            throw externalAbortError(options.signal);
+        const attemptController = new AbortController();
+        let timedOut = false;
+        const timer = options.timeoutMs !== undefined
+            ? setTimeout(() => {
+                timedOut = true;
+                attemptController.abort();
+            }, options.timeoutMs)
+            : undefined;
+        try {
+            const signal = options.signal
+                ? AbortSignal.any([attemptController.signal, options.signal])
+                : attemptController.signal;
+            const requestInit = { ...init, signal };
+            const dispatcher = await resolveProxyDispatcher();
+            if (dispatcher !== undefined)
+                requestInit.dispatcher = dispatcher;
+            return await globalThis.fetch(url, requestInit);
+        }
+        catch (err) {
+            // 1. External cancellation: never retry, surface the signal's reason.
+            if (options.signal?.aborted)
+                throw externalAbortError(options.signal);
+            // 2. Our own per-attempt timeout fired: retryable, but reword the error
+            //    on exhaustion (an AbortError named "The operation was aborted"
+            //    tells the user nothing).
+            if (timedOut) {
+                if (attempt >= retries) {
+                    throw new Error(`request timed out after ${options.timeoutMs}ms (${attempt + 1} attempt${attempt ? 's' : ''})`);
+                }
+            }
+            else if (!isRetryableError(err) || attempt >= retries) {
+                throw enrichFetchError(err, attempt + 1);
+            }
+            await sleep(backoffDelayMs(attempt), options.signal);
+        }
+        finally {
+            if (timer)
+                clearTimeout(timer);
+        }
+    }
+}
+//# sourceMappingURL=net.js.map

package/dist/utils/net.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"net.js","sourceRoot":"","sources":["../../src/utils/net.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thatgfsj-code",
-  "version": "3.0.17",
+  "version": "3.0.19",
   "description": "Thatgfsj Code - AI Coding Assistant with Reasonix-style prompt caching",
   "main": "dist/cmd/index.js",
   "type": "module",
@@ -49,7 +49,8 @@
     "marked": "^15.0.12",
     "marked-terminal": "^7.3.0",
     "playwright-core": "^1.63.0",
-    "react": "^19.2.7"
+    "react": "^19.2.7",
+    "undici": "^7.29.1"
   },
   "devDependencies": {
     "@types/marked-terminal": "^6.1.1",