chore: review PR comments

CHANGELOG.md

@@ -1,4 +1,4 @@
-4.0.6 / 2024/10/23
+4.0.7 / 2024/10/23
 ====================
 - Handles proxy authentication consistently throughout the codebase (solves e.g. this [`http2-wrapper`](https://github.com/szmarczak/http2-wrapper/issues/108) issue).
 

src/agent/h1-proxy-agent.ts

@@ -4,7 +4,7 @@ import https from 'node:https';
 import { isIPv6 } from 'node:net';
 import tls, { type ConnectionOptions } from 'node:tls';
 import { URL } from 'node:url';
-import { getBasic } from '../auth.js';
+import { buildBasicAuthHeader } from '../auth.js';
 
 interface AgentOptions extends http.AgentOptions {
     proxy: string | URL;
@@ -63,7 +63,7 @@ export class HttpRegularProxyAgent extends http.Agent {
 
         request.path = url.href;
 
-        const basic = getBasic(this.proxy);
+        const basic = buildBasicAuthHeader(this.proxy);
         if (basic) {
             request.setHeader('proxy-authorization', basic);
         }
@@ -101,7 +101,7 @@ export class HttpProxyAgent extends http.Agent {
             host: hostport,
         };
 
-        const basic = getBasic(this.proxy);
+        const basic = buildBasicAuthHeader(this.proxy);
         if (basic) {
             headers['proxy-authorization'] = basic;
             headers.authorization = basic;

src/auth.ts

@@ -4,7 +4,7 @@
  * @param url URL object to process
  * @returns `Basic BASE64` string
  */
-export function getBasic(url: URL): string | null {
+export function buildBasicAuthHeader(url: URL): string | null {
     if (!url.username && !url.password) {
         return null;
     }

src/hooks/proxy.ts

@@ -3,7 +3,7 @@ import http2, { auto } from 'http2-wrapper';
 import { URL } from 'node:url';
 import { HttpProxyAgent, HttpRegularProxyAgent, HttpsProxyAgent } from '../agent/h1-proxy-agent.js';
 import { TransformHeadersAgent } from '../agent/transform-headers-agent.js';
-import { getBasic } from '../auth.js';
+import { buildBasicAuthHeader } from '../auth.js';
 
 const {
     HttpOverHttp2,
@@ -39,7 +39,7 @@ async function getAgents(parsedProxyUrl: URL, rejectUnauthorized: boolean) {
     // Sockets must not be reused, the proxy server may rotate upstream proxies as well.
 
     const headers: Record<string, string> = {};
-    const basic = getBasic(parsedProxyUrl);
+    const basic = buildBasicAuthHeader(parsedProxyUrl);
 
     if (basic) {
         headers.authorization = basic;

src/resolve-protocol.ts

@@ -5,7 +5,7 @@ import { type Headers } from 'got';
 import { auto, type ResolveProtocolConnectFunction, type ResolveProtocolFunction } from 'http2-wrapper';
 import QuickLRU from 'quick-lru';
 import { ProxyError } from './hooks/proxy.js';
-import { getBasic } from './auth.js';
+import { buildBasicAuthHeader } from './auth.js';
 
 const connect = async (proxyUrl: string, options: tls.ConnectionOptions, callback: () => void) => new Promise<TLSSocket>((resolve, reject) => {
     let host = `${options.host}:${options.port}`;
@@ -21,7 +21,7 @@ const connect = async (proxyUrl: string, options: tls.ConnectionOptions, callbac
             };
 
             const url = new URL(proxyUrl);
-            const basic = getBasic(url);
+            const basic = buildBasicAuthHeader(url);
 
             if (basic) {
                 headers.authorization = basic;