Browse Source

日志优化:开发阶段,打印更多客户端连接和代理连接的事件日志。

pull/384/head
王良 1 month ago
parent
commit
ddbf1e1185
  1. 86
      packages/mitmproxy/src/lib/proxy/mitmproxy/createConnectHandler.js

86
packages/mitmproxy/src/lib/proxy/mitmproxy/createConnectHandler.js

@ -58,6 +58,49 @@ function connect (req, cltSocket, head, hostname, port, dnsConfig = null, isDire
const isDnsIntercept = {} const isDnsIntercept = {}
const hostport = `${hostname}:${port}` const hostport = `${hostname}:${port}`
try { try {
// 客户端的连接事件监听
cltSocket.on('timeout', (e) => {
log.error(`cltSocket timeout: ${hostport}, errorMsg: ${e.message}`)
})
cltSocket.on('error', (e) => {
log.error(`cltSocket error: ${hostport}, errorMsg: ${e.message}`)
})
// 开发过程中,如有需要可以将此参数临时改为true,打印所有事件的日志
const printDebugLog = false && process.env.NODE_ENV === 'development'
if (printDebugLog) {
cltSocket.on('close', (hadError) => {
log.debug('【cltSocket close】', hadError)
})
cltSocket.on('connect', () => {
log.debug('【cltSocket connect】')
})
cltSocket.on('connectionAttempt', (ip, port, family) => {
log.debug(`【cltSocket connectionAttempt】${ip}:${port}, family:`, family)
})
cltSocket.on('connectionAttemptFailed', (ip, port, family) => {
log.debug(`【cltSocket connectionAttemptFailed】${ip}:${port}, family:`, family)
})
cltSocket.on('connectionAttemptTimeout', (ip, port, family) => {
log.debug(`【cltSocket connectionAttemptTimeout】${ip}:${port}, family:`, family)
})
cltSocket.on('data', (data) => {
log.debug('【cltSocket data】')
})
cltSocket.on('drain', () => {
log.debug('【cltSocket drain】')
})
cltSocket.on('end', () => {
log.debug('【cltSocket end】')
})
// cltSocket.on('lookup', (err, address, family, host) => {
// })
cltSocket.on('ready', () => {
log.debug('【cltSocket ready】')
})
}
// ---------------------------------------------------------------------------------------------------
const options = { const options = {
port, port,
host: hostname, host: hostname,
@ -69,8 +112,10 @@ function connect (req, cltSocket, head, hostname, port, dnsConfig = null, isDire
options.lookup = dnsLookup.createLookupFunc(null, dns, 'connect', hostport, isDnsIntercept) options.lookup = dnsLookup.createLookupFunc(null, dns, 'connect', hostport, isDnsIntercept)
} }
} }
// 代理连接事件监听
const proxySocket = net.connect(options, () => { const proxySocket = net.connect(options, () => {
if (!isDirect) log.info('Proxy connect start:', hostport) if (!isDirect) log.info('Proxy connect start:', hostport)
else log.debug('Direct connect start:', hostport)
cltSocket.write('HTTP/1.1 200 Connection Established\r\n' + cltSocket.write('HTTP/1.1 200 Connection Established\r\n' +
'Proxy-agent: dev-sidecar\r\n' + 'Proxy-agent: dev-sidecar\r\n' +
@ -80,12 +125,6 @@ function connect (req, cltSocket, head, hostname, port, dnsConfig = null, isDire
cltSocket.pipe(proxySocket) cltSocket.pipe(proxySocket)
}) })
cltSocket.on('timeout', (e) => {
log.error(`cltSocket timeout: ${hostport}, errorMsg: ${e.message}`)
})
cltSocket.on('error', (e) => {
log.error(`cltSocket error: ${hostport}, errorMsg: ${e.message}`)
})
proxySocket.on('timeout', () => { proxySocket.on('timeout', () => {
const cost = new Date() - start const cost = new Date() - start
const errorMsg = `${isDirect ? '直连' : '代理连接'}超时: ${hostport}, cost: ${cost} ms` const errorMsg = `${isDirect ? '直连' : '代理连接'}超时: ${hostport}, cost: ${cost} ms`
@ -103,7 +142,7 @@ function connect (req, cltSocket, head, hostname, port, dnsConfig = null, isDire
// 连接失败,可能被GFW拦截,或者服务端拥挤 // 连接失败,可能被GFW拦截,或者服务端拥挤
const cost = new Date() - start const cost = new Date() - start
const errorMsg = `${isDirect ? '直连' : '代理连接'}失败: ${hostport}, cost: ${cost} ms, errorMsg: ${e.message}` const errorMsg = `${isDirect ? '直连' : '代理连接'}失败: ${hostport}, cost: ${cost} ms, errorMsg: ${e.message}`
log.error(errorMsg) log.error(`${errorMsg}\r\n`, e)
cltSocket.destroy() cltSocket.destroy()
@ -113,6 +152,39 @@ function connect (req, cltSocket, head, hostname, port, dnsConfig = null, isDire
log.error(`记录ip失败次数,用于优选ip! hostname: ${hostname}, ip: ${ip}, reason: ${errorMsg}, dns: ${dns.name}`) log.error(`记录ip失败次数,用于优选ip! hostname: ${hostname}, ip: ${ip}, reason: ${errorMsg}, dns: ${dns.name}`)
} }
}) })
if (printDebugLog) {
proxySocket.on('close', (hadError) => {
log.debug('【proxySocket close】', hadError)
})
proxySocket.on('connect', () => {
log.debug('【proxySocket connect】')
})
proxySocket.on('connectionAttempt', (ip, port, family) => {
log.debug(`【proxySocket connectionAttempt】${ip}:${port}, family:`, family)
})
proxySocket.on('connectionAttemptFailed', (ip, port, family) => {
log.debug(`【proxySocket connectionAttemptFailed】${ip}:${port}, family:`, family)
})
proxySocket.on('connectionAttemptTimeout', (ip, port, family) => {
log.debug(`【proxySocket connectionAttemptTimeout】${ip}:${port}, family:`, family)
})
proxySocket.on('data', (data) => {
log.debug('【proxySocket data】')
})
proxySocket.on('drain', () => {
log.debug('【proxySocket drain】')
})
proxySocket.on('end', () => {
log.debug('【proxySocket end】')
})
// proxySocket.on('lookup', (err, address, family, host) => {
// })
proxySocket.on('ready', () => {
log.debug('【proxySocket ready】')
})
}
return proxySocket return proxySocket
} catch (e) { } catch (e) {
log.error(`${isDirect ? '直连' : '代理连接'}错误: ${hostport}, error:`, e) log.error(`${isDirect ? '直连' : '代理连接'}错误: ${hostport}, error:`, e)

Loading…
Cancel
Save