From 3f7799a8718da5d7083c6d818842b9be93d5c3de Mon Sep 17 00:00:00 2001
From: lausten <codeberg.batboy@almost-me.com>
Date: Sat, 2 May 2026 15:59:35 +0200
Subject: [PATCH 1/3] Add proxy auth when using fetch

---
 src/public/settings.html             |  2 +-
 src/server/utils/http-proxy-fetch.ts | 29 ++++++++++++++++++++++++----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/public/settings.html b/src/public/settings.html
index f5db6b6d..b73e6872 100644
--- a/src/public/settings.html
+++ b/src/public/settings.html
@@ -633,7 +633,7 @@ <h2 class="settings-section-heading">
                       id="settings-proxy-urls"
                       class="settings-proxy-urls"
                       rows="4"
-                      placeholder="http://proxy1:8080&#10;socks5://proxy2:1080"
+                      placeholder="http://proxy1:8080&#10;http://user:pass@proxy2:8080&#10;socks5://proxy3:1080"
                     ></textarea>
                     <button
                       class="btn btn--secondary proxy-test-btn"
diff --git a/src/server/utils/http-proxy-fetch.ts b/src/server/utils/http-proxy-fetch.ts
index befd5f62..500affb8 100644
--- a/src/server/utils/http-proxy-fetch.ts
+++ b/src/server/utils/http-proxy-fetch.ts
@@ -6,9 +6,24 @@ import type { TransportFetchOptions as OutgoingFetchOptions } from "../types";
 const MAX_REDIRECTS = 5;
 const CONNECT_TIMEOUT_MS = 8_000;
 
-function parseProxyUrl(proxyUrl: string): { host: string; port: number } {
+function parseProxyUrl(proxyUrl: string): {
+  host: string;
+  port: number;
+  auth: string | undefined;
+} {
   const url = new URL(proxyUrl);
-  return { host: url.hostname, port: Number(url.port) || 8080 };
+  const username = decodeURIComponent(url.username);
+  const password = decodeURIComponent(url.password);
+  const auth =
+    username || password
+      ? `Basic ${Buffer.from(`${username}:${password}`).toString("base64")}`
+      : undefined;
+
+  return {
+    host: url.hostname,
+    port: Number(url.port) || 80,
+    auth,
+  };
 }
 
 const _openConnectTunnel = (
@@ -16,6 +31,7 @@ const _openConnectTunnel = (
   proxyPort: number,
   targetHost: string,
   targetPort: number,
+  proxyAuth: string | undefined,
   timeoutMs: number = CONNECT_TIMEOUT_MS,
 ): Promise<net.Socket> =>
   new Promise((resolve, reject) => {
@@ -26,8 +42,9 @@ const _openConnectTunnel = (
     }, timeoutMs);
 
     sock.once("connect", () => {
+      const authHeader = proxyAuth ? `Proxy-Authorization: ${proxyAuth}` : "";
       sock.write(
-        `CONNECT ${targetHost}:${targetPort} HTTP/1.1\r\nHost: ${targetHost}:${targetPort}\r\n\r\n`,
+        `CONNECT ${targetHost}:${targetPort} HTTP/1.1\r\nHost: ${targetHost}:${targetPort}\r\n${authHeader}\r\n\r\n`,
       );
     });
 
@@ -59,6 +76,7 @@ const _openConnectTunnel = (
 async function _openProxySocket(
   proxyHost: string,
   proxyPort: number,
+  proxyAuth: string | undefined,
   targetHost: string,
   targetPort: number,
   useTls: boolean,
@@ -69,6 +87,7 @@ async function _openProxySocket(
     proxyPort,
     targetHost,
     targetPort,
+    proxyAuth,
     timeoutMs,
   );
   if (!useTls) return sock;
@@ -174,7 +193,8 @@ export async function fetchViaHttpProxy(
   options: OutgoingFetchOptions = {},
   timeoutMs?: number,
 ): Promise<Response> {
-  const { host: proxyHost, port: proxyPort } = parseProxyUrl(proxyUrl);
+  const { host: proxyHost, port: proxyPort, auth: proxyAuth } =
+    parseProxyUrl(proxyUrl);
   const followRedirects = (options.redirect ?? "follow") !== "manual";
   const method = options.method ?? "GET";
 
@@ -189,6 +209,7 @@ export async function fetchViaHttpProxy(
     const sock = await _openProxySocket(
       proxyHost,
       proxyPort,
+      proxyAuth,
       parsed.hostname,
       port,
       useTls,

From ed9dc3628152dfd9bbd7ba06398eaa383c5a6f50 Mon Sep 17 00:00:00 2001
From: lausten <codeberg.batboy@almost-me.com>
Date: Sat, 2 May 2026 16:47:22 +0200
Subject: [PATCH 2/3] Fix default ports

---
 src/server/utils/http-proxy-fetch.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/server/utils/http-proxy-fetch.ts b/src/server/utils/http-proxy-fetch.ts
index 500affb8..8cc0af48 100644
--- a/src/server/utils/http-proxy-fetch.ts
+++ b/src/server/utils/http-proxy-fetch.ts
@@ -21,7 +21,7 @@ function parseProxyUrl(proxyUrl: string): {
 
   return {
     host: url.hostname,
-    port: Number(url.port) || 80,
+    port: Number(url.port) || url.protocol == "http:" ? 80 : 443,
     auth,
   };
 }
@@ -42,9 +42,9 @@ const _openConnectTunnel = (
     }, timeoutMs);
 
     sock.once("connect", () => {
-      const authHeader = proxyAuth ? `Proxy-Authorization: ${proxyAuth}` : "";
+      const authHeader = proxyAuth ? `Proxy-Authorization: ${proxyAuth}\r\n` : "";
       sock.write(
-        `CONNECT ${targetHost}:${targetPort} HTTP/1.1\r\nHost: ${targetHost}:${targetPort}\r\n${authHeader}\r\n\r\n`,
+        `CONNECT ${targetHost}:${targetPort} HTTP/1.1\r\nHost: ${targetHost}:${targetPort}\r\n${authHeader}\r\n`,
       );
     });
 

From 384543735b962a593758efdc194e48d3391f741b Mon Sep 17 00:00:00 2001
From: fccview <comm.campione@gmail.com>
Date: Sat, 2 May 2026 20:35:42 +0100
Subject: [PATCH 3/3] fix bug around or operation

---
 src/server/utils/http-proxy-fetch.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/utils/http-proxy-fetch.ts b/src/server/utils/http-proxy-fetch.ts
index 8cc0af48..09fadb6e 100644
--- a/src/server/utils/http-proxy-fetch.ts
+++ b/src/server/utils/http-proxy-fetch.ts
@@ -21,7 +21,7 @@ function parseProxyUrl(proxyUrl: string): {
 
   return {
     host: url.hostname,
-    port: Number(url.port) || url.protocol == "http:" ? 80 : 443,
+    port: Number(url.port) || (url.protocol === "http:" ? 80 : 443),
     auth,
   };
 }