From bdcff4a1cc7465a5b2a5276498cdfb590572c85c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com>
Date: Tue, 29 Apr 2025 17:15:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E8=B0=83=E6=95=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/lib/interceptor/impl/res/responseReplace.js |  6 +++---
 packages/mitmproxy/src/utils/util.match.js          | 13 ++-----------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/packages/mitmproxy/src/lib/interceptor/impl/res/responseReplace.js b/packages/mitmproxy/src/lib/interceptor/impl/res/responseReplace.js
index 559c8be..05b9f4c 100644
--- a/packages/mitmproxy/src/lib/interceptor/impl/res/responseReplace.js
+++ b/packages/mitmproxy/src/lib/interceptor/impl/res/responseReplace.js
@@ -92,9 +92,9 @@ module.exports = {
       // 如果未手动配置需要缓存，则不允许使用缓存
       const maxAge = cacheReq.getMaxAge(interceptOpt)
       if (maxAge == null || maxAge <= 0) {
-        replaceHeaders['cache-control'] = '[remove]'
-        replaceHeaders['last-modified'] = '[remove]'
-        replaceHeaders.expires = '[remove]'
+        replaceHeaders['cache-control'] = REMOVE
+        replaceHeaders['last-modified'] = REMOVE
+        replaceHeaders.expires = REMOVE
       }
 
       actions += `${actions ? ',' : ''}download:${filename}`
diff --git a/packages/mitmproxy/src/utils/util.match.js b/packages/mitmproxy/src/utils/util.match.js
index 46bf246..4dae077 100644
--- a/packages/mitmproxy/src/utils/util.match.js
+++ b/packages/mitmproxy/src/utils/util.match.js
@@ -1,5 +1,6 @@
 const lodash = require('lodash')
 const log = require('./util.log.server')
+const mergeApi = require('@docmirror/dev-sidecar/src/merge')
 
 function isMatched (url, regexp) {
   if (regexp === '.*' || regexp === '*' || regexp === 'true' || regexp === true) {
@@ -113,16 +114,6 @@ function merge (oldObj, newObj) {
     }
   })
 }
-function deleteNullItems (target) {
-  lodash.forEach(target, (item, key) => {
-    if (item == null || item === '[delete]') {
-      delete target[key]
-    }
-    if (lodash.isObject(item)) {
-      deleteNullItems(item)
-    }
-  })
-}
 
 function matchHostnameAll (hostMap, hostname, action) {
   // log.debug('matchHostname-all:', action, hostMap)
@@ -178,7 +169,7 @@ function matchHostnameAll (hostMap, hostname, action) {
   }
 
   if (!lodash.isEmpty(values)) {
-    deleteNullItems(values)
+    mergeApi.deleteNullItems(values)
     log.info(`matchHostname-all: ${action}: '${hostname}':`, JSON.stringify(values))
     return values
   } else {