@typespec/ts-http-runtime 1.0.0-alpha.20240207.1 → 1.0.0-alpha.20240213.2

package/dist/index.js

@@ -1817,34 +1817,6 @@ function getDefaultProxySettings(proxyUrl) {
         password: parsedUrl.password,
     };
 }
-/**
- * @internal
- */
-function getProxyAgentOptions(proxySettings, { headers, tlsSettings }) {
-    let parsedProxyUrl;
-    try {
-        parsedProxyUrl = new URL(proxySettings.host);
-    }
-    catch (_error) {
-        throw new Error(`Expecting a valid host string in proxy settings, but found "${proxySettings.host}".`);
-    }
-    if (tlsSettings) {
-        logger.warning("TLS settings are not supported in combination with custom Proxy, certificates provided to the client will be ignored.");
-    }
-    const proxyAgentOptions = {
-        hostname: parsedProxyUrl.hostname,
-        port: proxySettings.port,
-        protocol: parsedProxyUrl.protocol,
-        headers: headers.toJSON(),
-    };
-    if (proxySettings.username && proxySettings.password) {
-        proxyAgentOptions.auth = `${proxySettings.username}:${proxySettings.password}`;
-    }
-    else if (proxySettings.username) {
-        proxyAgentOptions.auth = `${proxySettings.username}`;
-    }
-    return proxyAgentOptions;
-}
 function setProxyAgentOnRequest(request, cachedAgents) {
     // Custom Agent should take precedence so if one is present
     // we should skip to avoid overwriting it.
@@ -1855,17 +1827,26 @@ function setProxyAgentOnRequest(request, cachedAgents) {
     const isInsecure = url.protocol !== "https:";
     const proxySettings = request.proxySettings;
     if (proxySettings) {
+        let parsedProxyUrl;
+        try {
+            parsedProxyUrl = new URL(proxySettings.host);
+        }
+        catch (_error) {
+            throw new Error(`Expecting a valid host string in proxy settings, but found "${proxySettings.host}".`);
+        }
+        if (request.tlsSettings) {
+            logger.warning("TLS settings are not supported in combination with custom Proxy, certificates provided to the client will be ignored.");
+        }
+        const headers = request.headers.toJSON();
         if (isInsecure) {
             if (!cachedAgents.httpProxyAgent) {
-                const proxyAgentOptions = getProxyAgentOptions(proxySettings, request);
-                cachedAgents.httpProxyAgent = new httpProxyAgent.HttpProxyAgent(proxyAgentOptions);
+                cachedAgents.httpProxyAgent = new httpProxyAgent.HttpProxyAgent(parsedProxyUrl, { headers });
             }
             request.agent = cachedAgents.httpProxyAgent;
         }
         else {
             if (!cachedAgents.httpsProxyAgent) {
-                const proxyAgentOptions = getProxyAgentOptions(proxySettings, request);
-                cachedAgents.httpsProxyAgent = new httpsProxyAgent.HttpsProxyAgent(proxyAgentOptions);
+                cachedAgents.httpsProxyAgent = new httpsProxyAgent.HttpsProxyAgent(parsedProxyUrl, { headers });
             }
             request.agent = cachedAgents.httpsProxyAgent;
         }