@certd/plugin-cert 1.20.9 → 1.20.12

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

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

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

@@ -0,0 +1,8 @@
+import { CreateRecordOptions, DnsProviderContext, IDnsProvider, RemoveRecordOptions } from "./api";
+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/d/dns-provider/index.d.ts

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

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

@@ -1,6 +1,6 @@
 import * as acme from "@certd/acme-client";
 import { Logger } from "log4js";
-import { IContext } from "@certd/pipeline/src/core/context";
+import { IContext } from "@certd/pipeline";
 import { IDnsProvider } from "../../dns-provider";
 export type CertInfo = {
     crt: string;
@@ -19,6 +19,7 @@ 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>;
     /**
      * Function used to remove an ACME challenge response

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

@@ -11,7 +11,7 @@ export declare class CertApplyPlugin extends AbstractTaskPlugin {
     dnsProviderAccess: string;
     renewDays: number;
     forceUpdate: string;
-    csrInfo: any;
+    csrInfo: string;
     acme: AcmeService;
     logger: Logger;
     userContext: IContext;
@@ -21,11 +21,10 @@ export declare class CertApplyPlugin extends AbstractTaskPlugin {
     cert?: CertInfo;
     onInstance(): Promise<void>;
     execute(): Promise<void>;
-    output(cert: CertInfo): Promise<void>;
-    zipCert(cert: CertInfo): Promise<void>;
+    output(certReader: CertReader): Promise<void>;
+    zipCert(cert: CertInfo, applyTime: string): Promise<void>;
     /**
      * 是否更新证书
-     * @param input
      */
     condition(): Promise<CertReader | null>;
     doCertApply(): Promise<CertReader>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-cert",
   "private": false,
-  "version": "1.20.9",
+  "version": "1.20.12",
   "main": "./dist/bundle.js",
   "module": "./dist/bundle.mjs",
   "types": "./dist/d/index.d.ts",
@@ -12,10 +12,11 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/acme-client": "^1.20.9",
-    "@certd/pipeline": "^1.20.9",
+    "@certd/acme-client": "^1.20.12",
+    "@certd/pipeline": "^1.20.12",
     "jszip": "^3.10.1",
-    "node-forge": "^0.10.0"
+    "node-forge": "^0.10.0",
+    "psl": "^1.9.0"
   },
   "devDependencies": {
     "@alicloud/cs20151215": "^3.0.3",
@@ -30,6 +31,7 @@
     "@types/lodash": "^4.14.186",
     "@types/mocha": "^10.0.0",
     "@types/node-forge": "^1.3.0",
+    "@types/psl": "^1.1.3",
     "@typescript-eslint/eslint-plugin": "^5.38.1",
     "@typescript-eslint/parser": "^5.38.1",
     "chai": "^4.3.6",
@@ -51,5 +53,5 @@
     "vite": "^3.1.0",
     "vue-tsc": "^0.38.9"
   },
-  "gitHead": "adf569eb62540ce74e091b0d7a55706d959a5e0d"
+  "gitHead": "eed265faf11b72c19fd71a3084aa4d623693002c"
 }