chore: 1

packages/core/acme-client/src/auto.js

@@ -5,6 +5,7 @@
 const { readCsrDomains } = require('./crypto');
 const { log } = require('./logger');
 const { wait } = require('./wait');
+const { CancelError } = require('./error');
 
 const defaultOpts = {
     csr: null,
@@ -250,7 +251,7 @@ module.exports = async (client, userOpts) => {
             i += 1;
             log(`开始第${i}组`);
             if (opts.signal && opts.signal.aborted) {
-                throw new Error('用户取消');
+                throw new CancelError('用户取消');
             }
 
             try {

packages/core/acme-client/src/client.js

@@ -12,6 +12,7 @@ const AcmeApi = require('./api');
 const verify = require('./verify');
 const util = require('./util');
 const auto = require('./auto');
+const { CancelError } = require('./error');
 
 /**
  * ACME states
@@ -490,9 +491,10 @@ class AcmeClient {
 
         const keyAuthorization = await this.getChallengeKeyAuthorization(challenge);
 
-        const verifyFn = async () => {
+        const verifyFn = async (abort) => {
             if (this.opts.signal && this.opts.signal.aborted) {
-                throw new Error('用户取消');
+                abort();
+                throw new CancelError('用户取消');
             }
             await verify[challenge.type](authz, challenge, keyAuthorization);
         };
@@ -518,7 +520,7 @@ class AcmeClient {
 
     async completeChallenge(challenge) {
         if (this.opts.signal && this.opts.signal.aborted) {
-            throw new Error('用户取消');
+            throw new CancelError('用户取消');
         }
         const resp = await this.api.completeChallenge(challenge.url, {});
         return resp.data;
@@ -559,7 +561,7 @@ class AcmeClient {
         const verifyFn = async (abort) => {
             if (this.opts.signal && this.opts.signal.aborted) {
                 abort();
-                throw new Error('用户取消');
+                throw new CancelError('用户取消');
             }
 
             const resp = await this.api.apiRequest(item.url, null, [200]);

packages/core/acme-client/src/error.js

@@ -0,0 +1,10 @@
+class CancelError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = 'CancelError';
+    }
+}
+
+module.exports = {
+    CancelError,
+};

packages/core/acme-client/src/index.js

@@ -48,3 +48,4 @@ exports.agents = require('./agents');
 exports.setLogger = require('./logger').setLogger;
 
 exports.walkTxtRecord = require('./verify').walkTxtRecord;
+exports.CancelError = require('./error').CancelError;

packages/core/acme-client/src/wait.js

@@ -5,5 +5,5 @@ async function wait(ms) {
 }
 
 module.exports = {
-    wait
+    wait,
 };