Skip to content

Commit d76b527

Browse files
committed
fix: move error handler so it is not missed in some cases
1 parent cffc459 commit d76b527

2 files changed

Lines changed: 33 additions & 4 deletions

File tree

‎lib/node-repo.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,10 @@ async function getDefaultBranch ({ owner, repo, logger }) {
116116
function getCodeOwnersFile (url, { logger }) {
117117
return new Promise((resolve, reject) => {
118118
https.get(url, (res) => {
119+
res.on('error', (err) => {
120+
logger.error(err, 'Error retrieving OWNERS')
121+
return reject(err)
122+
})
119123
if (res.statusCode !== 200) {
120124
// discard the response body so the socket is released
121125
res.resume()
@@ -129,10 +133,6 @@ function getCodeOwnersFile (url, { logger }) {
129133
res.on('end', () => {
130134
return resolve(body)
131135
})
132-
res.on('error', (err) => {
133-
logger.error(err, 'Error retrieving OWNERS')
134-
return reject(err)
135-
})
136136
}).on('error', (err) => {
137137
logger.error(err, 'Error retrieving OWNERS')
138138
return reject(err)

‎test/unit/node-repo-owners.test.js‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import test from 'node:test'
2+
import { Readable } from 'node:stream'
23
import fetchMock from 'fetch-mock'
34
import nock from 'nock'
45

@@ -191,6 +192,34 @@ test('getCodeOwnersFile network error', async (t) => {
191192
scope.done()
192193
})
193194

195+
test('getCodeOwnersFile handles an interrupted error response', async (t) => {
196+
const errors = []
197+
const options = {
198+
logger: { error: (...args) => errors.push(args) }
199+
}
200+
let sent = false
201+
const response = new Readable({
202+
read () {
203+
if (sent) return
204+
sent = true
205+
this.push('partial response')
206+
setImmediate(() => this.destroy(new Error('socket hang up')))
207+
}
208+
})
209+
const base = 'https://localhost'
210+
const filePath = '/CODEOWNERS'
211+
const scope = nock(base)
212+
.get(filePath)
213+
.reply(500, () => response)
214+
215+
await t.assert.rejects(getCodeOwnersFile(`${base}${filePath}`, options))
216+
await new Promise(resolve => setImmediate(resolve))
217+
218+
t.assert.strictEqual(errors.length, 2)
219+
t.assert.ok(errors[1][0] instanceof Error)
220+
scope.done()
221+
})
222+
194223
test('pingOwners success', async (t) => {
195224
const options = {
196225
owner: 'nodejs',

0 commit comments

Comments
 (0)