@certd/plugin-cert 1.24.3 → 1.25.1

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

@@ -1,31 +1,34 @@
-import { CertInfo } from "./acme.js";
-import { ILogger } from "@certd/pipeline";
-export type CertReaderHandleContext = {
-    reader: CertReader;
-    tmpCrtPath: string;
-    tmpKeyPath: string;
-    tmpPfxPath?: string;
-    tmpDerPath?: string;
-};
-export type CertReaderHandle = (ctx: CertReaderHandleContext) => Promise<void>;
-export type HandleOpts = {
-    logger: ILogger;
-    handle: CertReaderHandle;
-};
-export declare class CertReader {
-    cert: CertInfo;
-    crt: string;
-    key: string;
-    csr: string;
-    detail: any;
-    expires: number;
-    constructor(certInfo: CertInfo);
-    toCertInfo(): CertInfo;
-    getCrtDetail(crt?: string): {
-        detail: import("@certd/acme-client").CertificateInfo;
-        expires: Date;
-    };
-    saveToFile(type: "crt" | "key" | "pfx" | "der", filepath?: string): string;
-    readCertFile(opts: HandleOpts): Promise<void>;
-    buildCertFileName(suffix: string, applyTime: number, prefix?: string): string;
-}
+import { CertInfo } from "./acme.js";
+import { ILogger } from "@certd/pipeline";
+export type CertReaderHandleContext = {
+    reader: CertReader;
+    tmpCrtPath: string;
+    tmpKeyPath: string;
+    tmpPfxPath?: string;
+    tmpDerPath?: string;
+    tmpIcPath?: string;
+};
+export type CertReaderHandle = (ctx: CertReaderHandleContext) => Promise<void>;
+export type HandleOpts = {
+    logger: ILogger;
+    handle: CertReaderHandle;
+};
+export declare class CertReader {
+    cert: CertInfo;
+    crt: string;
+    key: string;
+    csr: string;
+    ic: string;
+    detail: any;
+    expires: number;
+    constructor(certInfo: CertInfo);
+    getIc(): string;
+    toCertInfo(): CertInfo;
+    getCrtDetail(crt?: string): {
+        detail: import("@certd/acme-client").CertificateInfo;
+        expires: Date;
+    };
+    saveToFile(type: "crt" | "key" | "pfx" | "der" | "ic", filepath?: string): string;
+    readCertFile(opts: HandleOpts): Promise<void>;
+    buildCertFileName(suffix: string, applyTime: number, prefix?: string): string;
+}

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

