github
/
certd
mirror of https://github.com/certd/certd
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: 修复google证书*.xx.com与xx.com同时申请时报错的bug

pull/229/head
xiaojunnuo 2024-10-22 11:23:59 +08:00
parent ffeede38af
commit f8b99b81a2
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
packages/core/acme-client/src/auto.js
View File

@ -233,36 +233,39 @@ module.exports = async (client, userOpts) => {
return Promise.all(results); return Promise.all(results);
} }
log(`开始challenge，共${allChallengePromises.length}组`); try {
let i = 0; log(`开始challenge，共${allChallengePromises.length}组`);
// eslint-disable-next-line no-restricted-syntax let i = 0;
for (const challengePromises of allChallengePromises) { // eslint-disable-next-line no-restricted-syntax
i += 1; for (const challengePromises of allChallengePromises) {
log(`开始第${i}组`); i += 1;
if (opts.signal && opts.signal.aborted) { log(`开始第${i}组`);
throw new Error('用户取消'); if (opts.signal && opts.signal.aborted) {
} throw new Error('用户取消');
}
try {
// eslint-disable-next-line no-await-in-loop
await runPromisePa(challengePromises);
}
catch (e) {
log(`证书申请失败${e.message}`);
throw e;
}
finally {
log(`清理challenge痕迹，length:${clearTasks.length}`);
try { try {
// eslint-disable-next-line no-await-in-loop // eslint-disable-next-line no-await-in-loop
await runAllPromise(clearTasks); await runPromisePa(challengePromises);
} }
catch (e) { catch (e) {
log('清理challenge失败'); log(`证书申请失败${e.message}`);
log(e); throw e;
} }
} }
} }
finally {
log(`清理challenge痕迹，length:${clearTasks.length}`);
try {
// eslint-disable-next-line no-await-in-loop
await runAllPromise(clearTasks);
}
catch (e) {
log('清理challenge失败');
log(e);
}
}
log('challenge结束'); log('challenge结束');
// log('[auto] Waiting for challenge valid status'); // log('[auto] Waiting for challenge valid status');