lkddi/certd
1
0
Fork 0
mirror of https://github.com/certd/certd.git synced 2026-06-14 21:27:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: 优化代码格式

Browse Source
This commit is contained in:
xiaojunnuo
2026-06-14 20:59:38 +08:00
parent a3a215b7ae
commit e913fe509c
13 changed files with 202 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/ui/certd-server/src/configuration.ts
-2
View File
@@ -134,7 +134,5 @@ export class MainConfiguration {
});
logger.info("当前环境：", this.app.getEnv()); // prod
}
}
packages/ui/certd-server/src/modules/auto/fix/legacy-acme-account-access-fix.ts
+7 -7
View File
@@ -98,17 +98,17 @@ export class LegacyAcmeAccountAccessFix {
continue;
}
const name = buildAcmeAccountAccessName(parsedKey.caType, parsedKey.email);
const query = {
userId: record.userId,
type: "acmeAccount",
subtype: parsedKey.caType,
name,
} as any
const query = {
userId: record.userId,
type: "acmeAccount",
subtype: parsedKey.caType,
name,
} as any;
if (record.projectId) {
query.projectId = record.projectId;
}
const exists = await this.accessService.findOne({
where:query,
where: query,
});
if (exists) {
continue;
packages/ui/certd-server/src/modules/cert/service/cert-apply-template-service.test.ts
+1 -4
View File
@@ -192,10 +192,7 @@ describe("CertApplyTemplateService", () => {
await service.setDefault(2, 10, null);
assert.deepEqual((service as any).updateWhereList, [
{ userId: 10 },
{ userId: 10, id: 2 },
]);
assert.deepEqual((service as any).updateWhereList, [{ userId: 10 }, { userId: 10, id: 2 }]);
assert.equal(list[0].isDefault, false);
assert.equal(list[1].isDefault, true);
assert.equal(list[2].isDefault, false);
packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
+11 -24
View File
@@ -897,13 +897,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
if (param.projectId != null) {
query.projectId = param.projectId;
}
const statusCount = await this.repository
.createQueryBuilder()
.select("status")
.addSelect("count(1)", "count")
.where(query)
.groupBy("status")
.getRawMany();
const statusCount = await this.repository.createQueryBuilder().select("status").addSelect("count(1)", "count").where(query).groupBy("status").getRawMany();
return statusCount;
}
@@ -915,13 +909,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
if (param.projectId != null) {
query.projectId = param.projectId;
}
const statusCount = await this.repository
.createQueryBuilder()
.select("disabled")
.addSelect("count(1)", "count")
.where(query)
.groupBy("disabled")
.getRawMany();
const statusCount = await this.repository.createQueryBuilder().select("disabled").addSelect("count(1)", "count").where(query).groupBy("disabled").getRawMany();
const result = {
enabled: 0,
disabled: 0,
@@ -1115,14 +1103,12 @@ export class PipelineService extends BaseService<PipelineEntity> {
},
});
for (const item of list) {
const pipeline = JSON.parse(item.content);
if (trigger.props === false) {
//清除trigger
pipeline.triggers = [];
} else {
const start = dayjs().format("YYYY-MM-DD") + " " + trigger.randomRange[0];
let end = dayjs().format("YYYY-MM-DD") + " " + trigger.randomRange[1];
if (trigger.randomRange[1] < trigger.randomRange[0]) {
@@ -1137,19 +1123,20 @@ export class PipelineService extends BaseService<PipelineEntity> {
//随机时间
const randomTime = Math.floor(Math.random() * (endTime - startTime)) + startTime;
const time = dayjs(randomTime).format(" ss:mm:HH").replaceAll(":", " ").replaceAll(" 0", " ").trim();
set(triggerConf, "props.cron", `${time} * * *`)
set(triggerConf, "props.cron", `${time} * * *`);
}
delete triggerConf.random
delete triggerConf.random;
delete triggerConf.randomRange;
pipeline.triggers = [{
id: nanoid(),
title: "定时触发",
...triggerConf
}];
pipeline.triggers = [
{
id: nanoid(),
title: "定时触发",
...triggerConf,
},
];
}
await this.doUpdatePipelineJson(item, pipeline);
}
}
async batchUpdateNotifications(ids: number[], notification: Notification, userId: any, projectId?: number) {
packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-apig/index.ts
+3 -3
View File
@@ -78,8 +78,8 @@ export class DeployCertToAliyunApig extends AbstractTaskPlugin {
action: DeployCertToAliyunApig.prototype.onGetDomainList.name,
watches: ["region", "accessId", "gatewayType"],
required: true,
pager:true,
search:true,
pager: true,
search: true,
})
)
domainList!: string[];
@@ -196,7 +196,7 @@ export class DeployCertToAliyunApig extends AbstractTaskPlugin {
throw new Error("请选择网关类型");
}
const pager = new Pager(data);
const pager = new Pager(data);
const access = await this.getAccess<AliyunAccess>(this.accessId);
const client = access.getClient(this.regionEndpoint);
packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-apigateway/index.ts
+1 -1
View File
@@ -69,7 +69,7 @@ export class DeployCertToAliyunApiGateway extends AbstractTaskPlugin {
action: DeployCertToAliyunApiGateway.prototype.onGetGroupList.name,
watches: ["regionEndpoint", "accessId"],
required: true,
single:true
single: true,
})
)
groupId!: string;
packages/ui/certd-server/src/plugins/plugin-aws/libs/aws-client.ts
+1 -4
View File
@@ -33,10 +33,7 @@ export class AwsClient {
// Split the full PEM chain: first block is the leaf cert, the rest is the intermediate chain
const pemBlocks = certInfo.crt.split(/(?<=-----END CERTIFICATE-----)/);
const cert = pemBlocks[0].trim();
const chain = pemBlocks
.slice(1)
.join("")
.trim();
const chain = pemBlocks.slice(1).join("").trim();
// 构建上传参数
const data = await acmClient.send(
packages/ui/certd-server/src/plugins/plugin-cert/access/acme-account-access.ts
+3 -4
View File
@@ -144,10 +144,10 @@ export class AcmeAccountAccess extends BaseAccess {
action: "GenerateAccount",
buttonText: "生成ACME账号",
successMessage: "ACME账号已生成，请保存授权配置",
type:"textarea",
rows:4,
type: "textarea",
rows: 4,
},
col:{span:24},
col: { span: 24 },
required: true,
helper: "请生成ACME账号，账号一旦生成不允许修改",
encrypt: true,
@@ -170,7 +170,6 @@ export class AcmeAccountAccess extends BaseAccess {
required: false,
helper: "是否开启修改ACME账号，注意，开启后，会影响DNS持久验证记录",
encrypt: false,
})
editAccount = false;
packages/ui/certd-server/src/plugins/plugin-dynadot/access.ts
+78 -37
View File
@@ -1,6 +1,13 @@
import { AccessInput, BaseAccess, IsAccess, PageRes, PageSearch } from "@certd/pipeline";
import { AccessInput, BaseAccess, IsAccess, PageRes, PageSearch, Pager } from "@certd/pipeline";
import { DomainRecord } from "@certd/plugin-lib";
import { merge } from "lodash-es";
import { createHmac } from "crypto";
export type RequestOptions = {
method: "GET" | "POST" | "PUT" | "DELETE";
path: string;
params?: Record<string, any>;
data?: any;
};
@IsAccess({
name: "dynadot",
@@ -20,6 +27,19 @@ export class DynadotAccess extends BaseAccess {
})
apiKey = "";
@AccessInput({
title: "API Secret",
component: {
name: "a-input-password",
vModel: "value",
placeholder: "api secret",
},
helper: "前往 [Dynadot API设置](https://www.dynadot.cn/zh/account/domain/setting/api.html) 获取API Secret",
required: true,
encrypt: true,
})
apiSecret = "";
@AccessInput({
title: "测试",
component: {
@@ -39,20 +59,25 @@ export class DynadotAccess extends BaseAccess {
}
async getDomainListPage(req: PageSearch): Promise<PageRes<DomainRecord>> {
const params: any = {
command: "list_domain",
key: this.apiKey,
const pager = new Pager(req);
const params: Record<string, any> = {
page: pager.pageNo,
page_size: pager.pageSize,
};
if (req.searchKey) {
params.search = req.searchKey;
}
const res = await this.doRequest(params);
const res = await this.doRequest({
method: "GET",
path: "/restful/v2/domains",
params,
});
const domains = res.ListDomainResponse?.DomainList || [];
const list = domains.map((item: any) => ({
id: item.Name || item.DomainName,
domain: item.Name || item.DomainName,
const domainList = res.data?.domain_info_list || [];
const list = domainList.map((item: any) => ({
id: item.domain_name,
domain: item.domain_name,
}));
return {
@@ -61,40 +86,56 @@ export class DynadotAccess extends BaseAccess {
};
}
async doRequest(params: any = null) {
params = merge(
{
key: this.apiKey,
},
params
);
const res = await this.ctx.http.request<any, any>({
url: "/api3.json",
baseURL: "https://api.dynadot.com",
method: "get",
params,
headers: {
"Content-Type": "application/json",
},
});
async doRequest(opts: RequestOptions): Promise<any> {
const { method, path, params, data } = opts;
this.checkApiError(res);
return res;
const queryString = params ? "?" + new URLSearchParams(params).toString() : "";
const fullPath = path + queryString;
const body = data ? JSON.stringify(data) : "";
const headers: Record<string, string> = {
"Content-Type": "application/json",
Accept: "application/json",
Authorization: `Bearer ${this.apiKey}`,
"X-Signature": this.generateSignature(fullPath, body),
};
try {
const res = await this.ctx.http.request<any, any>({
url: fullPath,
baseURL: "https://api.dynadot.com",
method,
data: body || undefined,
headers,
});
this.checkApiError(res);
return res;
} catch (e: any) {
if (e.response?.data) {
const errData = e.response.data;
this.ctx.logger.error("Dynadot API返回错误:", JSON.stringify(errData));
throw new Error(`Dynadot API错误: ${errData.message || JSON.stringify(errData)}`);
}
throw e;
}
}
private generateSignature(fullPathAndQuery: string, body: string): string {
const stringToSign = this.apiKey + "\n" + fullPathAndQuery + "\n\n" + body;
const hmac = createHmac("sha256", this.apiSecret);
hmac.update(stringToSign, "utf8");
return hmac.digest("base64");
}
private checkApiError(res: any) {
if (!res || typeof res !== "object") {
return;
}
for (const key of Object.keys(res)) {
const value = res[key];
if (value && typeof value === "object" && "ResponseCode" in value) {
const code = value.ResponseCode;
if (code !== 0 && code !== "0") {
const errorMsg = value.Error || value.Status || JSON.stringify(value);
throw new Error(`Dynadot API错误: ${errorMsg}`);
}
}
const code = res.code;
if (code !== undefined && code !== null && code !== 200) {
const errorMsg = res.message || JSON.stringify(res);
throw new Error(`Dynadot API错误: ${errorMsg}`);
}
}
}
packages/ui/certd-server/src/plugins/plugin-dynadot/dns-provider.ts
+90 -114
View File
@@ -3,11 +3,14 @@ import { AbstractDnsProvider, CreateRecordOptions, DomainRecord, IsDnsProvider,
import { DynadotAccess } from "./access.js";
export type DynadotRecord = {
subdomain: string;
sub_record_type: string;
sub_record: string;
sub_host: string;
record_type: string;
record_value1: string;
};
type SubRecordItem = DynadotRecord & { record_value2: string };
type MainRecordItem = { record_type: string; record_value1: string; record_value2: string };
@IsDnsProvider({
name: "dynadot",
title: "Dynadot",
@@ -27,43 +30,22 @@ export class DynadotDnsProvider extends AbstractDnsProvider<DynadotRecord> {
this.logger.info("添加域名解析：", fullRecord, value, type, domain);
try {
const existingRecords = await this.getDnsRecords(domain);
const subdomainIndex = existingRecords.subRecords.length;
const subRecords = [
{
sub_host: hostRecord,
record_type: type.toLowerCase(),
record_value1: value,
record_value2: "",
}
]
const setParams: any = {
command: "set_dns2",
domain,
key: this.access.apiKey,
};
for (let i = 0; i < existingRecords.mainRecords.length; i++) {
const rec = existingRecords.mainRecords[i];
setParams[`main_record_type${i}`] = rec.type;
setParams[`main_record${i}`] = rec.value;
setParams[`main_recordx${i}`] = rec.extra || "";
}
for (let i = 0; i < existingRecords.subRecords.length; i++) {
const rec = existingRecords.subRecords[i];
setParams[`subdomain${i}`] = rec.subdomain;
setParams[`sub_record_type${i}`] = rec.type;
setParams[`sub_record${i}`] = rec.value;
setParams[`sub_recordx${i}`] = rec.extra || "";
}
setParams[`subdomain${subdomainIndex}`] = hostRecord;
setParams[`sub_record_type${subdomainIndex}`] = type;
setParams[`sub_record${subdomainIndex}`] = value;
setParams[`sub_recordx${subdomainIndex}`] = "";
setParams.ttl = 600;
await this.access.doRequest(setParams);
await this.postRecords(domain, {subRecords, mainRecords: [], addToCurrent: true});
this.logger.info("添加域名解析成功：", fullRecord, value);
return {
subdomain: hostRecord,
sub_record_type: type,
sub_record: value,
sub_host: hostRecord,
record_type: type.toLowerCase(),
record_value1: value,
};
} catch (error) {
this.logger.error("创建DNS记录失败:", error);
@@ -76,47 +58,37 @@ export class DynadotDnsProvider extends AbstractDnsProvider<DynadotRecord> {
const record = options.recordRes;
this.logger.info("删除域名解析：", fullRecord, value);
try {
if (!record || !record.subdomain) {
this.logger.info("record为空，不执行删除");
return;
}
const existingRecords = await this.getDnsRecords(domain);
const setParams: any = {
command: "set_dns2",
domain,
key: this.access.apiKey,
};
for (let i = 0; i < existingRecords.mainRecords.length; i++) {
const rec = existingRecords.mainRecords[i];
setParams[`main_record_type${i}`] = rec.type;
setParams[`main_record${i}`] = rec.value;
setParams[`main_recordx${i}`] = rec.extra || "";
}
let newIndex = 0;
for (let i = 0; i < existingRecords.subRecords.length; i++) {
const rec = existingRecords.subRecords[i];
if (rec.subdomain === record.subdomain && rec.type === record.sub_record_type && rec.value === record.sub_record) {
continue;
}
setParams[`subdomain${newIndex}`] = rec.subdomain;
setParams[`sub_record_type${newIndex}`] = rec.type;
setParams[`sub_record${newIndex}`] = rec.value;
setParams[`sub_recordx${newIndex}`] = rec.extra || "";
newIndex++;
}
setParams.ttl = 600;
await this.access.doRequest(setParams);
this.logger.info("删除域名解析成功:", fullRecord, value);
} catch (error) {
this.logger.error("删除DNS记录失败:", error);
if (!record || !record.sub_host) {
this.logger.info("record为空，不执行删除");
return;
}
const existingRecords = await this.getDnsRecords(domain);
const beforeCount = existingRecords.subRecords.length;
existingRecords.subRecords = existingRecords.subRecords.filter(item => !(item.sub_host === record.sub_host && item.record_type === record.record_type && item.record_value1 === record.record_value1));
if (beforeCount === existingRecords.subRecords.length) {
this.logger.info("未找到要删除的DNS记录，可能已被移除或不存在:", fullRecord);
return;
}
if (existingRecords.mainRecords.length == 0) {
existingRecords.mainRecords = [
{
record_type: "txt",
record_value1: "init_txt_by_certd",
record_value2: "",
}
]
}
await this.postRecords(domain, {
...existingRecords,
addToCurrent: false,
});
this.logger.info("删除域名解析成功:", fullRecord, value);
}
async getDomainListPage(req: PageSearch): Promise<PageRes<DomainRecord>> {
@@ -124,50 +96,54 @@ export class DynadotDnsProvider extends AbstractDnsProvider<DynadotRecord> {
}
private async getDnsRecords(domain: string): Promise<{
mainRecords: Array<{ type: string; value: string; extra: string }>;
subRecords: Array<{ subdomain: string; type: string; value: string; extra: string }>;
mainRecords: MainRecordItem[];
subRecords: SubRecordItem[];
}> {
const res = await this.access.doRequest({
command: "get_dns",
domain,
});
const dnsContent = res.GetDnsResponse?.DnsContent || res.GetDnsResponse?.dnsContent || {};
const mainRecords: Array<{ type: string; value: string; extra: string }> = [];
const subRecords: Array<{ subdomain: string; type: string; value: string; extra: string }> = [];
const MAX_MAIN = 20;
const MAX_SUB = 100;
for (let i = 0; i < MAX_MAIN; i++) {
const type = dnsContent[`MainRecordType${i}`];
const value = dnsContent[`MainRecord${i}`];
if (value !== undefined && value !== null && value !== "") {
mainRecords.push({
type: type || "",
value: String(value),
extra: String(dnsContent[`MainRecordX${i}`] || ""),
});
}
let res: any;
try {
res = await this.access.doRequest({
method: "GET",
path: `/restful/v2/domains/${domain}/records`,
});
} catch (e: any) {
this.logger.info("获取DNS记录失败，域名可能尚未配置DNS记录，将视为空记录:");
return { mainRecords: [], subRecords: [] };
}
for (let i = 0; i < MAX_SUB; i++) {
const subdomain = dnsContent[`SubDomain${i}`];
const type = dnsContent[`SubRecordType${i}`];
const value = dnsContent[`SubRecord${i}`];
if (value !== undefined && value !== null && value !== "" && subdomain !== undefined && subdomain !== null && subdomain !== "") {
subRecords.push({
subdomain: String(subdomain),
type: type || "",
value: String(value),
extra: String(dnsContent[`SubRecordX${i}`] || ""),
});
}
}
const glueInfo = res.data?.glue_info || {};
const subRecords: SubRecordItem[] = (glueInfo.dns_sub_list || [])
.filter((item: any) => item.sub_host && item.record_value1)
.map((item: any) => ({
sub_host: item.sub_host || "",
record_type: item.record_type || "",
record_value1: item.record_value1 || "",
record_value2: item.record_value2 || "",
}));
const mainRecords: MainRecordItem[] = (glueInfo.dns_main_list || [])
.filter((item: any) => item.record_value1)
.map((item: any) => ({
record_type: item.record_type || "",
record_value1: String(item.record_value1),
record_value2: String(item.record_value2 || ""),
}));
return { mainRecords, subRecords };
}
private async postRecords(domain: string, records: { mainRecords: MainRecordItem[]; subRecords: SubRecordItem[] ,addToCurrent: boolean}): Promise<void> {
await this.access.doRequest({
method: "POST",
path: `/restful/v2/domains/${domain}/records`,
data: {
dns_main_list: records.mainRecords,
dns_sub_list: records.subRecords,
ttl: 300,
add_dns_to_current_setting: records.addToCurrent || false,
},
});
}
}
new DynadotDnsProvider();
packages/ui/certd-server/src/plugins/plugin-hipmdnsmgr/access/hipmdnsmgr-access.ts
+4 -4
View File
@@ -53,12 +53,12 @@ export class HipmDnsmgrAccess extends BaseAccess {
*/
async getDomainId(domainName: string): Promise<string> {
this.ctx.logger.info(`[HiPM DNSMgr] 尝试通过keyword查询域名: ${domainName}`);
// 方案1: 使用 keyword 参数直接查询
try {
const resp = await this.doRequest({
method: 'GET',
path: '/domains',
method: "GET",
path: "/domains",
params: {
page: 1,
pageSize: 1,
@@ -80,7 +80,7 @@ export class HipmDnsmgrAccess extends BaseAccess {
// 方案2: 如果 keyword 查询未找到，使用列表匹配作为冗余
this.ctx.logger.info(`[HiPM DNSMgr] keyword查询未找到，尝试列表匹配: ${domainName}`);
const domainList = await this.getDomainList();
const domainInfo = domainList.find((item: any) => item.domain === domainName);
packages/ui/certd-server/src/plugins/plugin-hipmdnsmgr/dns-provider/hipmdnsmgr-dns-provider.ts
+1 -1
View File
@@ -29,7 +29,7 @@ export class HipmDnsmgrDnsProvider extends AbstractDnsProvider<{ domainId: strin
// 1. 获取域名 ID（双层查询策略）
const domainId = await this.access.getDomainId(domain);
this.logger.debug('[HiPM DNSMgr] 找到域名:', domain, 'ID:', domainId);
this.logger.debug("[HiPM DNSMgr] 找到域名:", domain, "ID:", domainId);
// 2. 创建 DNS 记录
const name = hostRecord; // 使用子域名，如 _acme-challenge
packages/ui/certd-server/src/plugins/plugin-volcengine/plugins/plugin-deploy-to-vke.ts
+2 -3
View File
@@ -21,7 +21,7 @@ const regionOptions = [
icon: "svg:icon-volcengine",
group: pluginGroups.volcengine.key,
desc: "替换火山引擎VKE集群中的TLS Secret证书",
needPlus:true,
needPlus: true,
default: {
strategy: {
runStrategy: RunStrategy.SkipWhenSucceed,
@@ -495,7 +495,6 @@ export class VolcengineDeployToVKE extends AbstractPlusTaskPlugin {
await this.deleteKubeconfig(vkeService, kubeconfigId);
}
}
}
new VolcengineDeployToVKE();
new VolcengineDeployToVKE();