@certd/plugin-cert 1.24.0 → 1.24.2

package/CHANGELOG.md

@@ -3,6 +3,21 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.24.2](https://github.com/certd/certd/compare/v1.24.1...v1.24.2) (2024-09-06)
+
+### Performance Improvements
+
+* 任务配置不需要的字段可以自动隐藏 ([192d9dc](https://github.com/certd/certd/commit/192d9dc7e36737d684c769f255f407c28b1152ac))
+* 修复windows下无法执行第二条命令的bug ([d5bfcdb](https://github.com/certd/certd/commit/d5bfcdb6de1dcc1702155442e2e00237d0bbb6e5))
+* 优化跳过处理逻辑 ([b80210f](https://github.com/certd/certd/commit/b80210f24bf5db1c958d06ab27c9e5d3db452eda))
+* 支持pfx、der ([fbeaed2](https://github.com/certd/certd/commit/fbeaed203519f59b6d9396c4e8953353ccb5e723))
+
+## [1.24.1](https://github.com/certd/certd/compare/v1.24.0...v1.24.1) (2024-09-02)
+
+### Performance Improvements
+
+* 授权配置支持加密 ([42a56b5](https://github.com/certd/certd/commit/42a56b581d754c3e5f9838179d19ab0d004ef2eb))
+
 # [1.24.0](https://github.com/certd/certd/compare/v1.23.1...v1.24.0) (2024-08-25)
 
 ### Bug Fixes

package/dist/access/eab-access.js

@@ -1,46 +1,48 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-import { IsAccess, AccessInput } from "@certd/pipeline";
-let EabAccess = class EabAccess {
-    kid = "";
-    hmacKey = "";
-};
-__decorate([
-    AccessInput({
-        title: "KID",
-        component: {
-            placeholder: "kid",
-        },
-        helper: "EAB KID",
-        required: true,
-    }),
-    __metadata("design:type", Object)
-], EabAccess.prototype, "kid", void 0);
-__decorate([
-    AccessInput({
-        title: "HMACKey",
-        component: {
-            placeholder: "HMAC Key",
-        },
-        helper: "EAB HMAC Key",
-        required: true,
-    }),
-    __metadata("design:type", Object)
-], EabAccess.prototype, "hmacKey", void 0);
-EabAccess = __decorate([
-    IsAccess({
-        name: "eab",
-        title: "EAB授权",
-        desc: "ZeroSSL证书申请需要EAB授权",
-    })
-], EabAccess);
-export { EabAccess };
-new EabAccess();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZWFiLWFjY2Vzcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY2Nlc3MvZWFiLWFjY2Vzcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsUUFBUSxFQUFFLFdBQVcsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBT2pELElBQU0sU0FBUyxHQUFmLE1BQU0sU0FBUztJQVNwQixHQUFHLEdBQUcsRUFBRSxDQUFDO0lBU1QsT0FBTyxHQUFHLEVBQUUsQ0FBQztDQUNkLENBQUE7QUFsQkM7SUFBQyxXQUFXLENBQUM7UUFDWCxLQUFLLEVBQUUsS0FBSztRQUNaLFNBQVMsRUFBRTtZQUNULFdBQVcsRUFBRSxLQUFLO1NBQ25CO1FBQ0QsTUFBTSxFQUFFLFNBQVM7UUFDakIsUUFBUSxFQUFFLElBQUk7S0FDZixDQUFDOztzQ0FDTztBQUNUO0lBQUMsV0FBVyxDQUFDO1FBQ1gsS0FBSyxFQUFFLFNBQVM7UUFDaEIsU0FBUyxFQUFFO1lBQ1QsV0FBVyxFQUFFLFVBQVU7U0FDeEI7UUFDRCxNQUFNLEVBQUUsY0FBYztRQUN0QixRQUFRLEVBQUUsSUFBSTtLQUNmLENBQUM7OzBDQUNXO0FBbEJGLFNBQVM7SUFMckIsUUFBUSxDQUFDO1FBQ1IsSUFBSSxFQUFFLEtBQUs7UUFDWCxLQUFLLEVBQUUsT0FBTztRQUNkLElBQUksRUFBRSxvQkFBb0I7S0FDM0IsQ0FBQztHQUNXLFNBQVMsQ0FtQnJCO1NBbkJZLFNBQVM7QUFxQnRCLElBQUksU0FBUyxFQUFFLENBQUMifQ==
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+import { IsAccess, AccessInput } from "@certd/pipeline";
+let EabAccess = class EabAccess {
+    kid = "";
+    hmacKey = "";
+};
+__decorate([
+    AccessInput({
+        title: "KID",
+        component: {
+            placeholder: "kid",
+        },
+        helper: "EAB KID",
+        required: true,
+        encrypt: true,
+    }),
+    __metadata("design:type", Object)
+], EabAccess.prototype, "kid", void 0);
+__decorate([
+    AccessInput({
+        title: "HMACKey",
+        component: {
+            placeholder: "HMAC Key",
+        },
+        helper: "EAB HMAC Key",
+        required: true,
+        encrypt: true,
+    }),
+    __metadata("design:type", Object)
+], EabAccess.prototype, "hmacKey", void 0);
+EabAccess = __decorate([
+    IsAccess({
+        name: "eab",
+        title: "EAB授权",
+        desc: "ZeroSSL证书申请需要EAB授权",
+    })
+], EabAccess);
+export { EabAccess };
+new EabAccess();
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZWFiLWFjY2Vzcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY2Nlc3MvZWFiLWFjY2Vzcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsUUFBUSxFQUFFLFdBQVcsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBT3hELElBQWEsU0FBUyxHQUF0QixNQUFhLFNBQVM7SUFVcEIsR0FBRyxHQUFHLEVBQUUsQ0FBQztJQVVULE9BQU8sR0FBRyxFQUFFLENBQUM7Q0FDZCxDQUFBO0FBWEM7SUFUQyxXQUFXLENBQUM7UUFDWCxLQUFLLEVBQUUsS0FBSztRQUNaLFNBQVMsRUFBRTtZQUNULFdBQVcsRUFBRSxLQUFLO1NBQ25CO1FBQ0QsTUFBTSxFQUFFLFNBQVM7UUFDakIsUUFBUSxFQUFFLElBQUk7UUFDZCxPQUFPLEVBQUUsSUFBSTtLQUNkLENBQUM7O3NDQUNPO0FBVVQ7SUFUQyxXQUFXLENBQUM7UUFDWCxLQUFLLEVBQUUsU0FBUztRQUNoQixTQUFTLEVBQUU7WUFDVCxXQUFXLEVBQUUsVUFBVTtTQUN4QjtRQUNELE1BQU0sRUFBRSxjQUFjO1FBQ3RCLFFBQVEsRUFBRSxJQUFJO1FBQ2QsT0FBTyxFQUFFLElBQUk7S0FDZCxDQUFDOzswQ0FDVztBQXBCRixTQUFTO0lBTHJCLFFBQVEsQ0FBQztRQUNSLElBQUksRUFBRSxLQUFLO1FBQ1gsS0FBSyxFQUFFLE9BQU87UUFDZCxJQUFJLEVBQUUsb0JBQW9CO0tBQzNCLENBQUM7R0FDVyxTQUFTLENBcUJyQjtTQXJCWSxTQUFTO0FBdUJ0QixJQUFJLFNBQVMsRUFBRSxDQUFDIn0=

package/dist/access/index.js

@@ -1,2 +1,2 @@
-export * from "./eab-access.js";
+export * from "./eab-access.js";
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYWNjZXNzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsaUJBQWlCLENBQUMifQ==

package/dist/dns-provider/api.js

@@ -1,2 +1,2 @@
-export {};
+export {};
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBpLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Rucy1wcm92aWRlci9hcGkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9

package/dist/dns-provider/base.js

@@ -1,7 +1,7 @@
-export class AbstractDnsProvider {
-    ctx;
-    setCtx(ctx) {
-        this.ctx = ctx;
-    }
-}
+export class AbstractDnsProvider {
+    ctx;
+    setCtx(ctx) {
+        this.ctx = ctx;
+    }
+}
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kbnMtcHJvdmlkZXIvYmFzZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxNQUFNLE9BQWdCLG1CQUFtQjtJQUN2QyxHQUFHLENBQXNCO0lBRXpCLE1BQU0sQ0FBQyxHQUF1QjtRQUM1QixJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQztJQUNqQixDQUFDO0NBT0YifQ==

package/dist/dns-provider/decorator.js

@@ -1,26 +1,26 @@
-import { dnsProviderRegistry } from "./registry.js";
-import { Decorator, AUTOWIRE_KEY } from "@certd/pipeline";
-import _ from "lodash-es";
-// 提供一个唯一 key
-export const DNS_PROVIDER_CLASS_KEY = "pipeline:dns-provider";
-export function IsDnsProvider(define) {
-    return (target) => {
-        target = Decorator.target(target);
-        const autowires = {};
-        const properties = Decorator.getClassProperties(target);
-        for (const property in properties) {
-            const autowire = Reflect.getMetadata(AUTOWIRE_KEY, target, property);
-            if (autowire) {
-                autowires[property] = autowire;
-            }
-        }
-        _.merge(define, { autowire: autowires });
-        Reflect.defineMetadata(DNS_PROVIDER_CLASS_KEY, define, target);
-        target.define = define;
-        dnsProviderRegistry.register(define.name, {
-            define,
-            target,
-        });
-    };
-}
+import { dnsProviderRegistry } from "./registry.js";
+import { Decorator, AUTOWIRE_KEY } from "@certd/pipeline";
+import _ from "lodash-es";
+// 提供一个唯一 key
+export const DNS_PROVIDER_CLASS_KEY = "pipeline:dns-provider";
+export function IsDnsProvider(define) {
+    return (target) => {
+        target = Decorator.target(target);
+        const autowires = {};
+        const properties = Decorator.getClassProperties(target);
+        for (const property in properties) {
+            const autowire = Reflect.getMetadata(AUTOWIRE_KEY, target, property);
+            if (autowire) {
+                autowires[property] = autowire;
+            }
+        }
+        _.merge(define, { autowire: autowires });
+        Reflect.defineMetadata(DNS_PROVIDER_CLASS_KEY, define, target);
+        target.define = define;
+        dnsProviderRegistry.register(define.name, {
+            define,
+            target,
+        });
+    };
+}
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVjb3JhdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Rucy1wcm92aWRlci9kZWNvcmF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRXBELE9BQU8sRUFBRSxTQUFTLEVBQUUsWUFBWSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDMUQsT0FBTyxDQUFDLE1BQU0sV0FBVyxDQUFDO0FBRTFCLGFBQWE7QUFDYixNQUFNLENBQUMsTUFBTSxzQkFBc0IsR0FBRyx1QkFBdUIsQ0FBQztBQUU5RCxNQUFNLFVBQVUsYUFBYSxDQUFDLE1BQXlCO0lBQ3JELE9BQU8sQ0FBQyxNQUFXLEVBQUUsRUFBRTtRQUNyQixNQUFNLEdBQUcsU0FBUyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUNsQyxNQUFNLFNBQVMsR0FBUSxFQUFFLENBQUM7UUFDMUIsTUFBTSxVQUFVLEdBQUcsU0FBUyxDQUFDLGtCQUFrQixDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ3hELEtBQUssTUFBTSxRQUFRLElBQUksVUFBVSxFQUFFO1lBQ2pDLE1BQU0sUUFBUSxHQUFHLE9BQU8sQ0FBQyxXQUFXLENBQUMsWUFBWSxFQUFFLE1BQU0sRUFBRSxRQUFRLENBQUMsQ0FBQztZQUNyRSxJQUFJLFFBQVEsRUFBRTtnQkFDWixTQUFTLENBQUMsUUFBUSxDQUFDLEdBQUcsUUFBUSxDQUFDO2FBQ2hDO1NBQ0Y7UUFDRCxDQUFDLENBQUMsS0FBSyxDQUFDLE1BQU0sRUFBRSxFQUFFLFFBQVEsRUFBRSxTQUFTLEVBQUUsQ0FBQyxDQUFDO1FBRXpDLE9BQU8sQ0FBQyxjQUFjLENBQUMsc0JBQXNCLEVBQUUsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBRS9ELE1BQU0sQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO1FBQ3ZCLG1CQUFtQixDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFO1lBQ3hDLE1BQU07WUFDTixNQUFNO1NBQ1AsQ0FBQyxDQUFDO0lBQ0wsQ0FBQyxDQUFDO0FBQ0osQ0FBQyJ9

package/dist/dns-provider/index.js

@@ -1,5 +1,5 @@
-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";
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZG5zLXByb3ZpZGVyL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsVUFBVSxDQUFDO0FBQ3pCLGNBQWMsZUFBZSxDQUFDO0FBQzlCLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyxXQUFXLENBQUMifQ==

package/dist/dns-provider/registry.js

@@ -1,3 +1,3 @@
-import { Registry } from "@certd/pipeline";
-export const dnsProviderRegistry = new Registry("dnsProvider");
+import { Registry } from "@certd/pipeline";
+export const dnsProviderRegistry = new Registry("dnsProvider");
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVnaXN0cnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZG5zLXByb3ZpZGVyL3JlZ2lzdHJ5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUUzQyxNQUFNLENBQUMsTUFBTSxtQkFBbUIsR0FBRyxJQUFJLFFBQVEsQ0FBQyxhQUFhLENBQUMsQ0FBQyJ9

package/dist/index.js

@@ -1,4 +1,4 @@
-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";
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLHlCQUF5QixDQUFDO0FBQ3hDLGNBQWMsbUJBQW1CLENBQUMifQ==

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

@@ -1,62 +1,65 @@
-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, UrlMapping } from "@certd/acme-client";
-export type CertInfo = {
-    crt: string;
-    key: string;
-    csr: string;
-};
-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;
-    sslProvider: SSLProvider;
-    eab?: ClientExternalAccountBindingOptions;
-    skipLocalVerify?: boolean;
-    useMappingProxy?: boolean;
-    privateKeyType?: PrivateKeyType;
-    signal?: AbortSignal;
-};
-export declare class AcmeService {
-    options: AcmeServiceOptions;
-    userContext: IContext;
-    logger: Logger;
-    sslProvider: SSLProvider;
-    skipLocalVerify: boolean;
-    eab?: ClientExternalAccountBindingOptions;
-    constructor(options: AcmeServiceOptions);
-    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>;
-    createNewKey(): Promise<string>;
-    parseDomain(fullDomain: string): string;
-    challengeCreateFn(authz: any, challenge: any, keyAuthorization: string, dnsProvider: IDnsProvider): Promise<any>;
-    /**
-     * Function used to remove an ACME challenge response
-     *
-     * @param {object} authz Authorization object
-     * @param {object} challenge Selected challenge
-     * @param {string} keyAuthorization Authorization key
-     * @param recordItem  challengeCreateFn create record item
-     * @param dnsProvider dnsProvider
-     * @returns {Promise}
-     */
-    challengeRemoveFn(authz: any, challenge: any, keyAuthorization: string, recordItem: any, dnsProvider: IDnsProvider): Promise<void>;
-    order(options: {
-        email: string;
-        domains: string | string[];
-        dnsProvider: any;
-        csrInfo: any;
-        isTest?: boolean;
-        privateKeyType?: string;
-    }): Promise<CertInfo>;
-    buildCommonNameByDomains(domains: string | string[]): {
-        commonName: string;
-        altNames: string[] | undefined;
-    };
-}
-export {};
+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, UrlMapping } from "@certd/acme-client";
+export type CertInfo = {
+    crt: string;
+    key: string;
+    csr: string;
+    pfx?: string;
+    der?: string;
+};
+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;
+    sslProvider: SSLProvider;
+    eab?: ClientExternalAccountBindingOptions;
+    skipLocalVerify?: boolean;
+    useMappingProxy?: boolean;
+    privateKeyType?: PrivateKeyType;
+    signal?: AbortSignal;
+};
+export declare class AcmeService {
+    options: AcmeServiceOptions;
+    userContext: IContext;
+    logger: Logger;
+    sslProvider: SSLProvider;
+    skipLocalVerify: boolean;
+    eab?: ClientExternalAccountBindingOptions;
+    constructor(options: AcmeServiceOptions);
+    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>;
+    createNewKey(): Promise<string>;
+    parseDomain(fullDomain: string): string;
+    challengeCreateFn(authz: any, challenge: any, keyAuthorization: string, dnsProvider: IDnsProvider): Promise<any>;
+    /**
+     * Function used to remove an ACME challenge response
+     *
+     * @param {object} authz Authorization object
+     * @param {object} challenge Selected challenge
+     * @param {string} keyAuthorization Authorization key
+     * @param recordItem  challengeCreateFn create record item
+     * @param dnsProvider dnsProvider
+     * @returns {Promise}
+     */
+    challengeRemoveFn(authz: any, challenge: any, keyAuthorization: string, recordItem: any, dnsProvider: IDnsProvider): Promise<void>;
+    order(options: {
+        email: string;
+        domains: string | string[];
+        dnsProvider: any;
+        csrInfo: any;
+        isTest?: boolean;
+        privateKeyType?: string;
+    }): Promise<CertInfo>;
+    buildCommonNameByDomains(domains: string | string[]): {
+        commonName: string;
+        altNames: string[] | undefined;
+    };
+    private testDirectory;
+}
+export {};

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

@@ -2,6 +2,7 @@
 import * as acme from "@certd/acme-client";
 import _ from "lodash-es";
 import psl from "psl";
+import { utils } from "@certd/pipeline";
 export class AcmeService {
     options;
     userContext;
@@ -53,6 +54,7 @@ export class AcmeService {
         if (conf.key == null) {
             conf.key = await this.createNewKey();
             await this.saveAccountConfig(email, conf);
+            this.logger.info(`创建新的Accountkey:${email}`);
         }
         let directoryUrl = "";
         if (isTest) {
@@ -64,6 +66,14 @@ export class AcmeService {
         if (this.options.useMappingProxy) {
             urlMapping.enabled = true;
         }
+        else {
+            //测试directory是否可以访问
+            const isOk = await this.testDirectory(directoryUrl);
+            if (!isOk) {
+                this.logger.info("测试访问失败，自动使用代理");
+                urlMapping.enabled = true;
+            }
+        }
         const client = new acme.Client({
             directoryUrl: directoryUrl,
             accountKey: conf.key,
@@ -88,7 +98,7 @@ export class AcmeService {
         return client;
     }
     async createNewKey() {
-        const key = await acme.forge.createPrivateKey();
+        const key = await acme.crypto.createPrivateKey(2048);
         return key.toString();
     }
     parseDomain(fullDomain) {
@@ -179,7 +189,10 @@ export class AcmeService {
         const privateKeyType = options.privateKeyType || "rsa_2048";
         const privateKeyArr = privateKeyType.split("_");
         const type = privateKeyArr[0];
-        const size = parseInt(privateKeyArr[1]);
+        let size = 2048;
+        if (privateKeyArr.length > 1) {
+            size = parseInt(privateKeyArr[1]);
+        }
         if (type == "ec") {
             const name = "P-" + size;
             privateKey = await acme.crypto.createPrivateEcdsaKey(name);
@@ -238,5 +251,20 @@ export class AcmeService {
             altNames,
         };
     }
+    async testDirectory(directoryUrl) {
+        try {
+            await utils.http({
+                url: directoryUrl,
+                method: "GET",
+                timeout: 10000,
+            });
+        }
+        catch (e) {
+            this.logger.error(`${directoryUrl}，测试访问失败`, e.stack);
+            return false;
+        }
+        this.logger.info(`${directoryUrl}，测试访问成功`);
+        return true;
+    }
 }
-//# 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,46 +1,46 @@
-import { AbstractTaskPlugin, HttpClient, IContext, Step } from "@certd/pipeline";
-import type { CertInfo } from "./acme.js";
-import { CertReader } from "./cert-reader.js";
-export { CertReader };
-export type { CertInfo };
-export declare abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
-    domains: string[];
-    email: string;
-    renewDays: number;
-    forceUpdate: string;
-    successNotify: boolean;
-    intro: string;
-    csrInfo: string;
-    userContext: IContext;
-    http: HttpClient;
-    lastStatus: Step;
-    cert?: CertInfo;
-    onInstance(): Promise<void>;
-    abstract onInit(): Promise<void>;
-    abstract doCertApply(): Promise<any>;
-    execute(): Promise<void>;
-    output(certReader: CertReader, isNew: boolean): Promise<void>;
-    zipCert(cert: CertInfo, applyTime: string): Promise<void>;
-    /**
-     * 是否更新证书
-     */
-    condition(): Promise<CertReader>;
-    formatCert(pem: string): string;
-    formatCerts(cert: {
-        crt: string;
-        key: string;
-        csr: string;
-    }): CertInfo;
-    readLastCert(): Promise<CertReader | undefined>;
-    /**
-     * 检查是否过期，默认提前20天
-     * @param expires
-     * @param maxDays
-     * @returns {boolean}
-     */
-    isWillExpire(expires: number, maxDays?: number): {
-        isWillExpire: boolean;
-        leftDays: number;
-    };
-    private sendSuccessEmail;
-}
+import { AbstractTaskPlugin, HttpClient, IContext, Step } from "@certd/pipeline";
+import type { CertInfo } from "./acme.js";
+import { CertReader } from "./cert-reader.js";
+export { CertReader };
+export type { CertInfo };
+export declare abstract class CertApplyBasePlugin extends AbstractTaskPlugin {
+    domains: string[];
+    email: string;
+    pfxPassword: string;
+    renewDays: number;
+    forceUpdate: string;
+    successNotify: boolean;
+    csrInfo: string;
+    userContext: IContext;
+    http: HttpClient;
+    lastStatus: Step;
+    cert?: CertInfo;
+    onInstance(): Promise<void>;
+    abstract onInit(): Promise<void>;
+    abstract doCertApply(): Promise<any>;
+    execute(): Promise<void>;
+    output(certReader: CertReader, isNew: boolean): Promise<void>;
+    zipCert(cert: CertInfo, filename: string): Promise<void>;
+    /**
+     * 是否更新证书
+     */
+    condition(): Promise<CertReader>;
+    formatCert(pem: string): string;
+    formatCerts(cert: {
+        crt: string;
+        key: string;
+        csr: string;
+    }): CertInfo;
+    readLastCert(): Promise<CertReader | undefined>;
+    /**
+     * 检查是否过期，默认提前20天
+     * @param expires
+     * @param maxDays
+     * @returns {boolean}
+     */
+    isWillExpire(expires: number, maxDays?: number): {
+        isWillExpire: boolean;
+        leftDays: number;
+    };
+    private sendSuccessEmail;
+}