perf: OpenAPI支持autoApply参数

packages/ui/certd-server/src/modules/monitor/facade/cert-info-facade.ts

@@ -0,0 +1,96 @@
+import { Inject, Provide, Scope, ScopeEnum } from "@midwayjs/core";
+import { CodeException, Constants } from "@certd/lib-server";
+import { CertInfoEntity } from "../entity/cert-info.js";
+import { utils } from "@certd/basic";
+import { PipelineService } from "../../pipeline/service/pipeline-service.js";
+import { UserSettingsService } from "../../mine/service/user-settings-service.js";
+import { UserEmailSetting } from "../../mine/service/models.js";
+import { PipelineEntity } from "../../pipeline/entity/pipeline.js";
+import { CertInfoService } from "../service/cert-info-service.js";
+
+
+@Provide("CertInfoFacade")
+@Scope(ScopeEnum.Request, { allowDowngrade: true })
+export class CertInfoFacade  {
+
+  @Inject()
+  pipelineService: PipelineService;
+
+  @Inject()
+  certInfoService: CertInfoService ;
+
+  @Inject()
+  userSettingsService : UserSettingsService
+
+  async getCertInfo(req: { domains?: string; certId?: number; userId: number,autoApply?:boolean }) {
+    const { domains, certId, userId } = req;
+    if (certId) {
+      return await this.certInfoService.getCertInfoById({ id: certId, userId });
+    }
+    const domainArr = domains.split(',');
+
+    const matchedList = await this.certInfoService.getMatchCertList({domains:domainArr,userId})
+    let matched: CertInfoEntity = null
+    if (matchedList.length === 0 ) {
+      if(req.autoApply === true){
+        //自动申请，先创建自动申请流水线
+        const pipeline:PipelineEntity = await this.createAutoPipeline({domains:domainArr,userId})
+        await this.triggerApplyPipeline({pipelineId:pipeline.id})
+      }else{
+        throw new CodeException(Constants.res.openCertNotFound);
+      }
+    }
+    matched = null;
+    for (const item of matchedList) {
+      if (item.expiresTime>0 && item.expiresTime < new Date().getTime()) {
+        matched = item;
+        break
+      }
+    }
+    if (!matched) {
+      if(req.autoApply === true){
+        //如果没有找到有效期内的证书，则自动触发一次申请
+        const first = matchedList[0]
+        await this.triggerApplyPipeline({pipelineId:first.pipelineId})
+        return
+      }else{
+        throw new CodeException(Constants.res.openCertNotFound);
+      }
+    }
+
+    return await this.certInfoService.getCertInfoById({ id: matched.id, userId: userId });
+  }
+
+  async createAutoPipeline(req:{domains:string[],userId:number}){
+    const userEmailSetting = await this.userSettingsService.getSetting<UserEmailSetting>(req.userId,UserEmailSetting)
+    if(!userEmailSetting.list){
+      throw new CodeException(Constants.res.openEmailNotFound)
+    }
+    const email = userEmailSetting.list[0]
+
+    return await this.pipelineService.createAutoPipeline({
+      domains: req.domains,
+      email,
+      userId: req.userId,
+      from:"OpenAPI"
+    })
+
+  }
+
+  async triggerApplyPipeline(req:{pipelineId:number}){
+    //查询流水线状态
+    const status = await this.pipelineService.getStatus(req.pipelineId)
+    if (status != 'running') {
+      await this.pipelineService.trigger(req.pipelineId)
+      await utils.sleep(1000)
+    }
+    throw new CodeException({
+      ...Constants.res.openCertApplying,
+      data:{
+        pipelineId:req.pipelineId
+      }
+    });
+  }
+
+
+}

packages/ui/certd-server/src/modules/monitor/service/cert-info-service.ts

@@ -1,10 +1,10 @@
-import {Provide, Scope, ScopeEnum} from "@midwayjs/core";
-import {BaseService, CodeException, Constants, PageReq} from "@certd/lib-server";
-import {InjectEntityModel} from "@midwayjs/typeorm";
-import {MoreThan, Repository} from "typeorm";
-import {CertInfoEntity} from "../entity/cert-info.js";
-import {utils} from "@certd/basic";
-import {CertInfo, CertReader} from "@certd/plugin-cert";
+import { Provide, Scope, ScopeEnum } from "@midwayjs/core";
+import { BaseService, CodeException, Constants, PageReq } from "@certd/lib-server";
+import { InjectEntityModel } from "@midwayjs/typeorm";
+import { Repository } from "typeorm";
+import { CertInfoEntity } from "../entity/cert-info.js";
+import { utils } from "@certd/basic";
+import { CertInfo, CertReader } from "@certd/plugin-cert";
 
 export type UploadCertReq = {
   id?: number;
@@ -71,6 +71,7 @@ export class CertInfoService extends BaseService<CertInfoEntity> {
     }
 
     await this.addOrUpdate(bean);
+    return bean.id
   }
 
   async deleteByPipelineId(id: number) {
@@ -82,44 +83,28 @@ export class CertInfoService extends BaseService<CertInfoEntity> {
     });
   }
 
-  async getCertInfo(params: { domains?: string; certId?: number; userId: number }) {
-    const { domains, certId, userId } = params;
-    if (certId) {
-      return await this.getCertInfoById({ id: certId, userId });
-    }
-    return await this.getCertInfoByDomains({
-      domains,
-      userId,
-    });
-  }
-
-  private async getCertInfoByDomains(params: { domains: string; userId: number }) {
+  async getMatchCertList(params: { domains: string[]; userId: number }) {
     const { domains, userId } = params;
     if (!domains) {
       throw new CodeException(Constants.res.openCertNotFound);
     }
-    const domainArr = domains.split(',');
 
     const list = await this.find({
       select: {
         id: true,
         domains: true,
+        expiresTime:true,
+        pipelineId:true,
       },
       where: {
         userId,
-        expiresTime: MoreThan(new Date().getTime())
       },
     });
     //遍历查找
-    const matched = list.find(item => {
+    return list.filter(item => {
       const itemDomains = item.domains.split(',');
-      return utils.domain.match(domainArr, itemDomains);
+      return utils.domain.match(domains, itemDomains);
     });
-    if (!matched) {
-      throw new CodeException(Constants.res.openCertNotFound);
-    }
-
-    return await this.getCertInfoById({ id: matched.id, userId: userId });
   }
 
   async getCertInfoById(req: { id: number; userId: number }) {