Skip to content

Commit a40f57f

Browse files
Copilotsj817
andauthored
fix: improve error messages for version resolution failures
Agent-Logs-Url: https://github.com/KarinJS/puppeteer/sessions/7b042e34-6923-405a-b23a-53d04d7be24d Co-authored-by: sj817 <74231782+sj817@users.noreply.github.com>
1 parent 45fc059 commit a40f57f

3 files changed

Lines changed: 8 additions & 4 deletions

File tree

src/config/index.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ describe('resolveVersion', () => {
328328
expect(result).toBe('120.0.6099.109')
329329
})
330330

331-
it('所有探针都失败时应抛出 AggregateError', async () => {
331+
it('所有探针都失败时应抛出包含 URL 信息的错误', async () => {
332332
delete process.env.PUPPETEER_CHROME_MIRROR
333333

334334
vi.stubGlobal('fetch', vi.fn().mockResolvedValue({
@@ -337,6 +337,6 @@ describe('resolveVersion', () => {
337337
statusText: 'Internal Server Error',
338338
}))
339339

340-
await expect(configModule.resolveVersion('stable')).rejects.toThrow()
340+
await expect(configModule.resolveVersion('stable')).rejects.toThrow('所有版本解析 API 均不可用')
341341
})
342342
})

src/config/index.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,11 @@ export const resolveVersion = async (version: string): Promise<string> => {
165165
return resolveVersionFromMirror(version, baseUrl)
166166
})
167167

168-
return Promise.any(probePromises)
168+
try {
169+
return await Promise.any(probePromises)
170+
} catch {
171+
throw new Error(`所有版本解析 API 均不可用: ${urls.join(', ')}`)
172+
}
169173
}
170174

171175
/**

src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const main = async () => {
1515
config.download.version = resolvedVersion
1616
}
1717
} catch (err) {
18-
logger.info(`[${pluginName}] 版本解析失败,使用默认方式: ${err instanceof Error ? err.message : String(err)}`)
18+
logger.info(`[${pluginName}] 版本解析失败,将使用配置的版本: ${err instanceof Error ? err.message : String(err)}`)
1919
}
2020
}
2121

0 commit comments

Comments
 (0)