Skip to content

Commit 116092b

Browse files
committed
refactor: rename root onProxyError to callback
1 parent b350268 commit 116092b

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

index.js

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ if (NODE_VER[0] < 9 && (NODE_VER[0] !== 8 || NODE_VER[1] > 4)) {
2828
}
2929

3030
module.exports = {
31-
ws (req, socket, head, options, onProxyError) {
32-
impl(req, socket, head, options, onProxyError)
31+
ws (req, socket, head, options, callback) {
32+
impl(req, socket, head, options, callback)
3333
},
34-
web (req, res, options, onProxyError) {
35-
impl(req, res, null, options, onProxyError)
34+
web (req, res, options, callback) {
35+
impl(req, res, null, options, callback)
3636
}
3737
}
3838

@@ -44,7 +44,7 @@ function impl (req, resOrSocket, headOrNil, {
4444
proxyName,
4545
onReq,
4646
onRes
47-
}, onProxyError) {
47+
}, callback) {
4848
let hasError = false
4949

5050
function onError (err, statusCode = err.statusCode || 500) {
@@ -64,8 +64,8 @@ function impl (req, resOrSocket, headOrNil, {
6464
resOrSocket.end()
6565
}
6666

67-
if (onProxyError) {
68-
onProxyError(err, req, resOrSocket)
67+
if (callback) {
68+
callback(err, req, resOrSocket)
6969
} else {
7070
throw err
7171
}
@@ -151,7 +151,7 @@ function proxy (req, resOrSocket, options, onRes, onError) {
151151
}
152152
}
153153

154-
const callback = err => {
154+
const onProxyError = err => {
155155
if (hasError) {
156156
return
157157
}
@@ -168,26 +168,26 @@ function proxy (req, resOrSocket, options, onRes, onError) {
168168
.on('error', err => {
169169
if (err.code === 'ECONNREFUSED' || err.code === 'ENOTFOUND') {
170170
err.statusCode = 503
171-
callback(err)
171+
onProxyError(err)
172172
} else if (/HPE_INVALID/.test(err.code)) {
173173
err.statusCode = 502
174-
callback(err)
174+
onProxyError(err)
175175
} else if (err.code === 'ECONNRESET') {
176176
if (!proxyReq.aborted) {
177177
err.statusCode = 502
178-
callback(err)
178+
onProxyError(err)
179179
}
180180
} else {
181-
callback(err)
181+
onProxyError(err)
182182
}
183183
})
184184
// NOTE http.ClientRequest emits "socket hang up" error when aborted
185185
// before having received a response, i.e. there is no need to listen for
186186
// proxyReq.on('aborted', ...).
187-
.on('timeout', () => callback(createError('gateway timeout', null, 504)))
187+
.on('timeout', () => onProxyError(createError('gateway timeout', null, 504)))
188188
.on('response', proxyRes => {
189189
try {
190-
proxyRes.on('aborted', () => callback(createError('socket hang up', 'ECONNRESET', 502)))
190+
proxyRes.on('aborted', () => onProxyError(createError('socket hang up', 'ECONNRESET', 502)))
191191

192192
if (resOrSocket instanceof net.Socket) {
193193
if (onRes) {
@@ -214,11 +214,11 @@ function proxy (req, resOrSocket, options, onRes, onError) {
214214
resOrSocket.addTrailers(proxyRes.trailers)
215215
})
216216
proxyRes
217-
.on('error', callback)
217+
.on('error', onProxyError)
218218
.pipe(resOrSocket)
219219
}
220220
} catch (err) {
221-
callback(err)
221+
onProxyError(err)
222222
}
223223
})
224224

@@ -251,14 +251,14 @@ function proxy (req, resOrSocket, options, onRes, onError) {
251251
.join('\r\n') + '\r\n\r\n'
252252
)
253253

254-
proxyRes.on('error', callback)
254+
proxyRes.on('error', onProxyError)
255255

256256
proxySocket
257-
.on('error', callback)
257+
.on('error', onProxyError)
258258
.pipe(resOrSocket)
259259
.pipe(proxySocket)
260260
} catch (err) {
261-
callback(err)
261+
onProxyError(err)
262262
}
263263
})
264264
}

0 commit comments

Comments
 (0)