@@ -1,89 +1,112 @@
-import fs from "fs";
-import os from "os";
-import path from "path";
-import { crypto } from "@certd/acme-client";
-import dayjs from "dayjs";
-export class CertReader {
-    cert;
-    crt;
-    key;
-    csr;
-    detail;
-    expires;
-    constructor(certInfo) {
-        this.cert = certInfo;
-        this.crt = certInfo.crt;
-        this.key = certInfo.key;
-        this.csr = certInfo.csr;
-        const { detail, expires } = this.getCrtDetail(this.cert.crt);
-        this.detail = detail;
-        this.expires = expires.getTime();
-    }
-    toCertInfo() {
-        return this.cert;
-    }
-    getCrtDetail(crt = this.cert.crt) {
-        const detail = crypto.readCertificateInfo(crt.toString());
-        const expires = detail.notAfter;
-        return { detail, expires };
-    }
-    saveToFile(type, filepath) {
-        if (!this.cert[type]) {
-            return;
-        }
-        if (filepath == null) {
-            //写入临时目录
-            filepath = path.join(os.tmpdir(), "/certd/tmp/", Math.floor(Math.random() * 1000000) + "", `cert.${type}`);
-        }
-        const dir = path.dirname(filepath);
-        if (!fs.existsSync(dir)) {
-            fs.mkdirSync(dir, { recursive: true });
-        }
-        if (type === "crt" || type === "key") {
-            fs.writeFileSync(filepath, this.cert[type]);
-        }
-        else {
-            fs.writeFileSync(filepath, Buffer.from(this.cert[type], "base64"));
-        }
-        return filepath;
-    }
-    async readCertFile(opts) {
-        const logger = opts.logger;
-        logger.info("将证书写入本地缓存文件");
-        const tmpCrtPath = this.saveToFile("crt");
-        const tmpKeyPath = this.saveToFile("key");
-        const tmpPfxPath = this.saveToFile("pfx");
-        const tmpDerPath = this.saveToFile("der");
-        logger.info("本地文件写入成功");
-        try {
-            await opts.handle({
-                reader: this,
-                tmpCrtPath: tmpCrtPath,
-                tmpKeyPath: tmpKeyPath,
-                tmpPfxPath: tmpPfxPath,
-                tmpDerPath: tmpDerPath,
-            });
-        }
-        finally {
-            //删除临时文件
-            logger.info("删除临时文件");
-            function removeFile(filepath) {
-                if (filepath) {
-                    fs.unlinkSync(filepath);
-                }
-            }
-            removeFile(tmpCrtPath);
-            removeFile(tmpKeyPath);
-            removeFile(tmpPfxPath);
-            removeFile(tmpDerPath);
-        }
-    }
-    buildCertFileName(suffix, applyTime, prefix = "cert") {
-        const detail = this.getCrtDetail();
-        let domain = detail.detail.domains.commonName;
-        domain = domain.replace(".", "_").replace("*", "_");
-        const timeStr = dayjs(applyTime).format("YYYYMMDDHHmmss");
-        return `${prefix}_${domain}_${timeStr}.${suffix}`;
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2VydC1yZWFkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcGx1Z2luL2NlcnQtcGx1Z2luL2NlcnQtcmVhZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxNQUFNLElBQUksQ0FBQztBQUNwQixPQUFPLEVBQUUsTUFBTSxJQUFJLENBQUM7QUFDcEIsT0FBTyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQ3hCLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUU1QyxPQUFPLEtBQUssTUFBTSxPQUFPLENBQUM7QUFLMUIsTUFBTSxPQUFPLFVBQVU7SUFDckIsSUFBSSxDQUFXO0lBQ2YsR0FBRyxDQUFTO0lBQ1osR0FBRyxDQUFTO0lBQ1osR0FBRyxDQUFTO0lBRVosTUFBTSxDQUFNO0lBQ1osT0FBTyxDQUFTO0lBQ2hCLFlBQVksUUFBa0I7UUFDNUIsSUFBSSxDQUFDLElBQUksR0FBRyxRQUFRLENBQUM7UUFDckIsSUFBSSxDQUFDLEdBQUcsR0FBRyxRQUFRLENBQUMsR0FBRyxDQUFDO1FBQ3hCLElBQUksQ0FBQyxHQUFHLEdBQUcsUUFBUSxDQUFDLEdBQUcsQ0FBQztRQUN4QixJQUFJLENBQUMsR0FBRyxHQUFHLFFBQVEsQ0FBQyxHQUFHLENBQUM7UUFFeEIsTUFBTSxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsR0FBRyxJQUFJLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDN0QsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7UUFDckIsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDbkMsQ0FBQztJQUVELFVBQVU7UUFDUixPQUFPLElBQUksQ0FBQyxJQUFJLENBQUM7SUFDbkIsQ0FBQztJQUVELFlBQVksQ0FBQyxNQUFjLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRztRQUN0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
+import fs from "fs";
+import os from "os";
+import path from "path";
+import { crypto } from "@certd/acme-client";
+import dayjs from "dayjs";
+export class CertReader {
+    cert;
+    crt;
+    key;
+    csr;
+    ic; //中间证书
+    detail;
+    expires;
+    constructor(certInfo) {
+        this.cert = certInfo;
+        this.crt = certInfo.crt;
+        this.key = certInfo.key;
+        this.csr = certInfo.csr;
+        this.ic = certInfo.ic;
+        if (!this.ic) {
+            this.ic = this.getIc();
+            this.cert.ic = this.ic;
+        }
+        const { detail, expires } = this.getCrtDetail(this.cert.crt);
+        this.detail = detail;
+        this.expires = expires.getTime();
+    }
+    getIc() {
+        //中间证书ic， 就是crt的第一个 -----END CERTIFICATE----- 之后的内容
+        const endStr = "-----END CERTIFICATE-----";
+        const firstBlockEndIndex = this.crt.indexOf(endStr);
+        const start = firstBlockEndIndex + endStr.length + 1;
+        if (this.crt.length <= start) {
+            return "";
+        }
+        const ic = this.crt.substring(start);
+        return ic.trim();
+    }
+    toCertInfo() {
+        return this.cert;
+    }
+    getCrtDetail(crt = this.cert.crt) {
+        const detail = crypto.readCertificateInfo(crt.toString());
+        const expires = detail.notAfter;
+        return { detail, expires };
+    }
+    saveToFile(type, filepath) {
+        if (!this.cert[type]) {
+            return;
+        }
+        if (filepath == null) {
+            //写入临时目录
+            filepath = path.join(os.tmpdir(), "/certd/tmp/", Math.floor(Math.random() * 1000000) + "", `cert.${type}`);
+        }
+        const dir = path.dirname(filepath);
+        if (!fs.existsSync(dir)) {
+            fs.mkdirSync(dir, { recursive: true });
+        }
+        if (type === "crt" || type === "key" || type === "ic") {
+            fs.writeFileSync(filepath, this.cert[type]);
+        }
+        else {
+            fs.writeFileSync(filepath, Buffer.from(this.cert[type], "base64"));
+        }
+        return filepath;
+    }
+    async readCertFile(opts) {
+        const logger = opts.logger;
+        logger.info("将证书写入本地缓存文件");
+        const tmpCrtPath = this.saveToFile("crt");
+        const tmpKeyPath = this.saveToFile("key");
+        const tmpPfxPath = this.saveToFile("pfx");
+        const tmpIcPath = this.saveToFile("ic");
+        logger.info("本地文件写入成功");
+        const tmpDerPath = this.saveToFile("der");
+        try {
+            return await opts.handle({
+                reader: this,
+                tmpCrtPath: tmpCrtPath,
+                tmpKeyPath: tmpKeyPath,
+                tmpPfxPath: tmpPfxPath,
+                tmpDerPath: tmpDerPath,
+                tmpIcPath: tmpIcPath,
+            });
+        }
+        catch (err) {
+            throw err;
+        }
+        finally {
+            //删除临时文件
+            logger.info("删除临时文件");
+            function removeFile(filepath) {
+                if (filepath) {
+                    fs.unlinkSync(filepath);
+                }
+            }
+            removeFile(tmpCrtPath);
+            removeFile(tmpKeyPath);
+            removeFile(tmpPfxPath);
+            removeFile(tmpDerPath);
+            removeFile(tmpIcPath);
+        }
+    }
+    buildCertFileName(suffix, applyTime, prefix = "cert") {
+        const detail = this.getCrtDetail();
+        let domain = detail.detail.domains.commonName;
+        domain = domain.replace(".", "_").replace("*", "_");
+        const timeStr = dayjs(applyTime).format("YYYYMMDDHHmmss");
+        return `${prefix}_${domain}_${timeStr}.${suffix}`;
+    }
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2VydC1yZWFkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcGx1Z2luL2NlcnQtcGx1Z2luL2NlcnQtcmVhZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxNQUFNLElBQUksQ0FBQztBQUNwQixPQUFPLEVBQUUsTUFBTSxJQUFJLENBQUM7QUFDcEIsT0FBTyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQ3hCLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUU1QyxPQUFPLEtBQUssTUFBTSxPQUFPLENBQUM7QUFZMUIsTUFBTSxPQUFPLFVBQVU7SUFDckIsSUFBSSxDQUFXO0lBQ2YsR0FBRyxDQUFTO0lBQ1osR0FBRyxDQUFTO0lBQ1osR0FBRyxDQUFTO0lBQ1osRUFBRSxDQUFTLENBQUMsTUFBTTtJQUVsQixNQUFNLENBQU07SUFDWixPQUFPLENBQVM7SUFDaEIsWUFBWSxRQUFrQjtRQUM1QixJQUFJLENBQUMsSUFBSSxHQUFHLFFBQVEsQ0FBQztRQUNyQixJQUFJLENBQUMsR0FBRyxHQUFHLFFBQVEsQ0FBQyxHQUFHLENBQUM7UUFDeEIsSUFBSSxDQUFDLEdBQUcsR0FBRyxRQUFRLENBQUMsR0FBRyxDQUFDO1FBQ3hCLElBQUksQ0FBQyxHQUFHLEdBQUcsUUFBUSxDQUFDLEdBQUcsQ0FBQztRQUV4QixJQUFJLENBQUMsRUFBRSxHQUFHLFFBQVEsQ0FBQyxFQUFFLENBQUM7UUFDdEIsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFLEVBQUU7WUFDWixJQUFJLENBQUMsRUFBRSxHQUFHLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztZQUN2QixJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsR0FBRyxJQUFJLENBQUMsRUFBRSxDQUFDO1NBQ3hCO1FBRUQsTUFBTSxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsR0FBRyxJQUFJLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJ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

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

@@ -1,21 +1,21 @@
-import { ILogger } from "@certd/pipeline";
-import type { CertInfo } from "../cert-plugin/acme.js";
-import { CertReader } from "../cert-plugin/cert-reader.js";
-export { CertReader };
-export type { CertInfo };
-export declare class CertConverter {
-    logger: ILogger;
-    constructor(opts: {
-        logger: ILogger;
-    });
-    convert(opts: {
-        cert: CertInfo;
-        pfxPassword: string;
-    }): Promise<{
-        pfxPath: string;
-        derPath: string;
-    }>;
-    exec(cmd: string): Promise<void>;
-    private convertPfx;
-    private convertDer;
-}
+import { ILogger } from "@certd/pipeline";
+import type { CertInfo } from "../cert-plugin/acme.js";
+import { CertReader } from "../cert-plugin/cert-reader.js";
+export { CertReader };
+export type { CertInfo };
+export declare class CertConverter {
+    logger: ILogger;
+    constructor(opts: {
+        logger: ILogger;
+    });
+    convert(opts: {
+        cert: CertInfo;
+        pfxPassword: string;
+    }): Promise<{
+        pfxPath: string;
+        derPath: string;
+    }>;
+    exec(cmd: string): Promise<void>;
+    private convertPfx;
+    private convertDer;
+}

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

@@ -1,71 +1,71 @@
-import { sp } from "@certd/pipeline";
-import { CertReader } from "../cert-plugin/cert-reader.js";
-import path from "path";
-import os from "os";
-import fs from "fs";
-export { CertReader };
-export class CertConverter {
-    logger;
-    constructor(opts) {
-        this.logger = opts.logger;
-    }
-    async convert(opts) {
-        const certReader = new CertReader(opts.cert);
-        let pfxPath;
-        let derPath;
-        const handle = async (opts) => {
-            // 调用openssl 转pfx
-            pfxPath = await this.convertPfx(opts);
-            // 转der
-            derPath = await this.convertDer(opts);
-        };
-        await certReader.readCertFile({ logger: this.logger, handle });
-        return {
-            pfxPath,
-            derPath,
-        };
-    }
-    async exec(cmd) {
-        await sp.spawn({
-            cmd: cmd,
-            logger: this.logger,
-        });
-    }
-    async convertPfx(opts, pfxPassword) {
-        const { tmpCrtPath, tmpKeyPath } = opts;
-        const pfxPath = path.join(os.tmpdir(), "/certd/tmp/", Math.floor(Math.random() * 1000000) + "", "cert.pfx");
-        const dir = path.dirname(pfxPath);
-        if (!fs.existsSync(dir)) {
-            fs.mkdirSync(dir, { recursive: true });
-        }
-        let passwordArg = "-passout pass:";
-        if (pfxPassword) {
-            passwordArg = `-password pass:${pfxPassword}`;
-        }
-        await this.exec(`openssl pkcs12 -export -out ${pfxPath} -inkey ${tmpKeyPath} -in ${tmpCrtPath} ${passwordArg}`);
-        return pfxPath;
-        // const fileBuffer = fs.readFileSync(pfxPath);
-        // this.pfxCert = fileBuffer.toString("base64");
-        //
-        // const applyTime = new Date().getTime();
-        // const filename = reader.buildCertFileName("pfx", applyTime);
-        // this.saveFile(filename, fileBuffer);
-    }
-    async convertDer(opts) {
-        const { tmpCrtPath } = opts;
-        const derPath = path.join(os.tmpdir(), "/certd/tmp/", Math.floor(Math.random() * 1000000) + "", `cert.der`);
-        const dir = path.dirname(derPath);
-        if (!fs.existsSync(dir)) {
-            fs.mkdirSync(dir, { recursive: true });
-        }
-        await this.exec(`openssl x509 -outform der -in ${tmpCrtPath} -out ${derPath}`);
-        return derPath;
-        // const fileBuffer = fs.readFileSync(derPath);
-        // this.derCert = fileBuffer.toString("base64");
-        //
-        // const applyTime = new Date().getTime();
-        // const filename = reader.buildCertFileName("der", applyTime);
-        // this.saveFile(filename, fileBuffer);
-    }
-}
+import { sp } from "@certd/pipeline";
+import { CertReader } from "../cert-plugin/cert-reader.js";
+import path from "path";
+import os from "os";
+import fs from "fs";
+export { CertReader };
+export class CertConverter {
+    logger;
+    constructor(opts) {
+        this.logger = opts.logger;
+    }
+    async convert(opts) {
+        const certReader = new CertReader(opts.cert);
+        let pfxPath;
+        let derPath;
+        const handle = async (opts) => {
+            // 调用openssl 转pfx
+            pfxPath = await this.convertPfx(opts);
+            // 转der
+            derPath = await this.convertDer(opts);
+        };
+        await certReader.readCertFile({ logger: this.logger, handle });
+        return {
+            pfxPath,
+            derPath,
+        };
+    }
+    async exec(cmd) {
+        await sp.spawn({
+            cmd: cmd,
+            logger: this.logger,
+        });
+    }
+    async convertPfx(opts, pfxPassword) {
+        const { tmpCrtPath, tmpKeyPath } = opts;
+        const pfxPath = path.join(os.tmpdir(), "/certd/tmp/", Math.floor(Math.random() * 1000000) + "", "cert.pfx");
+        const dir = path.dirname(pfxPath);
+        if (!fs.existsSync(dir)) {
+            fs.mkdirSync(dir, { recursive: true });
+        }
+        let passwordArg = "-passout pass:";
+        if (pfxPassword) {
+            passwordArg = `-password pass:${pfxPassword}`;
+        }
+        await this.exec(`openssl pkcs12 -export -out ${pfxPath} -inkey ${tmpKeyPath} -in ${tmpCrtPath} ${passwordArg}`);
+        return pfxPath;
+        // const fileBuffer = fs.readFileSync(pfxPath);
+        // this.pfxCert = fileBuffer.toString("base64");
+        //
+        // const applyTime = new Date().getTime();
+        // const filename = reader.buildCertFileName("pfx", applyTime);
+        // this.saveFile(filename, fileBuffer);
+    }
+    async convertDer(opts) {
+        const { tmpCrtPath } = opts;
+        const derPath = path.join(os.tmpdir(), "/certd/tmp/", Math.floor(Math.random() * 1000000) + "", `cert.der`);
+        const dir = path.dirname(derPath);
+        if (!fs.existsSync(dir)) {
+            fs.mkdirSync(dir, { recursive: true });
+        }
+        await this.exec(`openssl x509 -outform der -in ${tmpCrtPath} -out ${derPath}`);
+        return derPath;
+        // const fileBuffer = fs.readFileSync(derPath);
+        // this.derCert = fileBuffer.toString("base64");
+        //
+        // const applyTime = new Date().getTime();
+        // const filename = reader.buildCertFileName("der", applyTime);
+        // this.saveFile(filename, fileBuffer);
+    }
+}
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udmVydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wbHVnaW4vY2VydC1wbHVnaW4vY29udmVydC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQVcsRUFBRSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFOUMsT0FBTyxFQUFFLFVBQVUsRUFBMkIsTUFBTSwrQkFBK0IsQ0FBQztBQUNwRixPQUFPLElBQUksTUFBTSxNQUFNLENBQUM7QUFDeEIsT0FBTyxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBQ3BCLE9BQU8sRUFBRSxNQUFNLElBQUksQ0FBQztBQUVwQixPQUFPLEVBQUUsVUFBVSxFQUFFLENBQUM7QUFHdEIsTUFBTSxPQUFPLGFBQWE7SUFDeEIsTUFBTSxDQUFVO0lBRWhCLFlBQVksSUFBeUI7UUFDbkMsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDO0lBQzVCLENBQUM7SUFDRCxLQUFLLENBQUMsT0FBTyxDQUFDLElBQTZDO1FBSXpELE1BQU0sVUFBVSxHQUFHLElBQUksVUFBVSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUM3QyxJQUFJLE9BQWUsQ0FBQztRQUNwQixJQUFJLE9BQWUsQ0FBQztRQUNwQixNQUFNLE1BQU0sR0FBRyxLQUFLLEVBQUUsSUFBNkIsRUFBRSxFQUFFO1lBQ3JELGlCQUFpQjtZQUNqQixPQUFPLEdBQUcsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBRXRDLE9BQU87WUFDUCxPQUFPLEdBQUcsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3hDLENBQUMsQ0FBQztRQUVGLE1BQU0sVUFBVSxDQUFDLFlBQVksQ0FBQyxFQUFFLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxDQUFDLENBQUM7UUFFL0QsT0FBTztZQUNMLE9BQU87WUFDUCxPQUFPO1NBQ1IsQ0FBQztJQUNKLENBQUM7SUFFRCxLQUFLLENBQUMsSUFBSSxDQUFDLEdBQVc7UUFDcEIsTUFBTSxFQUFFLENBQUMsS0FBSyxDQUFDO1lBQ2IsR0FBRyxFQUFFLEdBQUc7WUFDUixNQUFNLEVBQUUsSUFBSSxDQUFDLE1BQU07U0FDcEIsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVPLEtBQUssQ0FBQyxVQUFVLENBQUMsSUFBNkIsRUFBRSxXQUFvQjtRQUMxRSxNQUFNLEVBQUUsVUFBVSxFQUFFLFVBQVUsRUFBRSxHQUFHLElBQUksQ0FBQztRQUV4QyxNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxhQUFhLEVBQUUsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLEdBQUcsT0FBTyxDQUFDLEdBQUcsRUFBRSxFQUFFLFVBQVUsQ0FBQyxDQUFDO1FBRTVHLE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDbEMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLEVBQUU7WUFDdkIsRUFBRSxDQUFDLFNBQVMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztTQUN4QztRQUVELElBQUksV0FBVyxHQUFHLGdCQUFnQixDQUFDO1FBQ25DLElBQUksV0FBVyxFQUFFO1lBQ2YsV0FBVyxHQUFHLGtCQUFrQixXQUFXLEVBQUUsQ0FBQztTQUMvQztRQUNELE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQywrQkFBK0IsT0FBTyxXQUFXLFVBQVUsUUFBUSxVQUFVLElBQUksV0FBVyxFQUFFLENBQUMsQ0FBQztRQUNoSCxPQUFPLE9BQU8sQ0FBQztRQUNmLCtDQUErQztRQUMvQyxnREFBZ0Q7UUFDaEQsRUFBRTtRQUNGLDBDQUEwQztRQUMxQywrREFBK0Q7UUFDL0QsdUNBQXVDO0lBQ3pDLENBQUM7SUFFTyxLQUFLLENBQUMsVUFBVSxDQUFDLElBQTZCO1FBQ3BELE1BQU0sRUFBRSxVQUFVLEVBQUUsR0FBRyxJQUFJLENBQUM7UUFDNUIsTUFBTSxPQUFPLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsTUFBTSxFQUFFLEVBQUUsYUFBYSxFQUFFLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxHQUFHLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBRSxVQUFVLENBQUMsQ0FBQztRQUU1RyxNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2xDLElBQUksQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxFQUFFO1lBQ3ZCLEVBQUUsQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7U0FDeEM7UUFFRCxNQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsaUNBQWlDLFVBQVUsU0FBUyxPQUFPLEVBQUUsQ0FBQyxDQUFDO1FBRS9FLE9BQU8sT0FBTyxDQUFDO1FBRWYsK0NBQStDO1FBQy9DLGdEQUFnRDtRQUNoRCxFQUFFO1FBQ0YsMENBQTBDO1FBQzFDLCtEQUErRDtRQUMvRCx1Q0FBdUM7SUFDekMsQ0FBQztDQUNGIn0=

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

@@ -1,18 +1,18 @@
-import type { CertInfo, PrivateKeyType, SSLProvider } from "./acme.js";
-import { AcmeService } from "./acme.js";
-import { CertReader } from "./cert-reader.js";
-import { CertApplyBasePlugin } from "./base.js";
-export type { CertInfo };
-export * from "./cert-reader.js";
-export declare class CertApplyPlugin extends CertApplyBasePlugin {
-    sslProvider: SSLProvider;
-    eabAccessId: number;
-    privateKeyType: PrivateKeyType;
-    dnsProviderType: string;
-    dnsProviderAccess: string;
-    useProxy: boolean;
-    skipLocalVerify: boolean;
-    acme: AcmeService;
-    onInit(): Promise<void>;
-    doCertApply(): Promise<CertReader>;
-}
+import type { CertInfo, PrivateKeyType, SSLProvider } from "./acme.js";
+import { AcmeService } from "./acme.js";
+import { CertReader } from "./cert-reader.js";
+import { CertApplyBasePlugin } from "./base.js";
+export type { CertInfo };
+export * from "./cert-reader.js";
+export declare class CertApplyPlugin extends CertApplyBasePlugin {
+    sslProvider: SSLProvider;
+    eabAccessId: number;
+    privateKeyType: PrivateKeyType;
+    dnsProviderType: string;
+    dnsProviderAccess: string;
+    useProxy: boolean;
+    skipLocalVerify: boolean;
+    acme: AcmeService;
+    onInit(): Promise<void>;
+    doCertApply(): Promise<CertReader>;
+}