Compare commits

...

8 Commits

Author SHA1 Message Date
xiaojunnuo 74400aacc6 chore: 敏感数据隐藏输出 2026-02-06 16:49:19 +08:00
xiaojunnuo 9f55c3605a chore: 1 2026-02-06 16:36:57 +08:00
xiaojunnuo 8d61e8179f chore: 1 2026-02-06 16:29:53 +08:00
xiaojunnuo f250889c3e Merge branch 'v2-dev' of https://github.com/certd/certd into v2-dev 2026-02-06 16:26:32 +08:00
xiaojunnuo 00f67d86d6 perf: 优化申请证书最大超时时长 2026-02-06 16:26:26 +08:00
xiaojunnuo 5b580d2a17 build: release 2026-02-05 17:12:31 +08:00
xiaojunnuo 083dd7d1a3 build: publish 2026-02-05 16:32:10 +08:00
xiaojunnuo 03bd4755ce build: trigger build image 2026-02-05 16:31:58 +08:00
19 changed files with 45 additions and 17 deletions
+12
View File
@@ -3,6 +3,18 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.38.7](https://github.com/certd/certd/compare/v1.38.6...v1.38.7) (2026-02-05)
### Bug Fixes
* 修复有域名记录时,域名输入框无法关闭的bug ([54c8217](https://github.com/certd/certd/commit/54c8217808453b121abf646b004596f28932509f))
### Performance Improvements
* eab从更多参数中挪到外面 ([5ea4f46](https://github.com/certd/certd/commit/5ea4f46de7ae403a7a16e9488dc1d9c7523d019a))
* 第三方登录支持Microsoft ([beb7a4c](https://github.com/certd/certd/commit/beb7a4c99277262bb9681c5594cfcd3e36c52074))
* 优化zerossl申请证书稳定性 ([4d86fb3](https://github.com/certd/certd/commit/4d86fb319b81dbf6fa6485982105725b1b066593))
## [1.38.6](https://github.com/certd/certd/compare/v1.38.5...v1.38.6) (2026-02-04) ## [1.38.6](https://github.com/certd/certd/compare/v1.38.5...v1.38.6) (2026-02-04)
### Bug Fixes ### Bug Fixes
+1 -1
View File
@@ -70,5 +70,5 @@
"bugs": { "bugs": {
"url": "https://github.com/publishlab/node-acme-client/issues" "url": "https://github.com/publishlab/node-acme-client/issues"
}, },
"gitHead": "1368259a1e780486204e9d814c88a741a373dcca" "gitHead": "29d37075dd600fa4898c5e38611e09db522e32fc"
} }
+4 -1
View File
@@ -601,7 +601,10 @@ class AcmeClient {
}; };
this.log(`[${d}] Waiting for valid status (等待valid状态): ${item.url}`, JSON.stringify(this.backoffOpts)); this.log(`[${d}] Waiting for valid status (等待valid状态): ${item.url}`, JSON.stringify(this.backoffOpts));
return util.retry(verifyFn, this.backoffOpts); const log = (...args)=>{
this.logger.info(...args)
}
return util.retry(verifyFn, this.backoffOpts,log);
} }
/** /**
+8 -2
View File
@@ -52,11 +52,17 @@ async function retryPromise(fn, attempts, backoff, logger = log) {
let aborted = false; let aborted = false;
try { try {
const data = await fn(() => { aborted = true; }); const setAbort = () => { aborted = true; }
const data = await fn(setAbort);
return data; return data;
} }
catch (e) { catch (e) {
if (aborted || ((backoff.attempts + 1) >= attempts)) { if (aborted){
logger(`用户取消重试`);
throw e;
}
if ( ((backoff.attempts + 1) >= attempts)) {
logger(`重试次数超过${attempts}`);
throw e; throw e;
} }
+1 -1
View File
@@ -47,5 +47,5 @@
"tslib": "^2.8.1", "tslib": "^2.8.1",
"typescript": "^5.4.2" "typescript": "^5.4.2"
}, },
"gitHead": "1368259a1e780486204e9d814c88a741a373dcca" "gitHead": "29d37075dd600fa4898c5e38611e09db522e32fc"
} }
@@ -77,6 +77,8 @@ export type ILogger = {
fatal(message: any, ...args: any[]): void; fatal(message: any, ...args: any[]): void;
mark(message: any, ...args: any[]): void; mark(message: any, ...args: any[]): void;
addSecret(secret: string): void;
}; };
const locale = Intl.DateTimeFormat().resolvedOptions().locale; const locale = Intl.DateTimeFormat().resolvedOptions().locale;
@@ -106,10 +108,14 @@ export class PipelineLogger implements ILogger {
constructor(name: string, write: (text: string) => void) { constructor(name: string, write: (text: string) => void) {
this.customWriter = write; this.customWriter = write;
//@ts-ignore
this.logger = log4js.getLogger(name); this.logger = log4js.getLogger(name);
} }
addSecret(secret: string) { addSecret(secret: string) {
if (!secret) {
return;
}
this._secrets.push(secret); this._secrets.push(secret);
} }
+1 -1
View File
@@ -45,5 +45,5 @@
"tslib": "^2.8.1", "tslib": "^2.8.1",
"typescript": "^5.4.2" "typescript": "^5.4.2"
}, },
"gitHead": "1368259a1e780486204e9d814c88a741a373dcca" "gitHead": "29d37075dd600fa4898c5e38611e09db522e32fc"
} }
+1 -1
View File
@@ -24,5 +24,5 @@
"prettier": "^2.8.8", "prettier": "^2.8.8",
"tslib": "^2.8.1" "tslib": "^2.8.1"
}, },
"gitHead": "1368259a1e780486204e9d814c88a741a373dcca" "gitHead": "29d37075dd600fa4898c5e38611e09db522e32fc"
} }
+1 -1
View File
@@ -31,5 +31,5 @@
"tslib": "^2.8.1", "tslib": "^2.8.1",
"typescript": "^5.4.2" "typescript": "^5.4.2"
}, },
"gitHead": "1368259a1e780486204e9d814c88a741a373dcca" "gitHead": "29d37075dd600fa4898c5e38611e09db522e32fc"
} }
+1 -1
View File
@@ -56,5 +56,5 @@
"fetch" "fetch"
] ]
}, },
"gitHead": "1368259a1e780486204e9d814c88a741a373dcca" "gitHead": "29d37075dd600fa4898c5e38611e09db522e32fc"
} }
+1 -1
View File
@@ -32,5 +32,5 @@
"tslib": "^2.8.1", "tslib": "^2.8.1",
"typescript": "^5.4.2" "typescript": "^5.4.2"
}, },
"gitHead": "1368259a1e780486204e9d814c88a741a373dcca" "gitHead": "29d37075dd600fa4898c5e38611e09db522e32fc"
} }
+1 -1
View File
@@ -64,5 +64,5 @@
"typeorm": "^0.3.11", "typeorm": "^0.3.11",
"typescript": "^5.4.2" "typescript": "^5.4.2"
}, },
"gitHead": "1368259a1e780486204e9d814c88a741a373dcca" "gitHead": "29d37075dd600fa4898c5e38611e09db522e32fc"
} }
+1 -1
View File
@@ -46,5 +46,5 @@
"typeorm": "^0.3.11", "typeorm": "^0.3.11",
"typescript": "^5.4.2" "typescript": "^5.4.2"
}, },
"gitHead": "1368259a1e780486204e9d814c88a741a373dcca" "gitHead": "29d37075dd600fa4898c5e38611e09db522e32fc"
} }
+1 -1
View File
@@ -38,5 +38,5 @@
"tslib": "^2.8.1", "tslib": "^2.8.1",
"typescript": "^5.4.2" "typescript": "^5.4.2"
}, },
"gitHead": "1368259a1e780486204e9d814c88a741a373dcca" "gitHead": "29d37075dd600fa4898c5e38611e09db522e32fc"
} }
+1 -1
View File
@@ -57,5 +57,5 @@
"tslib": "^2.8.1", "tslib": "^2.8.1",
"typescript": "^5.4.2" "typescript": "^5.4.2"
}, },
"gitHead": "1368259a1e780486204e9d814c88a741a373dcca" "gitHead": "29d37075dd600fa4898c5e38611e09db522e32fc"
} }
@@ -147,7 +147,7 @@ export class AcmeService {
externalAccountBinding: this.eab, externalAccountBinding: this.eab,
backoffAttempts: this.options.maxCheckRetryCount || 20, backoffAttempts: this.options.maxCheckRetryCount || 20,
backoffMin: 5000, backoffMin: 5000,
backoffMax: 1000*1000, backoffMax: 30*1000,
urlMapping, urlMapping,
signal: this.options.signal, signal: this.options.signal,
logger: this.logger, logger: this.logger,
@@ -60,6 +60,7 @@ export abstract class CertApplyBasePlugin extends CertApplyBaseConvertPlugin {
abstract doCertApply(): Promise<CertReader>; abstract doCertApply(): Promise<CertReader>;
async execute(): Promise<string | void> { async execute(): Promise<string | void> {
this.logger.addSecret(this.pfxPassword);
const oldCert = await this.condition(); const oldCert = await this.condition();
if (oldCert != null) { if (oldCert != null) {
await this.output(oldCert, false); await this.output(oldCert, false);
+1 -1
View File
@@ -1 +1 @@
01:18 16:31
+1 -1
View File
@@ -1 +1 @@
01:33 17:12