From f8b99b81a23e7e9fd5e05ebd5caf355c41d67a90 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Tue, 22 Oct 2024 11:23:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dgoogle=E8=AF=81?=
 =?UTF-8?q?=E4=B9=A6*.xx.com=E4=B8=8Exx.com=E5=90=8C=E6=97=B6=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E6=97=B6=E6=8A=A5=E9=94=99=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/core/acme-client/src/auto.js | 47 ++++++++++++++-------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/packages/core/acme-client/src/auto.js b/packages/core/acme-client/src/auto.js
index d8ee534e..087d28f2 100644
--- a/packages/core/acme-client/src/auto.js
+++ b/packages/core/acme-client/src/auto.js
@@ -233,36 +233,39 @@ module.exports = async (client, userOpts) => {
         return Promise.all(results);
     }
 
-    log(`开始challenge，共${allChallengePromises.length}组`);
-    let i = 0;
-    // eslint-disable-next-line no-restricted-syntax
-    for (const challengePromises of allChallengePromises) {
-        i += 1;
-        log(`开始第${i}组`);
-        if (opts.signal && opts.signal.aborted) {
-            throw new Error('用户取消');
-        }
+    try {
+        log(`开始challenge，共${allChallengePromises.length}组`);
+        let i = 0;
+        // eslint-disable-next-line no-restricted-syntax
+        for (const challengePromises of allChallengePromises) {
+            i += 1;
+            log(`开始第${i}组`);
+            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 {
                 // eslint-disable-next-line no-await-in-loop
-                await runAllPromise(clearTasks);
+                await runPromisePa(challengePromises);
             }
             catch (e) {
-                log('清理challenge失败');
-                log(e);
+                log(`证书申请失败${e.message}`);
+                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('[auto] Waiting for challenge valid status');