Merge branch 'v2-dev' into v2

packages/plugins/plugin-cert/src/dns-provider/api.ts

@@ -29,9 +29,25 @@ export type DnsProviderContext = {
 
 export interface IDnsProvider<T = any> {
   onInstance(): Promise<void>;
+
+  /**
+   * 中文转英文
+   * @param domain
+   */
+  punyCodeEncode(domain: string): string;
+
+  /**
+   * 转中文域名
+   * @param domain
+   */
+  punyCodeDecode(domain: string): string;
+
   createRecord(options: CreateRecordOptions): Promise<T>;
+
   removeRecord(options: RemoveRecordOptions<T>): Promise<void>;
+
   setCtx(ctx: DnsProviderContext): void;
+
   //中文域名是否需要punycode转码，如果返回True，则使用punycode来添加解析记录，否则使用中文域名添加解析记录
   usePunyCode(): boolean;
 }

packages/plugins/plugin-cert/src/dns-provider/base.ts

@@ -1,7 +1,7 @@
 import { CreateRecordOptions, DnsProviderContext, DnsProviderDefine, IDnsProvider, RemoveRecordOptions } from "./api.js";
 import { dnsProviderRegistry } from "./registry.js";
 import { HttpClient, ILogger } from "@certd/basic";
-
+import punycode from "punycode.js";
 export abstract class AbstractDnsProvider<T = any> implements IDnsProvider<T> {
   ctx!: DnsProviderContext;
   http!: HttpClient;
@@ -13,6 +13,22 @@ export abstract class AbstractDnsProvider<T = any> implements IDnsProvider<T> {
     return false;
   }
 
+  /**
+   * 中文转英文
+   * @param domain
+   */
+  punyCodeEncode(domain: string) {
+    return punycode.toASCII(domain);
+  }
+
+  /**
+   * 转中文域名
+   * @param domain
+   */
+  punyCodeDecode(domain: string) {
+    return punycode.toUnicode(domain);
+  }
+
   setCtx(ctx: DnsProviderContext) {
     this.ctx = ctx;
     this.logger = ctx.logger;

packages/plugins/plugin-cert/src/plugin/cert-plugin/acme.ts

@@ -6,7 +6,7 @@ import { Challenge } from "@certd/acme-client/types/rfc8555";
 import { IContext } from "@certd/pipeline";
 import { ILogger, utils } from "@certd/basic";
 import { IDnsProvider, IDomainParser } from "../../dns-provider/index.js";
-import punycode from "node:punycode";
+import punycode from "punycode.js";
 import { IOssClient } from "@certd/plugin-lib";
 export type CnameVerifyPlan = {
   type?: string;
@@ -233,16 +233,18 @@ export class AcmeService {
     let dnsProvider = providers.dnsProvider;
     let fullRecord = `_acme-challenge.${fullDomain}`;
 
+    const origDomain = punycode.toUnicode(domain);
+    const origFullDomain = punycode.toUnicode(fullDomain);
     if (providers.domainsVerifyPlan) {
       //按照计划执行
-      const domainVerifyPlan = providers.domainsVerifyPlan[domain];
+      const domainVerifyPlan = providers.domainsVerifyPlan[origDomain];
       if (domainVerifyPlan) {
         if (domainVerifyPlan.type === "dns") {
           dnsProvider = domainVerifyPlan.dnsProvider;
         } else if (domainVerifyPlan.type === "cname") {
           const cnameVerifyPlan = domainVerifyPlan.cnameVerifyPlan;
           if (cnameVerifyPlan) {
-            const cname = cnameVerifyPlan[fullDomain];
+            const cname = cnameVerifyPlan[origFullDomain];
             if (cname) {
               dnsProvider = cname.dnsProvider;
               domain = await this.options.domainParser.parse(cname.domain);

packages/plugins/plugin-cert/src/plugin/cert-plugin/cert-reader.ts

@@ -5,6 +5,7 @@ import path from "path";
 import { CertificateInfo, crypto } from "@certd/acme-client";
 import { ILogger } from "@certd/basic";
 import dayjs from "dayjs";
+import { uniq } from "lodash-es";
 
 export type CertReaderHandleContext = {
   reader: CertReader;
@@ -90,7 +91,8 @@ export class CertReader {
     const { detail } = this.getCrtDetail();
     const domains = [detail.domains.commonName];
     domains.push(...detail.domains.altNames);
-    return domains;
+    //去重
+    return uniq(domains);
   }
 
   getAltNames() {