fix: preserve non-default port in HTTP Host header

Author: lanshuizhiyue

src/frontEnd/src/utils/httpRequestParser/formatters/httpFormatter.ts

@@ -32,10 +32,10 @@ export function toRawHttpRequest(request: ParsedHttpRequest): string {
   // 请求行
   lines.push(`${request.method} ${request.path} HTTP/1.1`)
 
-  // 确保Host头存在
+  // 确保Host头存在（使用带端口的host，如存在非默认端口）
   const headers = { ...request.headers }
   if (!headers['Host'] && !headers['host']) {
-    headers['Host'] = request.host
+    headers['Host'] = request.hostWithPort || request.host
   }
 
   // Headers

src/frontEnd/src/utils/httpRequestParser/parsers/curlParser.ts

@@ -73,12 +73,14 @@ function parseCurlWithLib(normalizedInput: string): ParsedHttpRequest | null {
     // 库在解析包含引号的 body 时有 bug，需要自己重新提取
     const body = extractBody(normalizedInput)
 
-    const { host, path, protocol } = parseUrl(result.url)
+    const { host, hostWithPort, port, path, protocol } = parseUrl(result.url)
 
     return {
       method,
       url: result.url,
       host,
+      hostWithPort,
+      port,
       path,
       headers,
       body,

src/frontEnd/src/utils/httpRequestParser/parsers/fetchParser.ts

@@ -311,12 +311,14 @@ export function parseFetch(input: string): ParsedHttpRequest | null {
       body = extractBody(optionsStr)
     }
 
-    const { host, path, protocol } = parseUrl(url)
+    const { host, hostWithPort, port, path, protocol } = parseUrl(url)
 
     return {
       method,
       url,
       host,
+      hostWithPort,
+      port,
       path,
       headers,
       body,

src/frontEnd/src/utils/httpRequestParser/parsers/powershellParser.ts

@@ -191,12 +191,14 @@ export function parsePowerShell(input: string): ParsedHttpRequest | null {
     // 如果有 body 但没有明确指定方法，默认为 POST
     const finalMethod = (body && !hasExplicitMethod) ? 'POST' : method
 
-    const { host, path, protocol } = parseUrl(url)
+    const { host, hostWithPort, port, path, protocol } = parseUrl(url)
 
     return {
       method: finalMethod,
       url,
       host,
+      hostWithPort,
+      port,
       path,
       headers,
       body,

src/frontEnd/src/utils/httpRequestParser/parsers/rawHttpParser.ts

@@ -128,19 +128,26 @@ export function parseRawHttp(input: string): ParsedHttpRequest | null {
       body = lines.slice(bodyStartIndex).join('\n')
     }
 
-    // 从Host header提取host
-    const host = extractHost(headers)
+    // 从Host header提取host（可能包含端口）
+    const hostWithPort = extractHost(headers)
+    
+    // 分离host和端口
+    const hostParts = hostWithPort.split(':')
+    const host = hostParts[0] || ''
+    const port = hostParts[1] || ''
 
     // 协议默认http（无法从原始报文中确定）
     const protocol = 'http'
 
     // 构建URL
-    const url = host ? `${protocol}://${host}${path}` : path
+    const url = host ? `${protocol}://${hostWithPort}${path}` : path
 
     return {
       method,
       url,
       host,
+      hostWithPort,
+      port,
       path,
       headers,
       body,

src/frontEnd/src/utils/httpRequestParser/types.ts

@@ -14,6 +14,10 @@ export interface ParsedHttpRequest {
   url: string
   /** 主机名（不含端口） */
   host: string
+  /** 主机名（含端口，如存在非默认端口） */
+  hostWithPort: string
+  /** 端口号 */
+  port: string
   /** 请求路径（包含查询字符串和hash） */
   path: string
   /** HTTP头部 */

src/frontEnd/src/utils/httpRequestParser/urlParser.ts

@@ -7,6 +7,10 @@
 export interface UrlParseResult {
   /** 主机名（不含端口） */
   host: string
+  /** 主机名（含端口，如存在非默认端口） */
+  hostWithPort: string
+  /** 端口号 */
+  port: string
   /** 请求路径 */
   path: string
   /** 协议 */
@@ -25,7 +29,7 @@ export interface UrlParseResult {
  */
 export function parseUrl(urlStr: string): UrlParseResult {
   // 默认返回值
-  const defaultResult: UrlParseResult = { host: '', path: '/', protocol: 'http' }
+  const defaultResult: UrlParseResult = { host: '', hostWithPort: '', port: '', path: '/', protocol: 'http' }
 
   if (!urlStr || typeof urlStr !== 'string') {
     return defaultResult
@@ -36,8 +40,14 @@ export function parseUrl(urlStr: string): UrlParseResult {
     const url = new URL(urlStr)
     const path = url.pathname + url.search + url.hash
 
+    // 判断是否为默认端口
+    const isDefaultPort = (url.protocol === 'http:' && url.port === '80') ||
+                          (url.protocol === 'https:' && url.port === '443')
+    
     return {
-      host: url.hostname,  // 使用 hostname 而不是 host，不包含端口
+      host: url.hostname,
+      hostWithPort: isDefaultPort ? url.hostname : (url.host || url.hostname),
+      port: url.port || (url.protocol === 'https:' ? '443' : '80'),
       path: path || '/',
       protocol: url.protocol.replace(':', '')
     }
@@ -51,16 +61,29 @@ export function parseUrl(urlStr: string): UrlParseResult {
  * 手动解析URL（当原生URL API失败时的备选方案）
  */
 function parseUrlManually(urlStr: string): UrlParseResult | null {
-  const match = urlStr.match(/^(https?):\/\/([^\/:]+)(?::\d+)?(\/.*)?$/)
+  const match = urlStr.match(/^(https?):\/\/([^\/:]+)(?::(\d+))?(\/.*)?$/)
 
   if (!match) {
     return null
   }
 
+  const protocol = match[1] || 'http'
+  const hostname = match[2] || ''
+  const port = match[3]
+  const path = match[4] || '/'
+  
+  // 判断是否为默认端口
+  const isDefaultPort = (protocol === 'http' && port === '80') ||
+                        (protocol === 'https' && port === '443')
+  
+  const hostWithPort = port && !isDefaultPort ? `${hostname}:${port}` : hostname
+  
   return {
-    protocol: match[1] || 'http',
-    host: match[2] || '',  // 只取主机名，不含端口
-    path: match[3] || '/'
+    protocol,
+    host: hostname,
+    hostWithPort,
+    port: port || (protocol === 'https' ? '443' : '80'),
+    path
   }
 }