fix(openai): proxy websocket connections under bun (#29832)

This commit is contained in:
Aiden Cline 2026-05-28 23:53:07 -05:00 committed by GitHub
parent 43f110a6cb
commit a15d4f9f04
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 80 additions and 1 deletions

View file

@ -4,6 +4,7 @@
import WebSocket from "ws"
import { ProviderError } from "@/provider/error"
import { errorMessage } from "@/util/error"
import { ProxyEnv } from "@/util/proxy-env"
export const PROTOCOL_HEADER = "responses_websockets=2026-02-06"
@ -72,7 +73,13 @@ export function connectResponsesWebSocket(options: ConnectResponsesWebSocketOpti
}
delete headers["content-length"]
const socket = new WebSocket(options.url, { headers })
// Bun does not apply HTTP(S)_PROXY to WebSockets unless the proxy is supplied explicitly.
const proxy =
typeof Bun === "undefined"
? undefined
: ProxyEnv.getProxyForUrl(options.url.replace(/^wss:/, "https:").replace(/^ws:/, "http:"))
const connect = { headers, ...(proxy ? { proxy } : {}) }
const socket = new WebSocket(options.url, connect)
const timeout = options.timeout
? setTimeout(() => {
cleanup()

View file

@ -0,0 +1,72 @@
/*
* Adapted from proxy-from-env: https://github.com/Rob--W/proxy-from-env
*
* The MIT License
*
* Copyright (C) 2016-2018 Rob Wu <rob@robwu.nl>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in
* the Software without restriction, including without limitation the rights to
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
* of the Software, and to permit persons to whom the Software is furnished to do
* so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
const DEFAULT_PORTS: Record<string, number> = {
ftp: 21,
gopher: 70,
http: 80,
https: 443,
ws: 80,
wss: 443,
}
export function getProxyForUrl(input: string | URL) {
const url = typeof input === "string" ? (URL.canParse(input) ? new URL(input) : undefined) : input
if (!url) return
const protocol = url.protocol.split(":", 1)[0]
const hostname = url.host.replace(/:\d*$/, "")
const port = Number.parseInt(url.port) || DEFAULT_PORTS[protocol] || 0
if (!shouldProxy(hostname, port)) return
const proxy = env(`${protocol}_proxy`) || env("all_proxy")
if (!proxy) return
return proxy.includes("://") ? proxy : `${protocol}://${proxy}`
}
function shouldProxy(hostname: string, port: number) {
const noProxy = env("no_proxy").toLowerCase()
if (!noProxy) return true
if (noProxy === "*") return false
return noProxy.split(/[,\s]/).every((proxy) => {
if (!proxy) return true
const parsed = proxy.match(/^(.+):(\d+)$/)
const proxyHostname = parsed ? parsed[1] : proxy
const proxyPort = parsed ? Number.parseInt(parsed[2]) : 0
if (proxyPort && proxyPort !== port) return true
if (!/^[.*]/.test(proxyHostname)) return hostname !== proxyHostname
return !hostname.endsWith(proxyHostname.startsWith("*") ? proxyHostname.slice(1) : proxyHostname)
})
}
function env(key: string) {
return process.env[key.toLowerCase()] || process.env[key.toUpperCase()] || ""
}
export * as ProxyEnv from "./proxy-env"