@bubblebrain-ai/bubble 0.0.18 → 0.0.19

package/dist/network/chatgpt-transport.d.ts

@@ -13,4 +13,5 @@ export declare function createChatGptFetch(options?: ChatGptFetchOptions): ChatG
 export declare function createChatGptDispatcher(env?: NodeJS.ProcessEnv, input?: RequestInfo | URL): Dispatcher | undefined;
 export declare function withChatGptNetworkOptions(input: RequestInfo | URL, init: RequestInit | undefined, env?: NodeJS.ProcessEnv, dispatcher?: Dispatcher | undefined): RequestInitWithDispatcher;
 export declare function normalizeChatGptNetworkError(error: unknown, env?: NodeJS.ProcessEnv): Error;
+export declare function parseMacSystemProxyForUrl(output: string, url: URL): string | undefined;
 export {};

package/dist/network/chatgpt-transport.js

@@ -1,3 +1,4 @@
+import { execFileSync } from "node:child_process";
 import { readFileSync } from "node:fs";
 import { delimiter } from "node:path";
 import { rootCertificates } from "node:tls";
@@ -19,9 +20,8 @@ export function getChatGptFetch(env = process.env) {
 export function createChatGptFetch(options = {}) {
     const env = options.env ?? process.env;
     const fetchImpl = options.fetch ?? ((input, init) => globalThis.fetch(input, init));
-    const dispatcher = createChatGptDispatcher(env);
     return async (input, init) => {
-        const requestInit = withChatGptNetworkOptions(input, init, env, dispatcher);
+        const requestInit = withChatGptNetworkOptions(input, init, env);
         try {
             return await fetchImpl(input, requestInit);
         }
@@ -34,9 +34,9 @@ export function createChatGptDispatcher(env = process.env, input) {
     if (isBunRuntime())
         return undefined;
     const ca = loadExtraCaCertificates(env);
-    if (!hasProxyEnv(env) && ca.length === 0)
-        return undefined;
     const proxy = input ? nodeProxyForUrl(input, env) : defaultNodeProxy(env);
+    if (!proxy && ca.length === 0)
+        return undefined;
     const caOptions = ca.length > 0 ? { ca: [...rootCertificates, ...ca] } : undefined;
     if (proxy) {
         return new ProxyAgent({
@@ -73,41 +73,144 @@ export function normalizeChatGptNetworkError(error, env = process.env) {
             : "This looks like a proxy or network transport failure.",
         hasProxyEnv(env)
             ? "Bubble is using proxy environment variables for ChatGPT requests. Make sure NO_PROXY includes localhost,127.0.0.1."
-            : "If your network requires a proxy, set HTTPS_PROXY or HTTP_PROXY, and set NO_PROXY=localhost,127.0.0.1.",
+            : hasMacSystemProxy(env)
+                ? "Bubble detected the macOS system proxy for ChatGPT requests. If it is stale, restart your proxy client or set BUBBLE_DISABLE_SYSTEM_PROXY=1 and configure HTTPS_PROXY explicitly."
+                : "If your network requires a proxy, set HTTPS_PROXY or HTTP_PROXY, and set NO_PROXY=localhost,127.0.0.1.",
         "Do not disable TLS verification with NODE_TLS_REJECT_UNAUTHORIZED=0.",
         `Original error: ${firstMeaningfulErrorMessage(error) || "unknown network error"}`,
     ].join(" ");
     return new Error(message, { cause: error });
 }
 function hasProxyEnv(env) {
-    return Boolean(env.HTTPS_PROXY || env.https_proxy || env.HTTP_PROXY || env.http_proxy || env.ALL_PROXY || env.all_proxy);
+    return Boolean(env.BUBBLE_CHATGPT_PROXY ||
+        env.bubble_chatgpt_proxy ||
+        env.HTTPS_PROXY ||
+        env.https_proxy ||
+        env.HTTP_PROXY ||
+        env.http_proxy ||
+        env.ALL_PROXY ||
+        env.all_proxy);
 }
 function isBunRuntime() {
     return typeof globalThis.Bun !== "undefined";
 }
 function bunProxyForUrl(input, env) {
+    return proxyForUrl(input, env);
+}
+function nodeProxyForUrl(input, env) {
+    return proxyForUrl(input, env);
+}
+function proxyForUrl(input, env) {
     const url = urlFromInput(input);
     if (!url || shouldBypassProxy(url, env))
         return undefined;
+    const explicit = explicitProxyForUrl(url, env);
+    return explicit ?? macSystemProxyForUrl(url, env);
+}
+function defaultNodeProxy(env) {
+    return (env.BUBBLE_CHATGPT_PROXY ??
+        env.bubble_chatgpt_proxy ??
+        env.HTTPS_PROXY ??
+        env.https_proxy ??
+        env.HTTP_PROXY ??
+        env.http_proxy ??
+        env.ALL_PROXY ??
+        env.all_proxy ??
+        macSystemProxyForUrl(new URL("https://chatgpt.com/"), env));
+}
+function explicitProxyForUrl(url, env) {
+    const chatGptProxy = env.BUBBLE_CHATGPT_PROXY ?? env.bubble_chatgpt_proxy;
+    if (chatGptProxy)
+        return chatGptProxy;
     const allProxy = env.ALL_PROXY ?? env.all_proxy;
     if (url.protocol === "https:")
         return env.HTTPS_PROXY ?? env.https_proxy ?? allProxy;
     if (url.protocol === "http:")
         return env.HTTP_PROXY ?? env.http_proxy ?? allProxy;
+    return allProxy;
+}
+function hasMacSystemProxy(env) {
+    return Boolean(macSystemProxyForUrl(new URL("https://chatgpt.com/"), env));
+}
+function macSystemProxyForUrl(url, env) {
+    if (process.platform !== "darwin" || truthyEnv(env.BUBBLE_DISABLE_SYSTEM_PROXY))
+        return undefined;
+    const output = readMacSystemProxy();
+    return output ? parseMacSystemProxyForUrl(output, url) : undefined;
+}
+export function parseMacSystemProxyForUrl(output, url) {
+    if (macProxyExceptionMatches(output, url.hostname, url.port))
+        return undefined;
+    const values = parseScutilProxyValues(output);
+    if (url.protocol === "https:") {
+        return formatMacProxy(values.HTTPSEnable, values.HTTPSProxy, values.HTTPSPort);
+    }
+    if (url.protocol === "http:") {
+        return formatMacProxy(values.HTTPEnable, values.HTTPProxy, values.HTTPPort);
+    }
     return undefined;
 }
-function nodeProxyForUrl(input, env) {
-    const url = urlFromInput(input);
-    if (!url || shouldBypassProxy(url, env))
+function parseScutilProxyValues(output) {
+    const values = {};
+    for (const line of output.split(/\r?\n/)) {
+        const match = line.match(/^\s*([A-Za-z]+(?:Enable|Proxy|Port))\s*:\s*(.+?)\s*$/);
+        if (match)
+            values[match[1]] = match[2];
+    }
+    return values;
+}
+function formatMacProxy(enabled, host, port) {
+    if (enabled !== "1" || !host || !port)
         return undefined;
-    if (url.protocol === "https:")
-        return env.HTTPS_PROXY ?? env.https_proxy ?? env.ALL_PROXY ?? env.all_proxy;
-    if (url.protocol === "http:")
-        return env.HTTP_PROXY ?? env.http_proxy ?? env.ALL_PROXY ?? env.all_proxy;
-    return defaultNodeProxy(env);
+    if (/^[a-z][a-z0-9+.-]*:\/\//i.test(host))
+        return host;
+    const normalizedHost = host.includes(":") && !host.startsWith("[") ? `[${host}]` : host;
+    return `http://${normalizedHost}:${port}`;
 }
-function defaultNodeProxy(env) {
-    return env.HTTPS_PROXY ?? env.https_proxy ?? env.HTTP_PROXY ?? env.http_proxy ?? env.ALL_PROXY ?? env.all_proxy;
+function macProxyExceptionMatches(output, hostname, port) {
+    const exceptions = parseMacProxyExceptions(output);
+    return exceptions.some((entry) => noProxyEntryMatches(entry.toLowerCase(), hostname.toLowerCase(), port));
+}
+function parseMacProxyExceptions(output) {
+    const exceptions = [];
+    let inExceptions = false;
+    for (const line of output.split(/\r?\n/)) {
+        if (line.includes("ExceptionsList")) {
+            inExceptions = true;
+            continue;
+        }
+        if (!inExceptions)
+            continue;
+        if (/^\s*}\s*$/.test(line))
+            break;
+        const match = line.match(/^\s*\d+\s*:\s*(.+?)\s*$/);
+        if (match)
+            exceptions.push(match[1].trim());
+    }
+    return exceptions;
+}
+let cachedMacSystemProxy;
+function readMacSystemProxy() {
+    const now = Date.now();
+    if (cachedMacSystemProxy && now - cachedMacSystemProxy.checkedAtMs < 5_000) {
+        return cachedMacSystemProxy.output;
+    }
+    let output;
+    try {
+        output = execFileSync("scutil", ["--proxy"], {
+            encoding: "utf-8",
+            stdio: ["ignore", "pipe", "ignore"],
+            timeout: 1_000,
+        });
+    }
+    catch {
+        output = undefined;
+    }
+    cachedMacSystemProxy = { checkedAtMs: now, output };
+    return output;
+}
+function truthyEnv(value) {
+    return /^(1|true|yes|on)$/i.test(value?.trim() ?? "");
 }
 function bunExtraCaFiles(env) {
     const bun = globalThis.Bun;
@@ -177,6 +280,9 @@ function networkEnvSignature(env) {
         env.https_proxy,
         env.ALL_PROXY,
         env.all_proxy,
+        env.BUBBLE_CHATGPT_PROXY,
+        env.bubble_chatgpt_proxy,
+        env.BUBBLE_DISABLE_SYSTEM_PROXY,
         env.NO_PROXY,
         env.no_proxy,
         env.NODE_EXTRA_CA_CERTS,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bubblebrain-ai/bubble",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "description": "A terminal coding agent",
   "type": "module",
   "engines": {