@certd/plugin-cert 1.23.1 → 1.24.0

package/dist/d/plugin/cert-plugin/acme.d.ts

@@ -13,14 +13,12 @@ export declare class AcmeService {
     userContext: IContext;
     logger: Logger;
     sslProvider: SSLProvider;
-    skipLocalVerify: boolean;
     eab?: ClientExternalAccountBindingOptions;
     constructor(options: {
         userContext: IContext;
         logger: Logger;
         sslProvider: SSLProvider;
         eab?: ClientExternalAccountBindingOptions;
-        skipLocalVerify?: boolean;
     });
     getAccountConfig(email: string): Promise<any>;
     buildAccountKey(email: string): string;

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

@@ -11,7 +11,6 @@ export declare class CertApplyPlugin extends AbstractTaskPlugin {
     eabAccessId: number;
     dnsProviderType: string;
     dnsProviderAccess: string;
-    skipLocalVerify: boolean;
     renewDays: number;
     forceUpdate: string;
     csrInfo: string;

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

@@ -1,27 +1,27 @@
-import { HttpClient, IAccess, ILogger, Registrable } from "@certd/pipeline";
-export type DnsProviderDefine = Registrable & {
-    accessType: string;
-    autowire?: {
-        [key: string]: any;
-    };
-};
-export type CreateRecordOptions = {
-    fullRecord: string;
-    type: string;
-    value: any;
-    domain: string;
-};
-export type RemoveRecordOptions<T> = CreateRecordOptions & {
-    record: T;
-};
-export type DnsProviderContext = {
-    access: IAccess;
-    logger: ILogger;
-    http: HttpClient;
-};
-export interface IDnsProvider<T = any> {
-    onInstance(): Promise<void>;
-    createRecord(options: CreateRecordOptions): Promise<T>;
-    removeRecord(options: RemoveRecordOptions<T>): Promise<void>;
-    setCtx(ctx: DnsProviderContext): void;
-}
+import { HttpClient, IAccess, ILogger, Registrable } from "@certd/pipeline";
+export type DnsProviderDefine = Registrable & {
+    accessType: string;
+    autowire?: {
+        [key: string]: any;
+    };
+};
+export type CreateRecordOptions = {
+    fullRecord: string;
+    type: string;
+    value: any;
+    domain: string;
+};
+export type RemoveRecordOptions<T> = CreateRecordOptions & {
+    record: T;
+};
+export type DnsProviderContext = {
+    access: IAccess;
+    logger: ILogger;
+    http: HttpClient;
+};
+export interface IDnsProvider<T = any> {
+    onInstance(): Promise<void>;
+    createRecord(options: CreateRecordOptions): Promise<T>;
+    removeRecord(options: RemoveRecordOptions<T>): Promise<void>;
+    setCtx(ctx: DnsProviderContext): void;
+}

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

@@ -1,8 +1,8 @@
-import { CreateRecordOptions, DnsProviderContext, IDnsProvider, RemoveRecordOptions } from "./api.js";
-export declare abstract class AbstractDnsProvider<T = any> implements IDnsProvider<T> {
-    ctx: DnsProviderContext;
-    setCtx(ctx: DnsProviderContext): void;
-    abstract createRecord(options: CreateRecordOptions): Promise<T>;
-    abstract onInstance(): Promise<void>;
-    abstract removeRecord(options: RemoveRecordOptions<T>): Promise<void>;
-}
+import { CreateRecordOptions, DnsProviderContext, IDnsProvider, RemoveRecordOptions } from "./api.js";
+export declare abstract class AbstractDnsProvider<T = any> implements IDnsProvider<T> {
+    ctx: DnsProviderContext;
+    setCtx(ctx: DnsProviderContext): void;
+    abstract createRecord(options: CreateRecordOptions): Promise<T>;
+    abstract onInstance(): Promise<void>;
+    abstract removeRecord(options: RemoveRecordOptions<T>): Promise<void>;
+}

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

@@ -1,3 +1,3 @@
-import { DnsProviderDefine } from "./api.js";
-export declare const DNS_PROVIDER_CLASS_KEY = "pipeline:dns-provider";
-export declare function IsDnsProvider(define: DnsProviderDefine): ClassDecorator;
+import { DnsProviderDefine } from "./api.js";
+export declare const DNS_PROVIDER_CLASS_KEY = "pipeline:dns-provider";
+export declare function IsDnsProvider(define: DnsProviderDefine): ClassDecorator;

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

@@ -1,4 +1,4 @@
-export * from "./api.js";
-export * from "./registry.js";
-export * from "./decorator.js";
-export * from "./base.js";
+export * from "./api.js";
+export * from "./registry.js";
+export * from "./decorator.js";
+export * from "./base.js";

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

@@ -1,2 +1,2 @@
-import { Registry } from "@certd/pipeline";
-export declare const dnsProviderRegistry: Registry<unknown>;
+import { Registry } from "@certd/pipeline";
+export declare const dnsProviderRegistry: Registry<unknown>;

package/dist/index.d.ts

@@ -1,3 +1,3 @@
-export * from "./plugin/index.js";
-export * from "./dns-provider/index.js";
-export * from "./access/index.js";
+export * from "./plugin/index.js";
+export * from "./dns-provider/index.js";
+export * from "./access/index.js";

package/dist/plugin/cert-plugin/acme.d.ts

@@ -2,13 +2,14 @@ import * as acme from "@certd/acme-client";
 import { Logger } from "log4js";
 import { IContext } from "@certd/pipeline";
 import { IDnsProvider } from "../../dns-provider/index.js";
-import { ClientExternalAccountBindingOptions } from "@certd/acme-client";
+import { ClientExternalAccountBindingOptions, UrlMapping } from "@certd/acme-client";
 export type CertInfo = {
     crt: string;
     key: string;
     csr: string;
 };
-export type SSLProvider = "letsencrypt" | "buypass" | "zerossl";
+export type SSLProvider = "letsencrypt" | "google" | "zerossl";
+export type PrivateKeyType = "rsa_1024" | "rsa_2048" | "rsa_3072" | "rsa_4096" | "ec_256" | "ec_384" | "ec_521";
 type AcmeServiceOptions = {
     userContext: IContext;
     logger: Logger;
@@ -16,6 +17,8 @@ type AcmeServiceOptions = {
     eab?: ClientExternalAccountBindingOptions;
     skipLocalVerify?: boolean;
     useMappingProxy?: boolean;
+    privateKeyType?: PrivateKeyType;
+    signal?: AbortSignal;
 };
 export declare class AcmeService {
     options: AcmeServiceOptions;
@@ -25,7 +28,7 @@ export declare class AcmeService {
     skipLocalVerify: boolean;
     eab?: ClientExternalAccountBindingOptions;
     constructor(options: AcmeServiceOptions);
-    getAccountConfig(email: string): Promise<any>;
+    getAccountConfig(email: string, urlMapping: UrlMapping): Promise<any>;
     buildAccountKey(email: string): string;
     saveAccountConfig(email: string, conf: any): Promise<void>;
     getAcmeClient(email: string, isTest?: boolean): Promise<acme.Client>;
@@ -49,6 +52,7 @@ export declare class AcmeService {
         dnsProvider: any;
         csrInfo: any;
         isTest?: boolean;
+        privateKeyType?: string;
     }): Promise<CertInfo>;
     buildCommonNameByDomains(domains: string | string[]): {
         commonName: string;

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

@@ -20,8 +20,20 @@ export class AcmeService {
             this.logger.info(text);
         });
     }
-    async getAccountConfig(email) {
-        return (await this.userContext.getObj(this.buildAccountKey(email))) || {};
+    async getAccountConfig(email, urlMapping) {
+        const conf = (await this.userContext.getObj(this.buildAccountKey(email))) || {};
+        if (urlMapping && urlMapping.mappings) {
+            for (const key in urlMapping.mappings) {
+                if (Object.prototype.hasOwnProperty.call(urlMapping.mappings, key)) {
+                    const element = urlMapping.mappings[key];
+                    if (conf.accountUrl?.indexOf(element) > -1) {
+                        //如果用了代理url，要替换回去
+                        conf.accountUrl = conf.accountUrl.replace(element, key);
+                    }
+                }
+            }
+        }
+        return conf;
     }
     buildAccountKey(email) {
         return `acme.config.${this.sslProvider}.${email}`;
@@ -30,7 +42,14 @@ export class AcmeService {
         await this.userContext.setObj(this.buildAccountKey(email), conf);
     }
     async getAcmeClient(email, isTest = false) {
-        const conf = await this.getAccountConfig(email);
+        const urlMapping = {
+            enabled: false,
+            mappings: {
+                "acme-v02.api.letsencrypt.org": "letsencrypt.proxy.handsfree.work",
+                "dv.acme-v02.api.pki.goog": "google.proxy.handsfree.work",
+            },
+        };
+        const conf = await this.getAccountConfig(email, urlMapping);
         if (conf.key == null) {
             conf.key = await this.createNewKey();
             await this.saveAccountConfig(email, conf);
@@ -42,22 +61,19 @@ export class AcmeService {
         else {
             directoryUrl = acme.directory[this.sslProvider].production;
         }
-        const urlMapping = { enabled: false, mappings: {} };
         if (this.options.useMappingProxy) {
             urlMapping.enabled = true;
-            urlMapping.mappings = {
-                "acme-v02.api.letsencrypt.org": "letsencrypt.proxy.handsfree.work",
-            };
         }
         const client = new acme.Client({
             directoryUrl: directoryUrl,
             accountKey: conf.key,
             accountUrl: conf.accountUrl,
             externalAccountBinding: this.eab,
-            backoffAttempts: 30,
+            backoffAttempts: 15,
             backoffMin: 5000,
             backoffMax: 10000,
             urlMapping,
+            signal: this.options.signal,
         });
         if (conf.accountUrl == null) {
             const accountPayload = {
@@ -159,11 +175,23 @@ export class AcmeService {
         const client = await this.getAcmeClient(email, isTest);
         /* Create CSR */
         const { commonName, altNames } = this.buildCommonNameByDomains(domains);
-        const [key, csr] = await acme.forge.createCsr({
+        let privateKey = null;
+        const privateKeyType = options.privateKeyType || "rsa_2048";
+        const privateKeyArr = privateKeyType.split("_");
+        const type = privateKeyArr[0];
+        const size = parseInt(privateKeyArr[1]);
+        if (type == "ec") {
+            const name = "P-" + size;
+            privateKey = await acme.crypto.createPrivateEcdsaKey(name);
+        }
+        else {
+            privateKey = await acme.crypto.createPrivateRsaKey(size);
+        }
+        const [key, csr] = await acme.crypto.createCsr({
             commonName,
             ...csrInfo,
             altNames,
-        });
+        }, privateKey);
         if (dnsProvider == null) {
             throw new Error("dnsProvider 不能为空");
         }
@@ -180,6 +208,7 @@ export class AcmeService {
             challengeRemoveFn: async (authz, challenge, keyAuthorization, recordItem) => {
                 return await this.challengeRemoveFn(authz, challenge, keyAuthorization, recordItem, dnsProvider);
             },
+            signal: this.options.signal,
         });
         const cert = {
             crt: crt.toString(),
@@ -210,4 +239,4 @@ export class AcmeService {
         };
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"acme.js","sourceRoot":"","sources":["../../../src/plugin/cert-plugin/acme.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"acme.js","sourceRoot":"","sources":["../../../src/plugin/cert-plugin/acme.ts"],"names":[],"mappings":"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"}

package/dist/plugin/cert-plugin/base.d.ts

@@ -1,6 +1,5 @@
-import { AbstractTaskPlugin, HttpClient, IAccessService, IContext, Step } from "@certd/pipeline";
+import { AbstractTaskPlugin, HttpClient, IContext, Step } from "@certd/pipeline";
 import type { CertInfo } from "./acme.js";
-import { Logger } from "log4js";
 import { CertReader } from "./cert-reader.js";
 export { CertReader };
 export type { CertInfo };
@@ -12,9 +11,7 @@ export declare abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
     successNotify: boolean;
     intro: string;
     csrInfo: string;
-    logger: Logger;
     userContext: IContext;
-    accessService: IAccessService;
     http: HttpClient;
     lastStatus: Step;
     cert?: CertInfo;

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

@@ -24,15 +24,11 @@ export class CertApplyBasePlugin extends AbstractTaskPlugin {
     //   helper: "暂时没有用",
     // })
     csrInfo;
-    logger;
     userContext;
-    accessService;
     http;
     lastStatus;
     cert;
     async onInstance() {
-        this.accessService = this.ctx.accessService;
-        this.logger = this.ctx.logger;
         this.userContext = this.ctx.userContext;
         this.http = this.ctx.http;
         this.lastStatus = this.ctx.lastStatus;
@@ -59,9 +55,9 @@ export class CertApplyBasePlugin extends AbstractTaskPlugin {
     async output(certReader, isNew) {
         const cert = certReader.toCertInfo();
         this.cert = cert;
-        this._result.pipelineVars.certExpiresTime = dayjs(certReader.detail.validity.notAfter).valueOf();
+        this._result.pipelineVars.certExpiresTime = dayjs(certReader.detail.notAfter).valueOf();
         if (isNew) {
-            const applyTime = dayjs(certReader.detail.validity.notBefore).format("YYYYMMDD_HHmmss");
+            const applyTime = dayjs(certReader.detail.notBefore).format("YYYYMMDD_HHmmss");
             await this.zipCert(cert, applyTime);
         }
         else {
@@ -257,4 +253,4 @@ __decorate([
     }),
     __metadata("design:type", Object)
 ], CertApplyBasePlugin.prototype, "cert", void 0);
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../src/plugin/cert-plugin/base.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../src/plugin/cert-plugin/base.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,kBAAkB,EAA8B,SAAS,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AACxG,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,UAAU,EAAE,CAAC;AAGtB,MAAM,OAAgB,mBAAoB,SAAQ,kBAAkB;IAoBlE,OAAO,CAAY;IAYnB,KAAK,CAAU;IAaf,SAAS,CAAU;IAWnB,WAAW,CAAU;IAYrB,aAAa,GAAG,IAAI,CAAC;IAOrB,KAAK,CAAU;IAEf,eAAe;IACf,sBAAsB;IACtB,qBAAqB;IACrB,KAAK;IACL,OAAO,CAAU;IAEjB,WAAW,CAAY;IACvB,IAAI,CAAc;IAClB,UAAU,CAAQ;IAKlB,IAAI,CAAY;IAEhB,KAAK,CAAC,UAAU;QACd,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC;QACxC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;QAC1B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,UAAkB,CAAC;QAC9C,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;IACtB,CAAC;IAMD,KAAK,CAAC,OAAO;QACX,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACvC,IAAI,OAAO,IAAI,IAAI,EAAE;YACnB,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;SAC1C;QACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACtC,IAAI,IAAI,IAAI,IAAI,EAAE;YAChB,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAC9B,uBAAuB;YACvB,IAAI,CAAC,eAAe,EAAE,CAAC;YAEvB,IAAI,IAAI,CAAC,aAAa,EAAE;gBACtB,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;aAC/B;SACF;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC;SAC3B;IACH,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,UAAsB,EAAE,KAAc;QACjD,MAAM,IAAI,GAAa,UAAU,CAAC,UAAU,EAAE,CAAC;QAC/C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QAEjB,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,eAAe,GAAG,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC;QAExF,IAAI,KAAK,EAAE;YACT,MAAM,SAAS,GAAG,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;YAC/E,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;SACrC;aAAM;YACL,IAAI,CAAC,YAAY,EAAE,CAAC;SACrB;QACD,MAAM;QACN,oDAAoD;IACtD,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAc,EAAE,SAAiB;QAC7C,MAAM,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC;QACxB,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QAC/B,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACxE,MAAM,QAAQ,GAAG,QAAQ,WAAW,IAAI,SAAS,MAAM,CAAC;QACxD,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC;QAChE,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACjC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,CAAC;IACxC,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,SAAS;QACb,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,OAAO,IAAI,CAAC;SACb;QAED,IAAI,YAAY,GAAG,KAAK,CAAC;QACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QACjE,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/C,IAAI,QAAQ,KAAK,SAAS,EAAE;YAC1B,YAAY,GAAG,IAAI,CAAC;SACrB;QAED,IAAI,OAAO,GAA2B,SAAS,CAAC;QAChD,IAAI;YACF,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;SACrC;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;SAClC;QACD,IAAI,OAAO,IAAI,IAAI,EAAE;YACnB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAClC,OAAO,IAAI,CAAC;SACb;QAED,IAAI,YAAY,EAAE;YAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACjC,OAAO,IAAI,CAAC;SACb;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAC/D,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE;YACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC,MAAM,GAAG,CAAC,QAAQ,GAAG,CAAC,CAAC;YAC1G,OAAO,OAAO,CAAC;SAChB;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAChC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,UAAU,CAAC,GAAW;QACpB,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC7B,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACjC,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC9B,OAAO,GAAG,CAAC;IACb,CAAC;IAED,WAAW,CAAC,IAA+C;QACzD,MAAM,OAAO,GAAa;YACxB,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC;YAC9B,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC;YAC9B,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC;SAC/B,CAAC;QACF,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC;QACnD,IAAI,IAAI,IAAI,IAAI,EAAE;YAChB,OAAO,SAAS,CAAC;SAClB;QACD,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAED;;;;;OAKG;IACH,YAAY,CAAC,OAAe,EAAE,OAAO,GAAG,EAAE;QACxC,IAAI,OAAO,IAAI,IAAI,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC;SAC7B;QACD,QAAQ;QACR,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,KAAK,CAAC,CAAC;QACrD,OAAO;YACL,YAAY,EAAE,QAAQ,GAAG,OAAO;YAChC,QAAQ;SACT,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,gBAAgB;QAC5B,IAAI;YACF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;YAC3C,MAAM,OAAO,GAAG,iBAAiB,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;YACpD,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC;gBAC/B,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM;gBAChC,SAAS,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;gBACvB,OAAO,EAAE,OAAO;gBAChB,OAAO,EAAE,aAAa,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;aAC/C,CAAC,CAAC;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC;SAC1C;IACH,CAAC;CACF;AApPC;IAAC,SAAS,CAAC;QACT,KAAK,EAAE,IAAI;QACX,SAAS,EAAE;YACT,IAAI,EAAE,UAAU;YAChB,MAAM,EAAE,OAAO;YACf,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,KAAK;SACZ;QACD,QAAQ,EAAE,IAAI;QACd,GAAG,EAAE;YACH,IAAI,EAAE,EAAE;SACT;QACD,KAAK,EAAE,CAAC,CAAC;QACT,MAAM,EACJ,yDAAyD;YACzD,oDAAoD;YACpD,6DAA6D;YAC7D,mBAAmB;KACtB,CAAC;;oDACiB;AAEnB;IAAC,SAAS,CAAC;QACT,KAAK,EAAE,IAAI;QACX,SAAS,EAAE;YACT,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,OAAO;SAChB;QACD,QAAQ,EAAE,IAAI;QACd,KAAK,EAAE,CAAC,CAAC;QACT,MAAM,EAAE,OAAO;KAChB,CAAC;;kDACa;AAEf;IAAC,SAAS,CAAC;QACT,KAAK,EAAE,MAAM;QACb,KAAK,EAAE,EAAE;QACT,SAAS,EAAE;YACT,IAAI,EAAE,gBAAgB;YACtB,MAAM,EAAE,OAAO;SAChB;QACD,QAAQ,EAAE,IAAI;QACd,KAAK,EAAE,GAAG;QACV,MAAM,EAAE,8CAA8C;KACvD,CAAC;;sDACiB;AAEnB;IAAC,SAAS,CAAC;QACT,KAAK,EAAE,MAAM;QACb,SAAS,EAAE;YACT,IAAI,EAAE,UAAU;YAChB,MAAM,EAAE,SAAS;SAClB;QACD,KAAK,EAAE,GAAG;QACV,MAAM,EAAE,YAAY;KACrB,CAAC;;wDACmB;AAErB;IAAC,SAAS,CAAC;QACT,KAAK,EAAE,SAAS;QAChB,KAAK,EAAE,IAAI;QACX,SAAS,EAAE;YACT,IAAI,EAAE,UAAU;YAChB,MAAM,EAAE,SAAS;SAClB;QACD,KAAK,EAAE,GAAG;QACV,MAAM,EAAE,eAAe;KACxB,CAAC;;0DACmB;AAErB;IAAC,SAAS,CAAC;QACT,KAAK,EAAE,MAAM;QACb,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,0EAA0E;KACnF,CAAC;;kDACa;AAYf;IAAC,UAAU,CAAC;QACV,KAAK,EAAE,MAAM;KACd,CAAC;;iDACc"}

package/dist/plugin/cert-plugin/cert-reader.d.ts

@@ -1,5 +1,4 @@
 import { CertInfo } from "./acme.js";
-import forge from "node-forge";
 export declare class CertReader implements CertInfo {
     crt: string;
     key: string;
@@ -9,7 +8,7 @@ export declare class CertReader implements CertInfo {
     constructor(certInfo: CertInfo);
     toCertInfo(): CertInfo;
     getCrtDetail(crt: string): {
-        detail: forge.pki.Certificate;
+        detail: import("@certd/acme-client").CertificateInfo;
         expires: Date;
     };
     saveToFile(type: "crt" | "key", filepath?: string): string;

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

@@ -1,7 +1,7 @@
 import fs from "fs";
 import os from "os";
-import forge from "node-forge";
 import path from "path";
+import { crypto } from "@certd/acme-client";
 export class CertReader {
     crt;
     key;
@@ -24,9 +24,8 @@ export class CertReader {
         };
     }
     getCrtDetail(crt) {
-        const pki = forge.pki;
-        const detail = pki.certificateFromPem(crt.toString());
-        const expires = detail.validity.notAfter;
+        const detail = crypto.readCertificateInfo(crt.toString());
+        const expires = detail.notAfter;
         return { detail, expires };
     }
     saveToFile(type, filepath) {
@@ -42,4 +41,4 @@ export class CertReader {
         return filepath;
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2VydC1yZWFkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcGx1Z2luL2NlcnQtcGx1Z2luL2NlcnQtcmVhZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxNQUFNLElBQUksQ0FBQztBQUNwQixPQUFPLEVBQUUsTUFBTSxJQUFJLENBQUM7QUFDcEIsT0FBTyxLQUFLLE1BQU0sWUFBWSxDQUFDO0FBQy9CLE9BQU8sSUFBSSxNQUFNLE1BQU0sQ0FBQztBQUN4QixNQUFNLE9BQU8sVUFBVTtJQUNyQixHQUFHLENBQVM7SUFDWixHQUFHLENBQVM7SUFDWixHQUFHLENBQVM7SUFFWixNQUFNLENBQU07SUFDWixPQUFPLENBQVM7SUFDaEIsWUFBWSxRQUFrQjtRQUM1QixJQUFJLENBQUMsR0FBRyxHQUFHLFFBQVEsQ0FBQyxHQUFHLENBQUM7UUFDeEIsSUFBSSxDQUFDLEdBQUcsR0FBRyxRQUFRLENBQUMsR0FBRyxDQUFDO1FBQ3hCLElBQUksQ0FBQyxHQUFHLEdBQUcsUUFBUSxDQUFDLEdBQUcsQ0FBQztRQUV4QixNQUFNLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3hELElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO1FBQ3JCLElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQ25DLENBQUM7SUFFRCxVQUFVO1FBQ1IsT0FBTztZQUNMLEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRztZQUNiLEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRztZQUNiLEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRztTQUNkLENBQUM7SUFDSixDQUFDO0lBRUQsWUFBWSxDQUFDLEdBQVc7UUFDdEIsTUFBTSxHQUFHLEdBQUcsS0FBSyxDQUFDLEdBQUcsQ0FBQztRQUN0QixNQUFNLE1BQU0sR0FBRyxHQUFHLENBQUMsa0JBQWtCLENBQUMsR0FBRyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7UUFDdEQsTUFBTSxPQUFPLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUM7UUFDekMsT0FBTyxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsQ0FBQztJQUM3QixDQUFDO0lBRUQsVUFBVSxDQUFDLElBQW1CLEVBQUUsUUFBaUI7UUFDL0MsSUFBSSxRQUFRLElBQUksSUFBSSxFQUFFO1lBQ3BCLFFBQVE7WUFDUixRQUFRLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsTUFBTSxFQUFFLEVBQUUsYUFBYSxFQUFFLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxHQUFHLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBRSxRQUFRLElBQUksRUFBRSxDQUFDLENBQUM7U0FDNUc7UUFFRCxNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQ25DLElBQUksQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxFQUFFO1lBQ3ZCLEVBQUUsQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7U0FDeEM7UUFFRCxFQUFFLENBQUMsYUFBYSxDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUN2QyxPQUFPLFFBQVEsQ0FBQztJQUNsQixDQUFDO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2VydC1yZWFkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcGx1Z2luL2NlcnQtcGx1Z2luL2NlcnQtcmVhZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxNQUFNLElBQUksQ0FBQztBQUNwQixPQUFPLEVBQUUsTUFBTSxJQUFJLENBQUM7QUFDcEIsT0FBTyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQ3hCLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUM1QyxNQUFNLE9BQU8sVUFBVTtJQUNyQixHQUFHLENBQVM7SUFDWixHQUFHLENBQVM7SUFDWixHQUFHLENBQVM7SUFFWixNQUFNLENBQU07SUFDWixPQUFPLENBQVM7SUFDaEIsWUFBWSxRQUFrQjtRQUM1QixJQUFJLENBQUMsR0FBRyxHQUFHLFFBQVEsQ0FBQyxHQUFHLENBQUM7UUFDeEIsSUFBSSxDQUFDLEdBQUcsR0FBRyxRQUFRLENBQUMsR0FBRyxDQUFDO1FBQ3hCLElBQUksQ0FBQyxHQUFHLEdBQUcsUUFBUSxDQUFDLEdBQUcsQ0FBQztRQUV4QixNQUFNLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3hELElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO1FBQ3JCLElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQ25DLENBQUM7SUFFRCxVQUFVO1FBQ1IsT0FBTztZQUNMLEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRztZQUNiLEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRztZQUNiLEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRztTQUNkLENBQUM7SUFDSixDQUFDO0lBRUQsWUFBWSxDQUFDLEdBQVc7UUFDdEIsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLG1CQUFtQixDQUFDLEdBQUcsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO1FBQzFELE1BQU0sT0FBTyxHQUFHLE1BQU0sQ0FBQyxRQUFRLENBQUM7UUFDaEMsT0FBTyxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsQ0FBQztJQUM3QixDQUFDO0lBRUQsVUFBVSxDQUFDLElBQW1CLEVBQUUsUUFBaUI7UUFDL0MsSUFBSSxRQUFRLElBQUksSUFBSSxFQUFFO1lBQ3BCLFFBQVE7WUFDUixRQUFRLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsTUFBTSxFQUFFLEVBQUUsYUFBYSxFQUFFLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxHQUFHLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBRSxRQUFRLElBQUksRUFBRSxDQUFDLENBQUM7U0FDNUc7UUFFRCxNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQ25DLElBQUksQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxFQUFFO1lBQ3ZCLEVBQUUsQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7U0FDeEM7UUFFRCxFQUFFLENBQUMsYUFBYSxDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUN2QyxPQUFPLFFBQVEsQ0FBQztJQUNsQixDQUFDO0NBQ0YifQ==

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

@@ -1,4 +1,4 @@
-import type { CertInfo, SSLProvider } from "./acme.js";
+import type { CertInfo, PrivateKeyType, SSLProvider } from "./acme.js";
 import { AcmeService } from "./acme.js";
 import { CertReader } from "./cert-reader.js";
 import { CertApplyBasePlugin } from "./base.js";
@@ -6,6 +6,7 @@ export { CertReader };
 export type { CertInfo };
 export declare class CertApplyPlugin extends CertApplyBasePlugin {
     sslProvider: SSLProvider;
+    privateKeyType: PrivateKeyType;
     eabAccessId: number;
     dnsProviderType: string;
     dnsProviderAccess: string;

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

@@ -16,6 +16,7 @@ import { CertApplyBasePlugin } from "./base.js";
 export { CertReader };
 let CertApplyPlugin = class CertApplyPlugin extends CertApplyBasePlugin {
     sslProvider;
+    privateKeyType;
     eabAccessId;
     dnsProviderType;
     dnsProviderAccess;
@@ -34,6 +35,7 @@ let CertApplyPlugin = class CertApplyPlugin extends CertApplyBasePlugin {
             eab,
             skipLocalVerify: this.skipLocalVerify,
             useMappingProxy: this.useProxy,
+            privateKeyType: this.privateKeyType,
         });
     }
     async doCertApply() {
@@ -67,6 +69,7 @@ let CertApplyPlugin = class CertApplyPlugin extends CertApplyBasePlugin {
                 dnsProvider,
                 csrInfo,
                 isTest: false,
+                privateKeyType: this.privateKeyType,
             });
             const certInfo = this.formatCerts(cert);
             return new CertReader(certInfo);
@@ -90,15 +93,36 @@ __decorate([
             vModel: "value",
             options: [
                 { value: "letsencrypt", label: "Let's Encrypt" },
-                // { value: "letsencrypt-proxy", label: "Let's Encrypt代理，letsencrypt.org无法访问时使用" },
-                // { value: "buypass", label: "Buypass" },
+                { value: "google", label: "Google" },
                 { value: "zerossl", label: "ZeroSSL" },
             ],
         },
+        helper: "如果letsencrypt.org或dv.acme-v02.api.pki.goog无法访问，请尝试开启代理选项\n如果使用ZeroSSL、google证书，需要提供EAB授权",
         required: true,
     }),
     __metadata("design:type", String)
 ], CertApplyPlugin.prototype, "sslProvider", void 0);
+__decorate([
+    TaskInput({
+        title: "加密算法",
+        value: "rsa_2048",
+        component: {
+            name: "a-select",
+            vModel: "value",
+            options: [
+                { value: "rsa_1024", label: "RSA 1024" },
+                { value: "rsa_2048", label: "RSA 2048" },
+                { value: "rsa_3072", label: "RSA 3072" },
+                { value: "rsa_4096", label: "RSA 4096" },
+                { value: "ec_256", label: "EC 256" },
+                { value: "ec_384", label: "EC 384" },
+                // { value: "ec_521", label: "EC 521" },
+            ],
+        },
+        required: true,
+    }),
+    __metadata("design:type", String)
+], CertApplyPlugin.prototype, "privateKeyType", void 0);
 __decorate([
     TaskInput({
         title: "EAB授权",
@@ -107,7 +131,7 @@ __decorate([
             type: "eab",
         },
         maybeNeed: true,
-        helper: "如果使用ZeroSSL证书，需要提供EAB授权， 请前往 https://app.zerossl.com/developer 生成 'EAB Credentials for ACME Clients' ",
+        helper: "如果使用ZeroSSL或者google证书，需要提供EAB授权\nZeroSSL：请前往 https://app.zerossl.com/developer 生成 'EAB Credentials' \n Google：请前往https://github.com/certd/certd/blob/v2/doc/google/google.md",
     }),
     __metadata("design:type", Number)
 ], CertApplyPlugin.prototype, "eabAccessId", void 0);
@@ -148,7 +172,8 @@ __decorate([
             name: "a-switch",
             vModel: "checked",
         },
-        helper: "如果acme-v02.api.letsencrypt.org被墙无法连接访问，请尝试开启此选项",
+        maybeNeed: true,
+        helper: "如果acme-v02.api.letsencrypt.org或dv.acme-v02.api.pki.goog被墙无法访问，请尝试开启此选项",
     }),
     __metadata("design:type", Object)
 ], CertApplyPlugin.prototype, "useProxy", void 0);
@@ -183,4 +208,4 @@ CertApplyPlugin = __decorate([
 ], CertApplyPlugin);
 export { CertApplyPlugin };
 new CertApplyPlugin();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcGx1Z2luL2NlcnQtcGx1Z2luL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQUUsWUFBWSxFQUFFLFlBQVksRUFBRSxXQUFXLEVBQUUsU0FBUyxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFaEcsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUN4QyxPQUFPLENBQUMsTUFBTSxXQUFXLENBQUM7QUFDMUIsT0FBTyxFQUF5QyxtQkFBbUIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ3pHLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUM5QyxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFFaEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxDQUFDO0FBa0JmLElBQU0sZUFBZSxHQUFyQixNQUFNLGVBQWdCLFNBQVEsbUJBQW1CO0lBZ0J0RCxXQUFXLENBQWU7SUFXMUIsV0FBVyxDQUFVO0lBVXJCLGVBQWUsQ0FBVTtJQWlCekIsaUJBQWlCLENBQVU7SUFXM0IsUUFBUSxHQUFHLEtBQUssQ0FBQztJQVdqQixlQUFlLEdBQUcsS0FBSyxDQUFDO0lBRXhCLElBQUksQ0FBZTtJQUVuQixLQUFLLENBQUMsTUFBTTtRQUNWLElBQUksR0FBRyxHQUFRLElBQUksQ0FBQztRQUNwQixJQUFJLElBQUksQ0FBQyxXQUFXLEVBQUU7WUFDcEIsR0FBRyxHQUFHLE1BQU0sSUFBSSxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQztTQUM5RDtRQUNELElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxXQUFXLENBQUM7WUFDMUIsV0FBVyxFQUFFLElBQUksQ0FBQyxXQUFXO1lBQzdCLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTTtZQUNuQixXQUFXLEVBQUUsSUFBSSxDQUFDLFdBQVc7WUFDN0IsR0FBRztZQUNILGVBQWUsRUFBRSxJQUFJLENBQUMsZUFBZTtZQUNyQyxlQUFlLEVBQUUsSUFBSSxDQUFDLFFBQVE7U0FDL0IsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELEtBQUssQ0FBQyxXQUFXO1FBQ2YsTUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQzVCLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUNoQyxNQUFNLGVBQWUsR0FBRyxJQUFJLENBQUMsaUJBQWlCLENBQUMsQ0FBQztRQUNoRCxNQUFNLG1CQUFtQixHQUFHLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDO1FBQ3RELE1BQU0sT0FBTyxHQUFHLENBQUMsQ0FBQyxLQUFLLENBQ3JCO1lBQ0UsT0FBTyxFQUFFLElBQUk7WUFDYixLQUFLLEVBQUUsV0FBVztZQUNsQixRQUFRLEVBQUUsV0FBVztZQUNyQixZQUFZLEVBQUUsWUFBWTtZQUMxQixnQkFBZ0IsRUFBRSxlQUFlO1lBQ2pDLFlBQVksRUFBRSxLQUFLO1NBQ3BCLEVBQ0QsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FDN0MsQ0FBQztRQUNGLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxLQUFLLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFFNUMsTUFBTSxpQkFBaUIsR0FBRyxtQkFBbUIsQ0FBQyxHQUFHLENBQUMsZUFBZSxDQUFDLENBQUM7UUFDbkUsTUFBTSxnQkFBZ0IsR0FBRyxpQkFBaUIsQ0FBQyxNQUFNLENBQUM7UUFDbEQsTUFBTSxpQkFBaUIsR0FBRyxpQkFBaUIsQ0FBQyxNQUEyQixDQUFDO1FBQ3hFLE1BQU0sTUFBTSxHQUFHLE1BQU0sSUFBSSxDQUFDLGFBQWEsQ0FBQyxPQUFPLENBQUMsbUJBQW1CLENBQUMsQ0FBQztRQUVyRSxhQUFhO1FBQ2IsTUFBTSxXQUFXLEdBQWlCLElBQUksZ0JBQWdCLEVBQUUsQ0FBQztRQUN6RCxNQUFNLE9BQU8sR0FBdUIsRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLElBQUksQ0FBQyxNQUFNLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUNyRixTQUFTLENBQUMsTUFBTSxDQUFDLGlCQUFpQixDQUFDLFFBQVEsRUFBRSxXQUFXLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDbkUsV0FBVyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUM1QixNQUFNLFdBQVcsQ0FBQyxVQUFVLEVBQUUsQ0FBQztRQUUvQixJQUFJO1lBQ0YsTUFBTSxJQUFJLEdBQUcsTUFBTSxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQztnQkFDakMsS0FBSztnQkFDTCxPQUFPO2dCQUNQLFdBQVc7Z0JBQ1gsT0FBTztnQkFDUCxNQUFNLEVBQUUsS0FBSzthQUNkLENBQUMsQ0FBQztZQUVILE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDeEMsT0FBTyxJQUFJLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQztTQUNqQztRQUFDLE9BQU8sQ0FBTSxFQUFFO1lBQ2YsTUFBTSxPQUFPLEdBQVcsQ0FBQyxDQUFDLE9BQU8sQ0FBQztZQUNsQyxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsc0RBQXNELENBQUMsSUFBSSxDQUFDLEVBQUU7Z0JBQ2hGLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO2dCQUNyQixNQUFNLElBQUksS0FBSyxDQUFDLDBCQUEwQixPQUFPLEdBQUcsQ0FBQyxDQUFDO2FBQ3ZEO1lBQ0QsTUFBTSxDQUFDLENBQUM7U0FDVDtJQUNILENBQUM7Q0FDRixDQUFBO0FBaEpDO0lBQUMsU0FBUyxDQUFDO1FBQ1QsS0FBSyxFQUFFLE9BQU87UUFDZCxLQUFLLEVBQUUsYUFBYTtRQUNwQixTQUFTLEVBQUU7WUFDVCxJQUFJLEVBQUUsVUFBVTtZQUNoQixNQUFNLEVBQUUsT0FBTztZQUNmLE9BQU8sRUFBRTtnQkFDUCxFQUFFLEtBQUssRUFBRSxhQUFhLEVBQUUsS0FBSyxFQUFFLGVBQWUsRUFBRTtnQkFDaEQsbUZBQW1GO2dCQUNuRiwwQ0FBMEM7Z0JBQzFDLEVBQUUsS0FBSyxFQUFFLFNBQVMsRUFBRSxLQUFLLEVBQUUsU0FBUyxFQUFFO2FBQ3ZDO1NBQ0Y7UUFDRCxRQUFRLEVBQUUsSUFBSTtLQUNmLENBQUM7O29EQUN3QjtBQUUxQjtJQUFDLFNBQVMsQ0FBQztRQUNULEtBQUssRUFBRSxPQUFPO1FBQ2QsU0FBUyxFQUFFO1lBQ1QsSUFBSSxFQUFFLG9CQUFvQjtZQUMxQixJQUFJLEVBQUUsS0FBSztTQUNaO1FBQ0QsU0FBUyxFQUFFLElBQUk7UUFDZixNQUFNLEVBQUUsdUdBQXVHO0tBQ2hILENBQUM7O29EQUNtQjtBQUVyQjtJQUFDLFNBQVMsQ0FBQztRQUNULEtBQUssRUFBRSxRQUFRO1FBQ2YsU0FBUyxFQUFFO1lBQ1QsSUFBSSxFQUFFLDBCQUEwQjtTQUNqQztRQUNELFFBQVEsRUFBRSxJQUFJO1FBQ2QsTUFBTSxFQUFFLGFBQWE7S0FDdEIsQ0FBQzs7d0RBQ3VCO0FBRXpCO0lBQUMsU0FBUyxDQUFDO1FBQ1QsS0FBSyxFQUFFLFNBQVM7UUFDaEIsU0FBUyxFQUFFO1lBQ1QsSUFBSSxFQUFFLG9CQUFvQjtTQUMzQjtRQUNELFFBQVEsRUFBRSxJQUFJO1FBQ2QsTUFBTSxFQUFFLGVBQWU7UUFDdkIsU0FBUyxFQUFFO1lBQ1Q7Z0JBQ0UsR0FBRyxFQUFFLHNCQUFzQjtnQkFDM0IsSUFBSSxFQUFFLGdCQUFnQjtnQkFDdEIsSUFBSSxFQUFFLFVBQVU7YUFDakI7U0FDRjtLQUNGLENBQUM7OzBEQUN5QjtBQUUzQjtJQUFDLFNBQVMsQ0FBQztRQUNULEtBQUssRUFBRSxNQUFNO1FBQ2IsS0FBSyxFQUFFLEtBQUs7UUFDWixTQUFTLEVBQUU7WUFDVCxJQUFJLEVBQUUsVUFBVTtZQUNoQixNQUFNLEVBQUUsU0FBUztTQUNsQjtRQUNELE1BQU0sRUFBRSxpREFBaUQ7S0FDMUQsQ0FBQzs7aURBQ2U7QUFFakI7SUFBQyxTQUFTLENBQUM7UUFDVCxLQUFLLEVBQUUsV0FBVztRQUNsQixLQUFLLEVBQUUsS0FBSztRQUNaLFNBQVMsRUFBRTtZQUNULElBQUksRUFBRSxVQUFVO1lBQ2hCLE1BQU0sRUFBRSxTQUFTO1NBQ2xCO1FBQ0QsTUFBTSxFQUFFLDhEQUE4RDtLQUN2RSxDQUFDOzt3REFDc0I7QUE1RWIsZUFBZTtJQWYzQixZQUFZLENBQUM7UUFDWixJQUFJLEVBQUUsV0FBVztRQUNqQixLQUFLLEVBQUUsV0FBVztRQUNsQixLQUFLLEVBQUUsWUFBWSxDQUFDLElBQUksQ0FBQyxHQUFHO1FBQzVCLElBQUksRUFBRSw0QkFBNEI7UUFDbEMsT0FBTyxFQUFFO1lBQ1AsS0FBSyxFQUFFO2dCQUNMLFNBQVMsRUFBRSxFQUFFO2dCQUNiLFdBQVcsRUFBRSxLQUFLO2FBQ25CO1lBQ0QsUUFBUSxFQUFFO2dCQUNSLFdBQVcsRUFBRSxXQUFXLENBQUMsU0FBUzthQUNuQztTQUNGO0tBQ0YsQ0FBQztHQUNXLGVBQWUsQ0FpSjNCO1NBakpZLGVBQWU7QUFtSjVCLElBQUksZUFBZSxFQUFFLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcGx1Z2luL2NlcnQtcGx1Z2luL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQUUsWUFBWSxFQUFFLFlBQVksRUFBRSxXQUFXLEVBQUUsU0FBUyxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFaEcsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUN4QyxPQUFPLENBQUMsTUFBTSxXQUFXLENBQUM7QUFDMUIsT0FBTyxFQUF5QyxtQkFBbUIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ3pHLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUM5QyxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFFaEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxDQUFDO0FBa0JmLElBQU0sZUFBZSxHQUFyQixNQUFNLGVBQWdCLFNBQVEsbUJBQW1CO0lBZ0J0RCxXQUFXLENBQWU7SUFvQjFCLGNBQWMsQ0FBa0I7SUFZaEMsV0FBVyxDQUFVO0lBVXJCLGVBQWUsQ0FBVTtJQWlCekIsaUJBQWlCLENBQVU7SUFZM0IsUUFBUSxHQUFHLEtBQUssQ0FBQztJQVdqQixlQUFlLEdBQUcsS0FBSyxDQUFDO0lBRXhCLElBQUksQ0FBZTtJQUVuQixLQUFLLENBQUMsTUFBTTtRQUNWLElBQUksR0FBRyxHQUFRLElBQUksQ0FBQztRQUNwQixJQUFJLElBQUksQ0FBQyxXQUFXLEVBQUU7WUFDcEIsR0FBRyxHQUFHLE1BQU0sSUFBSSxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQztTQUM5RDtRQUNELElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxXQUFXLENBQUM7WUFDMUIsV0FBVyxFQUFFLElBQUksQ0FBQyxXQUFXO1lBQzdC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

package/dist/plugin/cert-plugin/lego/dns.d.ts

@@ -1 +1 @@
-export declare const dnsList: any[];
+export declare const dnsList: any[];

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

@@ -1,17 +1,17 @@
-import type { CertInfo } from "../acme.js";
-import { CertReader } from "../cert-reader.js";
-import { CertApplyBasePlugin } from "../base.js";
-import { EabAccess } from "../../../access/index.js";
-export { CertReader };
-export type { CertInfo };
-export declare class CertApplyLegoPlugin extends CertApplyBasePlugin {
-    acmeServer: string;
-    dnsType: string;
-    environment: string;
-    legoEabAccessId: number;
-    customArgs: string;
-    eab?: EabAccess;
-    onInstance(): Promise<void>;
-    onInit(): Promise<void>;
-    doCertApply(): Promise<CertReader>;
-}
+import type { CertInfo } from "../acme.js";
+import { CertReader } from "../cert-reader.js";
+import { CertApplyBasePlugin } from "../base.js";
+import { EabAccess } from "../../../access/index.js";
+export { CertReader };
+export type { CertInfo };
+export declare class CertApplyLegoPlugin extends CertApplyBasePlugin {
+    acmeServer: string;
+    dnsType: string;
+    environment: string;
+    legoEabAccessId: number;
+    customArgs: string;
+    eab?: EabAccess;
+    onInstance(): Promise<void>;
+    onInit(): Promise<void>;
+    doCertApply(): Promise<CertReader>;
+}