From 4a7c44589417a738d9399d51dbb90b9dfffc1a4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Tue, 3 Dec 2024 10:57:37 +0800 Subject: [PATCH] =?UTF-8?q?optimize:=20=E8=AF=B7=E6=B1=82=E6=8B=A6?= =?UTF-8?q?=E6=88=AA=E5=99=A8=E4=BC=98=E5=85=88=E7=BA=A7=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E5=85=B6=E6=9B=B4=E5=90=88=E7=90=86=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/lib/interceptor/impl/req/OPTIONS.js | 2 +- .../impl/req/{cacheReq.js => cacheRequest.js} | 2 +- .../src/lib/interceptor/impl/req/redirect.js | 2 +- .../mitmproxy/src/lib/interceptor/impl/req/sni.js | 2 +- .../src/lib/interceptor/impl/req/success.js | 2 +- .../src/lib/interceptor/impl/req/unVerifySsl.js | 2 +- .../impl/res/{cacheRes.js => cacheResponse.js} | 4 ++-- .../src/lib/interceptor/impl/res/responseReplace.js | 2 +- packages/mitmproxy/src/lib/interceptor/index.js | 12 +++++------- 9 files changed, 14 insertions(+), 16 deletions(-) rename packages/mitmproxy/src/lib/interceptor/impl/req/{cacheReq.js => cacheRequest.js} (99%) rename packages/mitmproxy/src/lib/interceptor/impl/res/{cacheRes.js => cacheResponse.js} (98%) diff --git a/packages/mitmproxy/src/lib/interceptor/impl/req/OPTIONS.js b/packages/mitmproxy/src/lib/interceptor/impl/req/OPTIONS.js index 45b6c863..433fa246 100644 --- a/packages/mitmproxy/src/lib/interceptor/impl/req/OPTIONS.js +++ b/packages/mitmproxy/src/lib/interceptor/impl/req/OPTIONS.js @@ -14,7 +14,7 @@ function readConfig (config, defaultConfig) { module.exports = { name: 'options', - priority: 1, + priority: 101, requestIntercept (context, interceptOpt, req, res, ssl, next) { const { rOptions, log } = context diff --git a/packages/mitmproxy/src/lib/interceptor/impl/req/cacheReq.js b/packages/mitmproxy/src/lib/interceptor/impl/req/cacheRequest.js similarity index 99% rename from packages/mitmproxy/src/lib/interceptor/impl/req/cacheReq.js rename to packages/mitmproxy/src/lib/interceptor/impl/req/cacheRequest.js index 5028002b..cf14ea11 100644 --- a/packages/mitmproxy/src/lib/interceptor/impl/req/cacheReq.js +++ b/packages/mitmproxy/src/lib/interceptor/impl/req/cacheRequest.js @@ -55,7 +55,7 @@ function getLastModifiedTimeFromIfModifiedSince (rOptions, log) { } module.exports = { - name: 'cacheReq', + name: 'cacheRequest', priority: 104, requestIntercept (context, interceptOpt, req, res, ssl, next) { const { rOptions, log } = context diff --git a/packages/mitmproxy/src/lib/interceptor/impl/req/redirect.js b/packages/mitmproxy/src/lib/interceptor/impl/req/redirect.js index 93845f49..1812abdd 100644 --- a/packages/mitmproxy/src/lib/interceptor/impl/req/redirect.js +++ b/packages/mitmproxy/src/lib/interceptor/impl/req/redirect.js @@ -2,7 +2,7 @@ const proxyApi = require('./proxy') module.exports = { name: 'redirect', - priority: 102, + priority: 105, requestIntercept (context, interceptOpt, req, res, ssl, next, matched) { const { rOptions, log } = context diff --git a/packages/mitmproxy/src/lib/interceptor/impl/req/sni.js b/packages/mitmproxy/src/lib/interceptor/impl/req/sni.js index 782fb8a6..d2b9f7bd 100644 --- a/packages/mitmproxy/src/lib/interceptor/impl/req/sni.js +++ b/packages/mitmproxy/src/lib/interceptor/impl/req/sni.js @@ -1,6 +1,6 @@ module.exports = { name: 'sni', - priority: 122, + priority: 123, requestIntercept (context, interceptOpt, req, res, ssl, next) { const { rOptions, log } = context diff --git a/packages/mitmproxy/src/lib/interceptor/impl/req/success.js b/packages/mitmproxy/src/lib/interceptor/impl/req/success.js index 3991c436..59ee3fc9 100644 --- a/packages/mitmproxy/src/lib/interceptor/impl/req/success.js +++ b/packages/mitmproxy/src/lib/interceptor/impl/req/success.js @@ -1,6 +1,6 @@ module.exports = { name: 'success', - priority: 101, + priority: 102, requestIntercept (context, interceptOpt, req, res, ssl, next) { const { rOptions, log } = context diff --git a/packages/mitmproxy/src/lib/interceptor/impl/req/unVerifySsl.js b/packages/mitmproxy/src/lib/interceptor/impl/req/unVerifySsl.js index 6a3e863e..e50f7bc7 100644 --- a/packages/mitmproxy/src/lib/interceptor/impl/req/unVerifySsl.js +++ b/packages/mitmproxy/src/lib/interceptor/impl/req/unVerifySsl.js @@ -1,6 +1,6 @@ module.exports = { name: 'unVerifySsl', - priority: 123, + priority: 124, requestIntercept (context, interceptOpt, req, res, ssl, next) { const { rOptions, log } = context diff --git a/packages/mitmproxy/src/lib/interceptor/impl/res/cacheRes.js b/packages/mitmproxy/src/lib/interceptor/impl/res/cacheResponse.js similarity index 98% rename from packages/mitmproxy/src/lib/interceptor/impl/res/cacheRes.js rename to packages/mitmproxy/src/lib/interceptor/impl/res/cacheResponse.js index 458df35e..04bfa905 100644 --- a/packages/mitmproxy/src/lib/interceptor/impl/res/cacheRes.js +++ b/packages/mitmproxy/src/lib/interceptor/impl/res/cacheResponse.js @@ -1,7 +1,7 @@ -const cacheReq = require('../req/cacheReq') +const cacheReq = require('../req/cacheRequest') module.exports = { - name: 'cacheRes', + name: 'cacheResponse', priority: 202, responseIntercept (context, interceptOpt, req, res, proxyReq, proxyRes, ssl, next) { const { rOptions, log } = context diff --git a/packages/mitmproxy/src/lib/interceptor/impl/res/responseReplace.js b/packages/mitmproxy/src/lib/interceptor/impl/res/responseReplace.js index 1877476a..559c8be3 100644 --- a/packages/mitmproxy/src/lib/interceptor/impl/res/responseReplace.js +++ b/packages/mitmproxy/src/lib/interceptor/impl/res/responseReplace.js @@ -1,5 +1,5 @@ const lodash = require('lodash') -const cacheReq = require('../req/cacheReq') +const cacheReq = require('../req/cacheRequest') const REMOVE = '[remove]' diff --git a/packages/mitmproxy/src/lib/interceptor/index.js b/packages/mitmproxy/src/lib/interceptor/index.js index f2d351a7..c8255c5f 100644 --- a/packages/mitmproxy/src/lib/interceptor/index.js +++ b/packages/mitmproxy/src/lib/interceptor/index.js @@ -1,10 +1,9 @@ // request interceptor impls const OPTIONS = require('./impl/req/OPTIONS.js') - const success = require('./impl/req/success') -const redirect = require('./impl/req/redirect') const abort = require('./impl/req/abort') -const cacheReq = require('./impl/req/cacheReq') +const cacheRequest = require('./impl/req/cacheRequest') +const redirect = require('./impl/req/redirect') const requestReplace = require('./impl/req/requestReplace') @@ -16,20 +15,19 @@ const baiduOcr = require('./impl/req/baiduOcr') // response interceptor impls const AfterOPTIONSHeaders = require('./impl/res/AfterOPTIONSHeaders') -const cacheRes = require('./impl/res/cacheRes') +const cacheResponse = require('./impl/res/cacheResponse') const responseReplace = require('./impl/res/responseReplace') const script = require('./impl/res/script') module.exports = [ // request interceptor impls - OPTIONS, - success, redirect, abort, cacheReq, + OPTIONS, success, abort, cacheRequest, redirect, requestReplace, proxy, sni, unVerifySsl, baiduOcr, // response interceptor impls - AfterOPTIONSHeaders, cacheRes, responseReplace, + AfterOPTIONSHeaders, cacheResponse, responseReplace, script, ]