This commit is contained in:
xiaojunnuo
2024-11-01 02:13:34 +08:00
parent 5160b9fbd6
commit dc9040a68e
25 changed files with 65 additions and 279 deletions

View File

@@ -60,8 +60,8 @@ export class AcmeService {
this.sslProvider = options.sslProvider || "letsencrypt";
this.eab = options.eab;
this.skipLocalVerify = options.skipLocalVerify ?? false;
acme.setLogger((text: string) => {
this.logger.info(text);
acme.setLogger((...text: any) => {
this.logger.info(...text);
});
}

View File

@@ -7,6 +7,7 @@ import { CertReader } from "./cert-reader.js";
import { CertApplyBasePlugin } from "./base.js";
import { GoogleClient } from "../../libs/google.js";
import { EabAccess } from "../../access";
import { CancelError } from "@certd/pipeline";
export type { CertInfo };
export * from "./cert-reader.js";
@@ -293,6 +294,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
useMappingProxy: this.useProxy,
reverseProxy: this.reverseProxy,
privateKeyType: this.privateKeyType,
signal: this.ctx.signal,
// cnameProxyService: this.ctx.cnameProxyService,
// dnsProviderCreator: this.createDnsProvider.bind(this),
});
@@ -347,6 +349,9 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
this.logger.error(e);
throw new Error(`通配符域名已经包含了普通域名,请删除其中一个(${message}`);
}
if (e.name === "CancelError") {
throw new CancelError(e.message);
}
throw e;
}
}