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

chore: 升级acme

pull/68/head
xiaojunnuo 2024-03-06 18:36:10 +08:00
parent 09c9b42cab
commit ce49dce8c6
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,6 +84,8 @@ module.exports = async function(client, userOpts) {
log('[auto] Resolving and satisfying authorization challenges'); log('[auto] Resolving and satisfying authorization challenges');
const clearTasks = [];
const challengeFunc = async (authz) => { const challengeFunc = async (authz) => {
const d = authz.identifier.value; const d = authz.identifier.value;
let challengeCompleted = false; let challengeCompleted = false;
@ -139,15 +141,17 @@ module.exports = async function(client, userOpts) {
throw e; throw e;
} }
finally { finally {
/* Trigger challengeRemoveFn(), suppress errors */ log(`[auto] [${d}] add challengeRemoveFn()`);
log(`[auto] [${d}] Trigger challengeRemoveFn()`); clearTasks.push(async () => {
/* Trigger challengeRemoveFn(), suppress errors */
try { log(`[auto] [${d}] Trigger challengeRemoveFn()`);
await opts.challengeRemoveFn(authz, challenge, keyAuthorization, recordItem); try {
} await opts.challengeRemoveFn(authz, challenge, keyAuthorization, recordItem);
catch (e) { }
log(`[auto] [${d}] challengeRemoveFn threw error: ${e.message}`); catch (e) {
} log(`[auto] [${d}] challengeRemoveFn threw error: ${e.message}`);
}
});
} }
} }
catch (e) { catch (e) {
@ -184,6 +188,9 @@ module.exports = async function(client, userOpts) {
await runPromisesSerially(challengePromises); await runPromisesSerially(challengePromises);
log('清理challenge');
await runPromisesSerially(clearTasks);
log('challenge结束'); log('challenge结束');
// log('[auto] Waiting for challenge valid status'); // log('[auto] Waiting for challenge valid status');

5
packages/core/acme-client/src/axios.js
View File

@ -22,7 +22,10 @@ instance.defaults.acmeSettings = {
tlsAlpnChallengePort: 443 tlsAlpnChallengePort: 443
}; };
// instance.defaults.proxy = {
// host: '192.168.34.139',
// port: 10811
// };
/** /**
* Explicitly set Node as default HTTP adapter * Explicitly set Node as default HTTP adapter
* *