拆分 DNS 权限验证与证书传播等待

This commit is contained in:
xuans committed 2026-09-16 00:33:14 +08:00
1 parent d872d7eaaf
commit f64f0d778f
12 files changed
+45 -87

No files matched your search

+2 -13
View File
@@ -1,7 +1,6 @@
import { computed, onBeforeUnmount, onMounted, ref, watch } from "vue";
const defaultDNSVerificationTimeoutSeconds = 45;
const dnsVerificationCleanupBufferSeconds = 30;
const defaultDNSVerificationTimeoutSeconds = 60;
export function useDashboard() {
const scertLogo = "/Scert.png";
@@ -218,14 +217,6 @@ export function useDashboard() {
new Date(dns.expires_at).getTime() > Date.now();
});
function resolveDNSVerificationTimeoutSeconds(value) {
const propagationTimeout = Number(value);
if (!Number.isFinite(propagationTimeout) || propagationTimeout <= 0) {
return defaultDNSVerificationTimeoutSeconds;
}
return Math.floor(propagationTimeout) + dnsVerificationCleanupBufferSeconds;
}
function updateDNSVerificationTimeoutSeconds(value) {
const timeout = Number(value);
if (Number.isFinite(timeout) && timeout > 0) {
@@ -244,9 +235,7 @@ export function useDashboard() {
function startDNSVerificationTimer(requestVersion) {
stopDNSVerificationTimer();
dnsVerificationTimeoutSeconds.value = resolveDNSVerificationTimeoutSeconds(
settingsForm.value.acme.propagation_timeout_secs,
);
dnsVerificationTimeoutSeconds.value = defaultDNSVerificationTimeoutSeconds;
const startedAt = Date.now();
const updateElapsedSeconds = () => {
if (requestVersion !== dnsRequestVersion) return;
@@ -103,7 +103,7 @@ test("管理设置 DNS 验证显示等待进度,并在结束后停止计时",
assert.equal(state.dnsTesting.value, true);
assert.equal(state.dnsVerificationElapsedSeconds.value, 0);
assert.equal(state.dnsVerificationTimeoutSeconds.value, 930);
assert.equal(state.dnsVerificationTimeoutSeconds.value, 60);
advanceTime(3200);
runIntervals();
assert.equal(state.dnsVerificationElapsedSeconds.value, 3);
@@ -113,12 +113,12 @@ test("管理设置 DNS 验证显示等待进度,并在结束后停止计时",
credential_ref: "secret://test/only",
verification_token: "test-token",
expires_at: new Date(Date.now() + 60000).toISOString(),
verification_timeout_secs: 31,
verification_timeout_secs: 60,
}));
await task;
assert.equal(state.dnsTesting.value, false);
assert.equal(state.dnsVerificationElapsedSeconds.value, 0);
assert.equal(state.dnsVerificationTimeoutSeconds.value, 31);
assert.equal(state.dnsVerificationTimeoutSeconds.value, 60);
advanceTime(1000);
runIntervals();
assert.equal(state.dnsVerificationElapsedSeconds.value, 0);
+2 -13
View File
@@ -1,7 +1,6 @@
import { computed, onMounted, onUnmounted, ref, watch } from "vue";
const defaultDNSVerificationTimeoutSeconds = 45;
const dnsVerificationCleanupBufferSeconds = 30;
const defaultDNSVerificationTimeoutSeconds = 60;
const commonEmailDomains = [
{ label: "常用邮箱", value: "" },
@@ -155,14 +154,6 @@ export function useSetupWizard(props, emit) {
dnsTestError.value = "";
}
function resolveDNSVerificationTimeoutSeconds(value) {
const propagationTimeout = Number(value);
if (!Number.isFinite(propagationTimeout) || propagationTimeout <= 0) {
return defaultDNSVerificationTimeoutSeconds;
}
return Math.floor(propagationTimeout) + dnsVerificationCleanupBufferSeconds;
}
function updateDNSVerificationTimeoutSeconds(value) {
const timeout = Number(value);
if (Number.isFinite(timeout) && timeout > 0) {
@@ -181,9 +172,7 @@ export function useSetupWizard(props, emit) {
function startDNSVerificationTimer(requestVersion) {
stopDNSVerificationTimer();
dnsVerificationTimeoutSeconds.value = resolveDNSVerificationTimeoutSeconds(
form.value.propagation_timeout_secs,
);
dnsVerificationTimeoutSeconds.value = defaultDNSVerificationTimeoutSeconds;
const startedAt = Date.now();
const updateElapsedSeconds = () => {
if (requestVersion !== dnsRequestVersion) return;
@@ -34,7 +34,7 @@ test("初始化 DNS 验证显示等待进度,并采用服务端返回的最长
assert.equal(state.dnsTesting.value, true);
assert.equal(state.dnsVerificationElapsedSeconds.value, 0);
assert.equal(state.dnsVerificationTimeoutSeconds.value, 930);
assert.equal(state.dnsVerificationTimeoutSeconds.value, 60);
advanceTime(2500);
runIntervals();
@@ -45,12 +45,12 @@ test("初始化 DNS 验证显示等待进度,并采用服务端返回的最长
credential_ref: "secret://test/only",
verification_token: "test-token",
expires_at: new Date(Date.now() + 60000).toISOString(),
verification_timeout_secs: 31,
verification_timeout_secs: 60,
}));
await task;
assert.equal(state.dnsTesting.value, false);
assert.equal(state.dnsVerificationElapsedSeconds.value, 0);
assert.equal(state.dnsVerificationTimeoutSeconds.value, 31);
assert.equal(state.dnsVerificationTimeoutSeconds.value, 60);
advanceTime(1000);
runIntervals();