From 7c4fac6cedfdbdbf74d61176df02367dd540aacb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com>
Date: Tue, 26 Mar 2024 10:13:28 +0800
Subject: [PATCH] =?UTF-8?q?vue-json-editor=20=E6=9B=BF=E6=8D=A2=E4=B8=BA?=
 =?UTF-8?q?=20vue-json-editor-fix-cn=EF=BC=8C=E8=A7=A3=E5=86=B3=E4=B8=AD?=
 =?UTF-8?q?=E6=96=87=E8=BE=93=E5=85=A5=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/core/src/config/index.js                           | 2 +-
 packages/gui/package.json                                   | 1 +
 packages/gui/src/view/components/settings.vue               | 4 ++--
 packages/gui/src/view/pages/server.vue                      | 2 +-
 packages/mitmproxy/src/lib/interceptor/impl/req/sni.js      | 6 +++---
 packages/mitmproxy/src/lib/interceptor/impl/res/cacheRes.js | 3 ++-
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/core/src/config/index.js b/packages/core/src/config/index.js
index fd6f804..f7acc62 100644
--- a/packages/core/src/config/index.js
+++ b/packages/core/src/config/index.js
@@ -143,7 +143,7 @@ module.exports = {
           proxy: 'avatars.githubusercontent.com',
           sni: 'baidu.com'
         },
-        '^/u/\\d+.*$': {
+        '^/u/\\d+(\\?.*)?$': {
           cacheDays: 365,
           desc: '用户头像，缓存1年'
         }
diff --git a/packages/gui/package.json b/packages/gui/package.json
index f94eeb7..88c5529 100644
--- a/packages/gui/package.json
+++ b/packages/gui/package.json
@@ -43,6 +43,7 @@
     "sass-loader": "^10.0.4",
     "vue": "^2.6.11",
     "vue-json-editor": "^1.4.2",
+    "vue-json-editor-fix-cn": "^1.4.3",
     "vue-router": "^3.4.8"
   },
   "devDependencies": {
diff --git a/packages/gui/src/view/components/settings.vue b/packages/gui/src/view/components/settings.vue
index cfa78df..f4ac91a 100644
--- a/packages/gui/src/view/components/settings.vue
+++ b/packages/gui/src/view/components/settings.vue
@@ -17,7 +17,7 @@
       :style="{ height: '100%' }"
     >
       <a-tab-pane tab="拦截设置" key="1"  >
-        <vue-json-editor  style="height:100%;" ref="editor" v-model="targetConfig.intercepts" mode="code" :show-btns="false" :expandedOnStart="true" @json-change="onJsonChange" ></vue-json-editor>
+        <vue-json-editor style="height:100%;" ref="editor" v-model="targetConfig.intercepts" mode="code" :show-btns="false" :expandedOnStart="true" @json-change="onJsonChange" ></vue-json-editor>
       </a-tab-pane>
       <a-tab-pane tab="DNS设置" key="2">
         <div>
@@ -98,7 +98,7 @@
 </template>
 
 <script>
-import vueJsonEditor from 'vue-json-editor'
+import vueJsonEditor from 'vue-json-editor-fix-cn'
 import lodash from 'lodash'
 import api from '../api'
 export default {
diff --git a/packages/gui/src/view/pages/server.vue b/packages/gui/src/view/pages/server.vue
index 2666640..3d553ea 100644
--- a/packages/gui/src/view/pages/server.vue
+++ b/packages/gui/src/view/pages/server.vue
@@ -217,7 +217,7 @@
 </template>
 
 <script>
-import vueJsonEditor from 'vue-json-editor'
+import vueJsonEditor from 'vue-json-editor-fix-cn'
 import Plugin from '../mixins/plugin'
 import _ from 'lodash'
 
diff --git a/packages/mitmproxy/src/lib/interceptor/impl/req/sni.js b/packages/mitmproxy/src/lib/interceptor/impl/req/sni.js
index b912b40..aef5ee7 100644
--- a/packages/mitmproxy/src/lib/interceptor/impl/req/sni.js
+++ b/packages/mitmproxy/src/lib/interceptor/impl/req/sni.js
@@ -1,13 +1,13 @@
 module.exports = {
   requestIntercept (context, interceptOpt) {
-    const { rOptions } = context
+    const { rOptions, log } = context
     if (interceptOpt.sni != null) {
       rOptions.servername = interceptOpt.sni
-      console.log('sni replace', rOptions.hostname, rOptions.servername)
+      log.info('sni intercept: sni replace servername:', rOptions.hostname, '➜', rOptions.servername)
     }
     return true
   },
   is (interceptOpt) {
-    return !!interceptOpt.sni
+    return !!interceptOpt.sni && !interceptOpt.proxy // proxy生效时，sni不需要生效，因为proxy中也会使用sni覆盖 rOptions.servername
   }
 }
diff --git a/packages/mitmproxy/src/lib/interceptor/impl/res/cacheRes.js b/packages/mitmproxy/src/lib/interceptor/impl/res/cacheRes.js
index 7cebb65..a62a288 100644
--- a/packages/mitmproxy/src/lib/interceptor/impl/res/cacheRes.js
+++ b/packages/mitmproxy/src/lib/interceptor/impl/res/cacheRes.js
@@ -2,7 +2,7 @@ const cacheReq = require('../req/cacheReq')
 
 module.exports = {
   responseIntercept (context, interceptOpt, req, res, proxyReq, proxyRes, ssl, next) {
-    const { rOptions } = context
+    const { rOptions, log } = context
 
     // 只有GET请求，且响应码为2xx时才进行缓存
     if (rOptions.method !== 'GET' || proxyRes.statusCode < 200 || proxyRes.statusCode >= 300) {
@@ -81,6 +81,7 @@ module.exports = {
     }
 
     res.setHeader('Dev-Sidecar-Cache-Response-Interceptor', 'cacheRes:maxAge=' + maxAge)
+    log.info('[cacheRes]', 'maxAge=' + maxAge)
   },
   is (interceptOpt) {
     const maxAge = cacheReq.getMaxAge(interceptOpt)