@certd/plugin-cert 1.36.21 → 1.36.23

package/CHANGELOG.md

@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.36.23](https://github.com/certd/certd/compare/v1.36.22...v1.36.23) (2025-09-26)
+
+### Performance Improvements
+
+* 手动上传证书优化，增加到期前报错提醒 ([3d42bfd](https://github.com/certd/certd/commit/3d42bfd479eaacc4a49c401224815a6e2a0204b0))
+* 支持腾讯云验证码 ([03f317f](https://github.com/certd/certd/commit/03f317ffdb6595ce70e8a2302b05f390c52110c8))
+
+## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
+
+### Bug Fixes
+
+* 修复旧版本升级上来报错eab授权的bug ([b76f2e2](https://github.com/certd/certd/commit/b76f2e2008a7fefac4c91179c45c56c7a7a84b71))
+
+### Performance Improvements
+
+* add preferred chain for google trust service ([#539](https://github.com/certd/certd/issues/539)) @ZeroClover ([e31d26a](https://github.com/certd/certd/commit/e31d26a8871c6088d9f8c0f580746ff2a810ae0c))
+
 ## [1.36.21](https://github.com/certd/certd/compare/v1.36.20...v1.36.21) (2025-09-15)
 
 ### Bug Fixes

package/dist/dns-provider/api.d.ts

@@ -1,5 +1,5 @@
 import { HttpClient, ILogger, utils } from "@certd/basic";
-import { IAccess, Registrable } from "@certd/pipeline";
+import { IAccess, IServiceGetter, Registrable } from "@certd/pipeline";
 export type DnsProviderDefine = Registrable & {
     accessType: string;
     icon?: string;
@@ -21,6 +21,7 @@ export type DnsProviderContext = {
     http: HttpClient;
     utils: typeof utils;
     domainParser: IDomainParser;
+    serviceGetter: IServiceGetter;
 };
 export interface IDnsProvider<T = any> {
     onInstance(): Promise<void>;

package/dist/plugin/cert-plugin/custom/index.d.ts

@@ -4,11 +4,13 @@ import { CertApplyBaseConvertPlugin } from "../base-convert.js";
 export { CertReader };
 export type { CertInfo };
 export declare class CertApplyUploadPlugin extends CertApplyBaseConvertPlugin {
+    renewDays: number;
     uploadCert: CertInfo;
     certMd5?: string;
     onInstance(): Promise<void>;
     onInit(): Promise<void>;
     getCertFromStore(): Promise<any>;
+    private checkExpires;
     execute(): Promise<string | void>;
     onCertUpdate(data: any): Promise<{
         input: {

package/dist/plugin/cert-plugin/custom/index.js

@@ -13,6 +13,7 @@ import { CertApplyBaseConvertPlugin } from "../base-convert.js";
 import dayjs from "dayjs";
 export { CertReader };
 let CertApplyUploadPlugin = class CertApplyUploadPlugin extends CertApplyBaseConvertPlugin {
+    renewDays;
     uploadCert;
     certMd5;
     async onInstance() {
@@ -31,43 +32,52 @@ let CertApplyUploadPlugin = class CertApplyUploadPlugin extends CertApplyBaseCon
         catch (e) {
             this.logger.warn("读取cert失败：", e);
         }
-        if (certReader == null) {
-            certReader = new CertReader(this.uploadCert);
-        }
-        if (!certReader.expires || certReader.expires < new Date().getTime()) {
-            throw new Error("证书已过期，停止部署，请重新上传证书");
-        }
         return certReader;
     }
-    async execute() {
-        let certReader = await this.getCertFromStore();
-        const crtMd5 = this.ctx.utils.hash.md5(certReader.cert.crt);
-        const leftDays = dayjs(certReader.expires).diff(dayjs(), "day");
-        this.logger.info(`证书过期时间${dayjs(certReader.expires).format("YYYY-MM-DD HH:mm:ss")},剩余${leftDays}天`);
-        if (!this.ctx.inputChanged) {
-            this.logger.info("输入参数无变化");
-            const lastCrtMd5 = this.lastStatus?.status?.output?.certMd5;
-            this.logger.info("证书MD5", crtMd5);
-            this.logger.info("上次证书MD5", lastCrtMd5);
-            if (lastCrtMd5 === crtMd5) {
-                this.logger.info("证书无变化，跳过");
-                //输出证书MD5
-                this.certMd5 = crtMd5;
-                await this.output(certReader, false);
-                return "skip";
+    checkExpires(certReader) {
+        const renewDays = (this.renewDays ?? 10) * 24 * 60 * 60 * 1000;
+        if (certReader.expires) {
+            if (certReader.expires < new Date().getTime()) {
+                throw new Error("证书已过期，停止部署，请尽快上传新证书");
+            }
+            if (certReader.expires < new Date().getTime() + renewDays) {
+                throw new Error("证书即将已过期，停止部署，请尽快上传新证书");
             }
-            this.logger.info("证书有变化，重新部署");
         }
-        else {
-            this.logger.info("输入参数有变化，重新部署");
+    }
+    async execute() {
+        const oldCertReader = await this.getCertFromStore();
+        if (oldCertReader) {
+            const leftDays = dayjs(oldCertReader.expires).diff(dayjs(), "day");
+            this.logger.info(`证书过期时间${dayjs(oldCertReader.expires).format("YYYY-MM-DD HH:mm:ss")},剩余${leftDays}天`);
+            this.checkExpires(oldCertReader);
+            if (!this.ctx.inputChanged) {
+                this.logger.info("输入参数无变化");
+                const lastCrtMd5 = this.lastStatus?.status?.output?.certMd5;
+                const newCrtMd5 = this.ctx.utils.hash.md5(this.uploadCert.crt);
+                this.logger.info("证书MD5", newCrtMd5);
+                this.logger.info("上次证书MD5", lastCrtMd5);
+                if (lastCrtMd5 === newCrtMd5) {
+                    this.logger.info("证书无变化，跳过");
+                    //输出证书MD5
+                    this.certMd5 = newCrtMd5;
+                    await this.output(oldCertReader, false);
+                    return "skip";
+                }
+                this.logger.info("证书有变化，重新部署");
+            }
+            else {
+                this.logger.info("输入参数有变化，重新部署");
+            }
         }
-        certReader = new CertReader(this.uploadCert);
+        const newCertReader = new CertReader(this.uploadCert);
         this.clearLastStatus();
         //输出证书MD5
-        this.certMd5 = this.ctx.utils.hash.md5(certReader.cert.crt);
-        const newLeftDays = dayjs(certReader.expires).diff(dayjs(), "day");
-        this.logger.info(`新证书过期时间${dayjs(certReader.expires).format("YYYY-MM-DD HH:mm:ss")},剩余${newLeftDays}天`);
-        await this.output(certReader, true);
+        this.certMd5 = this.ctx.utils.hash.md5(newCertReader.cert.crt);
+        const newLeftDays = dayjs(newCertReader.expires).diff(dayjs(), "day");
+        this.logger.info(`新证书过期时间${dayjs(newCertReader.expires).format("YYYY-MM-DD HH:mm:ss")},剩余${newLeftDays}天`);
+        this.checkExpires(newCertReader);
+        await this.output(newCertReader, true);
         //必须output之后执行
         await this.emitCertApplySuccess();
         return;
@@ -85,6 +95,20 @@ let CertApplyUploadPlugin = class CertApplyUploadPlugin extends CertApplyBaseCon
         };
     }
 };
+__decorate([
+    TaskInput({
+        title: "过期前提醒",
+        value: 10,
+        component: {
+            name: "a-input-number",
+            vModel: "value",
+        },
+        required: true,
+        order: 100,
+        helper: "到期前多少天提醒",
+    }),
+    __metadata("design:type", Number)
+], CertApplyUploadPlugin.prototype, "renewDays", void 0);
 __decorate([
     TaskInput({
         title: "手动上传证书",
@@ -175,4 +199,4 @@ CertApplyUploadPlugin = __decorate([
 ], CertApplyUploadPlugin);
 export { CertApplyUploadPlugin };
 new CertApplyUploadPlugin();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvcGx1Z2luL2NlcnQtcGx1Z2luL2N1c3RvbS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLFlBQVksRUFBRSxXQUFXLEVBQVEsU0FBUyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRXZHLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUMvQyxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNoRSxPQUFPLEtBQUssTUFBTSxPQUFPLENBQUM7QUFFMUIsT0FBTyxFQUFFLFVBQVUsRUFBRSxDQUFDO0FBeURmLElBQU0scUJBQXFCLEdBQTNCLE1BQU0scUJBQXNCLFNBQVEsMEJBQTBCO0lBc0JuRSxVQUFVLENBQVk7SUFNdEIsT0FBTyxDQUFVO0lBRWpCLEtBQUssQ0FBQyxVQUFVO1FBQ2QsSUFBSSxDQUFDLGFBQWEsR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLGFBQWEsQ0FBQztRQUM1QyxJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDO1FBQzlCLElBQUksQ0FBQyxXQUFXLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUM7UUFDeEMsSUFBSSxDQUFDLFVBQVUsR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLFVBQWtCLENBQUM7SUFDaEQsQ0FBQztJQUNELEtBQUssQ0FBQyxNQUFNLEtBQW1CLENBQUM7SUFFaEMsS0FBSyxDQUFDLGdCQUFnQjtRQUNwQixJQUFJLFVBQVUsR0FBRyxJQUFJLENBQUM7UUFDdEIsSUFBSSxDQUFDO1lBQ0gsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUM7WUFDM0IsVUFBVSxHQUFHLE1BQU0sSUFBSSxDQUFDLFlBQVks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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvcGx1Z2luL2NlcnQtcGx1Z2luL2N1c3RvbS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLFlBQVksRUFBRSxXQUFXLEVBQVEsU0FBUyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRXZHLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUMvQyxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNoRSxPQUFPLEtBQUssTUFBTSxPQUFPLENBQUM7QUFFMUIsT0FBTyxFQUFFLFVBQVUsRUFBRSxDQUFDO0FBMERmLElBQU0scUJBQXFCLEdBQTNCLE1BQU0scUJBQXNCLFNBQVEsMEJBQTBCO0lBWW5FLFNBQVMsQ0FBVTtJQXVCbkIsVUFBVSxDQUFZO0lBTXRCLE9BQU8sQ0FBVTtJQUVqQixLQUFLLENBQUMsVUFBVTtRQUNkLElBQUksQ0FBQyxhQUFhLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUM7UUFDNUMsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQztRQUM5QixJQUFJLENBQUMsV0FBVyxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDO1FBQ3hDLElBQUksQ0FBQyxVQUFVLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxVQUFrQixDQUFDO0lBQ2hELENBQUM7SUFFRCxLQUFLLENBQUMsTUFBTSxLQUFtQixDQUFDO0lBRWhDLEtBQUssQ0FBQyxnQkFBZ0I7UUFDcEIsSUFBSSxVQUFVLEdBQUcsSUFBSSxDQUFDO1FBQ3RCLElBQUksQ0FBQztZQUNILElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQzNCLFVBQVUsR0FBRyxNQUFNLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQztRQUN6QyxDQUFDO1FBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztZQUNYLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDLENBQUMsQ0FBQztRQUNuQyxDQUFDO1FBQ0QsT0FBTyxVQUFVLENBQUM7SUFDcEIsQ0FBQztJQUVPLFlBQVksQ0FBQyxVQUFzQjtRQUN6QyxNQUFNLFNBQVMsR0FBRyxDQUFDLElBQUksQ0FBQyxTQUFTLElBQUksRUFBRSxDQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsSUFBSSxDQUFDO1FBQy9ELElBQUksVUFBVSxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQ3ZCLElBQUksVUFBVSxDQUFDLE9BQU8sR0FBRyxJQUFJLElBQUksRUFBRSxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUM7Z0JBQzlDLE1BQU0sSUFBSSxLQUFLLENBQUMscUJBQXFCLENBQUMsQ0FBQztZQUN6QyxDQUFDO1lBQ0QsSUFBSSxVQUFVLENBQUMsT0FBTyxHQUFHLElBQUksSUFBSSxFQUFFLENBQUMsT0FBTyxFQUFFLEdBQUcsU0FBUyxFQUFFLENBQUM7Z0JBQzFELE1BQU0sSUFBSSxLQUFLLENBQUMsdUJBQXVCLENBQUMsQ0FBQztZQUMzQyxDQUFDO1FBQ0gsQ0FBQztJQUNILENBQUM7SUFFRCxLQUFLLENBQUMsT0FBTztRQUNYLE1BQU0sYUFBYSxHQUFHLE1BQU0sSUFBSSxDQUFDLGdCQUFnQixFQUFFLENBQUM7UUFDcEQsSUFBSSxhQUFhLEVBQUUsQ0FBQztZQUNsQixNQUFNLFFBQVEsR0FBRyxLQUFLLENBQUMsYUFBYSxDQUFDLE9BQU8sQ0FBQyxDQUFDLElBQUksQ0FBQyxLQUFLLEVBQUUsRUFBRSxLQUFLLENBQUMsQ0FBQztZQUNuRSxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxTQUFTLEtBQUssQ0FBQyxhQUFhLENBQUMsT0FBTyxDQUFDLENBQUMsTUFBTSxDQUFDLHFCQUFxQixDQUFDLE1BQU0sUUFBUSxHQUFHLENBQUMsQ0FBQztZQUN2RyxJQUFJLENBQUMsWUFBWSxDQUFDLGFBQWEsQ0FBQyxDQUFDO1lBQ2pDLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLFlBQVksRUFBRSxDQUFDO2dCQUMzQixJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQztnQkFDNUIsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLFVBQVUsRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLE9BQU8sQ0FBQztnQkFDNUQsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxDQUFDO2dCQUMvRCxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsU0FBUyxDQUFDLENBQUM7Z0JBQ3JDLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxVQUFVLENBQUMsQ0FBQztnQkFDeEMsSUFBSSxVQUFVLEtBQUssU0FBUyxFQUFFLENBQUM7b0JBQzdCLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDO29CQUM3QixTQUFTO29CQUNULElBQUksQ0FBQyxPQUFPLEdBQUcsU0FBUyxDQUFDO29CQUN6QixNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsYUFBYSxFQUFFLEtBQUssQ0FBQyxDQUFDO29CQUN4QyxPQUFPLE1BQU0sQ0FBQztnQkFDaEIsQ0FBQztnQkFDRCxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsQ0FBQztZQUNqQyxDQUFDO2lCQUFNLENBQUM7Z0JBQ04sSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUM7WUFDbkMsQ0FBQztRQUNILENBQUM7UUFFRCxNQUFNLGFBQWEsR0FBRyxJQUFJLFVBQVUsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUM7UUFDdEQsSUFBSSxDQUFDLGVBQWUsRUFBRSxDQUFDO1FBQ3ZCLFNBQVM7UUFDVCxJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUMvRCxNQUFNLFdBQVcsR0FBRyxLQUFLLENBQUMsYUFBYSxDQUFDLE9BQU8sQ0FBQyxDQUFDLElBQUksQ0FBQyxLQUFLLEVBQUUsRUFBRSxLQUFLLENBQUMsQ0FBQztRQUN0RSxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxVQUFVLEtBQUssQ0FBQyxhQUFhLENBQUMsT0FBTyxDQUFDLENBQUMsTUFBTSxDQUFDLHFCQUFxQixDQUFDLE1BQU0sV0FBVyxHQUFHLENBQUMsQ0FBQztRQUMzRyxJQUFJLENBQUMsWUFBWSxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQ2pDLE1BQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxhQUFhLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFFdkMsY0FBYztRQUNkLE1BQU0sSUFBSSxDQUFDLG9CQUFvQixFQUFFLENBQUM7UUFDbEMsT0FBTztJQUNULENBQUM7SUFFRCxLQUFLLENBQUMsWUFBWSxDQUFDLElBQVM7UUFDMUIsTUFBTSxVQUFVLEdBQUcsSUFBSSxVQUFVLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDeEMsT0FBTztZQUNMLEtBQUssRUFBRTtnQkFDTCxVQUFVLEVBQUU7b0JBQ1YsR0FBRyxFQUFFLElBQUksQ0FBQyxHQUFHO29CQUNiLEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRztpQkFDZDtnQkFDRCxPQUFPLEVBQUUsVUFBVSxDQUFDLGFBQWEsRUFBRTthQUNwQztTQUNGLENBQUM7SUFDSixDQUFDO0NBQ0YsQ0FBQTtBQWxIQztJQVhDLFNBQVMsQ0FBQztRQUNULEtBQUssRUFBRSxPQUFPO1FBQ2QsS0FBSyxFQUFFLEVBQUU7UUFDVCxTQUFTLEVBQUU7WUFDVCxJQUFJLEVBQUUsZ0JBQWdCO1lBQ3RCLE1BQU0sRUFBRSxPQUFPO1NBQ2hCO1FBQ0QsUUFBUSxFQUFFLElBQUk7UUFDZCxLQUFLLEVBQUUsR0FBRztRQUNWLE1BQU0sRUFBRSxVQUFVO0tBQ25CLENBQUM7O3dEQUNpQjtBQXVCbkI7SUFyQkMsU0FBUyxDQUFDO1FBQ1QsS0FBSyxFQUFFLFFBQVE7UUFDZixTQUFTLEVBQUU7WUFDVCxJQUFJLEVBQUUsbUJBQW1CO1lBQ3pCLE1BQU0sRUFBRSxZQUFZO1NBQ3JCO1FBQ0QsTUFBTSxFQUFFLFFBQVE7UUFDaEIsS0FBSyxFQUFFLENBQUMsSUFBSTtRQUNaLFFBQVEsRUFBRSxJQUFJO1FBQ2QsV0FBVyxFQUFFOzs7Ozs7Ozs7O0tBVVo7S0FDRixDQUFDOzt5REFDb0I7QUFNdEI7SUFKQyxVQUFVLENBQUM7UUFDVixLQUFLLEVBQUUsT0FBTztRQUNkLElBQUksRUFBRSxTQUFTO0tBQ2hCLENBQUM7O3NEQUNlO0FBekNOLHFCQUFxQjtJQXZEakMsWUFBWSxDQUFDO1FBQ1osSUFBSSxFQUFFLGlCQUFpQjtRQUN2QixJQUFJLEVBQUUsZ0JBQWdCO1FBQ3RCLEtBQUssRUFBRSxRQUFRO1FBQ2YsS0FBSyxFQUFFLFlBQVksQ0FBQyxJQUFJLENBQUMsR0FBRztRQUM1QixJQUFJLEVBQUUsb0NBQW9DO1FBQzFDLE9BQU8sRUFBRTtZQUNQLFFBQVEsRUFBRTtnQkFDUixXQUFXLEVBQUUsV0FBVyxDQUFDLFNBQVM7YUFDbkM7U0FDRjtRQUNELFFBQVEsRUFBRTtZQUNSLFVBQVUsRUFBRTtnQkFDVixLQUFLLEVBQUUsTUFBTTtnQkFDYixJQUFJLEVBQUUsWUFBWTtnQkFDbEIsTUFBTSxFQUFFLGNBQWM7Z0JBQ3RCLElBQUksRUFBRTtvQkFDSixPQUFPLEVBQUU7d0JBQ1AsR0FBRyxFQUFFOzRCQUNILEtBQUssRUFBRSxJQUFJOzRCQUNYLElBQUksRUFBRSxNQUFNOzRCQUNaLElBQUksRUFBRTtnQ0FDSixTQUFTLEVBQUU7b0NBQ1QsSUFBSSxFQUFFLFdBQVc7b0NBQ2pCLE1BQU0sRUFBRSxZQUFZO29DQUNwQixRQUFRLEVBQUU7d0NBQ1IsSUFBSSxFQUFFLENBQUM7d0NBQ1AsV0FBVyxFQUFFLGtFQUFrRTtxQ0FDaEY7aUNBQ0Y7Z0NBQ0QsS0FBSyxFQUFFLENBQUMsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsQ0FBQztnQ0FDNUMsR0FBRyxFQUFFLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRTs2QkFDbEI7eUJBQ0Y7d0JBQ0QsR0FBRyxFQUFFOzRCQUNILEtBQUssRUFBRSxJQUFJOzRCQUNYLElBQUksRUFBRSxNQUFNOzRCQUNaLElBQUksRUFBRTtnQ0FDSixTQUFTLEVBQUU7b0NBQ1QsSUFBSSxFQUFFLFdBQVc7b0NBQ2pCLE1BQU0sRUFBRSxZQUFZO29DQUNwQixRQUFRLEVBQUU7d0NBQ1IsSUFBSSxFQUFFLENBQUM7d0NBQ1AsV0FBVyxFQUFFLG1FQUFtRTtxQ0FDakY7aUNBQ0Y7Z0NBQ0QsS0FBSyxFQUFFLENBQUMsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsQ0FBQztnQ0FDNUMsR0FBRyxFQUFFLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRTs2QkFDbEI7eUJBQ0Y7cUJBQ0Y7aUJBQ0Y7YUFDRjtTQUNGO0tBQ0YsQ0FBQztHQUNXLHFCQUFxQixDQThIakM7O0FBRUQsSUFBSSxxQkFBcUIsRUFBRSxDQUFDIn0=

package/dist/plugin/cert-plugin/index.js

@@ -19,6 +19,50 @@ import { DomainParser } from "../../dns-provider/domain-parser.js";
 import { ossClientFactory } from "@certd/plugin-lib";
 export * from "./base.js";
 export * from "./cert-reader.js";
+const preferredChainConfigs = {
+    letsencrypt: {
+        helper: "如无特殊需求保持默认即可",
+        options: [
+            { value: "ISRG Root X1", label: "ISRG Root X1" },
+            { value: "ISRG Root X2", label: "ISRG Root X2" },
+        ],
+    },
+    google: {
+        helper: "GlobalSign 提供对老旧设备更好的兼容性，但证书链会变长",
+        options: [
+            { value: "GTS Root R1", label: "GTS Root R1" },
+            { value: "GlobalSign", label: "GlobalSign" },
+        ],
+    },
+};
+const preferredChainSupportedProviders = Object.keys(preferredChainConfigs);
+const preferredChainMergeScript = (() => {
+    const configs = JSON.stringify(preferredChainConfigs);
+    const supportedProviders = JSON.stringify(preferredChainSupportedProviders);
+    const defaultProvider = JSON.stringify(preferredChainSupportedProviders[0]);
+    return `
+    const chainConfigs = ${configs};
+    const supportedProviders = ${supportedProviders};
+    const defaultProvider = ${defaultProvider};
+    const getConfig = (provider)=> chainConfigs[provider] || chainConfigs[defaultProvider];
+    return {
+        show: ctx.compute(({form})=> supportedProviders.includes(form.sslProvider)),
+        component: {
+            options: ctx.compute(({form})=> getConfig(form.sslProvider).options)
+        },
+        helper: ctx.compute(({form})=> getConfig(form.sslProvider).helper),
+        value: ctx.compute(({form})=>{
+            const { options } = getConfig(form.sslProvider);
+            const allowed = options.map(item=>item.value);
+            const current = form.preferredChain;
+            if(allowed.includes(current)){
+                return current;
+            }
+            return allowed[0];
+        })
+    };
+  `;
+})();
 let CertApplyPlugin = class CertApplyPlugin extends CertApplyBasePlugin {
     challengeType;
     sslProvider;
@@ -44,7 +88,7 @@ let CertApplyPlugin = class CertApplyPlugin extends CertApplyBasePlugin {
     eab;
     async onInit() {
         let eab = null;
-        if (this.sslProvider !== "letsencrypt") {
+        if (this.sslProvider && this.sslProvider !== "letsencrypt") {
             if (this.sslProvider === "google" && this.googleAccessId) {
                 this.logger.info("当前正在使用 google服务账号授权获取EAB");
                 const googleAccess = await this.getAccess(this.googleAccessId);
@@ -153,6 +197,7 @@ let CertApplyPlugin = class CertApplyPlugin extends CertApplyBasePlugin {
             http: this.ctx.http,
             utils,
             domainParser,
+            serviceGetter: this.ctx.serviceGetter,
         };
         return await createDnsProvider({
             dnsProviderType,
@@ -167,7 +212,7 @@ let CertApplyPlugin = class CertApplyPlugin extends CertApplyBasePlugin {
             const mainDomain = await domainParser.parse(domain);
             const planSetting = verifyPlanSetting[mainDomain];
             if (planSetting == null) {
-                throw new Error(`没有找到域名（${domain}）的校验计划`);
+                throw new Error(`没有找到域名（${domain}）的校验计划（如果您在流水线创建之后设置了子域名托管，需要重新编辑证书申请任务和重新校验cname记录的校验状态）`);
             }
             if (planSetting.type === "dns") {
                 plan[domain] = await this.createDnsDomainVerifyPlan(planSetting, domain, mainDomain);
@@ -252,6 +297,13 @@ let CertApplyPlugin = class CertApplyPlugin extends CertApplyBasePlugin {
         if (cnameRecord == null) {
             throw new Error(`请先配置${domain}的CNAME记录，并通过校验`);
         }
+        if (cnameRecord.status !== "valid") {
+            throw new Error(`CNAME记录${domain}的校验状态为${cnameRecord.status}，请等待校验通过`);
+        }
+        // 主域名异常
+        if (cnameRecord.mainDomain !== mainDomain) {
+            throw new Error(`CNAME记录${domain}的域名与配置的主域名不一致，请确认是否在流水线创建之后修改了子域名托管，您需要重新校验CNAME记录的校验状态`);
+        }
         let dnsProvider = cnameRecord.commonDnsProvider;
         if (cnameRecord.cnameProvider.id > 0) {
             dnsProvider = await this.createDnsProvider(cnameRecord.cnameProvider.dnsProviderType, cnameRecord.cnameProvider.access);
@@ -516,24 +568,14 @@ __decorate([
 __decorate([
     TaskInput({
         title: "首选链",
-        value: "ISRG Root X1",
         component: {
             name: "a-select",
             vModel: "value",
-            options: [
-                { value: "ISRG Root X1", label: "ISRG Root X1" },
-                { value: "ISRG Root X2", label: "ISRG Root X2" },
-            ],
+            options: preferredChainConfigs.letsencrypt.options,
         },
-        helper: "仅 Let's Encrypt 可选，默认为 ISRG Root X1",
+        helper: preferredChainConfigs.letsencrypt.helper,
         required: false,
-        mergeScript: `
-    return {
-        show: ctx.compute(({form})=>{
-            return form.sslProvider === 'letsencrypt'
-        })
-    }
-    `,
+        mergeScript: preferredChainMergeScript,
     }),
     __metadata("design:type", String)
 ], CertApplyPlugin.prototype, "preferredChain", void 0);
@@ -615,4 +657,4 @@ CertApplyPlugin = __decorate([
 ], CertApplyPlugin);
 export { CertApplyPlugin };
 new CertApplyPlugin();
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugin/cert-plugin/index.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugin/cert-plugin/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-cert",
   "private": false,
-  "version": "1.36.21",
+  "version": "1.36.23",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -16,10 +16,10 @@
     "pub": "npm publish"
   },
   "dependencies": {
-    "@certd/acme-client": "^1.36.21",
-    "@certd/basic": "^1.36.21",
-    "@certd/pipeline": "^1.36.21",
-    "@certd/plugin-lib": "^1.36.21",
+    "@certd/acme-client": "^1.36.23",
+    "@certd/basic": "^1.36.23",
+    "@certd/pipeline": "^1.36.23",
+    "@certd/plugin-lib": "^1.36.23",
     "@google-cloud/publicca": "^1.3.0",
     "dayjs": "^1.11.7",
     "jszip": "^3.10.1",
@@ -43,5 +43,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "3cedef4974708d828fb972acc54af0515e3ec3a0"
+  "gitHead": "f070030f6b5dd6dc1451400f55f5d723743a6aa9"
 }