aweshare 0.6.5 → 0.6.7

package/packages/producer-core/dist/proxy.d.ts

@@ -1,21 +1,38 @@
 import type { ResolvedBackend } from './adapters.js';
-export interface CodexProxyOptions {
+export interface BackendProxyOptions {
     httpProxy?: string;
     httpsProxy?: string;
     noProxy?: string;
-    source: 'HTTP_PROXY' | 'HTTPS_PROXY' | 'ALL_PROXY';
+    source: 'config' | 'HTTP_PROXY' | 'HTTPS_PROXY' | 'ALL_PROXY';
 }
-/** Proxy settings for the official Codex account upstream only.
+/** Egress proxy for one backend's upstream requests. Two sources, one rule:
+ * an explicit `proxyUrl` in the backend block wins over environment variables.
+ *
+ * - `proxyUrl` (config.toml, validated by parseCatalog) applies to any backend
+ *   and fills both the http and the https slot — the user said "this backend's
+ *   traffic goes through this proxy", and one backend has one egress. NO_PROXY
+ *   from the environment still applies.
+ * - Without `proxyUrl`, environment variables apply to codex-login backends
+ *   only: a machine-wide HTTPS_PROXY is ambient state (often set for git/npm)
+ *   and must never capture key-backed backends such as a local Ollama.
  *
  * EnvHttpProxyAgent implements HTTP_PROXY/HTTPS_PROXY/NO_PROXY matching. We
  * also accept ALL_PROXY because coding-agent proxy setups commonly provide it.
  * SOCKS URLs are deliberately ignored: the producer has no SOCKS dependency,
  * and silently treating one as HTTP would send account traffic incorrectly.
  */
-export declare function codexProxyOptions(backend: Pick<ResolvedBackend, 'login'>, env?: NodeJS.ProcessEnv): CodexProxyOptions | null;
-/** Fetch an upstream request, honoring proxy environment variables only for a
- * producer machine's Codex subscription login. */
-export declare function fetchUpstream(backend: Pick<ResolvedBackend, 'login'>, url: string, init: RequestInit): Promise<Response>;
+export declare function backendProxyOptions(backend: Pick<ResolvedBackend, 'login' | 'proxyUrl'>, env?: NodeJS.ProcessEnv): BackendProxyOptions | null;
+/** Close and forget routes whose proxy settings no longer belong to any
+ * backend. Call after a config (re)load so a replaced proxyUrl releases its
+ * pooled connections instead of leaking them for the life of the process.
+ * close() reclaims idle sockets only; requests already dispatched through a
+ * closed route still complete. */
+export declare function pruneProxyRoutes(backends: ReadonlyArray<Pick<ResolvedBackend, 'login' | 'proxyUrl'>>, env?: NodeJS.ProcessEnv): void;
+/** Fetch an upstream request through the backend's egress proxy when one is
+ * configured (config proxyUrl, or proxy environment variables on a codex-login
+ * upstream); plain fetch otherwise. */
+export declare function fetchUpstream(backend: Pick<ResolvedBackend, 'login' | 'proxyUrl'>, url: string, init: RequestInit): Promise<Response>;
 /** A safe, actionable suffix for network errors. Never include proxy URLs:
- * they can contain credentials. */
-export declare function codexNetworkHint(backend: Pick<ResolvedBackend, 'login'>): string;
+ * they can contain credentials. Read-only — building a hint must not create
+ * or close pooled routes as a side effect. */
+export declare function egressNetworkHint(backend: Pick<ResolvedBackend, 'login' | 'proxyUrl'>, env?: NodeJS.ProcessEnv): string;

package/packages/producer-core/dist/proxy.js

@@ -1,6 +1,14 @@
 import { EnvHttpProxyAgent } from 'undici';
-let cachedRoute;
-let cachedSignature;
+// One cached route per distinct proxy settings. A single-slot cache cannot
+// tell "the config changed the proxy" from "a different backend asked": with
+// mixed egress (one proxied backend, one direct) every request would evict —
+// and close — a pooled dispatcher another request may still be about to
+// dispatch through (undici rejects dispatches on a closed dispatcher with
+// UND_ERR_DESTROYED). Direct backends need no route and are never stored.
+const routes = new Map();
+function signatureOf(options) {
+    return JSON.stringify(options);
+}
 function envValue(env, lower, upper) {
     // Match the conventional lower-case precedence used by proxy-aware clients.
     return env[lower] ?? env[upper];
@@ -16,14 +24,32 @@ function httpProxy(value) {
         return undefined;
     }
 }
-/** Proxy settings for the official Codex account upstream only.
+/** Egress proxy for one backend's upstream requests. Two sources, one rule:
+ * an explicit `proxyUrl` in the backend block wins over environment variables.
+ *
+ * - `proxyUrl` (config.toml, validated by parseCatalog) applies to any backend
+ *   and fills both the http and the https slot — the user said "this backend's
+ *   traffic goes through this proxy", and one backend has one egress. NO_PROXY
+ *   from the environment still applies.
+ * - Without `proxyUrl`, environment variables apply to codex-login backends
+ *   only: a machine-wide HTTPS_PROXY is ambient state (often set for git/npm)
+ *   and must never capture key-backed backends such as a local Ollama.
  *
  * EnvHttpProxyAgent implements HTTP_PROXY/HTTPS_PROXY/NO_PROXY matching. We
  * also accept ALL_PROXY because coding-agent proxy setups commonly provide it.
  * SOCKS URLs are deliberately ignored: the producer has no SOCKS dependency,
  * and silently treating one as HTTP would send account traffic incorrectly.
  */
-export function codexProxyOptions(backend, env = process.env) {
+export function backendProxyOptions(backend, env = process.env) {
+    const configured = httpProxy(backend.proxyUrl);
+    if (configured) {
+        return {
+            httpProxy: configured,
+            httpsProxy: configured,
+            noProxy: envValue(env, 'no_proxy', 'NO_PROXY'),
+            source: 'config',
+        };
+    }
     if (backend.login !== 'codex')
         return null;
     const all = httpProxy(envValue(env, 'all_proxy', 'ALL_PROXY'));
@@ -41,21 +67,42 @@ export function codexProxyOptions(backend, env = process.env) {
         source,
     };
 }
-function codexProxyRoute(backend) {
-    const options = codexProxyOptions(backend);
-    const signature = options ? JSON.stringify(options) : '';
-    if (cachedSignature === signature && cachedRoute !== undefined)
-        return cachedRoute;
-    cachedSignature = signature;
-    cachedRoute = options
-        ? { dispatcher: new EnvHttpProxyAgent(options), source: options.source }
-        : null;
-    return cachedRoute;
+function backendProxyRoute(backend, env = process.env) {
+    const options = backendProxyOptions(backend, env);
+    if (!options)
+        return null;
+    const signature = signatureOf(options);
+    let route = routes.get(signature);
+    if (route === undefined) {
+        route = { dispatcher: new EnvHttpProxyAgent(options), source: options.source };
+        routes.set(signature, route);
+    }
+    return route;
 }
-/** Fetch an upstream request, honoring proxy environment variables only for a
- * producer machine's Codex subscription login. */
+/** Close and forget routes whose proxy settings no longer belong to any
+ * backend. Call after a config (re)load so a replaced proxyUrl releases its
+ * pooled connections instead of leaking them for the life of the process.
+ * close() reclaims idle sockets only; requests already dispatched through a
+ * closed route still complete. */
+export function pruneProxyRoutes(backends, env = process.env) {
+    const live = new Set();
+    for (const backend of backends) {
+        const options = backendProxyOptions(backend, env);
+        if (options)
+            live.add(signatureOf(options));
+    }
+    for (const [signature, route] of routes) {
+        if (live.has(signature))
+            continue;
+        routes.delete(signature);
+        void Promise.resolve(route.dispatcher.close()).catch(() => undefined);
+    }
+}
+/** Fetch an upstream request through the backend's egress proxy when one is
+ * configured (config proxyUrl, or proxy environment variables on a codex-login
+ * upstream); plain fetch otherwise. */
 export async function fetchUpstream(backend, url, init) {
-    const route = codexProxyRoute(backend);
+    const route = backendProxyRoute(backend);
     if (!route)
         return fetch(url, init);
     // Node's built-in fetch honors undici dispatchers at runtime, but its DOM
@@ -65,13 +112,17 @@ export async function fetchUpstream(backend, url, init) {
     return fetch(url, options);
 }
 /** A safe, actionable suffix for network errors. Never include proxy URLs:
- * they can contain credentials. */
-export function codexNetworkHint(backend) {
+ * they can contain credentials. Read-only — building a hint must not create
+ * or close pooled routes as a side effect. */
+export function egressNetworkHint(backend, env = process.env) {
+    const options = backendProxyOptions(backend, env);
+    if (options) {
+        return options.source === 'config'
+            ? ' (backend egress used the proxyUrl from config.toml; check that the proxy is reachable)'
+            : ` (Codex account request used ${options.source}; check that its HTTP(S) proxy is reachable)`;
+    }
     if (backend.login !== 'codex')
         return '';
-    const route = codexProxyRoute(backend);
-    return route
-        ? ` (Codex account request used ${route.source}; check that its HTTP(S) proxy is reachable)`
-        : ' (Codex account request went direct; set HTTPS_PROXY, HTTP_PROXY, or ALL_PROXY if ChatGPT requires a proxy)';
+    return ' (Codex account request went direct; set proxyUrl on the backend in config.toml, or HTTPS_PROXY, HTTP_PROXY, or ALL_PROXY before starting the producer, if the upstream needs a proxy)';
 }
 //# sourceMappingURL=proxy.js.map

package/packages/producer-core/dist/proxy.js.map

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