From eddc285227da956fb043fd98c68c9a1af4958b58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com>
Date: Wed, 16 Oct 2024 16:55:43 +0800
Subject: [PATCH] =?UTF-8?q?optimize:=20=E6=97=A5=E5=BF=97=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/mitmproxy/src/json.js                         | 10 +++++++---
 .../src/lib/proxy/mitmproxy/createRequestHandler.js    |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/mitmproxy/src/json.js b/packages/mitmproxy/src/json.js
index bfb82ad..3094a5b 100644
--- a/packages/mitmproxy/src/json.js
+++ b/packages/mitmproxy/src/json.js
@@ -15,10 +15,14 @@ module.exports = {
   // 仅用于记录日志时使用
   stringify2 (obj) {
     try {
-      return JSON5.stringify(obj)
+      return JSON.stringify(obj)
     } catch (e) {
-      log.debug('转换为JSON字符串失败, error:', e, ', obj:', obj)
-      return obj
+      try {
+        return JSON5.stringify(obj)
+      } catch (e2) {
+        log.debug('转换为JSON字符串失败, error:', e, ', obj:', obj)
+        return obj
+      }
     }
   }
 }
diff --git a/packages/mitmproxy/src/lib/proxy/mitmproxy/createRequestHandler.js b/packages/mitmproxy/src/lib/proxy/mitmproxy/createRequestHandler.js
index 094cb83..ec3727f 100644
--- a/packages/mitmproxy/src/lib/proxy/mitmproxy/createRequestHandler.js
+++ b/packages/mitmproxy/src/lib/proxy/mitmproxy/createRequestHandler.js
@@ -106,7 +106,7 @@ module.exports = function createRequestHandler (createIntercepts, middlewares, e
         function onFree () {
           url = `${rOptions.method} ➜ ${rOptions.protocol}//${rOptions.hostname}:${rOptions.port}${rOptions.path}`
           const start = new Date()
-          log.info('发起代理请求:', url, (rOptions.servername ? ', sni: ' + rOptions.servername : ''), ', headers:', rOptions.headers)
+          log.info('发起代理请求:', url, (rOptions.servername ? ', sni: ' + rOptions.servername : ''), ', headers:', jsonApi.stringify2(rOptions.headers))
 
           const isDnsIntercept = {}
           if (dnsConfig && dnsConfig.providers) {