chore: 优化阿里云cdn

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

@@ -588,7 +588,8 @@ class AcmeClient {
 
             if (invalidStates.includes(resp.data.status)) {
                 abort();
-                throw new Error(util.formatResponseError(resp));
+                this.log(`[${d}] : 检查状态 = ${resp.data.status} ： ${JSON.stringify(resp.data)}`);
+                throw new Error("校验失败：" + util.formatResponseError(resp));
             }
             else if (pendingStates.includes(resp.data.status)) {
                 throw new Error(`[${d}] Operation is pending or processing（当前仍然在等待状态）`);

packages/core/pipeline/src/plugin/api.ts

@@ -377,13 +377,13 @@ export abstract class AbstractTaskPlugin implements ITaskPlugin {
 
   async autoMatchedDeploy(req: {
     targetName: string;
-    getCertDomains: () => string[];
+    getCertDomains: () => Promise<string[]>;
     uploadCert: () => Promise<any>;
-    deployOne: (req: { target: any; cert: any }) => Promise<void>;
+    deployOne: (req: { target: CertTargetItem; cert: any }) => Promise<void>;
     getDeployTargetList: (req: PageSearch) => Promise<{ list: CertTargetItem[]; total: number }>;
-  }): Promise<{ result: any; deployedList: any[] }> {
+  }): Promise<{ result: string; deployedList: string[] }> {
     this.logger.info("证书匹配模式部署");
-    const certDomains = req.getCertDomains();
+    const certDomains = await req.getCertDomains();
     const certTargetList = await this.getAutoMatchedTargets({
       targetName: req.targetName,
       pageSize: 200,

packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-cdn/index.ts

@@ -1,8 +1,8 @@
-import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline';
+import { optionsUtils } from '@certd/basic';
+import { AbstractTaskPlugin, CertTargetItem, IsTaskPlugin, Pager, PageSearch, pluginGroups, RunStrategy, TaskInput, TaskOutput } from '@certd/pipeline';
+import { CertApplyPluginNames, CertReader } from "@certd/plugin-cert";
 import { CertInfo, createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from '@certd/plugin-lib';
 import { AliyunAccess } from "../../../plugin-lib/aliyun/access/index.js";
-import { optionsUtils } from '@certd/basic';
-import { CertApplyPluginNames, CertReader } from "@certd/plugin-cert";
 import { AliyunClient, AliyunSslClient, CasCertId } from "../../../plugin-lib/aliyun/lib/index.js";
 @IsTaskPlugin({
   name: 'DeployCertToAliyunCDN',
@@ -10,11 +10,12 @@ import { AliyunClient, AliyunSslClient, CasCertId } from "../../../plugin-lib/al
   icon: 'svg:icon-aliyun',
   group: pluginGroups.aliyun.key,
   desc: '自动部署域名证书至阿里云CDN',
-  default: {
-    strategy: {
-      runStrategy: RunStrategy.SkipWhenSucceed,
-    },
-  },
+  runStrategy: RunStrategy.AlwaysRun,
+  // default: {
+  //   strategy: {
+  //     runStrategy: RunStrategy.SkipWhenSucceed,
+  //   },
+  // },
 })
 export class DeployCertToAliyunCDN extends AbstractTaskPlugin {
   @TaskInput({
@@ -40,10 +41,10 @@ export class DeployCertToAliyunCDN extends AbstractTaskPlugin {
       name: 'output-selector',
       from: [...CertApplyPluginNames, 'uploadCertToAliyun'],
     },
-    template:false,
+    template: false,
     required: true,
   })
-  cert!: CertInfo | CasCertId |number;
+  cert!: CertInfo | CasCertId | number;
 
   @TaskInput(createCertDomainGetterInputDefine({ props: { required: false } }))
   certDomains!: string[];
@@ -59,32 +60,20 @@ export class DeployCertToAliyunCDN extends AbstractTaskPlugin {
   })
   accessId!: string;
 
-  @TaskInput(
-    createRemoteSelectInputDefine({
-      title: 'CDN加速域名',
-      helper: '你在阿里云上配置的CDN加速域名，比如:certd.docmirror.cn',
-      typeName: 'DeployCertToAliyunCDN',
-      action: DeployCertToAliyunCDN.prototype.onGetDomainList.name,
-      watches: ['certDomains', 'accessId'],
-      required: true,
-    })
-  )
-  domainName!: string | string[];
-
   @TaskInput({
     title: '证书所在地域',
     helper: 'cn-hangzhou和ap-southeast-1，默认cn-hangzhou。国际站用户建议使用ap-southeast-1。',
-    value:"cn-hangzhou",
+    value: "cn-hangzhou",
     component: {
       name: 'a-select',
-      options:[
-        {value:'cn-hangzhou',label:'中国大陆'},
-        {value:'ap-southeast-1',label:'新加坡'}
+      options: [
+        { value: 'cn-hangzhou', label: '中国大陆' },
+        { value: 'ap-southeast-1', label: '新加坡' }
       ]
     },
     required: true,
   })
-  certRegion:string
+  certRegion: string
 
   @TaskInput({
     title: '证书名称',
@@ -93,57 +82,131 @@ export class DeployCertToAliyunCDN extends AbstractTaskPlugin {
   certName!: string;
 
 
+  @TaskInput({
+    title: '域名匹配模式',
+    helper: '根据证书匹配：根据证书域名自动匹配DCDN加速域名自动部署，新增加速域名自动感知，自动新增部署',
+    component: {
+      name: 'a-select',
+      options: [
+        { label: '手动选择', value: 'manual' },
+        { label: '根据证书匹配', value: 'auto' },
+      ],
+    },
+    value: 'manual',
+  })
+  domainMatchMode!: 'manual' | 'auto';
 
-  async onInstance() {}
-  async execute(): Promise<void> {
+  @TaskInput(
+    createRemoteSelectInputDefine({
+      title: 'CDN加速域名',
+      helper: '你在阿里云上配置的CDN加速域名，比如:certd.docmirror.cn',
+      typeName: 'DeployCertToAliyunCDN',
+      action: DeployCertToAliyunCDN.prototype.onGetDomainList.name,
+      watches: ['certDomains', 'accessId'],
+      required: true,
+      mergeScript: `
+        return {
+          show: ctx.compute(({form})=>{
+            return form.domainMatchMode === "manual"
+          })
+        }
+      `,
+      pager:true,
+    })
+  )
+  domainName!: string | string[];
+
+  @TaskOutput({
+    title: '已部署过的DCDN加速域名',
+  })
+  deployedList!: string[];
+
+  async onInstance() { }
+  async execute(): Promise<any> {
     this.logger.info('开始部署证书到阿里云cdn');
     const access = await this.getAccess<AliyunAccess>(this.accessId);
+
+    if (this.cert == null) {
+      throw new Error('域名证书参数为空，请检查前置任务')
+    }
+
+    const client = await this.getClient(access);
     const sslClient = new AliyunSslClient({
       access,
       logger: this.logger,
       endpoint: this.endpoint || 'cas.aliyuncs.com',
     });
 
-    if(this.cert == null){
-      throw new Error('域名证书参数为空，请检查前置任务')
+    if (this.domainMatchMode === 'auto') {
+
+      const { result, deployedList } = await this.autoMatchedDeploy({
+        targetName: 'DCDN加速域名',
+        uploadCert: async () => {
+          return await sslClient.uploadCertOrGet(this.cert);
+        },
+        deployOne: async (req: { target: CertTargetItem, cert: any }) => {
+          return await this.deployOne(client, req.target.value, req.cert);
+        },
+        getCertDomains:async ()=>{
+           return sslClient.getCertDomains(this.cert);
+        },
+        getDeployTargetList: this.onGetDomainList.bind(this)
+      });
+      this.deployedList = deployedList;
+      return result;
+
+    } else {
+      if (this.isNotChanged()) {
+        this.logger.info('输入参数未变更，跳过');
+        return "skip";
+      }
+      const certId = await this.getOrUploadCasCert(sslClient);
+
+      if (typeof this.domainName === 'string') {
+        this.domainName = [this.domainName];
+      }
+      for (const domain of this.domainName) {
+        await this.deployOne(client, domain, certId );
+      }
     }
 
+    this.logger.info('部署完成');
+  }
+
+  async getOrUploadCasCert(sslClient: AliyunSslClient) {
     let certId: any = this.cert;
-
-    let certName =  this.appendTimeSuffix(this.certName);
-
+    let certName = this.appendTimeSuffix(this.certName);
     if (typeof this.cert === 'object') {
       const certInfo = this.cert as CertInfo;
       const casCert = this.cert as CasCertId;
       if (casCert.certId) {
         certId = casCert.certId;
       } else if (certInfo.crt) {
-        certName = this.buildCertName(CertReader.getMainDomain(certInfo.crt))
+        certName = CertReader.buildCertName(certInfo);
         const certIdRes = await sslClient.uploadCertificate({
-          name:certName,
+          name: certName,
           cert: certInfo,
         });
         certId = certIdRes.certId as any;
-      }else{
-        throw new Error('证书格式错误'+JSON.stringify(this.cert));
+      } else {
+        throw new Error('证书格式错误' + JSON.stringify(this.cert));
       }
     }
 
-    const client = await this.getClient(access);
-
-    if (typeof this.domainName === 'string') {
-      this.domainName = [this.domainName];
-    }
-    for (const domain of this.domainName) {
-      await this.SetCdnDomainSSLCertificate(client, {
-        CertId: certId,
-        DomainName: domain,
-        CertName: certName,
-        CertRegion:this.certRegion || 'cn-hangzhou',
-      });
+    return {
+      certId,
+      certName,
     }
+  }
 
-    this.logger.info('部署完成');
+  async deployOne(client: any, domain: string, cert: any ) {
+    const { certId, certName } = cert;
+    await this.SetCdnDomainSSLCertificate(client, {
+      CertId: certId,
+      DomainName: domain,
+      CertName: certName,
+      CertRegion: this.certRegion || 'cn-hangzhou',
+    });
   }
 
   async getClient(access: AliyunAccess) {
@@ -157,8 +220,8 @@ export class DeployCertToAliyunCDN extends AbstractTaskPlugin {
     return client;
   }
 
-  async SetCdnDomainSSLCertificate(client: any, params: { CertId: number; DomainName: string,CertName:string,CertRegion:string }) {
-    this.logger.info('设置CDN: ',JSON.stringify(params));
+  async SetCdnDomainSSLCertificate(client: any, params: { CertId: number; DomainName: string, CertName: string, CertRegion: string }) {
+    this.logger.info('设置CDN: ', JSON.stringify(params));
     const requestOption = {
       method: 'POST',
       formatParams: false,
@@ -168,7 +231,7 @@ export class DeployCertToAliyunCDN extends AbstractTaskPlugin {
       'SetCdnDomainSSLCertificate',
       {
         SSLProtocol: 'on',
-        CertType:"cas",
+        CertType: "cas",
         ...params,
       },
       requestOption
@@ -183,7 +246,7 @@ export class DeployCertToAliyunCDN extends AbstractTaskPlugin {
     }
   }
 
-  async onGetDomainList(data: any) {
+  async onGetDomainList(data: PageSearch) {
     if (!this.accessId) {
       throw new Error('请选择Access授权');
     }
@@ -191,9 +254,11 @@ export class DeployCertToAliyunCDN extends AbstractTaskPlugin {
 
     const client = await this.getClient(access);
 
+    const pager = new Pager(data)
     const params = {
       // 'DomainName': 'aaa',
-      PageSize: 500,
+      PageSize: pager.pageSize || 100,
+      PageNumber: pager.pageNo || 1,
     };
 
     const requestOption = {
@@ -205,8 +270,12 @@ export class DeployCertToAliyunCDN extends AbstractTaskPlugin {
     this.checkRet(res);
     const pageData = res?.Domains?.PageData;
     if (!pageData || pageData.length === 0) {
-      throw new Error('找不到CDN域名，您可以手动输入');
+        return {
+          list: [],
+          total: 0,
+        };
     }
+    const total  = res?.Domains?.TotalCount || 0;
     const options = pageData.map((item: any) => {
       return {
         value: item.DomainName,
@@ -214,7 +283,10 @@ export class DeployCertToAliyunCDN extends AbstractTaskPlugin {
         domain: item.DomainName,
       };
     });
-    return optionsUtils.buildGroupOptions(options, this.certDomains);
+    return {
+      list: optionsUtils.buildGroupOptions(options, this.certDomains),
+      total,
+    };
   }
 }
 new DeployCertToAliyunCDN();

packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-dcdn/index.ts

@@ -1,15 +1,13 @@
 import { AbstractTaskPlugin, CertTargetItem, IsTaskPlugin, PageSearch, pluginGroups, RunStrategy, TaskInput, TaskOutput } from '@certd/pipeline';
-import dayjs from 'dayjs';
 import {
-  CertReader,
   createCertDomainGetterInputDefine,
   createRemoteSelectInputDefine
 } from "@certd/plugin-lib";
+import dayjs from 'dayjs';
 import { AliyunAccess } from "../../../plugin-lib/aliyun/access/index.js";
 
-import { CertInfo } from '@certd/plugin-cert';
-import { CertApplyPluginNames } from '@certd/plugin-cert';
 import { optionsUtils } from "@certd/basic";
+import { CertApplyPluginNames, CertInfo } from '@certd/plugin-cert';
 import { AliyunClient, AliyunSslClient, CasCertId } from "../../../plugin-lib/aliyun/lib/index.js";
 @IsTaskPlugin({
   name: 'DeployCertToAliyunDCDN',
@@ -78,6 +76,7 @@ export class DeployCertToAliyunDCDN extends AbstractTaskPlugin {
       action: DeployCertToAliyunDCDN.prototype.onGetDomainList.name,
       watches: ['certDomains', 'accessId'],
       required: true,
+      pager:true,
       mergeScript: `
         return {
           show: ctx.compute(({form})=>{
@@ -101,32 +100,31 @@ export class DeployCertToAliyunDCDN extends AbstractTaskPlugin {
     const access = (await this.getAccess(this.accessId)) as AliyunAccess;
     const client = await this.getClient(access);
     const sslClient = new AliyunSslClient({ access, logger: this.logger });
-   
-    
+
+
     if (this.domainMatchMode === 'auto') {
-       const { result, deployedList } = await this.autoMatchedDeploy({
-        targetName: 'DCDN加速域名',
+      const { result, deployedList } = await this.autoMatchedDeploy({
+        targetName: 'CDN加速域名',
         uploadCert: async () => {
           return await sslClient.uploadCertOrGet(this.cert);
         },
-        deployOne: async (req:{target:any,cert:any})=>{
+        deployOne: async (req: { target: CertTargetItem, cert: any }) => {
           return await this.deployOne(client, req.target.value, req.cert);
         },
-        getCertDomains: ()=>{
-          return this.getCertDomains();
-        },
-        getDeployTargetList: async (req: PageSearch)=>{
-          return await this.onGetDomainList(req);
+        getCertDomains: async ()=>{
+          return sslClient.getCertDomains(this.cert);
         },
+        getDeployTargetList: this.onGetDomainList.bind(this)
       });
       this.deployedList = deployedList;
       return result;
-      
+
     } else {
       if (this.isNotChanged()) {
         this.logger.info('输入参数未变更，跳过');
         return "skip";
       }
+      
       if (!this.domainName) {
         throw new Error('您还未选择DCDN域名');
       }
@@ -137,27 +135,12 @@ export class DeployCertToAliyunDCDN extends AbstractTaskPlugin {
         await this.deployOne(client, domainName, aliCrtId);
       }
     }
-    
+
 
     this.logger.info('部署完成');
   }
 
-   getCertDomains(): string[]{
-      const casCert = this.cert as CasCertId;
-      const certInfo = this.cert as CertInfo;
-      if (casCert.certId) {
-        if (!casCert.detail){
-          throw new Error('未获取到证书域名列表，请尝试强制重新运行一下流水线');
-        }
-        return casCert.detail?.domains || [];
-      }else if (certInfo.crt){
-        return new CertReader(certInfo).getSimpleDetail().domains || [];
-      }else{
-        throw new Error('未获取到证书域名列表，请尝试强制重新运行一下流水线');
-      }
-  }
-
-  async deployOne(client: any, domainName: string, aliCrtId: CasCertId){
+  async deployOne(client: any, domainName: string, aliCrtId: CasCertId) {
     this.logger.info(`[${domainName}]开始部署`)
     const params = await this.buildParams(domainName, aliCrtId);
     await this.doRequest(client, params);
@@ -206,7 +189,7 @@ export class DeployCertToAliyunDCDN extends AbstractTaskPlugin {
   }
 
 
-  async onGetDomainList(data: PageSearch): Promise<{list: CertTargetItem[], total: number}> {
+  async onGetDomainList(data: PageSearch): Promise<{ list: CertTargetItem[], total: number }> {
     if (!this.accessId) {
       throw new Error('请选择Access授权');
     }
@@ -228,7 +211,7 @@ export class DeployCertToAliyunDCDN extends AbstractTaskPlugin {
     this.checkRet(res);
     const pageData = res?.Domains?.PageData || [];
     const total = res?.Domains?.TotalCount || 0;
-    
+
     const options = pageData.map((item: any) => {
       return {
         value: item.DomainName,
@@ -236,7 +219,7 @@ export class DeployCertToAliyunDCDN extends AbstractTaskPlugin {
         domain: item.DomainName,
       };
     });
-    
+
     return {
       list: optionsUtils.buildGroupOptions(options, this.certDomains),
       total: total,

packages/ui/certd-server/src/plugins/plugin-lib/aliyun/lib/ssl-client.ts

@@ -236,4 +236,19 @@ export class AliyunSslClient {
     }
     return region;
   }
+
+  getCertDomains(cert: CertInfo | number | CasCertId): string[]{
+      const casCert = cert as CasCertId;
+      const certInfo = cert as CertInfo;
+      if (casCert.certId) {
+        if (!casCert.detail){
+          throw new Error('未获取到证书域名列表，请尝试强制重新运行一下流水线');
+        }
+        return casCert.detail?.domains || [];
+      }else if (certInfo.crt){
+        return new CertReader(certInfo).getSimpleDetail().domains || [];
+      }else{
+        throw new Error('未获取到证书域名列表，请尝试强制重新运行一下流水线');
+      }
+  }
 }