diff --git a/src/handlers/setupPage.ts b/src/handlers/setupPage.ts index c336834..e74176d 100644 --- a/src/handlers/setupPage.ts +++ b/src/handlers/setupPage.ts @@ -42,7 +42,7 @@ function renderRegisterPageHTML(jwtState: JwtSecretState | null): string { padding: 40px 24px; } - .shell { width: min(980px, 100%); } + .shell { width: min(900px, 100%); } .panel { padding: 40px; @@ -426,22 +426,21 @@ function renderRegisterPageHTML(jwtState: JwtSecretState | null): string {

JWT secret check

-

-
+

Fix steps

-
-
+ +

Random JWT_SECRET

-

+
@@ -606,7 +605,7 @@ function renderRegisterPageHTML(jwtState: JwtSecretState | null): string { s1CompatOther: '其他：未测试', s2Title: '环境检测：JWT_SECRET', - s2DescGood: 'JWT_SECRET 检测通过。若你当前不是使用高强度随机密钥，建议改用右侧生成器生成后再保存。', + s2DescGood: 'JWT_SECRET 检测通过。', s2DescMissing: '检测到 JWT_SECRET 未配置，先添加后再继续。', s2DescDefault: '检测到 JWT_SECRET 使用默认值，先更换后再继续。', s2DescShort: '检测到 JWT_SECRET 长度小于 32，先更换后再继续。', @@ -618,8 +617,8 @@ function renderRegisterPageHTML(jwtState: JwtSecretState | null): string { s2FixStep2Replace: '打开 设置 → 变量和机密，找到 JWT_SECRET 并编辑为新值。', s2FixStep3: '保存并等待服务重新部署完成。', s2FixStep4: '设置完后回到本页，刷新页面继续。', + s2FixStep5: '如需新密钥，可在本卡片下方生成并复制后再粘贴到 JWT_SECRET。', s2GenTitle: '随机密钥生成器', - s2GenDesc: '建议至少 32 位，推荐 64 位。复制后粘贴到 JWT_SECRET。', refresh: '刷新', copy: '复制', copied: '已复制', @@ -695,7 +694,7 @@ function renderRegisterPageHTML(jwtState: JwtSecretState | null): string { s1CompatOther: 'Others: not tested', s2Title: 'Environment check: JWT_SECRET', - s2DescGood: 'JWT_SECRET check passed. If you are not using a strong random secret yet, we still recommend replacing it with one from the generator on the right.', + s2DescGood: 'JWT_SECRET check passed.', s2DescMissing: 'JWT_SECRET is missing. Add it before continuing.', s2DescDefault: 'JWT_SECRET is default/sample. Replace it before continuing.', s2DescShort: 'JWT_SECRET is shorter than 32 chars. Replace it before continuing.', @@ -707,8 +706,8 @@ function renderRegisterPageHTML(jwtState: JwtSecretState | null): string { s2FixStep2Replace: 'Go to Settings → Variables and Secrets, edit JWT_SECRET with a new value.', s2FixStep3: 'Save and wait for redeploy to complete.', s2FixStep4: 'After setting it, come back and refresh this page to continue.', + s2FixStep5: 'If needed, generate a new secret in the section below, then copy and paste it into JWT_SECRET.', s2GenTitle: 'Random secret generator', - s2GenDesc: 'Use 32+ chars (64 recommended). Copy and paste into JWT_SECRET.', refresh: 'Refresh', copy: 'Copy', copied: 'Copied', @@ -778,19 +777,18 @@ function renderRegisterPageHTML(jwtState: JwtSecretState | null): string { if (!el) return; if (!JWT_STATE) { el.innerHTML = isChinese() - ? '
当前状态：已通过
  1. 你可以继续下一步，不影响使用。
  2. 如果当前密钥不是强随机值，建议复制右侧生成器的 64 位密钥。
  3. 到 Cloudflare 控制台 → Workers 和 Pages → 你的服务 → 设置 → 变量和机密，更新 JWT_SECRET。
  4. 保存并等待重新部署完成，然后刷新本页确认。
' - : '
Current status: passed
  1. You can continue directly.
  2. If your current secret is not a strong random one, copy a 64-char secret from the generator.
  3. Go to Cloudflare Dashboard → Workers & Pages → your service → Settings → Variables and Secrets, then update JWT_SECRET.
  4. Save, wait for redeploy, and refresh this page to confirm.
'; + ? '
  1. 你可以继续下一步，不影响使用。
  2. 如果当前密钥不是强随机值，建议复制下方生成器的 64 位密钥。
  3. 到 Cloudflare 控制台 → Workers 和 Pages → 你的服务 → 设置 → 变量和机密，更新 JWT_SECRET。
  4. 保存并等待重新部署完成，然后刷新本页确认。
' + : '
  1. You can continue directly.
  2. If your current secret is not a strong random one, copy a 64-char secret from the generator below.
  3. Go to Cloudflare Dashboard → Workers & Pages → your service → Settings → Variables and Secrets, then update JWT_SECRET.
  4. Save, wait for redeploy, and refresh this page to confirm.
'; return; } const isAdd = JWT_STATE === 'missing'; - const title = isAdd ? t('s2FixAddTitle') : t('s2FixReplaceTitle'); const step2 = isAdd ? t('s2FixStep2Add') : t('s2FixStep2Replace'); - el.innerHTML = '
' + title + '
' - + '
    ' + el.innerHTML = '
      ' + '
    1. ' + t('s2FixStep1') + '
      2. ' + '
    2. ' + step2 + '
      3. ' + '
    3. ' + t('s2FixStep3') + '
      4. ' + '
    4. ' + t('s2FixStep4') + '
      5. ' + + '
    5. ' + t('s2FixStep5') + '
      6. ' + '
    '; } @@ -817,7 +815,6 @@ function renderRegisterPageHTML(jwtState: JwtSecretState | null): string { setText('t_s2_fix_title', t('s2FixTitle')); renderJwtFixSteps(); setText('t_s2_gen_title', t('s2GenTitle')); - setText('t_s2_gen_desc', t('s2GenDesc')); setText('refreshSecretBtn', t('refresh')); setText('copySecretBtn', t('copy')); @@ -861,12 +858,12 @@ function renderRegisterPageHTML(jwtState: JwtSecretState | null): string { setText('nextBtn', t('next')); setText('langToggle', isChinese() ? 'EN' : '中文'); - const desc = document.getElementById('t_s2_desc'); - if (desc) { - if (!JWT_STATE) desc.textContent = t('s2DescGood'); - else if (JWT_STATE === 'missing') desc.textContent = t('s2DescMissing'); - else if (JWT_STATE === 'default') desc.textContent = t('s2DescDefault'); - else desc.textContent = t('s2DescShort'); + const title = document.getElementById('t_s2_title'); + if (title) { + if (!JWT_STATE) title.textContent = t('s2DescGood'); + else if (JWT_STATE === 'missing') title.textContent = t('s2DescMissing'); + else if (JWT_STATE === 'default') title.textContent = t('s2DescDefault'); + else title.textContent = t('s2DescShort'); } }