@certd/plugin-cert 1.25.8 → 1.26.0

package/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.26.0](https://github.com/certd/certd/compare/v1.25.9...v1.26.0) (2024-10-10)
+
+### Features
+
+* 域名验证方法支持CNAME间接方式，此方式支持所有域名注册商，且无需提供Access授权，但是需要手动添加cname解析 ([f3d3508](https://github.com/certd/certd/commit/f3d35084ed44f9f33845f7045e520be5c27eed93))
+
+### Performance Improvements
+
+* 调整静态资源到static目录 ([0584b36](https://github.com/certd/certd/commit/0584b3672b40f9042a2ed87e5627022606d046cd))
+* 检查cname是否正确配置 ([b5d8935](https://github.com/certd/certd/commit/b5d8935159374fbe7fc7d4c48ae0ed9396861bdd))
+* 域名输入增加校验提示，避免输入错误的域名 ([0c8e83e](https://github.com/certd/certd/commit/0c8e83e1254a9ce4d5a4e7888eb1710394a4b77c))
+* cname校验配置增加未校验通过提示 ([77cc3c4](https://github.com/certd/certd/commit/77cc3c4a5cbd81f8233a8e0bb33fab0621c0905f))
+* google eab授权支持自动获取，不过要配置代理 ([592791d](https://github.com/certd/certd/commit/592791d1356fc252fbb70d7f168567aee9585507))
+
+## [1.25.9](https://github.com/certd/certd/compare/v1.25.8...v1.25.9) (2024-10-01)
+
+### Bug Fixes
+
+* 修复西部数码账户级别apikey不可用的bug ([f8f3e8b](https://github.com/certd/certd/commit/f8f3e8b43fd5d815887bcb53b95f46dc96424b79))
+
 ## [1.25.8](https://github.com/certd/certd/compare/v1.25.7...v1.25.8) (2024-09-30)
 
 ### Bug Fixes

package/dist/access/eab-access.d.ts

@@ -1,4 +1,5 @@
-export declare class EabAccess {
+import { BaseAccess } from "@certd/pipeline";
+export declare class EabAccess extends BaseAccess {
     kid: string;
     hmacKey: string;
 }

package/dist/access/eab-access.js

@@ -7,8 +7,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 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 {
+import { IsAccess, AccessInput, BaseAccess } from "@certd/pipeline";
+let EabAccess = class EabAccess extends BaseAccess {
     kid = "";
     hmacKey = "";
 };
@@ -45,4 +45,4 @@ EabAccess = __decorate([
 ], EabAccess);
 export { EabAccess };
 new EabAccess();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZWFiLWFjY2Vzcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY2Nlc3MvZWFiLWFjY2Vzcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsUUFBUSxFQUFFLFdBQVcsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBT2pELElBQU0sU0FBUyxHQUFmLE1BQU0sU0FBUztJQVVwQixHQUFHLEdBQUcsRUFBRSxDQUFDO0lBVVQsT0FBTyxHQUFHLEVBQUUsQ0FBQztDQUNkLENBQUE7QUFYQztJQVRDLFdBQVcsQ0FBQztRQUNYLEtBQUssRUFBRSxLQUFLO1FBQ1osU0FBUyxFQUFFO1lBQ1QsV0FBVyxFQUFFLEtBQUs7U0FDbkI7UUFDRCxNQUFNLEVBQUUsU0FBUztRQUNqQixRQUFRLEVBQUUsSUFBSTtRQUNkLE9BQU8sRUFBRSxJQUFJO0tBQ2QsQ0FBQzs7c0NBQ087QUFVVDtJQVRDLFdBQVcsQ0FBQztRQUNYLEtBQUssRUFBRSxTQUFTO1FBQ2hCLFNBQVMsRUFBRTtZQUNULFdBQVcsRUFBRSxVQUFVO1NBQ3hCO1FBQ0QsTUFBTSxFQUFFLGNBQWM7UUFDdEIsUUFBUSxFQUFFLElBQUk7UUFDZCxPQUFPLEVBQUUsSUFBSTtLQUNkLENBQUM7OzBDQUNXO0FBcEJGLFNBQVM7SUFMckIsUUFBUSxDQUFDO1FBQ1IsSUFBSSxFQUFFLEtBQUs7UUFDWCxLQUFLLEVBQUUsT0FBTztRQUNkLElBQUksRUFBRSxvQkFBb0I7S0FDM0IsQ0FBQztHQUNXLFNBQVMsQ0FxQnJCOztBQUVELElBQUksU0FBUyxFQUFFLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZWFiLWFjY2Vzcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY2Nlc3MvZWFiLWFjY2Vzcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsUUFBUSxFQUFFLFdBQVcsRUFBRSxVQUFVLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQU83RCxJQUFNLFNBQVMsR0FBZixNQUFNLFNBQVUsU0FBUSxVQUFVO0lBVXZDLEdBQUcsR0FBRyxFQUFFLENBQUM7SUFVVCxPQUFPLEdBQUcsRUFBRSxDQUFDO0NBQ2QsQ0FBQTtBQVhDO0lBVEMsV0FBVyxDQUFDO1FBQ1gsS0FBSyxFQUFFLEtBQUs7UUFDWixTQUFTLEVBQUU7WUFDVCxXQUFXLEVBQUUsS0FBSztTQUNuQjtRQUNELE1BQU0sRUFBRSxTQUFTO1FBQ2pCLFFBQVEsRUFBRSxJQUFJO1FBQ2QsT0FBTyxFQUFFLElBQUk7S0FDZCxDQUFDOztzQ0FDTztBQVVUO0lBVEMsV0FBVyxDQUFDO1FBQ1gsS0FBSyxFQUFFLFNBQVM7UUFDaEIsU0FBUyxFQUFFO1lBQ1QsV0FBVyxFQUFFLFVBQVU7U0FDeEI7UUFDRCxNQUFNLEVBQUUsY0FBYztRQUN0QixRQUFRLEVBQUUsSUFBSTtRQUNkLE9BQU8sRUFBRSxJQUFJO0tBQ2QsQ0FBQzs7MENBQ1c7QUFwQkYsU0FBUztJQUxyQixRQUFRLENBQUM7UUFDUixJQUFJLEVBQUUsS0FBSztRQUNYLEtBQUssRUFBRSxPQUFPO1FBQ2QsSUFBSSxFQUFFLG9CQUFvQjtLQUMzQixDQUFDO0dBQ1csU0FBUyxDQXFCckI7O0FBRUQsSUFBSSxTQUFTLEVBQUUsQ0FBQyJ9

package/dist/access/google-access.d.ts

@@ -0,0 +1,8 @@
+import { BaseAccess } from "@certd/pipeline";
+export declare class GoogleAccess extends BaseAccess {
+    type: string;
+    projectId: string;
+    apiKey: string;
+    serviceAccountSecret: string;
+    httpsProxy: string;
+}

package/dist/access/google-access.js

@@ -0,0 +1,118 @@
+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, BaseAccess } from "@certd/pipeline";
+let GoogleAccess = class GoogleAccess extends BaseAccess {
+    type = "";
+    projectId = "";
+    apiKey = "";
+    serviceAccountSecret = "";
+    httpsProxy = "";
+};
+__decorate([
+    AccessInput({
+        title: "密钥类型",
+        value: "serviceAccount",
+        component: {
+            placeholder: "密钥类型",
+            name: "a-select",
+            vModel: "value",
+            options: [
+                { value: "serviceAccount", label: "服务账号密钥" },
+                { value: "apiKey", label: "ApiKey，暂不可用", disabled: true },
+            ],
+        },
+        helper: "密钥类型",
+        required: true,
+        encrypt: false,
+    }),
+    __metadata("design:type", Object)
+], GoogleAccess.prototype, "type", void 0);
+__decorate([
+    AccessInput({
+        title: "项目ID",
+        component: {
+            placeholder: "ProjectId",
+        },
+        helper: "ProjectId",
+        required: true,
+        encrypt: false,
+        mergeScript: `
+    return {
+      show:ctx.compute(({form})=>{
+        return form.access.type === 'apiKey'
+      })
+    }
+    `,
+    }),
+    __metadata("design:type", Object)
+], GoogleAccess.prototype, "projectId", void 0);
+__decorate([
+    AccessInput({
+        title: "ApiKey",
+        component: {
+            placeholder: "ApiKey",
+        },
+        helper: "不要选，目前没有用",
+        required: true,
+        encrypt: true,
+        mergeScript: `
+    return {
+      show:ctx.compute(({form})=>{
+        return form.access.type === 'apiKey'
+      })
+    }
+    `,
+    }),
+    __metadata("design:type", Object)
+], GoogleAccess.prototype, "apiKey", void 0);
+__decorate([
+    AccessInput({
+        title: "服务账号密钥",
+        component: {
+            placeholder: "serviceAccountSecret",
+            name: "a-textarea",
+            vModel: "value",
+            rows: 4,
+        },
+        helper: "[如何创建服务账号](https://cloud.google.com/iam/docs/service-accounts-create?hl=zh-CN) \n[获取密钥](https://console.cloud.google.com/iam-admin/serviceaccounts?hl=zh-cn)，点击详情，点击创建密钥，将下载json文件，把内容填在此处",
+        required: true,
+        encrypt: true,
+        mergeScript: `
+    return {
+      show:ctx.compute(({form})=>{
+        return form.access.type === 'serviceAccount'
+      })
+    }
+    `,
+    }),
+    __metadata("design:type", Object)
+], GoogleAccess.prototype, "serviceAccountSecret", void 0);
+__decorate([
+    AccessInput({
+        title: "https代理",
+        component: {
+            placeholder: "http://127.0.0.1:10811",
+        },
+        helper: "Google的请求需要走代理，如果不配置，则会使用环境变量中的全局HTTPS_PROXY配置\n或者服务器本身在海外，则不需要配置",
+        required: false,
+        encrypt: false,
+    }),
+    __metadata("design:type", Object)
+], GoogleAccess.prototype, "httpsProxy", void 0);
+GoogleAccess = __decorate([
+    IsAccess({
+        name: "google",
+        title: "google cloud",
+        desc: "谷歌云授权",
+    })
+], GoogleAccess);
+export { GoogleAccess };
+new GoogleAccess();
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ29vZ2xlLWFjY2Vzcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY2Nlc3MvZ29vZ2xlLWFjY2Vzcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsUUFBUSxFQUFFLFdBQVcsRUFBRSxVQUFVLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQU83RCxJQUFNLFlBQVksR0FBbEIsTUFBTSxZQUFhLFNBQVEsVUFBVTtJQWlCMUMsSUFBSSxHQUFHLEVBQUUsQ0FBQztJQWtCVixTQUFTLEdBQUcsRUFBRSxDQUFDO0lBa0JmLE1BQU0sR0FBRyxFQUFFLENBQUM7SUFzQlosb0JBQW9CLEdBQUcsRUFBRSxDQUFDO0lBVzFCLFVBQVUsR0FBRyxFQUFFLENBQUM7Q0FDakIsQ0FBQTtBQXRFQztJQWhCQyxXQUFXLENBQUM7UUFDWCxLQUFLLEVBQUUsTUFBTTtRQUNiLEtBQUssRUFBRSxnQkFBZ0I7UUFDdkIsU0FBUyxFQUFFO1lBQ1QsV0FBVyxFQUFFLE1BQU07WUFDbkIsSUFBSSxFQUFFLFVBQVU7WUFDaEIsTUFBTSxFQUFFLE9BQU87WUFDZixPQUFPLEVBQUU7Z0JBQ1AsRUFBRSxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsS0FBSyxFQUFFLFFBQVEsRUFBRTtnQkFDNUMsRUFBRSxLQUFLLEVBQUUsUUFBUSxFQUFFLEtBQUssRUFBRSxhQUFhLEVBQUUsUUFBUSxFQUFFLElBQUksRUFBRTthQUMxRDtTQUNGO1FBQ0QsTUFBTSxFQUFFLE1BQU07UUFDZCxRQUFRLEVBQUUsSUFBSTtRQUNkLE9BQU8sRUFBRSxLQUFLO0tBQ2YsQ0FBQzs7MENBQ1E7QUFrQlY7SUFoQkMsV0FBVyxDQUFDO1FBQ1gsS0FBSyxFQUFFLE1BQU07UUFDYixTQUFTLEVBQUU7WUFDVCxXQUFXLEVBQUUsV0FBVztTQUN6QjtRQUNELE1BQU0sRUFBRSxXQUFXO1FBQ25CLFFBQVEsRUFBRSxJQUFJO1FBQ2QsT0FBTyxFQUFFLEtBQUs7UUFDZCxXQUFXLEVBQUU7Ozs7OztLQU1aO0tBQ0YsQ0FBQzs7K0NBQ2E7QUFrQmY7SUFoQkMsV0FBVyxDQUFDO1FBQ1gsS0FBSyxFQUFFLFFBQVE7UUFDZixTQUFTLEVBQUU7WUFDVCxXQUFXLEVBQUUsUUFBUTtTQUN0QjtRQUNELE1BQU0sRUFBRSxXQUFXO1FBQ25CLFFBQVEsRUFBRSxJQUFJO1FBQ2QsT0FBTyxFQUFFLElBQUk7UUFDYixXQUFXLEVBQUU7Ozs7OztLQU1aO0tBQ0YsQ0FBQzs7NENBQ1U7QUFzQlo7SUFwQkMsV0FBVyxDQUFDO1FBQ1gsS0FBSyxFQUFFLFFBQVE7UUFDZixTQUFTLEVBQUU7WUFDVCxXQUFXLEVBQUUsc0JBQXNCO1lBQ25DLElBQUksRUFBRSxZQUFZO1lBQ2xCLE1BQU0sRUFBRSxPQUFPO1lBQ2YsSUFBSSxFQUFFLENBQUM7U0FDUjtRQUNELE1BQU0sRUFDSiw0TEFBNEw7UUFDOUwsUUFBUSxFQUFFLElBQUk7UUFDZCxPQUFPLEVBQUUsSUFBSTtRQUNiLFdBQVcsRUFBRTs7Ozs7O0tBTVo7S0FDRixDQUFDOzswREFDd0I7QUFXMUI7SUFUQyxXQUFXLENBQUM7UUFDWCxLQUFLLEVBQUUsU0FBUztRQUNoQixTQUFTLEVBQUU7WUFDVCxXQUFXLEVBQUUsd0JBQXdCO1NBQ3RDO1FBQ0QsTUFBTSxFQUFFLG1FQUFtRTtRQUMzRSxRQUFRLEVBQUUsS0FBSztRQUNmLE9BQU8sRUFBRSxLQUFLO0tBQ2YsQ0FBQzs7Z0RBQ2M7QUF0RkwsWUFBWTtJQUx4QixRQUFRLENBQUM7UUFDUixJQUFJLEVBQUUsUUFBUTtRQUNkLEtBQUssRUFBRSxjQUFjO1FBQ3JCLElBQUksRUFBRSxPQUFPO0tBQ2QsQ0FBQztHQUNXLFlBQVksQ0F1RnhCOztBQUVELElBQUksWUFBWSxFQUFFLENBQUMifQ==

package/dist/access/index.d.ts

@@ -1 +1,2 @@
 export * from "./eab-access.js";
+export * from "./google-access.js";

package/dist/access/index.js

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

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

@@ -1,4 +1,4 @@
-import { HttpClient, IAccess, ILogger, Registrable } from "@certd/pipeline";
+import { HttpClient, IAccess, ILogger, Registrable, utils } from "@certd/pipeline";
 export type DnsProviderDefine = Registrable & {
     accessType: string;
     autowire?: {
@@ -6,18 +6,21 @@ export type DnsProviderDefine = Registrable & {
     };
 };
 export type CreateRecordOptions = {
+    domain: string;
     fullRecord: string;
+    hostRecord: string;
     type: string;
     value: any;
-    domain: string;
 };
-export type RemoveRecordOptions<T> = CreateRecordOptions & {
-    record: T;
+export type RemoveRecordOptions<T> = {
+    recordReq: CreateRecordOptions;
+    recordRes: T;
 };
 export type DnsProviderContext = {
     access: IAccess;
     logger: ILogger;
     http: HttpClient;
+    utils: typeof utils;
 };
 export interface IDnsProvider<T = any> {
     onInstance(): Promise<void>;

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

@@ -6,3 +6,8 @@ export declare abstract class AbstractDnsProvider<T = any> implements IDnsProvid
     abstract onInstance(): Promise<void>;
     abstract removeRecord(options: RemoveRecordOptions<T>): Promise<void>;
 }
+export declare function parseDomain(fullDomain: string): string;
+export declare function createDnsProvider(opts: {
+    dnsProviderType: string;
+    context: DnsProviderContext;
+}): Promise<IDnsProvider>;

package/dist/dns-provider/base.js

@@ -1,7 +1,32 @@
+import psl from "psl";
+import { dnsProviderRegistry } from "./registry.js";
+import { Decorator } from "@certd/pipeline";
 export class AbstractDnsProvider {
     ctx;
     setCtx(ctx) {
         this.ctx = ctx;
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kbnMtcHJvdmlkZXIvYmFzZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxNQUFNLE9BQWdCLG1CQUFtQjtJQUN2QyxHQUFHLENBQXNCO0lBRXpCLE1BQU0sQ0FBQyxHQUF1QjtRQUM1QixJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQztJQUNqQixDQUFDO0NBT0YifQ==
+export function parseDomain(fullDomain) {
+    const parsed = psl.parse(fullDomain);
+    if (parsed.error) {
+        throw new Error(`解析${fullDomain}域名失败:` + JSON.stringify(parsed.error));
+    }
+    return parsed.domain;
+}
+export async function createDnsProvider(opts) {
+    const { dnsProviderType, context } = opts;
+    const dnsProviderPlugin = dnsProviderRegistry.get(dnsProviderType);
+    const DnsProviderClass = dnsProviderPlugin.target;
+    const dnsProviderDefine = dnsProviderPlugin.define;
+    if (dnsProviderDefine.deprecated) {
+        throw new Error(dnsProviderDefine.deprecated);
+    }
+    // @ts-ignore
+    const dnsProvider = new DnsProviderClass();
+    Decorator.inject(dnsProviderDefine.autowire, dnsProvider, context);
+    dnsProvider.setCtx(context);
+    await dnsProvider.onInstance();
+    return dnsProvider;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kbnMtcHJvdmlkZXIvYmFzZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEdBQUcsTUFBTSxLQUFLLENBQUM7QUFDdEIsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ3BELE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUU1QyxNQUFNLE9BQWdCLG1CQUFtQjtJQUN2QyxHQUFHLENBQXNCO0lBRXpCLE1BQU0sQ0FBQyxHQUF1QjtRQUM1QixJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQztJQUNqQixDQUFDO0NBT0Y7QUFFRCxNQUFNLFVBQVUsV0FBVyxDQUFDLFVBQWtCO0lBQzVDLE1BQU0sTUFBTSxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsVUFBVSxDQUFxQixDQUFDO0lBQ3pELElBQUksTUFBTSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ2pCLE1BQU0sSUFBSSxLQUFLLENBQUMsS0FBSyxVQUFVLE9BQU8sR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO0lBQ3pFLENBQUM7SUFDRCxPQUFPLE1BQU0sQ0FBQyxNQUFnQixDQUFDO0FBQ2pDLENBQUM7QUFFRCxNQUFNLENBQUMsS0FBSyxVQUFVLGlCQUFpQixDQUFDLElBQThEO0lBQ3BHLE1BQU0sRUFBRSxlQUFlLEVBQUUsT0FBTyxFQUFFLEdBQUcsSUFBSSxDQUFDO0lBQzFDLE1BQU0saUJBQWlCLEdBQUcsbUJBQW1CLENBQUMsR0FBRyxDQUFDLGVBQWUsQ0FBQyxDQUFDO0lBQ25FLE1BQU0sZ0JBQWdCLEdBQUcsaUJBQWlCLENBQUMsTUFBTSxDQUFDO0lBQ2xELE1BQU0saUJBQWlCLEdBQUcsaUJBQWlCLENBQUMsTUFBMkIsQ0FBQztJQUN4RSxJQUFJLGlCQUFpQixDQUFDLFVBQVUsRUFBRSxDQUFDO1FBQ2pDLE1BQU0sSUFBSSxLQUFLLENBQUMsaUJBQWlCLENBQUMsVUFBVSxDQUFDLENBQUM7SUFDaEQsQ0FBQztJQUNELGFBQWE7SUFDYixNQUFNLFdBQVcsR0FBaUIsSUFBSSxnQkFBZ0IsRUFBRSxDQUFDO0lBRXpELFNBQVMsQ0FBQyxNQUFNLENBQUMsaUJBQWlCLENBQUMsUUFBUSxFQUFFLFdBQVcsRUFBRSxPQUFPLENBQUMsQ0FBQztJQUNuRSxXQUFXLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQzVCLE1BQU0sV0FBVyxDQUFDLFVBQVUsRUFBRSxDQUFDO0lBQy9CLE9BQU8sV0FBVyxDQUFDO0FBQ3JCLENBQUMifQ==

package/dist/index.d.ts

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

package/dist/index.js

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

package/dist/libs/google.d.ts

@@ -0,0 +1,11 @@
+import { EabAccess, GoogleAccess } from "../access/index.js";
+import { ILogger } from "@certd/basic";
+export declare class GoogleClient {
+    access: GoogleAccess;
+    logger: ILogger;
+    constructor(opts: {
+        logger: ILogger;
+        access: GoogleAccess;
+    });
+    getEab(): Promise<EabAccess>;
+}

package/dist/libs/google.js

@@ -0,0 +1,59 @@
+import { EabAccess } from "../access/index.js";
+export class GoogleClient {
+    access;
+    logger;
+    constructor(opts) {
+        this.access = opts.access;
+        this.logger = opts.logger;
+    }
+    async getEab() {
+        // https://cloud.google.com/docs/authentication/api-keys-use#using-with-client-libs
+        const { v1 } = await import("@google-cloud/publicca");
+        // process.env.HTTPS_PROXY = "http://127.0.0.1:10811";
+        const access = this.access;
+        if (!access.serviceAccountSecret) {
+            throw new Error("服务账号密钥 不能为空");
+        }
+        const credentials = JSON.parse(access.serviceAccountSecret);
+        const client = new v1.PublicCertificateAuthorityServiceClient({ credentials });
+        const parent = `projects/${credentials.project_id}/locations/global`;
+        const externalAccountKey = {};
+        const request = {
+            parent,
+            externalAccountKey,
+        };
+        let envHttpsProxy = "";
+        try {
+            if (this.access.httpsProxy) {
+                //设置临时使用代理
+                envHttpsProxy = process.env.HTTPS_PROXY;
+                process.env.HTTPS_PROXY = this.access.httpsProxy;
+            }
+            this.logger.info("开始获取google eab授权");
+            const response = await client.createExternalAccountKey(request);
+            const { keyId, b64MacKey } = response[0];
+            const eabAccess = new EabAccess();
+            eabAccess.kid = keyId;
+            eabAccess.hmacKey = b64MacKey.toString();
+            this.logger.info(`google eab授权获取成功，kid: ${eabAccess.kid}`);
+            return eabAccess;
+        }
+        finally {
+            if (envHttpsProxy) {
+                process.env.HTTPS_PROXY = envHttpsProxy;
+            }
+        }
+    }
+}
+// const access = new GoogleAccess();
+// access.projectId = "hip-light-432411-d4";
+// access.serviceAccountSecret = `
+//
+//
+// `;
+// // process.env.HTTPS_PROXY = "http://127.0.0.1:10811";
+// const client = new GoogleClient(access);
+// client.getEab().catch((e) => {
+//   console.error(e);
+// });
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ29vZ2xlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xpYnMvZ29vZ2xlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQWdCLE1BQU0sb0JBQW9CLENBQUM7QUFHN0QsTUFBTSxPQUFPLFlBQVk7SUFDdkIsTUFBTSxDQUFlO0lBQ3JCLE1BQU0sQ0FBVTtJQUNoQixZQUFZLElBQStDO1FBQ3pELElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQztRQUMxQixJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUM7SUFDNUIsQ0FBQztJQUNELEtBQUssQ0FBQyxNQUFNO1FBQ1YsbUZBQW1GO1FBQ25GLE1BQU0sRUFBRSxFQUFFLEVBQUUsR0FBRyxNQUFNLE1BQU0sQ0FBQyx3QkFBd0IsQ0FBQyxDQUFDO1FBQ3RELHNEQUFzRDtRQUN0RCxNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDO1FBQzNCLElBQUksQ0FBQyxNQUFNLENBQUMsb0JBQW9CLEVBQUUsQ0FBQztZQUNqQyxNQUFNLElBQUksS0FBSyxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQ2pDLENBQUM7UUFDRCxNQUFNLFdBQVcsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO1FBRTVELE1BQU0sTUFBTSxHQUFHLElBQUksRUFBRSxDQUFDLHVDQUF1QyxDQUFDLEVBQUUsV0FBVyxFQUFFLENBQUMsQ0FBQztRQUMvRSxNQUFNLE1BQU0sR0FBRyxZQUFZLFdBQVcsQ0FBQyxVQUFVLG1CQUFtQixDQUFDO1FBQ3JFLE1BQU0sa0JBQWtCLEdBQUcsRUFBRSxDQUFDO1FBQzlCLE1BQU0sT0FBTyxHQUFHO1lBQ2QsTUFBTTtZQUNOLGtCQUFrQjtTQUNuQixDQUFDO1FBRUYsSUFBSSxhQUFhLEdBQUcsRUFBRSxDQUFDO1FBQ3ZCLElBQUksQ0FBQztZQUNILElBQUksSUFBSSxDQUFDLE1BQU0sQ0FBQyxVQUFVLEVBQUUsQ0FBQztnQkFDM0IsVUFBVTtnQkFDVixhQUFhLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUM7Z0JBQ3hDLE9BQU8sQ0FBQyxHQUFHLENBQUMsV0FBVyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDO1lBQ25ELENBQUM7WUFDRCxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO1lBQ3JDLE1BQU0sUUFBUSxHQUFHLE1BQU0sTUFBTSxDQUFDLHdCQUF3QixDQUFDLE9BQU8sQ0FBQyxDQUFDO1lBQ2hFLE1BQU0sRUFBRSxLQUFLLEVBQUUsU0FBUyxFQUFFLEdBQUcsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ3pDLE1BQU0sU0FBUyxHQUFHLElBQUksU0FBUyxFQUFFLENBQUM7WUFDbEMsU0FBUyxDQUFDLEdBQUcsR0FBRyxLQUFLLENBQUM7WUFDdEIsU0FBUyxDQUFDLE9BQU8sR0FBRyxTQUFTLENBQUMsUUFBUSxFQUFFLENBQUM7WUFDekMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMseUJBQXlCLFNBQVMsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDO1lBQzNELE9BQU8sU0FBUyxDQUFDO1FBQ25CLENBQUM7Z0JBQVMsQ0FBQztZQUNULElBQUksYUFBYSxFQUFFLENBQUM7Z0JBQ2xCLE9BQU8sQ0FBQyxHQUFHLENBQUMsV0FBVyxHQUFHLGFBQWEsQ0FBQztZQUMxQyxDQUFDO1FBQ0gsQ0FBQztJQUNILENBQUM7Q0FDRjtBQUVELHFDQUFxQztBQUNyQyw0Q0FBNEM7QUFDNUMsa0NBQWtDO0FBQ2xDLEVBQUU7QUFDRixFQUFFO0FBQ0YsS0FBSztBQUNMLHlEQUF5RDtBQUN6RCwyQ0FBMkM7QUFDM0MsaUNBQWlDO0FBQ2pDLHNCQUFzQjtBQUN0QixNQUFNIn0=

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

@@ -1,8 +1,22 @@
 import * as acme from "@certd/acme-client";
+import { ClientExternalAccountBindingOptions, UrlMapping } 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 CnameVerifyPlan = {
+    domain: string;
+    fullRecord: string;
+    dnsProvider: IDnsProvider;
+};
+export type DomainVerifyPlan = {
+    domain: string;
+    type: "cname" | "dns";
+    dnsProvider?: IDnsProvider;
+    cnameVerifyPlan?: Record<string, CnameVerifyPlan>;
+};
+export type DomainsVerifyPlan = {
+    [key: string]: DomainVerifyPlan;
+};
 export type CertInfo = {
     crt: string;
     key: string;
@@ -20,6 +34,7 @@ type AcmeServiceOptions = {
     eab?: ClientExternalAccountBindingOptions;
     skipLocalVerify?: boolean;
     useMappingProxy?: boolean;
+    reverseProxy?: string;
     privateKeyType?: PrivateKeyType;
     signal?: AbortSignal;
 };
@@ -36,23 +51,34 @@ export declare class AcmeService {
     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>;
+    challengeCreateFn(authz: any, challenge: any, keyAuthorization: string, dnsProvider: IDnsProvider, domainsVerifyPlan: DomainsVerifyPlan): Promise<{
+        recordReq: {
+            domain: string;
+            fullRecord: string;
+            hostRecord: string;
+            type: string;
+            value: string;
+        };
+        recordRes: any;
+        dnsProvider: IDnsProvider<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 recordReq
+     * @param recordRes
      * @param dnsProvider dnsProvider
      * @returns {Promise}
      */
-    challengeRemoveFn(authz: any, challenge: any, keyAuthorization: string, recordItem: any, dnsProvider: IDnsProvider): Promise<void>;
+    challengeRemoveFn(authz: any, challenge: any, keyAuthorization: string, recordReq: any, recordRes: any, dnsProvider: IDnsProvider): Promise<void>;
     order(options: {
         email: string;
         domains: string | string[];
-        dnsProvider: any;
+        dnsProvider?: any;
+        domainsVerifyPlan?: DomainsVerifyPlan;
         csrInfo: any;
         isTest?: boolean;
         privateKeyType?: string;