mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-11-05 12:45:00 +03:00
Compare commits
34 Commits
4605f00a15
...
v3.6.0
| Author | SHA1 | Date | |
|---|---|---|---|
| c377dca27c | |||
| c56f6447a8 | |||
| 66740b7ef4 | |||
| 8d02ae28f5 | |||
| 2c943da3e0 | |||
| f52c3c4837 | |||
| 1e2d6f6081 | |||
| af5a8e5d40 | |||
| ad288a7ecc | |||
| ad5f2a28cb | |||
| e467b25f03 | |||
| 03cc80bb9e | |||
| 863473783d | |||
| c3fa73d5a0 | |||
| 87ebcc7a6f | |||
| 55f0281692 | |||
| bcd71c9296 | |||
| 33f72f8f4a | |||
| ea35884390 | |||
| 17e6b5a460 | |||
| 34d2591e50 | |||
| ca6955d88b | |||
| 411271b454 | |||
| e862d81c60 | |||
| 6af2995930 | |||
| 041476a317 | |||
| ff954ec48c | |||
| 8f49327efb | |||
| 8bbca76bdd | |||
| a2774bf212 | |||
| 48675ff197 | |||
| 604986598f | |||
| b6473004ac | |||
| 579acbc669 |
@@ -1,24 +1,5 @@
|
|||||||
name: Claude Bot
|
name: Claude Bot
|
||||||
|
|
||||||
# Every prompt: / claude_args: block below interpolates ${{ }}, so GitHub parses
|
|
||||||
# the whole block scalar as ONE expression and caps it at 21000 characters.
|
|
||||||
# Going over does not fail a job - the entire workflow stops parsing and
|
|
||||||
# vanishes from Actions, with the run reported only as a workflow file issue.
|
|
||||||
# The two triage prompts are the ones to watch: roughly 15100 characters each.
|
|
||||||
# Put shared context in CLAUDE.md and docs/architecture.md, which are in the
|
|
||||||
# checkout, instead of pasting it here.
|
|
||||||
#
|
|
||||||
# CLAUDE_CODE_SUBPROCESS_ENV_SCRUB=0 on the two jobs that set
|
|
||||||
# allowed_non_write_users: the action otherwise turns subprocess isolation on
|
|
||||||
# for them, installs bubblewrap, and every Bash call then dies in the sandbox
|
|
||||||
# with "bwrap: Can't create file at /home/.mcp.json: Permission denied" before
|
|
||||||
# the command runs. The job still reports success, so the bot silently answers
|
|
||||||
# nothing - which is what the "Fail if ..." steps catch.
|
|
||||||
#
|
|
||||||
# Only resolve-conflicts may change code, and only the merge it is handed: the
|
|
||||||
# model there has no shell at all, and the commit and push are done by a
|
|
||||||
# workflow step from the event payload, never by the model.
|
|
||||||
|
|
||||||
on:
|
on:
|
||||||
issues:
|
issues:
|
||||||
types: [opened]
|
types: [opened]
|
||||||
@@ -785,7 +766,7 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
resolve-conflicts:
|
resolve-conflicts:
|
||||||
if: github.event_name == 'issue_comment' && github.event.issue.pull_request && contains(github.event.comment.body, 'resolve pr conflicts') && github.event.comment.user.login == github.repository_owner
|
if: github.event_name == 'issue_comment' && github.event.issue.pull_request && contains(github.event.comment.body, 'resolve pr conflicts') && github.event.comment.user.login == github.repository_owner && github.event.comment.author_association == 'OWNER'
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
permissions:
|
permissions:
|
||||||
contents: read
|
contents: read
|
||||||
@@ -793,6 +774,29 @@ jobs:
|
|||||||
pull-requests: write
|
pull-requests: write
|
||||||
id-token: write
|
id-token: write
|
||||||
steps:
|
steps:
|
||||||
|
- name: Refuse a head that moved after the request
|
||||||
|
id: freshness
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
REPO: ${{ github.repository }}
|
||||||
|
PR: ${{ github.event.issue.number }}
|
||||||
|
COMMENT_AT: ${{ github.event.comment.created_at }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
head=$(gh api "repos/${REPO}/pulls/${PR}" --jq '"\(.head.sha) \(.head.repo.pushed_at // "")"')
|
||||||
|
HEAD_SHA=${head%% *}
|
||||||
|
HEAD_PUSHED_AT=${head#* }
|
||||||
|
if [ -z "$HEAD_PUSHED_AT" ]; then
|
||||||
|
gh pr comment "$PR" --repo "$REPO" --body "The head repository of this pull request is gone, so its branch cannot be verified or merged. Nothing was changed."
|
||||||
|
echo "::error::The head repository is unavailable; refusing to check it out."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if [ "$(date -d "$HEAD_PUSHED_AT" +%s)" -gt "$(date -d "$COMMENT_AT" +%s)" ]; then
|
||||||
|
gh pr comment "$PR" --repo "$REPO" --body "The head branch was pushed to at ${HEAD_PUSHED_AT}, after this was requested at ${COMMENT_AT}, so the code that would be checked out here is not the code that was reviewed. Nothing was changed. Ask again to act on the current head."
|
||||||
|
echo "::error::The head moved after the request; refusing to check it out."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "sha=${HEAD_SHA}" >> "$GITHUB_OUTPUT"
|
||||||
- uses: actions/checkout@v7
|
- uses: actions/checkout@v7
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
@@ -802,6 +806,7 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
PR: ${{ github.event.issue.number }}
|
PR: ${{ github.event.issue.number }}
|
||||||
|
PINNED_SHA: ${{ steps.freshness.outputs.sha }}
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
hand_back() {
|
hand_back() {
|
||||||
@@ -815,11 +820,17 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
base=$(gh pr view "$PR" --json baseRefName --jq '.baseRefName')
|
base=$(gh pr view "$PR" --json baseRefName --jq '.baseRefName')
|
||||||
head=$(gh pr view "$PR" --json headRefName --jq '.headRefName')
|
head=$(gh pr view "$PR" --json headRefName --jq '.headRefName')
|
||||||
gh pr checkout "$PR"
|
|
||||||
git config core.hooksPath /dev/null
|
git config core.hooksPath /dev/null
|
||||||
git config core.quotePath false
|
git config core.quotePath false
|
||||||
git config user.name "github-actions[bot]"
|
git config user.name "github-actions[bot]"
|
||||||
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||||
|
gh pr checkout "$PR"
|
||||||
|
checked_out=$(git rev-parse HEAD)
|
||||||
|
if [ "$checked_out" != "$PINNED_SHA" ]; then
|
||||||
|
gh pr comment "$PR" --body "The head of this pull request moved from \`${PINNED_SHA}\` to \`${checked_out}\` while this run was starting, so nothing was changed."
|
||||||
|
echo "::error::The head moved from ${PINNED_SHA} to ${checked_out} during the run."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
git fetch origin "$base"
|
git fetch origin "$base"
|
||||||
if git merge --no-commit --no-ff "origin/${base}"; then
|
if git merge --no-commit --no-ff "origin/${base}"; then
|
||||||
git merge --abort 2>/dev/null || true
|
git merge --abort 2>/dev/null || true
|
||||||
@@ -838,6 +849,14 @@ jobs:
|
|||||||
git merge --abort 2>/dev/null || true
|
git merge --abort 2>/dev/null || true
|
||||||
hand_back "The merge of \`${base}\` failed without leaving a conflicted file, so it needs a human. Nothing was changed."
|
hand_back "The merge of \`${base}\` failed without leaving a conflicted file, so it needs a human. Nothing was changed."
|
||||||
fi
|
fi
|
||||||
|
odd=$(printf '%s\n' "$files" | grep -vE '^[A-Za-z0-9._][A-Za-z0-9._/-]*$' || true)
|
||||||
|
if [ -n "$odd" ]; then
|
||||||
|
git merge --abort 2>/dev/null || true
|
||||||
|
hand_back "The merge of \`${base}\` conflicts over paths this job refuses to hand to its tooling:
|
||||||
|
$(printf '%s\n' "$odd" | sed 's/^/- /')
|
||||||
|
|
||||||
|
Nothing was changed. Resolve those by hand."
|
||||||
|
fi
|
||||||
rules=""
|
rules=""
|
||||||
while IFS= read -r f; do
|
while IFS= read -r f; do
|
||||||
[ -z "$f" ] && continue
|
[ -z "$f" ] && continue
|
||||||
|
|||||||
@@ -369,8 +369,8 @@ All registered in `web.go` → `startTask()`. Each is a struct with a `Run()` me
|
|||||||
| `@every 5m` | `outbound_subscription_job` | Refresh outbound provider configs |
|
| `@every 5m` | `outbound_subscription_job` | Refresh outbound provider configs |
|
||||||
| `@every 10m` | `clear_logs_job` (`PruneXrayLogsJob`) | Truncate Xray access/error logs once either exceeds 64 MiB |
|
| `@every 10m` | `clear_logs_job` (`PruneXrayLogsJob`) | Truncate Xray access/error logs once either exceeds 64 MiB |
|
||||||
| `@hourly` | `warp_ip_job`, `periodic_traffic_reset_job("hourly")` | WARP IP rotation; traffic resets |
|
| `@hourly` | `warp_ip_job`, `periodic_traffic_reset_job("hourly")` | WARP IP rotation; traffic resets |
|
||||||
| `@daily` | `clear_logs_job`, `periodic_traffic_reset_job("daily")` | IP-limit and Xray access/error log cleanup; traffic resets |
|
| `@daily` | `clear_logs_job`, `periodic_traffic_reset_job("daily")`, `periodic_traffic_reset_job("monthly")` | IP-limit and Xray access/error log cleanup; daily resets and due monthly resets |
|
||||||
| `@weekly` / `@monthly` | `periodic_traffic_reset_job(...)` | Weekly/monthly traffic resets |
|
| `@weekly` | `periodic_traffic_reset_job("weekly")` | Weekly traffic resets |
|
||||||
| default `@every 1m` | `ldap_sync_job` | Only if LDAP enabled; schedule configurable |
|
| default `@every 1m` | `ldap_sync_job` | Only if LDAP enabled; schedule configurable |
|
||||||
| default `@daily` | `stats_notify_job` | Only if TG bot enabled; schedule configurable |
|
| default `@daily` | `stats_notify_job` | Only if TG bot enabled; schedule configurable |
|
||||||
| `@every 2m` | `check_hash_storage` | Only if TG bot enabled; expires bot callback hashes |
|
| `@every 2m` | `check_hash_storage` | Only if TG bot enabled; expires bot callback hashes |
|
||||||
|
|||||||
@@ -40,6 +40,9 @@ See [Clients](/docs/config/clients).
|
|||||||
Optionally cap total traffic and set an expiry date for the inbound, and choose a
|
Optionally cap total traffic and set an expiry date for the inbound, and choose a
|
||||||
periodic **traffic reset** schedule: `never` (default), `hourly`, `daily`,
|
periodic **traffic reset** schedule: `never` (default), `hourly`, `daily`,
|
||||||
`weekly`, or `monthly`.
|
`weekly`, or `monthly`.
|
||||||
|
|
||||||
|
For `monthly` resets, select a day from 1 to 31. If the selected day does not
|
||||||
|
exist in a shorter month, the reset runs on that month's last day.
|
||||||
</Step>
|
</Step>
|
||||||
|
|
||||||
</Steps>
|
</Steps>
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ browser in full.
|
|||||||
| `webBasePath` | `/` | URL path the panel is served under (always normalized to `/…/`). |
|
| `webBasePath` | `/` | URL path the panel is served under (always normalized to `/…/`). |
|
||||||
| `webCertFile` / `webKeyFile` | _(none)_ | TLS certificate + key. When both are set, the panel serves **HTTPS**. |
|
| `webCertFile` / `webKeyFile` | _(none)_ | TLS certificate + key. When both are set, the panel serves **HTTPS**. |
|
||||||
| `sessionMaxAge` | `360` | Session lifetime in **minutes** (default 6 hours). |
|
| `sessionMaxAge` | `360` | Session lifetime in **minutes** (default 6 hours). |
|
||||||
| `trustedProxyCIDRs` | `127.0.0.1/32,::1/128` | IPs/CIDRs whose forwarded headers (real client IP) are trusted. |
|
| `trustedProxyCIDRs` | `127.0.0.1/32,::1/128` | IPs/CIDRs whose forwarded headers (real client IP) are trusted. A custom value also controls forwarded host and scheme in subscription links; include the subscription proxy or set `subURI` to override those links. |
|
||||||
| `panelOutbound` | _(none)_ | Route the panel's own egress (update checks, Telegram, geo/sub fetches) through a named Xray outbound. |
|
| `panelOutbound` | _(none)_ | Route the panel's own egress (update checks, Telegram, geo/sub fetches) through a named Xray outbound. |
|
||||||
|
|
||||||
After changing the port or base path, the panel URL becomes
|
After changing the port or base path, the panel URL becomes
|
||||||
|
|||||||
@@ -118,6 +118,13 @@ vless://<uuid>@<server>:443?security=reality&pbk=<public-key>&sid=<short-id>&sni
|
|||||||
- **Leaked private key.** Only ever distribute the **public** key to clients.
|
- **Leaked private key.** Only ever distribute the **public** key to clients.
|
||||||
- **Wrong flow.** REALITY + XTLS-Vision needs `flow = xtls-rprx-vision` on both
|
- **Wrong flow.** REALITY + XTLS-Vision needs `flow = xtls-rprx-vision` on both
|
||||||
the inbound client entry and the share link.
|
the inbound client entry and the share link.
|
||||||
|
- **Old client cores rejected by default.** An empty **Min Client Ver** is not
|
||||||
|
"no limit": Xray-core falls back to the built-in minimum of the core build you
|
||||||
|
run (26.3.27 in current releases) that keeps client TLS fingerprints fresh, so
|
||||||
|
third-party cores such as Mihomo and sing-box fail REALITY verification even
|
||||||
|
with a correct config — clients see timeouts while only Xray-core based apps
|
||||||
|
connect. Set it to `1.0.0` only if you must support them; that also re-admits
|
||||||
|
outdated fingerprints.
|
||||||
|
|
||||||
</Callout>
|
</Callout>
|
||||||
|
|
||||||
|
|||||||
@@ -40,6 +40,9 @@ TLS یا REALITY) را انتخاب کنید. به [انتقالها](/docs/c
|
|||||||
بهصورت اختیاری میتوانید کل ترافیک را محدود کنید و یک تاریخ انقضا برای ورودی
|
بهصورت اختیاری میتوانید کل ترافیک را محدود کنید و یک تاریخ انقضا برای ورودی
|
||||||
تعیین کنید، و یک زمانبندی **بازنشانی ترافیک** دورهای انتخاب کنید: `never`
|
تعیین کنید، و یک زمانبندی **بازنشانی ترافیک** دورهای انتخاب کنید: `never`
|
||||||
(پیشفرض)، `hourly`، `daily`، `weekly` یا `monthly`.
|
(پیشفرض)، `hourly`، `daily`، `weekly` یا `monthly`.
|
||||||
|
|
||||||
|
برای بازنشانی `monthly`، روزی از ۱ تا ۳۱ انتخاب کنید. اگر آن روز در ماهی کوتاهتر
|
||||||
|
وجود نداشته باشد، بازنشانی در آخرین روز همان ماه انجام میشود.
|
||||||
</Step>
|
</Step>
|
||||||
|
|
||||||
</Steps>
|
</Steps>
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ icon: SlidersHorizontal
|
|||||||
| `webBasePath` | `/` | مسیر URLی که پنل زیر آن ارائه میشود (همیشه به شکل `/…/` نرمالسازی میشود). |
|
| `webBasePath` | `/` | مسیر URLی که پنل زیر آن ارائه میشود (همیشه به شکل `/…/` نرمالسازی میشود). |
|
||||||
| `webCertFile` / `webKeyFile` | _(هیچکدام)_ | گواهی + کلید TLS. وقتی هر دو تنظیم شوند، پنل با **HTTPS** ارائه میشود. |
|
| `webCertFile` / `webKeyFile` | _(هیچکدام)_ | گواهی + کلید TLS. وقتی هر دو تنظیم شوند، پنل با **HTTPS** ارائه میشود. |
|
||||||
| `sessionMaxAge` | `360` | طول عمر نشست بر حسب **دقیقه** (پیشفرض ۶ ساعت). |
|
| `sessionMaxAge` | `360` | طول عمر نشست بر حسب **دقیقه** (پیشفرض ۶ ساعت). |
|
||||||
| `trustedProxyCIDRs` | `127.0.0.1/32,::1/128` | IPها/CIDRهایی که هدرهای فورواردشدهشان (IP واقعی کلاینت) مورد اعتماد است. |
|
| `trustedProxyCIDRs` | `127.0.0.1/32,::1/128` | IPها/CIDRهایی که هدرهای فورواردشدهشان (IP واقعی کلاینت) مورد اعتماد است. مقدار سفارشی همچنین میزبان و طرحِ لینکهای اشتراک را کنترل میکند؛ پراکسی اشتراک را اضافه کنید یا برای بازنویسی این لینکها `subURI` را تنظیم کنید. |
|
||||||
| `panelOutbound` | _(هیچکدام)_ | مسیریابی خروجیِ خود پنل (بررسی بهروزرسانیها، Telegram، واکشی geo/sub) از طریق یک خروجی Xray با نام مشخص. |
|
| `panelOutbound` | _(هیچکدام)_ | مسیریابی خروجیِ خود پنل (بررسی بهروزرسانیها، Telegram، واکشی geo/sub) از طریق یک خروجی Xray با نام مشخص. |
|
||||||
|
|
||||||
پس از تغییر پورت یا مسیر پایه، آدرس پنل بهصورت
|
پس از تغییر پورت یا مسیر پایه، آدرس پنل بهصورت
|
||||||
|
|||||||
@@ -118,6 +118,13 @@ vless://<uuid>@<server>:443?security=reality&pbk=<public-key>&sid=<short-id>&sni
|
|||||||
- **نشت کلید خصوصی.** فقط و فقط **کلید عمومی** را میان کلاینتها توزیع کنید.
|
- **نشت کلید خصوصی.** فقط و فقط **کلید عمومی** را میان کلاینتها توزیع کنید.
|
||||||
- **جریان نادرست.** REALITY + XTLS-Vision به `flow = xtls-rprx-vision` هم در ورودیِ
|
- **جریان نادرست.** REALITY + XTLS-Vision به `flow = xtls-rprx-vision` هم در ورودیِ
|
||||||
مدخل کلاینت و هم در لینک اشتراکگذاری نیاز دارد.
|
مدخل کلاینت و هم در لینک اشتراکگذاری نیاز دارد.
|
||||||
|
- **هستههای قدیمی کلاینت بهطور پیشفرض رد میشوند.** خالی گذاشتن
|
||||||
|
**حداقل نسخه کلاینت** به معنای «بدون محدودیت» نیست: Xray-core به حداقل داخلیِ
|
||||||
|
نسخهٔ هستهای که اجرا میکنید (در نسخههای فعلی 26.3.27) بازمیگردد تا اثر انگشتهای TLS کلاینتها تازه
|
||||||
|
بمانند؛ در نتیجه هستههای شخص ثالث مانند Mihomo و sing-box حتی با پیکربندی
|
||||||
|
کاملاً درست در تأیید REALITY شکست میخورند — کلاینتها تایماوت میبینند و فقط
|
||||||
|
اپلیکیشنهای مبتنی بر Xray-core وصل میشوند. تنها در صورت نیاز به پشتیبانی از
|
||||||
|
آنها مقدار `1.0.0` را تنظیم کنید؛ این کار اثر انگشتهای قدیمی را هم میپذیرد.
|
||||||
|
|
||||||
</Callout>
|
</Callout>
|
||||||
|
|
||||||
|
|||||||
@@ -41,6 +41,9 @@ icon: ArrowDownToLine
|
|||||||
При необходимости ограничьте общий объём трафика и установите дату истечения для
|
При необходимости ограничьте общий объём трафика и установите дату истечения для
|
||||||
входящего подключения, а также выберите расписание периодического **сброса трафика**:
|
входящего подключения, а также выберите расписание периодического **сброса трафика**:
|
||||||
`never` (по умолчанию), `hourly`, `daily`, `weekly` или `monthly`.
|
`never` (по умолчанию), `hourly`, `daily`, `weekly` или `monthly`.
|
||||||
|
|
||||||
|
Для сброса `monthly` выберите день от 1 до 31. Если выбранного дня нет в более
|
||||||
|
коротком месяце, сброс выполняется в последний день этого месяца.
|
||||||
</Step>
|
</Step>
|
||||||
|
|
||||||
</Steps>
|
</Steps>
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ icon: SlidersHorizontal
|
|||||||
| `webBasePath` | `/` | URL-путь, по которому обслуживается панель (всегда нормализуется к `/…/`). |
|
| `webBasePath` | `/` | URL-путь, по которому обслуживается панель (всегда нормализуется к `/…/`). |
|
||||||
| `webCertFile` / `webKeyFile` | _(нет)_ | Сертификат TLS + ключ. Когда заданы оба, панель обслуживается по **HTTPS**. |
|
| `webCertFile` / `webKeyFile` | _(нет)_ | Сертификат TLS + ключ. Когда заданы оба, панель обслуживается по **HTTPS**. |
|
||||||
| `sessionMaxAge` | `360` | Время жизни сессии в **минутах** (по умолчанию 6 часов). |
|
| `sessionMaxAge` | `360` | Время жизни сессии в **минутах** (по умолчанию 6 часов). |
|
||||||
| `trustedProxyCIDRs` | `127.0.0.1/32,::1/128` | IP-адреса/CIDR, чьим переадресованным заголовкам (реальный IP клиента) можно доверять. |
|
| `trustedProxyCIDRs` | `127.0.0.1/32,::1/128` | IP-адреса/CIDR, чьим переадресованным заголовкам (реальный IP клиента) можно доверять. Пользовательское значение также управляет пересылаемыми хостом и схемой в ссылках подписки; добавьте прокси подписки или задайте `subURI`, чтобы переопределить эти ссылки. |
|
||||||
| `panelOutbound` | _(нет)_ | Маршрутизация собственного исходящего трафика панели (проверка обновлений, Telegram, запросы geo/подписок) через именованный исходящий канал Xray. |
|
| `panelOutbound` | _(нет)_ | Маршрутизация собственного исходящего трафика панели (проверка обновлений, Telegram, запросы geo/подписок) через именованный исходящий канал Xray. |
|
||||||
|
|
||||||
После изменения порта или базового пути URL панели становится
|
После изменения порта или базового пути URL панели становится
|
||||||
|
|||||||
@@ -123,6 +123,14 @@ vless://<uuid>@<server>:443?security=reality&pbk=<public-key>&sid=<short-id>&sni
|
|||||||
ключ.
|
ключ.
|
||||||
- **Неправильный поток.** Для REALITY + XTLS-Vision нужен `flow = xtls-rprx-vision`
|
- **Неправильный поток.** Для REALITY + XTLS-Vision нужен `flow = xtls-rprx-vision`
|
||||||
как в записи клиента входящего подключения, так и в ссылке для подключения.
|
как в записи клиента входящего подключения, так и в ссылке для подключения.
|
||||||
|
- **Старые ядра клиентов отклоняются по умолчанию.** Пустое поле
|
||||||
|
**Мин. версия клиента** не означает «без ограничений»: Xray-core использует
|
||||||
|
встроенный минимум используемой сборки ядра (26.3.27 в текущих релизах),
|
||||||
|
который поддерживает свежесть
|
||||||
|
TLS-отпечатков клиентов, поэтому сторонние ядра, такие как Mihomo и sing-box,
|
||||||
|
не проходят проверку REALITY даже при корректной конфигурации — клиенты видят
|
||||||
|
таймауты, а подключаются только приложения на базе Xray-core. Ставьте `1.0.0`,
|
||||||
|
только если они вам необходимы; это также допустит устаревшие отпечатки.
|
||||||
|
|
||||||
</Callout>
|
</Callout>
|
||||||
|
|
||||||
|
|||||||
@@ -37,6 +37,9 @@ icon: ArrowDownToLine
|
|||||||
|
|
||||||
可选地为入站设置总流量上限和到期日期,并选择一个周期性的**流量重置**计划:
|
可选地为入站设置总流量上限和到期日期,并选择一个周期性的**流量重置**计划:
|
||||||
`never`(默认)、`hourly`、`daily`、`weekly` 或 `monthly`。
|
`never`(默认)、`hourly`、`daily`、`weekly` 或 `monthly`。
|
||||||
|
|
||||||
|
选择 `monthly` 时,可以指定每月 1 至 31 日重置。如果当月没有指定日期,
|
||||||
|
则在该月最后一天重置。
|
||||||
</Step>
|
</Step>
|
||||||
|
|
||||||
</Steps>
|
</Steps>
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ icon: SlidersHorizontal
|
|||||||
| `webBasePath` | `/` | 面板对外提供服务所使用的 URL 路径(始终规范化为 `/…/`)。 |
|
| `webBasePath` | `/` | 面板对外提供服务所使用的 URL 路径(始终规范化为 `/…/`)。 |
|
||||||
| `webCertFile` / `webKeyFile` | _(无)_ | TLS 证书 + 密钥。两者都设置后,面板将以 **HTTPS** 提供服务。 |
|
| `webCertFile` / `webKeyFile` | _(无)_ | TLS 证书 + 密钥。两者都设置后,面板将以 **HTTPS** 提供服务。 |
|
||||||
| `sessionMaxAge` | `360` | 会话有效期,单位为**分钟**(默认 6 小时)。 |
|
| `sessionMaxAge` | `360` | 会话有效期,单位为**分钟**(默认 6 小时)。 |
|
||||||
| `trustedProxyCIDRs` | `127.0.0.1/32,::1/128` | 其转发头(真实客户端 IP)受信任的 IP/CIDR。 |
|
| `trustedProxyCIDRs` | `127.0.0.1/32,::1/128` | 其转发头(真实客户端 IP)受信任的 IP/CIDR。自定义值还会控制订阅链接中转发的主机和协议;请将订阅代理加入列表,或设置 `subURI` 覆盖这些链接。 |
|
||||||
| `panelOutbound` | _(无)_ | 通过一个命名的 Xray 出站来路由面板自身的出口流量(更新检查、Telegram、地理/订阅拉取)。 |
|
| `panelOutbound` | _(无)_ | 通过一个命名的 Xray 出站来路由面板自身的出口流量(更新检查、Telegram、地理/订阅拉取)。 |
|
||||||
|
|
||||||
更改端口或基础路径后,面板 URL 将变为
|
更改端口或基础路径后,面板 URL 将变为
|
||||||
|
|||||||
@@ -105,6 +105,7 @@ vless://<uuid>@<server>:443?security=reality&pbk=<public-key>&sid=<short-id>&sni
|
|||||||
- **SNI 不匹配。** SNI / server names 必须与目标站点的真实证书匹配,否则握手会暴露伪装。
|
- **SNI 不匹配。** SNI / server names 必须与目标站点的真实证书匹配,否则握手会暴露伪装。
|
||||||
- **私钥泄露。** 永远只把**公钥**分发给客户端。
|
- **私钥泄露。** 永远只把**公钥**分发给客户端。
|
||||||
- **流控设置错误。** REALITY + XTLS-Vision 要求在入站的客户端条目和分享链接上都设置 `flow = xtls-rprx-vision`。
|
- **流控设置错误。** REALITY + XTLS-Vision 要求在入站的客户端条目和分享链接上都设置 `flow = xtls-rprx-vision`。
|
||||||
|
- **旧客户端内核默认被拒。** **最小客户端版本**留空并不是“不限制”:Xray-core 会退回到所运行内核版本的内置最低值(当前版本为 26.3.27)以保证客户端 TLS 指纹的新鲜度,因此 Mihomo、sing-box 等第三方内核即使配置完全正确也会导致 REALITY 验证失败——表现为客户端超时,只有基于 Xray-core 的应用能连上。只有在必须支持它们时才填 `1.0.0`;这同时也会放行过时的指纹。
|
||||||
|
|
||||||
</Callout>
|
</Callout>
|
||||||
|
|
||||||
|
|||||||
@@ -411,6 +411,9 @@
|
|||||||
"maximum": 65535,
|
"maximum": 65535,
|
||||||
"minimum": 1,
|
"minimum": 1,
|
||||||
"type": "integer"
|
"type": "integer"
|
||||||
|
},
|
||||||
|
"subShowIdentityOnAllLinks": {
|
||||||
|
"type": "boolean"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"required": [
|
"required": [
|
||||||
@@ -479,6 +482,7 @@
|
|||||||
"subPort",
|
"subPort",
|
||||||
"subProfileUrl",
|
"subProfileUrl",
|
||||||
"subRoutingRules",
|
"subRoutingRules",
|
||||||
|
"subShowIdentityOnAllLinks",
|
||||||
"subSupportUrl",
|
"subSupportUrl",
|
||||||
"subThemeDir",
|
"subThemeDir",
|
||||||
"subTitle",
|
"subTitle",
|
||||||
@@ -916,6 +920,9 @@
|
|||||||
"maximum": 65535,
|
"maximum": 65535,
|
||||||
"minimum": 1,
|
"minimum": 1,
|
||||||
"type": "integer"
|
"type": "integer"
|
||||||
|
},
|
||||||
|
"subShowIdentityOnAllLinks": {
|
||||||
|
"type": "boolean"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"required": [
|
"required": [
|
||||||
@@ -991,6 +998,7 @@
|
|||||||
"subPort",
|
"subPort",
|
||||||
"subProfileUrl",
|
"subProfileUrl",
|
||||||
"subRoutingRules",
|
"subRoutingRules",
|
||||||
|
"subShowIdentityOnAllLinks",
|
||||||
"subSupportUrl",
|
"subSupportUrl",
|
||||||
"subThemeDir",
|
"subThemeDir",
|
||||||
"subTitle",
|
"subTitle",
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { useEffect } from 'react';
|
import { useLayoutEffect } from 'react';
|
||||||
import type { Decorator, Preview } from '@storybook/react-vite';
|
import type { Decorator, Preview } from '@storybook/react-vite';
|
||||||
import { ConfigProvider } from 'antd';
|
import { ConfigProvider } from 'antd';
|
||||||
import i18next from 'i18next';
|
import i18next from 'i18next';
|
||||||
@@ -17,11 +17,12 @@ if (!i18next.isInitialized) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
const withTheme: Decorator = (Story, context) => {
|
export const withTheme: Decorator = (Story, context) => {
|
||||||
const dark = context.globals.theme === 'dark';
|
const dark = context.globals.theme === 'dark';
|
||||||
useEffect(() => {
|
useLayoutEffect(() => {
|
||||||
document.body.setAttribute('class', dark ? 'dark' : 'light');
|
document.body.classList.remove('dark', 'light');
|
||||||
document.documentElement.setAttribute('data-theme', dark ? 'dark' : 'light');
|
document.body.classList.add(dark ? 'dark' : 'light');
|
||||||
|
document.documentElement.removeAttribute('data-theme');
|
||||||
}, [dark]);
|
}, [dark]);
|
||||||
return (
|
return (
|
||||||
<ConfigProvider theme={buildAntdThemeConfig(dark, false)}>
|
<ConfigProvider theme={buildAntdThemeConfig(dark, false)}>
|
||||||
|
|||||||
@@ -53,4 +53,37 @@ export default [
|
|||||||
'jsx-a11y/no-autofocus': 'off',
|
'jsx-a11y/no-autofocus': 'off',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
// The settings and xray pages write numeric InputNumber changes straight
|
||||||
|
// into state, so a null-collapsing handler (`Number(v) || N`, or the
|
||||||
|
// ternary `typeof v === 'number' ? v : N`) turns a cleared field into a
|
||||||
|
// stored N — the cleared-port bug, #6121. Handlers here go through
|
||||||
|
// onNumber() (src/utils/onNumber.ts) instead. Known limit: a handler
|
||||||
|
// extracted into a variable and passed as onChange={handler} is not
|
||||||
|
// matched; the inline shapes below are the ones that drift in practice.
|
||||||
|
files: ['src/pages/settings/**/*.tsx', 'src/pages/xray/**/*.tsx'],
|
||||||
|
rules: {
|
||||||
|
'no-restricted-syntax': ['error', {
|
||||||
|
selector: 'JSXElement[openingElement.name.name="InputNumber"] JSXAttribute[name.name="onChange"] LogicalExpression[operator="||"] > CallExpression[callee.name="Number"]',
|
||||||
|
message: 'A cleared InputNumber must not write a synthetic value; wrap the handler with onNumber() from @/utils/onNumber (see #6127).',
|
||||||
|
}, {
|
||||||
|
selector: 'JSXElement[openingElement.name.name="InputNumber"] JSXAttribute[name.name="onChange"] ConditionalExpression[test.left.operator="typeof"][alternate.type="Literal"]',
|
||||||
|
message: 'A cleared InputNumber must not write a synthetic value; wrap the handler with onNumber() from @/utils/onNumber (see #6127).',
|
||||||
|
}, {
|
||||||
|
selector: 'JSXElement[openingElement.name.name="InputNumber"] JSXAttribute[name.name="onChange"] LogicalExpression[operator="??"][right.type="Literal"]',
|
||||||
|
message: 'A cleared InputNumber must not write a synthetic value; wrap the handler with onNumber() from @/utils/onNumber (see #6127).',
|
||||||
|
}],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
// The xray form modals (OutboundFormModal, BalancerFormModal,
|
||||||
|
// DnsServerModal, WarpModal, …) stage values behind Zod validation like
|
||||||
|
// the clients/inbounds modals do, and some of their fields carry a
|
||||||
|
// deliberate clear-means-zero semantic — the direct-write rule above
|
||||||
|
// does not apply to them.
|
||||||
|
files: ['src/pages/xray/**/*Modal.tsx'],
|
||||||
|
rules: {
|
||||||
|
'no-restricted-syntax': 'off',
|
||||||
|
},
|
||||||
|
},
|
||||||
];
|
];
|
||||||
|
|||||||
Generated
+123
-106
@@ -1,17 +1,17 @@
|
|||||||
{
|
{
|
||||||
"name": "3x-ui-frontend",
|
"name": "3x-ui-frontend",
|
||||||
"version": "0.4.3",
|
"version": "0.6.0",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "3x-ui-frontend",
|
"name": "3x-ui-frontend",
|
||||||
"version": "0.4.3",
|
"version": "0.6.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@ant-design/icons": "^6.3.2",
|
"@ant-design/icons": "^6.3.2",
|
||||||
"@codemirror/lang-json": "^6.0.2",
|
"@codemirror/lang-json": "^6.0.2",
|
||||||
"@codemirror/theme-one-dark": "^6.1.3",
|
"@codemirror/theme-one-dark": "^6.1.3",
|
||||||
"@hookform/resolvers": "^5.4.3",
|
"@hookform/resolvers": "^5.5.7",
|
||||||
"@noble/hashes": "^2.2.0",
|
"@noble/hashes": "^2.2.0",
|
||||||
"@tanstack/react-query": "^5.101.4",
|
"@tanstack/react-query": "^5.101.4",
|
||||||
"@tanstack/react-query-devtools": "^5.101.4",
|
"@tanstack/react-query-devtools": "^5.101.4",
|
||||||
@@ -32,10 +32,10 @@
|
|||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/js": "^10.0.1",
|
"@eslint/js": "^10.0.1",
|
||||||
"@storybook/addon-a11y": "^10.5.4",
|
"@storybook/addon-a11y": "^10.5.5",
|
||||||
"@storybook/addon-docs": "^10.5.4",
|
"@storybook/addon-docs": "^10.5.5",
|
||||||
"@storybook/addon-vitest": "^10.5.4",
|
"@storybook/addon-vitest": "^10.5.5",
|
||||||
"@storybook/react-vite": "^10.5.4",
|
"@storybook/react-vite": "^10.5.5",
|
||||||
"@testing-library/dom": "^10.4.1",
|
"@testing-library/dom": "^10.4.1",
|
||||||
"@testing-library/react": "^16.3.2",
|
"@testing-library/react": "^16.3.2",
|
||||||
"@types/react": "^19.2.17",
|
"@types/react": "^19.2.17",
|
||||||
@@ -47,13 +47,13 @@
|
|||||||
"eslint": "^10.8.0",
|
"eslint": "^10.8.0",
|
||||||
"eslint-plugin-jsx-a11y": "^6.10.2",
|
"eslint-plugin-jsx-a11y": "^6.10.2",
|
||||||
"eslint-plugin-react-hooks": "^7.1.1",
|
"eslint-plugin-react-hooks": "^7.1.1",
|
||||||
"globals": "^17.7.0",
|
"globals": "^17.8.0",
|
||||||
"husky": "^9.1.7",
|
"husky": "^9.1.7",
|
||||||
"jsdom": "^29.1.1",
|
"jsdom": "^30.0.1",
|
||||||
"lint-staged": "^17.2.0",
|
"lint-staged": "^17.2.0",
|
||||||
"msw": "^2.15.0",
|
"msw": "^2.15.0",
|
||||||
"playwright": "^1.62.0",
|
"playwright": "^1.62.0",
|
||||||
"storybook": "^10.5.4",
|
"storybook": "^10.5.5",
|
||||||
"typescript": "6.0.3",
|
"typescript": "6.0.3",
|
||||||
"typescript-eslint": "^8.65.0",
|
"typescript-eslint": "^8.65.0",
|
||||||
"vite": "8.1.5",
|
"vite": "8.1.5",
|
||||||
@@ -165,56 +165,58 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@asamuzakjp/css-color": {
|
"node_modules/@asamuzakjp/css-color": {
|
||||||
"version": "5.1.11",
|
"version": "6.0.5",
|
||||||
"resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-5.1.11.tgz",
|
"resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-6.0.5.tgz",
|
||||||
"integrity": "sha512-KVw6qIiCTUQhByfTd78h2yD1/00waTmm9uy/R7Ck/ctUyAPj+AEDLkQIdJW0T8+qGgj3j5bpNKK7Q3G+LedJWg==",
|
"integrity": "sha512-mbhpPMmnw/kwW19aRNmSUl1QzLbdGo1SCuE49BT98MNwqF6zaHb3o2owssFc/PEO/4t2UjqtCNwocuDtJornzA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@asamuzakjp/generational-cache": "^1.0.1",
|
"@csstools/css-calc": "^3.2.1",
|
||||||
"@csstools/css-calc": "^3.2.0",
|
"@csstools/css-color-parser": "^4.1.9",
|
||||||
"@csstools/css-color-parser": "^4.1.0",
|
|
||||||
"@csstools/css-parser-algorithms": "^4.0.0",
|
"@csstools/css-parser-algorithms": "^4.0.0",
|
||||||
"@csstools/css-tokenizer": "^4.0.0"
|
"@csstools/css-tokenizer": "^4.0.0",
|
||||||
|
"lru-cache": "^11.5.2"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": "^20.19.0 || ^22.12.0 || >=24.0.0"
|
"node": "^22.13.0 || >=24.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@asamuzakjp/css-color/node_modules/lru-cache": {
|
||||||
|
"version": "11.5.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.2.tgz",
|
||||||
|
"integrity": "sha512-4pfM1Ff0x50o0tQwb5ucw/RzNyD0/YJME6IVcStalZuMWxdt3sR3huStTtxz4PUmvZfRguvDejasvQ2kifR11g==",
|
||||||
|
"dev": true,
|
||||||
|
"license": "BlueOak-1.0.0",
|
||||||
|
"engines": {
|
||||||
|
"node": "20 || >=22"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@asamuzakjp/dom-selector": {
|
"node_modules/@asamuzakjp/dom-selector": {
|
||||||
"version": "7.1.1",
|
"version": "8.3.0",
|
||||||
"resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-7.1.1.tgz",
|
"resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-8.3.0.tgz",
|
||||||
"integrity": "sha512-67RZDnYRc8H/8MLDgQCDE//zoqVFwajkepHZgmXrbwybzXOEwOWGPYGmALYl9J2DOLfFPPs6kKCqmbzV895hTQ==",
|
"integrity": "sha512-UJLfKXBhrc8i1vH2eJXuYQMwlsLKWFw3O+CPqXSuVEiikeAim3UgrfWX0k4tA/X8cRFM8iZ7OaqBokFGbYusdg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@asamuzakjp/generational-cache": "^1.0.1",
|
|
||||||
"@asamuzakjp/nwsapi": "^2.3.9",
|
|
||||||
"bidi-js": "^1.0.3",
|
"bidi-js": "^1.0.3",
|
||||||
"css-tree": "^3.2.1",
|
"css-tree": "^3.2.1",
|
||||||
"is-potential-custom-element-name": "^1.0.1"
|
"is-potential-custom-element-name": "^1.0.1",
|
||||||
|
"lru-cache": "^11.5.2"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": "^20.19.0 || ^22.12.0 || >=24.0.0"
|
"node": "^22.13.0 || >=24.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@asamuzakjp/generational-cache": {
|
"node_modules/@asamuzakjp/dom-selector/node_modules/lru-cache": {
|
||||||
"version": "1.0.1",
|
"version": "11.5.2",
|
||||||
"resolved": "https://registry.npmjs.org/@asamuzakjp/generational-cache/-/generational-cache-1.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.2.tgz",
|
||||||
"integrity": "sha512-wajfB8KqzMCN2KGNFdLkReeHncd0AslUSrvHVvvYWuU8ghncRJoA50kT3zP9MVL0+9g4/67H+cdvBskj9THPzg==",
|
"integrity": "sha512-4pfM1Ff0x50o0tQwb5ucw/RzNyD0/YJME6IVcStalZuMWxdt3sR3huStTtxz4PUmvZfRguvDejasvQ2kifR11g==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "BlueOak-1.0.0",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": "^20.19.0 || ^22.12.0 || >=24.0.0"
|
"node": "20 || >=22"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@asamuzakjp/nwsapi": {
|
|
||||||
"version": "2.3.9",
|
|
||||||
"resolved": "https://registry.npmjs.org/@asamuzakjp/nwsapi/-/nwsapi-2.3.9.tgz",
|
|
||||||
"integrity": "sha512-n8GuYSrI9bF7FFZ/SjhwevlHc8xaVlb/7HmHelnc/PZXBD2ZR49NnN9sMMuDdEGPeeRQ5d0hqlSlEpgCX3Wl0Q==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT"
|
|
||||||
},
|
|
||||||
"node_modules/@babel/code-frame": {
|
"node_modules/@babel/code-frame": {
|
||||||
"version": "7.29.7",
|
"version": "7.29.7",
|
||||||
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.7.tgz",
|
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.7.tgz",
|
||||||
@@ -1384,9 +1386,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@hookform/resolvers": {
|
"node_modules/@hookform/resolvers": {
|
||||||
"version": "5.4.3",
|
"version": "5.5.7",
|
||||||
"resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-5.4.3.tgz",
|
"resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-5.5.7.tgz",
|
||||||
"integrity": "sha512-jtS1DEvkT1ql8ImIDQL+UmkhEnDmt3Bp7Yt4q5XQpc0JiQ8b8+I7yT/KQze4gw9Ocmi9xa9ef6zxifizPgdp3A==",
|
"integrity": "sha512-CyPCYV8/KlXfEXLWj8HHHhVsR/IZ6Ckm3b/a4fWtO/lRnRK1huqncb8LlAWrmpPRsse5glF5aVuDRMHEr3UGag==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@standard-schema/utils": "^0.3.0"
|
"@standard-schema/utils": "^0.3.0"
|
||||||
@@ -1413,7 +1415,7 @@
|
|||||||
"react-hook-form": "^7.55.0",
|
"react-hook-form": "^7.55.0",
|
||||||
"superstruct": ">=0.12.0",
|
"superstruct": ">=0.12.0",
|
||||||
"typanion": "^3.3.2",
|
"typanion": "^3.3.2",
|
||||||
"valibot": "^1.0.0 || ^1.0.0-beta.4 || ^1.0.0-rc",
|
"valibot": ">=0.31.0 || ^1.0.0-beta.4 || ^1.0.0-rc",
|
||||||
"vest": ">=3.0.0",
|
"vest": ">=3.0.0",
|
||||||
"yup": "^1.0.0",
|
"yup": "^1.0.0",
|
||||||
"zod": "^3.25.0 || ^4.0.0"
|
"zod": "^3.25.0 || ^4.0.0"
|
||||||
@@ -3631,9 +3633,9 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/@storybook/addon-a11y": {
|
"node_modules/@storybook/addon-a11y": {
|
||||||
"version": "10.5.4",
|
"version": "10.5.5",
|
||||||
"resolved": "https://registry.npmjs.org/@storybook/addon-a11y/-/addon-a11y-10.5.4.tgz",
|
"resolved": "https://registry.npmjs.org/@storybook/addon-a11y/-/addon-a11y-10.5.5.tgz",
|
||||||
"integrity": "sha512-UWdZtB7Dh1GjqxTPOrisUNDhDGF5pKGzZdzW9DSSHMBcAOx2dsTmXGzLSFprAz4LTT0OHCtKhxNqKK0JZJ0Y8g==",
|
"integrity": "sha512-nsMnSRe7pzepXIkUUqI/rL7sp8juXOluyypU4Dz0UuYHhw/cKaxfzuO+3WJN5EtEr/gcnKYb4awxH/duPGavUw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -3645,20 +3647,20 @@
|
|||||||
"url": "https://opencollective.com/storybook"
|
"url": "https://opencollective.com/storybook"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"storybook": "^10.5.4"
|
"storybook": "^10.5.5"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@storybook/addon-docs": {
|
"node_modules/@storybook/addon-docs": {
|
||||||
"version": "10.5.4",
|
"version": "10.5.5",
|
||||||
"resolved": "https://registry.npmjs.org/@storybook/addon-docs/-/addon-docs-10.5.4.tgz",
|
"resolved": "https://registry.npmjs.org/@storybook/addon-docs/-/addon-docs-10.5.5.tgz",
|
||||||
"integrity": "sha512-2Z/x2pKEmXOCQjmttYzPuQBu9aWeMly8uEs3msrCTBLiHs/F7IlBFnMu0Z+T2Qvk0LEy8O93AlcPSP76aCcKjw==",
|
"integrity": "sha512-0YpKlimS4XE0kQ8Maa5coeefQxdyDrBHg1wOP3WTPuBe4FolFSCDveR0ge2+vuUBk+fZfn2+l+3Q2jmAWaRGDg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@mdx-js/react": "^3.0.0",
|
"@mdx-js/react": "^3.0.0",
|
||||||
"@storybook/csf-plugin": "10.5.4",
|
"@storybook/csf-plugin": "10.5.5",
|
||||||
"@storybook/icons": "^2.0.2",
|
"@storybook/icons": "^2.0.2",
|
||||||
"@storybook/react-dom-shim": "10.5.4",
|
"@storybook/react-dom-shim": "10.5.5",
|
||||||
"react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
|
"react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
|
||||||
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
|
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
|
||||||
"ts-dedent": "^2.0.0"
|
"ts-dedent": "^2.0.0"
|
||||||
@@ -3669,7 +3671,7 @@
|
|||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
|
"@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
|
||||||
"storybook": "^10.5.4"
|
"storybook": "^10.5.5"
|
||||||
},
|
},
|
||||||
"peerDependenciesMeta": {
|
"peerDependenciesMeta": {
|
||||||
"@types/react": {
|
"@types/react": {
|
||||||
@@ -3678,9 +3680,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@storybook/addon-vitest": {
|
"node_modules/@storybook/addon-vitest": {
|
||||||
"version": "10.5.4",
|
"version": "10.5.5",
|
||||||
"resolved": "https://registry.npmjs.org/@storybook/addon-vitest/-/addon-vitest-10.5.4.tgz",
|
"resolved": "https://registry.npmjs.org/@storybook/addon-vitest/-/addon-vitest-10.5.5.tgz",
|
||||||
"integrity": "sha512-5lr81sgrbK3Tjjbstieg/yYj3jdtQYP70ihpOiN1TwogvFATY2/9eMT46FE5ioKtEFcfJRDcgJ2wSlmJKE+kZw==",
|
"integrity": "sha512-Ymq9ErkSkYiIDuqpJ2+hE5GCQ5J6TCLOWhutqArvwaeAO+HAibM82XNExpJ1/kvPqk9y961GDPkv2W15I88JIw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -3695,7 +3697,7 @@
|
|||||||
"@vitest/browser": "^3.0.0 || ^4.0.0",
|
"@vitest/browser": "^3.0.0 || ^4.0.0",
|
||||||
"@vitest/browser-playwright": "^4.0.0",
|
"@vitest/browser-playwright": "^4.0.0",
|
||||||
"@vitest/runner": "^3.0.0 || ^4.0.0",
|
"@vitest/runner": "^3.0.0 || ^4.0.0",
|
||||||
"storybook": "^10.5.4",
|
"storybook": "^10.5.5",
|
||||||
"vitest": "^3.0.0 || ^4.0.0"
|
"vitest": "^3.0.0 || ^4.0.0"
|
||||||
},
|
},
|
||||||
"peerDependenciesMeta": {
|
"peerDependenciesMeta": {
|
||||||
@@ -3714,13 +3716,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@storybook/builder-vite": {
|
"node_modules/@storybook/builder-vite": {
|
||||||
"version": "10.5.4",
|
"version": "10.5.5",
|
||||||
"resolved": "https://registry.npmjs.org/@storybook/builder-vite/-/builder-vite-10.5.4.tgz",
|
"resolved": "https://registry.npmjs.org/@storybook/builder-vite/-/builder-vite-10.5.5.tgz",
|
||||||
"integrity": "sha512-eXdgow+brSzZrG3CnG18YwxZwEYNAZIh2G5qKwNoZf0uk2ZCPgLRQwtVAcd7BiiEDGnXUHm9pycAS+UiF4F4Mg==",
|
"integrity": "sha512-dQoJ7gUl8y0z5rV9cE0mz6qTBNmN9R4GOLIZk98rJ8CwduNJOb9eGZXusDzzvnYcp8TnNkqDtyx4tXQSUDInPQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@storybook/csf-plugin": "10.5.4",
|
"@storybook/csf-plugin": "10.5.5",
|
||||||
"ts-dedent": "^2.0.0"
|
"ts-dedent": "^2.0.0"
|
||||||
},
|
},
|
||||||
"funding": {
|
"funding": {
|
||||||
@@ -3728,14 +3730,14 @@
|
|||||||
"url": "https://opencollective.com/storybook"
|
"url": "https://opencollective.com/storybook"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"storybook": "^10.5.4",
|
"storybook": "^10.5.5",
|
||||||
"vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"
|
"vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@storybook/csf-plugin": {
|
"node_modules/@storybook/csf-plugin": {
|
||||||
"version": "10.5.4",
|
"version": "10.5.5",
|
||||||
"resolved": "https://registry.npmjs.org/@storybook/csf-plugin/-/csf-plugin-10.5.4.tgz",
|
"resolved": "https://registry.npmjs.org/@storybook/csf-plugin/-/csf-plugin-10.5.5.tgz",
|
||||||
"integrity": "sha512-DSp5Z/eZlRnKq0KrKLJE6uoYf/Ysc+FP0Z5DVTGnOrie+z3tC0lNi9I4RB++EXkJeUDS9/4dxvJZVSWjhLlXxw==",
|
"integrity": "sha512-/euibhRFqklYCZqUseokojmfYcQpXshVY2QmA1qCuxMz9SzVFD3iSTw+aFLTxpsJGGdcZJk8fnm/rEthLzZ9jA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -3748,7 +3750,7 @@
|
|||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"esbuild": "*",
|
"esbuild": "*",
|
||||||
"rollup": "*",
|
"rollup": "*",
|
||||||
"storybook": "^10.5.4",
|
"storybook": "^10.5.5",
|
||||||
"vite": "*",
|
"vite": "*",
|
||||||
"webpack": "*"
|
"webpack": "*"
|
||||||
},
|
},
|
||||||
@@ -3785,14 +3787,14 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@storybook/react": {
|
"node_modules/@storybook/react": {
|
||||||
"version": "10.5.4",
|
"version": "10.5.5",
|
||||||
"resolved": "https://registry.npmjs.org/@storybook/react/-/react-10.5.4.tgz",
|
"resolved": "https://registry.npmjs.org/@storybook/react/-/react-10.5.5.tgz",
|
||||||
"integrity": "sha512-tOxfVgbYcaVsArN8XTDkJfdsnsnHh1LxjRHVpJ/N+VEkz4FveK/XH3jOLV0YqgrG8yXza7+CteDP4FfPVQY/mw==",
|
"integrity": "sha512-T2Xj0ey7a9RHU6coYLC0L5lhjcdyhLCs9wNv15FvHvgmrRobkynEV72kq5vGW8tFkahNWI1X9+GZPQ6r8Nm38w==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@storybook/global": "^5.0.0",
|
"@storybook/global": "^5.0.0",
|
||||||
"@storybook/react-dom-shim": "10.5.4",
|
"@storybook/react-dom-shim": "10.5.5",
|
||||||
"react-docgen": "^8.0.2",
|
"react-docgen": "^8.0.2",
|
||||||
"react-docgen-typescript": "^2.2.2"
|
"react-docgen-typescript": "^2.2.2"
|
||||||
},
|
},
|
||||||
@@ -3805,7 +3807,7 @@
|
|||||||
"@types/react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
|
"@types/react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
|
||||||
"react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
|
"react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
|
||||||
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
|
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
|
||||||
"storybook": "^10.5.4",
|
"storybook": "^10.5.5",
|
||||||
"typescript": ">= 4.9.x"
|
"typescript": ">= 4.9.x"
|
||||||
},
|
},
|
||||||
"peerDependenciesMeta": {
|
"peerDependenciesMeta": {
|
||||||
@@ -3821,9 +3823,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@storybook/react-dom-shim": {
|
"node_modules/@storybook/react-dom-shim": {
|
||||||
"version": "10.5.4",
|
"version": "10.5.5",
|
||||||
"resolved": "https://registry.npmjs.org/@storybook/react-dom-shim/-/react-dom-shim-10.5.4.tgz",
|
"resolved": "https://registry.npmjs.org/@storybook/react-dom-shim/-/react-dom-shim-10.5.5.tgz",
|
||||||
"integrity": "sha512-YdlppEOReg8MvTECRNuf79gu2zL83JqKDHIR/65eS0M6y+ue9pkpfjYo7hZVIcyOcRd9npBDXMdt2kC92bCuaA==",
|
"integrity": "sha512-PIk7N3LLrZIxfNxmkvmQN1d5UQ70XEedT8n0GhBiXnM6XL09xPGB8n8TZXeJBRYluKhDQcAyQeT0/OZmcDVQJg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"funding": {
|
"funding": {
|
||||||
@@ -3835,7 +3837,7 @@
|
|||||||
"@types/react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
|
"@types/react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
|
||||||
"react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
|
"react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
|
||||||
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
|
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
|
||||||
"storybook": "^10.5.4"
|
"storybook": "^10.5.5"
|
||||||
},
|
},
|
||||||
"peerDependenciesMeta": {
|
"peerDependenciesMeta": {
|
||||||
"@types/react": {
|
"@types/react": {
|
||||||
@@ -3847,16 +3849,16 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@storybook/react-vite": {
|
"node_modules/@storybook/react-vite": {
|
||||||
"version": "10.5.4",
|
"version": "10.5.5",
|
||||||
"resolved": "https://registry.npmjs.org/@storybook/react-vite/-/react-vite-10.5.4.tgz",
|
"resolved": "https://registry.npmjs.org/@storybook/react-vite/-/react-vite-10.5.5.tgz",
|
||||||
"integrity": "sha512-iw7EAA98n30vpf+ZSy2Ll4Ne7oyZ/lS6W22u5Sp5UOI2oAkYuklxIWjRIKGqpY0BHP+GqaGYtUGMZQnBqgul2g==",
|
"integrity": "sha512-Uy7VV72kVSkw6aDTAPQupXUeZX5LF6e4zqNvTZ+36qxsXAkaFgw7HPEm7L1tsaRfiV+s9anU7UvX47tfJpYGuQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@joshwooding/vite-plugin-react-docgen-typescript": "^0.7.0",
|
"@joshwooding/vite-plugin-react-docgen-typescript": "^0.7.0",
|
||||||
"@rollup/pluginutils": "^5.0.2",
|
"@rollup/pluginutils": "^5.0.2",
|
||||||
"@storybook/builder-vite": "10.5.4",
|
"@storybook/builder-vite": "10.5.5",
|
||||||
"@storybook/react": "10.5.4",
|
"@storybook/react": "10.5.5",
|
||||||
"empathic": "^2.0.0",
|
"empathic": "^2.0.0",
|
||||||
"magic-string": "^0.30.0",
|
"magic-string": "^0.30.0",
|
||||||
"react-docgen": "^8.0.2",
|
"react-docgen": "^8.0.2",
|
||||||
@@ -3870,7 +3872,7 @@
|
|||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
|
"react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
|
||||||
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
|
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
|
||||||
"storybook": "^10.5.4",
|
"storybook": "^10.5.5",
|
||||||
"typescript": ">= 4.9.x",
|
"typescript": ">= 4.9.x",
|
||||||
"vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"
|
"vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"
|
||||||
},
|
},
|
||||||
@@ -7165,7 +7167,7 @@
|
|||||||
"version": "3.1.3",
|
"version": "3.1.3",
|
||||||
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
|
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
|
||||||
"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
|
"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
|
||||||
"devOptional": true,
|
"dev": true,
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/fast-json-patch": {
|
"node_modules/fast-json-patch": {
|
||||||
@@ -7531,9 +7533,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/globals": {
|
"node_modules/globals": {
|
||||||
"version": "17.7.0",
|
"version": "17.8.0",
|
||||||
"resolved": "https://registry.npmjs.org/globals/-/globals-17.7.0.tgz",
|
"resolved": "https://registry.npmjs.org/globals/-/globals-17.8.0.tgz",
|
||||||
"integrity": "sha512-Czmyns5dUsq4seFBR/Kdydhmo8y9kC79hiSkPn0YcGtNnYWnrgt0vjrSjx9tspoDGWm2CMarffRuLjM4xUz8xg==",
|
"integrity": "sha512-Zz/LMDZScFmkakeL2cTHzf+PbWKdpU3uclqkZT7TjDG58j5WPt0PpA+n9uPI24fZtlw07q0OtEi84K+umsRzqQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"engines": {
|
"engines": {
|
||||||
@@ -8525,39 +8527,39 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/jsdom": {
|
"node_modules/jsdom": {
|
||||||
"version": "29.1.1",
|
"version": "30.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-29.1.1.tgz",
|
"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-30.0.1.tgz",
|
||||||
"integrity": "sha512-ECi4Fi2f7BdJtUKTflYRTiaMxIB0O6zfR1fX0GXpUrf6flp8QIYn1UT20YQqdSOfk2dfkCwS8LAFoJDEppNK5Q==",
|
"integrity": "sha512-52v7mUVUfNQVYYqE1lcdaymWL0njO7lTLUog6ZvW2U5KsbiLk/GnZlVJ+qx0xfNJZ6Gn+KSpPNE52vurbxZwrA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@asamuzakjp/css-color": "^5.1.11",
|
"@asamuzakjp/css-color": "^6.0.5",
|
||||||
"@asamuzakjp/dom-selector": "^7.1.1",
|
"@asamuzakjp/dom-selector": "^8.3.0",
|
||||||
"@bramus/specificity": "^2.4.2",
|
"@bramus/specificity": "^2.4.2",
|
||||||
"@csstools/css-syntax-patches-for-csstree": "^1.1.3",
|
"@csstools/css-syntax-patches-for-csstree": "^1.1.7",
|
||||||
"@exodus/bytes": "^1.15.0",
|
"@exodus/bytes": "^1.15.1",
|
||||||
"css-tree": "^3.2.1",
|
"css-tree": "^3.2.1",
|
||||||
"data-urls": "^7.0.0",
|
"data-urls": "^7.0.0",
|
||||||
"decimal.js": "^10.6.0",
|
"decimal.js": "^10.6.0",
|
||||||
"html-encoding-sniffer": "^6.0.0",
|
"html-encoding-sniffer": "^6.0.0",
|
||||||
"is-potential-custom-element-name": "^1.0.1",
|
"is-potential-custom-element-name": "^1.0.1",
|
||||||
"lru-cache": "^11.3.5",
|
"lru-cache": "^11.5.2",
|
||||||
"parse5": "^8.0.1",
|
"parse5": "^8.0.1",
|
||||||
"saxes": "^6.0.0",
|
"saxes": "^6.0.0",
|
||||||
"symbol-tree": "^3.2.4",
|
"symbol-tree": "^3.2.4",
|
||||||
"tough-cookie": "^6.0.1",
|
"tough-cookie": "^6.0.2",
|
||||||
"undici": "^7.25.0",
|
"undici": "^8.9.0",
|
||||||
"w3c-xmlserializer": "^5.0.0",
|
"w3c-xmlserializer": "^5.0.0",
|
||||||
"webidl-conversions": "^8.0.1",
|
"webidl-conversions": "^8.0.1",
|
||||||
"whatwg-mimetype": "^5.0.0",
|
"whatwg-mimetype": "^5.0.0",
|
||||||
"whatwg-url": "^16.0.1",
|
"whatwg-url": "^17.1.0",
|
||||||
"xml-name-validator": "^5.0.0"
|
"xml-name-validator": "^5.0.0"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": "^20.19.0 || ^22.13.0 || >=24.0.0"
|
"node": "^22.22.2 || ^24.15.0 || >=26.0.0"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"canvas": "^3.0.0"
|
"canvas": "^3.2.3"
|
||||||
},
|
},
|
||||||
"peerDependenciesMeta": {
|
"peerDependenciesMeta": {
|
||||||
"canvas": {
|
"canvas": {
|
||||||
@@ -8575,6 +8577,21 @@
|
|||||||
"node": "20 || >=22"
|
"node": "20 || >=22"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/jsdom/node_modules/whatwg-url": {
|
||||||
|
"version": "17.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-17.1.0.tgz",
|
||||||
|
"integrity": "sha512-3GeworPmc2ZfEEHP7lEbUfBX/L75wdEsi0rLNhXcXxnoN5jyq0SL5gCy06SGW2cyTIZdTvWIDQNQoza++vKeaw==",
|
||||||
|
"dev": true,
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@exodus/bytes": "^1.15.1",
|
||||||
|
"tr46": "^6.0.0",
|
||||||
|
"webidl-conversions": "^8.0.1"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": "^22.14.0 || >=24.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/jsesc": {
|
"node_modules/jsesc": {
|
||||||
"version": "3.1.0",
|
"version": "3.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
|
||||||
@@ -10420,7 +10437,7 @@
|
|||||||
"version": "2.0.2",
|
"version": "2.0.2",
|
||||||
"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
|
||||||
"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
|
"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
|
||||||
"devOptional": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=0.10.0"
|
"node": ">=0.10.0"
|
||||||
@@ -10967,9 +10984,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/storybook": {
|
"node_modules/storybook": {
|
||||||
"version": "10.5.4",
|
"version": "10.5.5",
|
||||||
"resolved": "https://registry.npmjs.org/storybook/-/storybook-10.5.4.tgz",
|
"resolved": "https://registry.npmjs.org/storybook/-/storybook-10.5.5.tgz",
|
||||||
"integrity": "sha512-bmLxPsxVSPnbeiZqYQpozyNOiJXfk+pf7WfHZflvPkwT6Y+rvYz3Cj/D6H4Kf2jHpuDNiMXBKO3yawLN2OWirg==",
|
"integrity": "sha512-UscBIBJDloUeqntukHOhP1a5W/vouePDJbzPSxj466WK801FZtzQiMffMtkjzJiWSuj20wfaYlB2QQKh9aOYAg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -10989,7 +11006,7 @@
|
|||||||
"recast": "^0.23.5",
|
"recast": "^0.23.5",
|
||||||
"semver": "^7.7.3",
|
"semver": "^7.7.3",
|
||||||
"use-sync-external-store": "^1.5.0",
|
"use-sync-external-store": "^1.5.0",
|
||||||
"ws": "^8.18.0"
|
"ws": "^8.21.1"
|
||||||
},
|
},
|
||||||
"bin": {
|
"bin": {
|
||||||
"storybook": "dist/bin/dispatcher.js"
|
"storybook": "dist/bin/dispatcher.js"
|
||||||
@@ -11760,13 +11777,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/undici": {
|
"node_modules/undici": {
|
||||||
"version": "7.29.0",
|
"version": "8.9.0",
|
||||||
"resolved": "https://registry.npmjs.org/undici/-/undici-7.29.0.tgz",
|
"resolved": "https://registry.npmjs.org/undici/-/undici-8.9.0.tgz",
|
||||||
"integrity": "sha512-IDxfleLmmbSskfWSUATiN1nfn2rDuvnMOqb5CWR92iIfojA0Ud+ulOAAEQ57LPr9rWmsreUyf5lwyao+7GNNVw==",
|
"integrity": "sha512-aWZpUj7XoGonMClx4gdDRfgBjqeA+F473aDmROQQbM9n6PRfK/u1q/a0X4wMTgcHfT8H6fpbt98PFuDUwFg2YA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=20.18.1"
|
"node": ">=22.19.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/undici-types": {
|
"node_modules/undici-types": {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "3x-ui-frontend",
|
"name": "3x-ui-frontend",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0.4.3",
|
"version": "0.6.0",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"description": "3x-ui panel frontend (React 19 + Ant Design 6 + Vite 8).",
|
"description": "3x-ui panel frontend (React 19 + Ant Design 6 + Vite 8).",
|
||||||
"engines": {
|
"engines": {
|
||||||
@@ -30,7 +30,7 @@
|
|||||||
"@ant-design/icons": "^6.3.2",
|
"@ant-design/icons": "^6.3.2",
|
||||||
"@codemirror/lang-json": "^6.0.2",
|
"@codemirror/lang-json": "^6.0.2",
|
||||||
"@codemirror/theme-one-dark": "^6.1.3",
|
"@codemirror/theme-one-dark": "^6.1.3",
|
||||||
"@hookform/resolvers": "^5.4.3",
|
"@hookform/resolvers": "^5.5.7",
|
||||||
"@noble/hashes": "^2.2.0",
|
"@noble/hashes": "^2.2.0",
|
||||||
"@tanstack/react-query": "^5.101.4",
|
"@tanstack/react-query": "^5.101.4",
|
||||||
"@tanstack/react-query-devtools": "^5.101.4",
|
"@tanstack/react-query-devtools": "^5.101.4",
|
||||||
@@ -51,10 +51,10 @@
|
|||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/js": "^10.0.1",
|
"@eslint/js": "^10.0.1",
|
||||||
"@storybook/addon-a11y": "^10.5.4",
|
"@storybook/addon-a11y": "^10.5.5",
|
||||||
"@storybook/addon-docs": "^10.5.4",
|
"@storybook/addon-docs": "^10.5.5",
|
||||||
"@storybook/addon-vitest": "^10.5.4",
|
"@storybook/addon-vitest": "^10.5.5",
|
||||||
"@storybook/react-vite": "^10.5.4",
|
"@storybook/react-vite": "^10.5.5",
|
||||||
"@testing-library/dom": "^10.4.1",
|
"@testing-library/dom": "^10.4.1",
|
||||||
"@testing-library/react": "^16.3.2",
|
"@testing-library/react": "^16.3.2",
|
||||||
"@types/react": "^19.2.17",
|
"@types/react": "^19.2.17",
|
||||||
@@ -66,13 +66,13 @@
|
|||||||
"eslint": "^10.8.0",
|
"eslint": "^10.8.0",
|
||||||
"eslint-plugin-jsx-a11y": "^6.10.2",
|
"eslint-plugin-jsx-a11y": "^6.10.2",
|
||||||
"eslint-plugin-react-hooks": "^7.1.1",
|
"eslint-plugin-react-hooks": "^7.1.1",
|
||||||
"globals": "^17.7.0",
|
"globals": "^17.8.0",
|
||||||
"husky": "^9.1.7",
|
"husky": "^9.1.7",
|
||||||
"jsdom": "^29.1.1",
|
"jsdom": "^30.0.1",
|
||||||
"lint-staged": "^17.2.0",
|
"lint-staged": "^17.2.0",
|
||||||
"msw": "^2.15.0",
|
"msw": "^2.15.0",
|
||||||
"playwright": "^1.62.0",
|
"playwright": "^1.62.0",
|
||||||
"storybook": "^10.5.4",
|
"storybook": "^10.5.5",
|
||||||
"typescript": "6.0.3",
|
"typescript": "6.0.3",
|
||||||
"typescript-eslint": "^8.65.0",
|
"typescript-eslint": "^8.65.0",
|
||||||
"vite": "8.1.5",
|
"vite": "8.1.5",
|
||||||
|
|||||||
@@ -270,6 +270,9 @@
|
|||||||
"subRoutingRules": {
|
"subRoutingRules": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
|
"subShowIdentityOnAllLinks": {
|
||||||
|
"type": "boolean"
|
||||||
|
},
|
||||||
"subSupportUrl": {
|
"subSupportUrl": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
@@ -441,6 +444,7 @@
|
|||||||
"subPort",
|
"subPort",
|
||||||
"subProfileUrl",
|
"subProfileUrl",
|
||||||
"subRoutingRules",
|
"subRoutingRules",
|
||||||
|
"subShowIdentityOnAllLinks",
|
||||||
"subSupportUrl",
|
"subSupportUrl",
|
||||||
"subThemeDir",
|
"subThemeDir",
|
||||||
"subTitle",
|
"subTitle",
|
||||||
@@ -737,6 +741,9 @@
|
|||||||
"subRoutingRules": {
|
"subRoutingRules": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
|
"subShowIdentityOnAllLinks": {
|
||||||
|
"type": "boolean"
|
||||||
|
},
|
||||||
"subSupportUrl": {
|
"subSupportUrl": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
@@ -915,6 +922,7 @@
|
|||||||
"subPort",
|
"subPort",
|
||||||
"subProfileUrl",
|
"subProfileUrl",
|
||||||
"subRoutingRules",
|
"subRoutingRules",
|
||||||
|
"subShowIdentityOnAllLinks",
|
||||||
"subSupportUrl",
|
"subSupportUrl",
|
||||||
"subThemeDir",
|
"subThemeDir",
|
||||||
"subTitle",
|
"subTitle",
|
||||||
@@ -1860,6 +1868,13 @@
|
|||||||
],
|
],
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
|
"trafficResetDay": {
|
||||||
|
"description": "Day of month for monthly traffic resets",
|
||||||
|
"example": 1,
|
||||||
|
"maximum": 31,
|
||||||
|
"minimum": 1,
|
||||||
|
"type": "integer"
|
||||||
|
},
|
||||||
"up": {
|
"up": {
|
||||||
"description": "Upload traffic in bytes",
|
"description": "Upload traffic in bytes",
|
||||||
"format": "int64",
|
"format": "int64",
|
||||||
@@ -1886,6 +1901,7 @@
|
|||||||
"tag",
|
"tag",
|
||||||
"total",
|
"total",
|
||||||
"trafficReset",
|
"trafficReset",
|
||||||
|
"trafficResetDay",
|
||||||
"up"
|
"up"
|
||||||
],
|
],
|
||||||
"type": "object"
|
"type": "object"
|
||||||
@@ -3151,6 +3167,7 @@
|
|||||||
"tag": "in-443-tcp",
|
"tag": "in-443-tcp",
|
||||||
"total": 0,
|
"total": 0,
|
||||||
"trafficReset": "never",
|
"trafficReset": "never",
|
||||||
|
"trafficResetDay": 1,
|
||||||
"up": 0
|
"up": 0
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@@ -3963,6 +3980,36 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"/panel/api/openapi.json": {
|
||||||
|
"get": {
|
||||||
|
"tags": [
|
||||||
|
"Server"
|
||||||
|
],
|
||||||
|
"summary": "Serve this API description as an OpenAPI 3 document — the same file that powers the API Docs page. Requires a session or Bearer token like the rest of /panel/api. Useful for generating clients or importing into API tooling.",
|
||||||
|
"operationId": "get_panel_api_openapi_json",
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "Successful response",
|
||||||
|
"content": {
|
||||||
|
"application/json": {
|
||||||
|
"schema": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"success": {
|
||||||
|
"type": "boolean"
|
||||||
|
},
|
||||||
|
"msg": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"obj": {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"/panel/api/server/status": {
|
"/panel/api/server/status": {
|
||||||
"get": {
|
"get": {
|
||||||
"tags": [
|
"tags": [
|
||||||
@@ -5644,7 +5691,7 @@
|
|||||||
"tags": [
|
"tags": [
|
||||||
"Clients"
|
"Clients"
|
||||||
],
|
],
|
||||||
"summary": "Filter, sort, and paginate clients on the server. Each item is a slim row (no uuid/password/auth/flow/security/reverse/tgId) so the clients page can ship 25-ish rows in a few KB instead of the full table. The response also includes a summary computed across the full DB row set so dashboard counters stay stable as the user paginates or filters. Page size capped at 200; fetch /get/:email to obtain the full per-client payload for an edit/info modal.",
|
"summary": "Filter, sort, and paginate clients on the server. Each item is a slim row (no uuid/password/auth/flow/security/reverse/tgId) so the clients page can ship 25-ish rows in a few KB instead of the full table. The response also includes a summary computed across the full DB row set so dashboard counters stay stable as the user paginates or filters: the *Count fields are exact, while the email arrays beside them stop at 200 entries so the payload does not grow with the panel. Page size capped at 200; fetch /get/:email to obtain the full per-client payload for an edit/info modal.",
|
||||||
"operationId": "get_panel_api_clients_list_paged",
|
"operationId": "get_panel_api_clients_list_paged",
|
||||||
"parameters": [
|
"parameters": [
|
||||||
{
|
{
|
||||||
@@ -5760,12 +5807,18 @@
|
|||||||
"summary": {
|
"summary": {
|
||||||
"total": 2000,
|
"total": 2000,
|
||||||
"active": 1850,
|
"active": 1850,
|
||||||
|
"onlineCount": 1,
|
||||||
|
"depletedCount": 0,
|
||||||
|
"expiringCount": 0,
|
||||||
|
"deactiveCount": 150,
|
||||||
"online": [
|
"online": [
|
||||||
"alice@example.com"
|
"alice@example.com"
|
||||||
],
|
],
|
||||||
"depleted": [],
|
"depleted": [],
|
||||||
"expiring": [],
|
"expiring": [],
|
||||||
"deactive": []
|
"deactive": [
|
||||||
|
"bob@example.com"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -5816,6 +5869,47 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"/panel/api/clients/get/tgId/{tgId}": {
|
||||||
|
"get": {
|
||||||
|
"tags": [
|
||||||
|
"Clients"
|
||||||
|
],
|
||||||
|
"summary": "Fetch clients by Telegram user ID. Returns an array since multiple clients can share the same Telegram ID.",
|
||||||
|
"operationId": "get_panel_api_clients_get_tgId_tgId",
|
||||||
|
"parameters": [
|
||||||
|
{
|
||||||
|
"name": "tgId",
|
||||||
|
"in": "path",
|
||||||
|
"required": true,
|
||||||
|
"description": "Telegram user ID (numeric).",
|
||||||
|
"schema": {
|
||||||
|
"type": "integer"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "Successful response",
|
||||||
|
"content": {
|
||||||
|
"application/json": {
|
||||||
|
"schema": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"success": {
|
||||||
|
"type": "boolean"
|
||||||
|
},
|
||||||
|
"msg": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"obj": {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"/panel/api/clients/add": {
|
"/panel/api/clients/add": {
|
||||||
"post": {
|
"post": {
|
||||||
"tags": [
|
"tags": [
|
||||||
@@ -9681,6 +9775,36 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"/panel/api/setting/factoryDefaults": {
|
||||||
|
"post": {
|
||||||
|
"tags": [
|
||||||
|
"Settings"
|
||||||
|
],
|
||||||
|
"summary": "Return the shipped (factory) default value per browser-safe setting key, so clients can tell a stored value apart from the default it would fall back to. Per-install material (secret, panelGuid, mTLS keys) and credential fields are never included.",
|
||||||
|
"operationId": "post_panel_api_setting_factoryDefaults",
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "Successful response",
|
||||||
|
"content": {
|
||||||
|
"application/json": {
|
||||||
|
"schema": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"success": {
|
||||||
|
"type": "boolean"
|
||||||
|
},
|
||||||
|
"msg": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"obj": {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"/panel/api/setting/update": {
|
"/panel/api/setting/update": {
|
||||||
"post": {
|
"post": {
|
||||||
"tags": [
|
"tags": [
|
||||||
|
|||||||
@@ -88,6 +88,28 @@ function encodeForm(data: unknown): string {
|
|||||||
return parts.join('&');
|
return parts.join('&');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function appendQuery(url: string, query: string): string {
|
||||||
|
if (query === '') return url;
|
||||||
|
const hashIndex = url.indexOf('#');
|
||||||
|
const path = hashIndex === -1 ? url : url.slice(0, hashIndex);
|
||||||
|
const hash = hashIndex === -1 ? '' : url.slice(hashIndex);
|
||||||
|
const hasQuery = path.includes('?');
|
||||||
|
const separator = !hasQuery ? '?' : path.endsWith('?') || path.endsWith('&') ? '' : '&';
|
||||||
|
return `${path}${separator}${query}${hash}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function requestSignal(options: HttpRequestOptions): AbortSignal | undefined {
|
||||||
|
if (!options.timeout) return options.signal;
|
||||||
|
const timeout = AbortSignal.timeout(options.timeout);
|
||||||
|
if (!options.signal) return timeout;
|
||||||
|
if (typeof AbortSignal.any === 'function') return AbortSignal.any([options.signal, timeout]);
|
||||||
|
const controller = new AbortController();
|
||||||
|
const abort = () => controller.abort();
|
||||||
|
options.signal.addEventListener('abort', abort, { once: true });
|
||||||
|
timeout.addEventListener('abort', abort, { once: true });
|
||||||
|
return controller.signal;
|
||||||
|
}
|
||||||
|
|
||||||
async function performFetch(
|
async function performFetch(
|
||||||
method: string,
|
method: string,
|
||||||
url: string,
|
url: string,
|
||||||
@@ -121,8 +143,8 @@ async function performFetch(
|
|||||||
}
|
}
|
||||||
|
|
||||||
const query = encodeForm(options.params);
|
const query = encodeForm(options.params);
|
||||||
const fullUrl = basePathPrefix + url + (query ? `?${query}` : '');
|
const fullUrl = basePathPrefix + appendQuery(url, query);
|
||||||
const signal = options.timeout ? AbortSignal.timeout(options.timeout) : options.signal;
|
const signal = requestSignal(options);
|
||||||
|
|
||||||
return fetch(fullUrl, { method: upper, headers, body, credentials: 'same-origin', signal });
|
return fetch(fullUrl, { method: upper, headers, body, credentials: 'same-origin', signal });
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { useCallback, useEffect, useMemo, useState } from 'react';
|
import { useCallback, useMemo, useState } from 'react';
|
||||||
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
|
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
|
||||||
|
|
||||||
import { HttpUtil, Msg } from '@/utils';
|
import { HttpUtil, Msg } from '@/utils';
|
||||||
@@ -6,8 +6,13 @@ import { parseMsg } from '@/utils/zodValidate';
|
|||||||
import { AllSetting } from '@/models/setting';
|
import { AllSetting } from '@/models/setting';
|
||||||
import { AllSettingSchema, type AllSettingInput } from '@/schemas/setting';
|
import { AllSettingSchema, type AllSettingInput } from '@/schemas/setting';
|
||||||
import { keys } from '@/api/queryKeys';
|
import { keys } from '@/api/queryKeys';
|
||||||
|
import { useServerDraft } from '@/hooks/useServerDraft';
|
||||||
|
|
||||||
type SettingSavePayload = Partial<AllSetting> & Record<string, unknown>;
|
type SettingSavePayload = Partial<AllSetting> & Record<string, unknown>;
|
||||||
|
type SettingSaveResult = {
|
||||||
|
msg: Msg<unknown>;
|
||||||
|
saved?: AllSetting;
|
||||||
|
};
|
||||||
|
|
||||||
async function fetchAllSetting(): Promise<AllSettingInput | null> {
|
async function fetchAllSetting(): Promise<AllSettingInput | null> {
|
||||||
const msg = await HttpUtil.post('/panel/api/setting/all', undefined, { silent: true });
|
const msg = await HttpUtil.post('/panel/api/setting/all', undefined, { silent: true });
|
||||||
@@ -18,7 +23,6 @@ async function fetchAllSetting(): Promise<AllSettingInput | null> {
|
|||||||
|
|
||||||
export function useAllSettings() {
|
export function useAllSettings() {
|
||||||
const queryClient = useQueryClient();
|
const queryClient = useQueryClient();
|
||||||
const [draft, setDraft] = useState<AllSetting>(() => new AllSetting());
|
|
||||||
const [extraSpinning, setExtraSpinning] = useState(false);
|
const [extraSpinning, setExtraSpinning] = useState(false);
|
||||||
|
|
||||||
const query = useQuery({
|
const query = useQuery({
|
||||||
@@ -28,41 +32,54 @@ export function useAllSettings() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const server = useMemo(() => new AllSetting(query.data), [query.data]);
|
const server = useMemo(() => new AllSetting(query.data), [query.data]);
|
||||||
|
const { draft, setDraft, isDirty, markSaved } = useServerDraft(
|
||||||
useEffect(() => {
|
query.data === undefined ? undefined : server,
|
||||||
if (query.data !== undefined) {
|
(setting) => new AllSetting(setting),
|
||||||
setDraft(new AllSetting(query.data));
|
(left, right) => left.equals(right),
|
||||||
}
|
);
|
||||||
}, [query.data]);
|
const allSetting = draft ?? server;
|
||||||
|
|
||||||
const updateSetting = useCallback((patch: Partial<AllSetting>) => {
|
const updateSetting = useCallback((patch: Partial<AllSetting>) => {
|
||||||
setDraft((prev) => {
|
setDraft((prev) => {
|
||||||
const next = new AllSetting(prev);
|
const next = new AllSetting(prev ?? server);
|
||||||
Object.assign(next, patch);
|
Object.assign(next, patch);
|
||||||
return next;
|
return next;
|
||||||
});
|
});
|
||||||
}, []);
|
}, [server, setDraft]);
|
||||||
|
|
||||||
const saveMut = useMutation({
|
const saveMut = useMutation({
|
||||||
mutationFn: async (next: SettingSavePayload): Promise<Msg<unknown>> => {
|
mutationFn: async ({ payload, saved }: { payload: SettingSavePayload; saved?: AllSetting }): Promise<SettingSaveResult> => {
|
||||||
const payload = { ...next };
|
const next = { ...payload };
|
||||||
const body = AllSettingSchema.partial().safeParse(payload);
|
const body = AllSettingSchema.partial().safeParse(next);
|
||||||
if (!body.success) {
|
if (!body.success) {
|
||||||
console.warn('[zod] setting/update body failed validation', body.error.issues);
|
console.warn('[zod] setting/update body failed validation', body.error.issues);
|
||||||
}
|
}
|
||||||
return HttpUtil.post('/panel/api/setting/update', body.success ? { ...payload, ...body.data } : payload);
|
const msg = await HttpUtil.post('/panel/api/setting/update', body.success ? { ...next, ...body.data } : next);
|
||||||
|
return { msg, saved };
|
||||||
},
|
},
|
||||||
onSuccess: (msg) => {
|
onSuccess: ({ msg, saved }) => {
|
||||||
if (msg?.success) queryClient.invalidateQueries({ queryKey: keys.settings.all() });
|
if (!msg?.success) return;
|
||||||
|
if (saved) markSaved(saved);
|
||||||
|
queryClient.invalidateQueries({ queryKey: keys.settings.all() });
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const saveAll = useCallback(() => saveMut.mutateAsync({ ...draft }), [saveMut, draft]);
|
const saveAll = useCallback(async () => {
|
||||||
const savePayload = useCallback((payload: SettingSavePayload) => saveMut.mutateAsync(payload), [saveMut]);
|
const saved = new AllSetting(allSetting);
|
||||||
const saveDisabled = useMemo(() => server.equals(draft), [server, draft]);
|
return (await saveMut.mutateAsync({ payload: { ...saved }, saved })).msg;
|
||||||
|
}, [allSetting, saveMut]);
|
||||||
|
const savePayload = useCallback(
|
||||||
|
async (payload: SettingSavePayload) => {
|
||||||
|
const saved = new AllSetting(allSetting);
|
||||||
|
Object.assign(saved, payload);
|
||||||
|
return (await saveMut.mutateAsync({ payload, saved })).msg;
|
||||||
|
},
|
||||||
|
[allSetting, saveMut],
|
||||||
|
);
|
||||||
|
const saveDisabled = !isDirty;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
allSetting: draft,
|
allSetting,
|
||||||
updateSetting,
|
updateSetting,
|
||||||
fetched: query.data !== undefined,
|
fetched: query.data !== undefined,
|
||||||
spinning: extraSpinning || saveMut.isPending,
|
spinning: extraSpinning || saveMut.isPending,
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
import { useQuery } from '@tanstack/react-query';
|
||||||
|
|
||||||
|
import { HttpUtil } from '@/utils';
|
||||||
|
import { parseMsg } from '@/utils/zodValidate';
|
||||||
|
import { FactoryDefaultsSchema, type FactoryDefaults } from '@/schemas/setting';
|
||||||
|
import { keys } from '@/api/queryKeys';
|
||||||
|
|
||||||
|
async function fetchFactoryDefaults(): Promise<FactoryDefaults> {
|
||||||
|
const msg = await HttpUtil.post('/panel/api/setting/factoryDefaults', undefined, { silent: true });
|
||||||
|
if (!msg?.success) throw new Error(msg?.msg || 'Failed to fetch factory defaults');
|
||||||
|
const validated = parseMsg(msg, FactoryDefaultsSchema, 'setting/factoryDefaults');
|
||||||
|
const parsed = FactoryDefaultsSchema.safeParse(validated.obj);
|
||||||
|
return parsed.success ? parsed.data : {};
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useFactoryDefaults() {
|
||||||
|
return useQuery({
|
||||||
|
queryKey: keys.settings.factoryDefaults(),
|
||||||
|
queryFn: fetchFactoryDefaults,
|
||||||
|
staleTime: Infinity,
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -17,6 +17,7 @@ export const keys = {
|
|||||||
root: () => ['settings'] as const,
|
root: () => ['settings'] as const,
|
||||||
all: () => ['settings', 'all'] as const,
|
all: () => ['settings', 'all'] as const,
|
||||||
defaults: () => ['settings', 'defaults'] as const,
|
defaults: () => ['settings', 'defaults'] as const,
|
||||||
|
factoryDefaults: () => ['settings', 'factoryDefaults'] as const,
|
||||||
},
|
},
|
||||||
inbounds: {
|
inbounds: {
|
||||||
root: () => ['inbounds'] as const,
|
root: () => ['inbounds'] as const,
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { useMemo } from 'react';
|
import { memo, useMemo } from 'react';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import { Popover, Progress } from 'antd';
|
import { Popover, Progress } from 'antd';
|
||||||
|
|
||||||
@@ -17,7 +17,11 @@ export interface ClientTrafficCellProps {
|
|||||||
compact?: boolean;
|
compact?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function ClientTrafficCell({
|
// Every prop is a primitive and the component is pure, so the memo bails out
|
||||||
|
// whenever a client's counters did not move — which is most of them on most
|
||||||
|
// pushes. Each skipped instance is one antd Popover (rc-trigger), one Progress,
|
||||||
|
// a useTranslation subscription and a theme context read, times up to 200 rows.
|
||||||
|
const ClientTrafficCell = memo(function ClientTrafficCell({
|
||||||
up = 0,
|
up = 0,
|
||||||
down = 0,
|
down = 0,
|
||||||
total = 0,
|
total = 0,
|
||||||
@@ -83,4 +87,6 @@ export default function ClientTrafficCell({
|
|||||||
</div>
|
</div>
|
||||||
</Popover>
|
</Popover>
|
||||||
);
|
);
|
||||||
}
|
});
|
||||||
|
|
||||||
|
export default ClientTrafficCell;
|
||||||
|
|||||||
@@ -16,6 +16,10 @@ body.light .config-block .ant-tag.ant-tag-filled.ant-tag-gold {
|
|||||||
color: #874d00;
|
color: #874d00;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
body.light .config-block-text {
|
||||||
|
color: #595959;
|
||||||
|
}
|
||||||
|
|
||||||
.config-block .ant-collapse-extra {
|
.config-block .ant-collapse-extra {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|||||||
@@ -121,7 +121,9 @@ export default function DateTimePicker({
|
|||||||
<DatePicker
|
<DatePicker
|
||||||
value={value}
|
value={value}
|
||||||
onChange={(next) => onChange(next || null)}
|
onChange={(next) => onChange(next || null)}
|
||||||
|
onCalendarChange={(next) => onChange((Array.isArray(next) ? next[0] : next) || null)}
|
||||||
showTime={showTime ? { format: 'HH:mm:ss' } : false}
|
showTime={showTime ? { format: 'HH:mm:ss' } : false}
|
||||||
|
needConfirm={false}
|
||||||
format={format}
|
format={format}
|
||||||
placeholder={placeholder}
|
placeholder={placeholder}
|
||||||
disabled={disabled}
|
disabled={disabled}
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
import { Tag } from 'antd';
|
||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
|
|
||||||
|
import { useFactoryDefaults } from '@/api/queries/useFactoryDefaults';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Value semantics on purpose: the tag answers "does this equal the shipped
|
||||||
|
* default?", not "has the user ever saved this key?" — a stored 2096 and a
|
||||||
|
* fallback 2096 behave identically, so they read identically.
|
||||||
|
*/
|
||||||
|
export function matchesFactoryDefault(current: unknown, factoryDefault: string | undefined): boolean {
|
||||||
|
if (factoryDefault === undefined) return false;
|
||||||
|
if (typeof current === 'number') {
|
||||||
|
const parsed = Number(factoryDefault);
|
||||||
|
return factoryDefault.trim() !== '' && !Number.isNaN(parsed) && parsed === current;
|
||||||
|
}
|
||||||
|
if (typeof current === 'boolean') {
|
||||||
|
if (factoryDefault !== 'true' && factoryDefault !== 'false') return false;
|
||||||
|
return (factoryDefault === 'true') === current;
|
||||||
|
}
|
||||||
|
if (typeof current === 'string') return factoryDefault === current;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface DefaultSettingTagProps {
|
||||||
|
settingKey: string;
|
||||||
|
value: unknown;
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function DefaultSettingTag({ settingKey, value }: DefaultSettingTagProps) {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const defaults = useFactoryDefaults();
|
||||||
|
|
||||||
|
if (!matchesFactoryDefault(value, defaults.data?.[settingKey])) return null;
|
||||||
|
|
||||||
|
return <Tag style={{ marginLeft: 8 }}>{t('pages.settings.defaultTag')}</Tag>;
|
||||||
|
}
|
||||||
@@ -5,6 +5,7 @@ import './SettingListItem.css';
|
|||||||
interface SettingListItemProps {
|
interface SettingListItemProps {
|
||||||
paddings?: 'small' | 'default';
|
paddings?: 'small' | 'default';
|
||||||
title?: ReactNode;
|
title?: ReactNode;
|
||||||
|
badge?: ReactNode;
|
||||||
description?: ReactNode;
|
description?: ReactNode;
|
||||||
children?: ReactNode;
|
children?: ReactNode;
|
||||||
control?: ReactNode;
|
control?: ReactNode;
|
||||||
@@ -13,6 +14,7 @@ interface SettingListItemProps {
|
|||||||
export default function SettingListItem({
|
export default function SettingListItem({
|
||||||
paddings = 'default',
|
paddings = 'default',
|
||||||
title,
|
title,
|
||||||
|
badge,
|
||||||
description,
|
description,
|
||||||
children,
|
children,
|
||||||
control,
|
control,
|
||||||
@@ -28,7 +30,12 @@ export default function SettingListItem({
|
|||||||
<Row gutter={[8, 16]} style={{ width: '100%' }}>
|
<Row gutter={[8, 16]} style={{ width: '100%' }}>
|
||||||
<Col xs={24} lg={12}>
|
<Col xs={24} lg={12}>
|
||||||
<div className="setting-list-meta">
|
<div className="setting-list-meta">
|
||||||
{title && <div className="setting-list-title" id={titleId}>{title}</div>}
|
{title && (
|
||||||
|
<div className="setting-list-title">
|
||||||
|
<span id={titleId}>{title}</span>
|
||||||
|
{badge}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
{description && <div className="setting-list-description">{description}</div>}
|
{description && <div className="setting-list-description">{description}</div>}
|
||||||
</div>
|
</div>
|
||||||
</Col>
|
</Col>
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
export { default as InputAddon } from './InputAddon';
|
export { default as InputAddon } from './InputAddon';
|
||||||
export { default as InfinityIcon } from './InfinityIcon';
|
export { default as InfinityIcon } from './InfinityIcon';
|
||||||
export { default as SettingListItem } from './SettingListItem';
|
export { default as SettingListItem } from './SettingListItem';
|
||||||
|
export { default as DefaultSettingTag } from './DefaultSettingTag';
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ interface SparklineProps {
|
|||||||
yTickStep?: number;
|
yTickStep?: number;
|
||||||
tickCountX?: number;
|
tickCountX?: number;
|
||||||
showTooltip?: boolean;
|
showTooltip?: boolean;
|
||||||
|
showLegend?: boolean;
|
||||||
valueMin?: number;
|
valueMin?: number;
|
||||||
valueMax?: number | null;
|
valueMax?: number | null;
|
||||||
yFormatter?: (v: number) => string;
|
yFormatter?: (v: number) => string;
|
||||||
@@ -80,13 +81,23 @@ interface SparklineView {
|
|||||||
extremaPoints: ExtremaResult | null;
|
extremaPoints: ExtremaResult | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
function hexToRgba(hex: string, alpha: number): string {
|
function hexToRgba(color: string, alpha: number): string {
|
||||||
let h = hex.trim();
|
const trimmed = color.trim();
|
||||||
|
const fn = trimmed.match(/^rgba?\(([^)]+)\)$/i);
|
||||||
|
if (fn) {
|
||||||
|
const parts = fn[1].split(/[,/]\s*|\s+/).filter(Boolean).map(Number);
|
||||||
|
if (parts.length >= 3 && parts.slice(0, 3).every((n) => Number.isFinite(n))) {
|
||||||
|
const baseAlpha = parts.length > 3 && Number.isFinite(parts[3]) ? parts[3] : 1;
|
||||||
|
return `rgba(${parts[0]}, ${parts[1]}, ${parts[2]}, ${baseAlpha * alpha})`;
|
||||||
|
}
|
||||||
|
return trimmed;
|
||||||
|
}
|
||||||
|
let h = trimmed;
|
||||||
if (h.startsWith('#')) h = h.slice(1);
|
if (h.startsWith('#')) h = h.slice(1);
|
||||||
if (h.length === 3) h = h.split('').map((c) => c + c).join('');
|
if (h.length === 3) h = h.split('').map((c) => c + c).join('');
|
||||||
if (h.length !== 6) return hex;
|
if (h.length !== 6) return trimmed;
|
||||||
const int = Number.parseInt(h, 16);
|
const int = Number.parseInt(h, 16);
|
||||||
if (Number.isNaN(int)) return hex;
|
if (Number.isNaN(int)) return trimmed;
|
||||||
const r = (int >> 16) & 255;
|
const r = (int >> 16) & 255;
|
||||||
const g = (int >> 8) & 255;
|
const g = (int >> 8) & 255;
|
||||||
const b = int & 255;
|
const b = int & 255;
|
||||||
@@ -129,6 +140,7 @@ export default function Sparkline(props: SparklineProps) {
|
|||||||
yTickStep = 25,
|
yTickStep = 25,
|
||||||
tickCountX = 4,
|
tickCountX = 4,
|
||||||
showTooltip = false,
|
showTooltip = false,
|
||||||
|
showLegend = true,
|
||||||
valueMin = 0,
|
valueMin = 0,
|
||||||
valueMax = 100,
|
valueMax = 100,
|
||||||
yFormatter = (v: number) => `${Math.round(v)}%`,
|
yFormatter = (v: number) => `${Math.round(v)}%`,
|
||||||
@@ -542,10 +554,6 @@ export default function Sparkline(props: SparklineProps) {
|
|||||||
);
|
);
|
||||||
}, [points, hasSeries2, hasSeries3, valueMin, valueMax]);
|
}, [points, hasSeries2, hasSeries3, valueMin, valueMax]);
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
plotRef.current?.redraw(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const redraw = () => plotRef.current?.redraw(false);
|
const redraw = () => plotRef.current?.redraw(false);
|
||||||
const moBody = new MutationObserver(redraw);
|
const moBody = new MutationObserver(redraw);
|
||||||
@@ -570,7 +578,7 @@ export default function Sparkline(props: SparklineProps) {
|
|||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
{legendItems.length > 0 && (
|
{showLegend && legendItems.length > 0 && (
|
||||||
<div className="sparkline-legend" aria-hidden="true">
|
<div className="sparkline-legend" aria-hidden="true">
|
||||||
{legendItems.map((s) => (
|
{legendItems.map((s) => (
|
||||||
<span key={s.name} className="extrema-item" style={{ color: s.color }}>● {s.name}</span>
|
<span key={s.name} className="extrema-item" style={{ color: s.color }}>● {s.name}</span>
|
||||||
|
|||||||
@@ -75,6 +75,7 @@ export const EXAMPLES: Record<string, unknown> = {
|
|||||||
"subPort": 1,
|
"subPort": 1,
|
||||||
"subProfileUrl": "",
|
"subProfileUrl": "",
|
||||||
"subRoutingRules": "",
|
"subRoutingRules": "",
|
||||||
|
"subShowIdentityOnAllLinks": false,
|
||||||
"subSupportUrl": "",
|
"subSupportUrl": "",
|
||||||
"subThemeDir": "",
|
"subThemeDir": "",
|
||||||
"subTitle": "",
|
"subTitle": "",
|
||||||
@@ -186,6 +187,7 @@ export const EXAMPLES: Record<string, unknown> = {
|
|||||||
"subPort": 1,
|
"subPort": 1,
|
||||||
"subProfileUrl": "",
|
"subProfileUrl": "",
|
||||||
"subRoutingRules": "",
|
"subRoutingRules": "",
|
||||||
|
"subShowIdentityOnAllLinks": false,
|
||||||
"subSupportUrl": "",
|
"subSupportUrl": "",
|
||||||
"subThemeDir": "",
|
"subThemeDir": "",
|
||||||
"subTitle": "",
|
"subTitle": "",
|
||||||
@@ -448,6 +450,7 @@ export const EXAMPLES: Record<string, unknown> = {
|
|||||||
"tag": "in-443-tcp",
|
"tag": "in-443-tcp",
|
||||||
"total": 0,
|
"total": 0,
|
||||||
"trafficReset": "never",
|
"trafficReset": "never",
|
||||||
|
"trafficResetDay": 1,
|
||||||
"up": 0
|
"up": 0
|
||||||
},
|
},
|
||||||
"InboundClientIps": {
|
"InboundClientIps": {
|
||||||
|
|||||||
@@ -244,6 +244,9 @@ export const SCHEMAS: Record<string, unknown> = {
|
|||||||
"subRoutingRules": {
|
"subRoutingRules": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
|
"subShowIdentityOnAllLinks": {
|
||||||
|
"type": "boolean"
|
||||||
|
},
|
||||||
"subSupportUrl": {
|
"subSupportUrl": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
@@ -415,6 +418,7 @@ export const SCHEMAS: Record<string, unknown> = {
|
|||||||
"subPort",
|
"subPort",
|
||||||
"subProfileUrl",
|
"subProfileUrl",
|
||||||
"subRoutingRules",
|
"subRoutingRules",
|
||||||
|
"subShowIdentityOnAllLinks",
|
||||||
"subSupportUrl",
|
"subSupportUrl",
|
||||||
"subThemeDir",
|
"subThemeDir",
|
||||||
"subTitle",
|
"subTitle",
|
||||||
@@ -711,6 +715,9 @@ export const SCHEMAS: Record<string, unknown> = {
|
|||||||
"subRoutingRules": {
|
"subRoutingRules": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
|
"subShowIdentityOnAllLinks": {
|
||||||
|
"type": "boolean"
|
||||||
|
},
|
||||||
"subSupportUrl": {
|
"subSupportUrl": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
@@ -889,6 +896,7 @@ export const SCHEMAS: Record<string, unknown> = {
|
|||||||
"subPort",
|
"subPort",
|
||||||
"subProfileUrl",
|
"subProfileUrl",
|
||||||
"subRoutingRules",
|
"subRoutingRules",
|
||||||
|
"subShowIdentityOnAllLinks",
|
||||||
"subSupportUrl",
|
"subSupportUrl",
|
||||||
"subThemeDir",
|
"subThemeDir",
|
||||||
"subTitle",
|
"subTitle",
|
||||||
@@ -1834,6 +1842,13 @@ export const SCHEMAS: Record<string, unknown> = {
|
|||||||
],
|
],
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
|
"trafficResetDay": {
|
||||||
|
"description": "Day of month for monthly traffic resets",
|
||||||
|
"example": 1,
|
||||||
|
"maximum": 31,
|
||||||
|
"minimum": 1,
|
||||||
|
"type": "integer"
|
||||||
|
},
|
||||||
"up": {
|
"up": {
|
||||||
"description": "Upload traffic in bytes",
|
"description": "Upload traffic in bytes",
|
||||||
"format": "int64",
|
"format": "int64",
|
||||||
@@ -1860,6 +1875,7 @@ export const SCHEMAS: Record<string, unknown> = {
|
|||||||
"tag",
|
"tag",
|
||||||
"total",
|
"total",
|
||||||
"trafficReset",
|
"trafficReset",
|
||||||
|
"trafficResetDay",
|
||||||
"up"
|
"up"
|
||||||
],
|
],
|
||||||
"type": "object"
|
"type": "object"
|
||||||
|
|||||||
@@ -81,6 +81,7 @@ export interface AllSetting {
|
|||||||
subPort: number;
|
subPort: number;
|
||||||
subProfileUrl: string;
|
subProfileUrl: string;
|
||||||
subRoutingRules: string;
|
subRoutingRules: string;
|
||||||
|
subShowIdentityOnAllLinks: boolean;
|
||||||
subSupportUrl: string;
|
subSupportUrl: string;
|
||||||
subThemeDir: string;
|
subThemeDir: string;
|
||||||
subTitle: string;
|
subTitle: string;
|
||||||
@@ -193,6 +194,7 @@ export interface AllSettingView {
|
|||||||
subPort: number;
|
subPort: number;
|
||||||
subProfileUrl: string;
|
subProfileUrl: string;
|
||||||
subRoutingRules: string;
|
subRoutingRules: string;
|
||||||
|
subShowIdentityOnAllLinks: boolean;
|
||||||
subSupportUrl: string;
|
subSupportUrl: string;
|
||||||
subThemeDir: string;
|
subThemeDir: string;
|
||||||
subTitle: string;
|
subTitle: string;
|
||||||
@@ -426,6 +428,7 @@ export interface Inbound {
|
|||||||
tag: string;
|
tag: string;
|
||||||
total: number;
|
total: number;
|
||||||
trafficReset: string;
|
trafficReset: string;
|
||||||
|
trafficResetDay: number;
|
||||||
up: number;
|
up: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -93,6 +93,7 @@ export const AllSettingSchema = z.object({
|
|||||||
subPort: z.number().int().min(1).max(65535),
|
subPort: z.number().int().min(1).max(65535),
|
||||||
subProfileUrl: z.string(),
|
subProfileUrl: z.string(),
|
||||||
subRoutingRules: z.string(),
|
subRoutingRules: z.string(),
|
||||||
|
subShowIdentityOnAllLinks: z.boolean(),
|
||||||
subSupportUrl: z.string(),
|
subSupportUrl: z.string(),
|
||||||
subThemeDir: z.string(),
|
subThemeDir: z.string(),
|
||||||
subTitle: z.string(),
|
subTitle: z.string(),
|
||||||
@@ -206,6 +207,7 @@ export const AllSettingViewSchema = z.object({
|
|||||||
subPort: z.number().int().min(1).max(65535),
|
subPort: z.number().int().min(1).max(65535),
|
||||||
subProfileUrl: z.string(),
|
subProfileUrl: z.string(),
|
||||||
subRoutingRules: z.string(),
|
subRoutingRules: z.string(),
|
||||||
|
subShowIdentityOnAllLinks: z.boolean(),
|
||||||
subSupportUrl: z.string(),
|
subSupportUrl: z.string(),
|
||||||
subThemeDir: z.string(),
|
subThemeDir: z.string(),
|
||||||
subTitle: z.string(),
|
subTitle: z.string(),
|
||||||
@@ -451,6 +453,7 @@ export const InboundSchema = z.object({
|
|||||||
tag: z.string(),
|
tag: z.string(),
|
||||||
total: z.number().int(),
|
total: z.number().int(),
|
||||||
trafficReset: z.enum(['never', 'hourly', 'daily', 'weekly', 'monthly']),
|
trafficReset: z.enum(['never', 'hourly', 'daily', 'weekly', 'monthly']),
|
||||||
|
trafficResetDay: z.number().int().min(1).max(31),
|
||||||
up: z.number().int(),
|
up: z.number().int(),
|
||||||
});
|
});
|
||||||
export type Inbound = z.infer<typeof InboundSchema>;
|
export type Inbound = z.infer<typeof InboundSchema>;
|
||||||
|
|||||||
@@ -73,7 +73,9 @@ export interface ClientQueryParams {
|
|||||||
|
|
||||||
const DEFAULT_QUERY: ClientQueryParams = { page: 1, pageSize: 25 };
|
const DEFAULT_QUERY: ClientQueryParams = { page: 1, pageSize: 25 };
|
||||||
const DEFAULT_SUMMARY: ClientsSummary = {
|
const DEFAULT_SUMMARY: ClientsSummary = {
|
||||||
total: 0, active: 0, online: [], depleted: [], expiring: [], deactive: [],
|
total: 0, active: 0,
|
||||||
|
onlineCount: 0, depletedCount: 0, expiringCount: 0, deactiveCount: 0,
|
||||||
|
online: [], depleted: [], expiring: [], deactive: [],
|
||||||
};
|
};
|
||||||
|
|
||||||
export interface ClientSpeedEntry {
|
export interface ClientSpeedEntry {
|
||||||
@@ -114,7 +116,63 @@ export function computeClientsSummary(
|
|||||||
if (nearExpiry || nearLimit) expiring.push(email);
|
if (nearExpiry || nearLimit) expiring.push(email);
|
||||||
else active += 1;
|
else active += 1;
|
||||||
}
|
}
|
||||||
return { total: stats.length, active, online, depleted, expiring, deactive };
|
return {
|
||||||
|
total: stats.length,
|
||||||
|
active,
|
||||||
|
onlineCount: online.length,
|
||||||
|
depletedCount: depleted.length,
|
||||||
|
expiringCount: expiring.length,
|
||||||
|
deactiveCount: deactive.length,
|
||||||
|
online,
|
||||||
|
depleted,
|
||||||
|
expiring,
|
||||||
|
deactive,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export function sameSpeedMap(
|
||||||
|
a: Record<string, ClientSpeedEntry>,
|
||||||
|
b: Record<string, ClientSpeedEntry>,
|
||||||
|
): boolean {
|
||||||
|
const aKeys = Object.keys(a);
|
||||||
|
if (aKeys.length !== Object.keys(b).length) return false;
|
||||||
|
for (const key of aKeys) {
|
||||||
|
const left = a[key];
|
||||||
|
const right = b[key];
|
||||||
|
if (!right || left.up !== right.up || left.down !== right.down) return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// The field list computeClientsSummary reads, and deliberately nothing else.
|
||||||
|
// lastOnline in particular churns for every online client on every push and no
|
||||||
|
// counter depends on it, so including it here would defeat the comparison.
|
||||||
|
export function sameSummaryInputs(a: ClientStatRow[], b: ClientStatRow[]): boolean {
|
||||||
|
if (a.length !== b.length) return false;
|
||||||
|
for (let i = 0; i < a.length; i++) {
|
||||||
|
const left = a[i];
|
||||||
|
const right = b[i];
|
||||||
|
if (left.email !== right.email
|
||||||
|
|| left.up !== right.up
|
||||||
|
|| left.down !== right.down
|
||||||
|
|| left.total !== right.total
|
||||||
|
|| left.enable !== right.enable
|
||||||
|
|| left.expiryTime !== right.expiryTime) return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function pickClientsSummary(
|
||||||
|
serverSummary: ClientsSummary,
|
||||||
|
allClientStats: ClientStatRow[],
|
||||||
|
onlineSet: Set<string>,
|
||||||
|
expireDiffMs: number,
|
||||||
|
trafficDiffBytes: number,
|
||||||
|
): ClientsSummary {
|
||||||
|
if (allClientStats.length === 0) return serverSummary;
|
||||||
|
if (serverSummary.total > allClientStats.length) return serverSummary;
|
||||||
|
const live = computeClientsSummary(allClientStats, onlineSet, expireDiffMs, trafficDiffBytes);
|
||||||
|
return { ...live, total: serverSummary.total || live.total };
|
||||||
}
|
}
|
||||||
|
|
||||||
function buildQS(p: ClientQueryParams): string {
|
function buildQS(p: ClientQueryParams): string {
|
||||||
@@ -142,7 +200,7 @@ async function fetchClientPage(params: ClientQueryParams): Promise<ClientPageRes
|
|||||||
const qs = buildQS(params);
|
const qs = buildQS(params);
|
||||||
const msg = await HttpUtil.get(`/panel/api/clients/list/paged?${qs}`, undefined, { silent: true });
|
const msg = await HttpUtil.get(`/panel/api/clients/list/paged?${qs}`, undefined, { silent: true });
|
||||||
if (!msg?.success || !msg.obj) throw new Error(msg?.msg || 'Failed to fetch clients');
|
if (!msg?.success || !msg.obj) throw new Error(msg?.msg || 'Failed to fetch clients');
|
||||||
const validated = parseMsg(msg, ClientPageResponseSchema, 'clients/list/paged');
|
const validated = parseMsg(msg, ClientPageResponseSchema, 'clients/list/paged', { strict: true });
|
||||||
if (!validated.obj) throw new Error('Empty clients response');
|
if (!validated.obj) throw new Error('Empty clients response');
|
||||||
return validated.obj;
|
return validated.obj;
|
||||||
}
|
}
|
||||||
@@ -161,17 +219,31 @@ async function fetchDefaults(): Promise<Record<string, unknown>> {
|
|||||||
return validated.obj || {};
|
return validated.obj || {};
|
||||||
}
|
}
|
||||||
|
|
||||||
export function useClients() {
|
export interface UseClientsOptions {
|
||||||
|
// Callers that only need the mutations — the bulk modals, the groups page —
|
||||||
|
// pass false. Mounting them used to start a second 5-second poll of the paged
|
||||||
|
// list whose result they never read, which on a large panel means a full
|
||||||
|
// summary aggregate every 5 seconds for nothing.
|
||||||
|
list?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useClients(options: UseClientsOptions = {}) {
|
||||||
|
const withList = options.list ?? true;
|
||||||
const queryClient = useQueryClient();
|
const queryClient = useQueryClient();
|
||||||
|
|
||||||
const [query, setQueryState] = useState<ClientQueryParams>(DEFAULT_QUERY);
|
// Null until the page has settled on a query. The clients page cannot build
|
||||||
|
// one until the persisted sort and the panel's configured page size are both
|
||||||
|
// known, and fetching before then cost three sequential requests per load —
|
||||||
|
// the first two thrown away (#trace).
|
||||||
|
const [query, setQueryState] = useState<ClientQueryParams | null>(null);
|
||||||
// setQuery shallow-compares so callers can pass a fresh object every render
|
// setQuery shallow-compares so callers can pass a fresh object every render
|
||||||
// (the common React pattern) without triggering a re-fetch when nothing
|
// (the common React pattern) without triggering a re-fetch when nothing
|
||||||
// actually changed.
|
// actually changed.
|
||||||
const setQuery = useCallback((next: ClientQueryParams) => {
|
const setQuery = useCallback((next: ClientQueryParams) => {
|
||||||
setQueryState((prev) => {
|
setQueryState((prev) => {
|
||||||
if (
|
if (
|
||||||
prev.page === next.page
|
prev
|
||||||
|
&& prev.page === next.page
|
||||||
&& prev.pageSize === next.pageSize
|
&& prev.pageSize === next.pageSize
|
||||||
&& (prev.search ?? '') === (next.search ?? '')
|
&& (prev.search ?? '') === (next.search ?? '')
|
||||||
&& (prev.filter ?? '') === (next.filter ?? '')
|
&& (prev.filter ?? '') === (next.filter ?? '')
|
||||||
@@ -193,8 +265,9 @@ export function useClients() {
|
|||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const listQuery = useQuery({
|
const listQuery = useQuery({
|
||||||
queryKey: keys.clients.list(query),
|
queryKey: keys.clients.list(query ?? DEFAULT_QUERY),
|
||||||
queryFn: () => fetchClientPage(query),
|
queryFn: () => fetchClientPage(query ?? DEFAULT_QUERY),
|
||||||
|
enabled: withList && query !== null,
|
||||||
staleTime: Infinity,
|
staleTime: Infinity,
|
||||||
// List is sorted/paged server-side, so the WS patch can't add new or
|
// List is sorted/paged server-side, so the WS patch can't add new or
|
||||||
// re-sort rows; poll the current page to keep it live (pauses when hidden).
|
// re-sort rows; poll the current page to keep it live (pauses when hidden).
|
||||||
@@ -205,6 +278,7 @@ export function useClients() {
|
|||||||
const inboundOptionsQuery = useQuery({
|
const inboundOptionsQuery = useQuery({
|
||||||
queryKey: keys.inbounds.options(),
|
queryKey: keys.inbounds.options(),
|
||||||
queryFn: fetchInboundOptions,
|
queryFn: fetchInboundOptions,
|
||||||
|
enabled: withList,
|
||||||
staleTime: Infinity,
|
staleTime: Infinity,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -222,6 +296,7 @@ export function useClients() {
|
|||||||
const validated = parseMsg(msg, OnlinesSchema, 'clients/onlines');
|
const validated = parseMsg(msg, OnlinesSchema, 'clients/onlines');
|
||||||
return Array.isArray(validated.obj) ? validated.obj : [];
|
return Array.isArray(validated.obj) ? validated.obj : [];
|
||||||
},
|
},
|
||||||
|
enabled: withList,
|
||||||
staleTime: Infinity,
|
staleTime: Infinity,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -231,7 +306,11 @@ export function useClients() {
|
|||||||
const allGroups = listQuery.data?.groups ?? [];
|
const allGroups = listQuery.data?.groups ?? [];
|
||||||
const fetched = listQuery.data !== undefined || listQuery.isError;
|
const fetched = listQuery.data !== undefined || listQuery.isError;
|
||||||
const fetchError = listQuery.error ? (listQuery.error as Error).message : '';
|
const fetchError = listQuery.error ? (listQuery.error as Error).message : '';
|
||||||
const loading = listQuery.isFetching;
|
// isFetching is deliberately NOT read here. Touching it makes it a tracked
|
||||||
|
// property, so the 5s refetchInterval notifies twice per cycle — two whole
|
||||||
|
// page renders even when structural sharing leaves the data identical, and
|
||||||
|
// each one bumps rc-table's immutable mark and re-runs every cell renderer.
|
||||||
|
// Callers that want a spinner for an explicit refresh drive it locally.
|
||||||
// Showing kept-previous data for a new key (filter/sort/page) — drives the
|
// Showing kept-previous data for a new key (filter/sort/page) — drives the
|
||||||
// table overlay so the 5s background poll doesn't flash it.
|
// table overlay so the 5s background poll doesn't flash it.
|
||||||
const transitioning = listQuery.isPlaceholderData;
|
const transitioning = listQuery.isPlaceholderData;
|
||||||
@@ -264,19 +343,18 @@ export function useClients() {
|
|||||||
const expireDiff = ((defaults.expireDiff as number) ?? 0) * 86400000;
|
const expireDiff = ((defaults.expireDiff as number) ?? 0) * 86400000;
|
||||||
const trafficDiff = ((defaults.trafficDiff as number) ?? 0) * 1073741824;
|
const trafficDiff = ((defaults.trafficDiff as number) ?? 0) * 1073741824;
|
||||||
const pageSize = (defaults.pageSize as number) ?? 0;
|
const pageSize = (defaults.pageSize as number) ?? 0;
|
||||||
|
// pageSize 0 means "one long page", which is indistinguishable from "the
|
||||||
|
// settings have not arrived yet" — so callers need this flag to know when the
|
||||||
|
// configured page size is real. isFetched (not isSuccess) so a failed
|
||||||
|
// settings request still lets the page fall back and render.
|
||||||
|
const settingsReady = defaultsQuery.isFetched;
|
||||||
|
|
||||||
// Live summary: the client_stats WS event refreshes allClientStats every few
|
|
||||||
// seconds, so the top counters track reality without a page refresh. Falls
|
|
||||||
// back to the server-computed summary until the first event lands, and keeps
|
|
||||||
// the server's authoritative total for the headline count.
|
|
||||||
const [allClientStats, setAllClientStats] = useState<ClientStatRow[]>([]);
|
const [allClientStats, setAllClientStats] = useState<ClientStatRow[]>([]);
|
||||||
const [clientSpeed, setClientSpeed] = useState<Record<string, ClientSpeedEntry>>({});
|
const [clientSpeed, setClientSpeed] = useState<Record<string, ClientSpeedEntry>>({});
|
||||||
const summary = useMemo<ClientsSummary>(() => {
|
const summary = useMemo<ClientsSummary>(
|
||||||
const serverSummary = listQuery.data?.summary ?? DEFAULT_SUMMARY;
|
() => pickClientsSummary(listQuery.data?.summary ?? DEFAULT_SUMMARY, allClientStats, new Set(onlines), expireDiff, trafficDiff),
|
||||||
if (allClientStats.length === 0) return serverSummary;
|
[allClientStats, onlines, expireDiff, trafficDiff, listQuery.data?.summary],
|
||||||
const live = computeClientsSummary(allClientStats, new Set(onlines), expireDiff, trafficDiff);
|
);
|
||||||
return { ...live, total: serverSummary.total || live.total };
|
|
||||||
}, [allClientStats, onlines, expireDiff, trafficDiff, listQuery.data?.summary]);
|
|
||||||
|
|
||||||
const invalidateAll = useCallback(
|
const invalidateAll = useCallback(
|
||||||
() => {
|
() => {
|
||||||
@@ -558,15 +636,23 @@ export function useClients() {
|
|||||||
queryClient.setQueryData(keys.clients.onlines(), p.onlineClients);
|
queryClient.setQueryData(keys.clients.onlines(), p.onlineClients);
|
||||||
}
|
}
|
||||||
if (Array.isArray(p.clientTraffics)) {
|
if (Array.isArray(p.clientTraffics)) {
|
||||||
|
// Xray reports a row per client whether or not it moved a byte, so most of
|
||||||
|
// this map used to be zeros. A missing entry and a zero entry render
|
||||||
|
// identically (isActiveSpeed treats both as inactive), so the zeros are
|
||||||
|
// dropped and an unchanged result returns the previous object — which lets
|
||||||
|
// React bail out of the update instead of re-rendering the table.
|
||||||
const next: Record<string, ClientSpeedEntry> = {};
|
const next: Record<string, ClientSpeedEntry> = {};
|
||||||
for (const ct of p.clientTraffics) {
|
for (const ct of p.clientTraffics) {
|
||||||
if (!ct || !ct.email) continue;
|
if (!ct || !ct.email) continue;
|
||||||
|
const up = ct.up || 0;
|
||||||
|
const down = ct.down || 0;
|
||||||
|
if (up === 0 && down === 0) continue;
|
||||||
next[ct.email] = {
|
next[ct.email] = {
|
||||||
up: (ct.up || 0) / TRAFFIC_POLL_INTERVAL_S,
|
up: up / TRAFFIC_POLL_INTERVAL_S,
|
||||||
down: (ct.down || 0) / TRAFFIC_POLL_INTERVAL_S,
|
down: down / TRAFFIC_POLL_INTERVAL_S,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
setClientSpeed(next);
|
setClientSpeed((prev) => (sameSpeedMap(prev, next) ? prev : next));
|
||||||
}
|
}
|
||||||
}, [queryClient]);
|
}, [queryClient]);
|
||||||
|
|
||||||
@@ -574,12 +660,17 @@ export function useClients() {
|
|||||||
if (!payload || typeof payload !== 'object') return;
|
if (!payload || typeof payload !== 'object') return;
|
||||||
const p = payload as { clients?: ClientStatRow[]; snapshot?: boolean };
|
const p = payload as { clients?: ClientStatRow[]; snapshot?: boolean };
|
||||||
if (!Array.isArray(p.clients) || p.clients.length === 0) return;
|
if (!Array.isArray(p.clients) || p.clients.length === 0) return;
|
||||||
if (p.snapshot !== false) setAllClientStats(p.clients);
|
if (p.snapshot !== false) {
|
||||||
|
const rows = p.clients;
|
||||||
|
setAllClientStats((prev) => (sameSummaryInputs(prev, rows) ? prev : rows));
|
||||||
|
}
|
||||||
|
const active = queryRef.current;
|
||||||
|
if (!active) return;
|
||||||
const byEmail = new Map<string, ClientTraffic>();
|
const byEmail = new Map<string, ClientTraffic>();
|
||||||
for (const row of p.clients) {
|
for (const row of p.clients) {
|
||||||
if (row && row.email) byEmail.set(row.email, row);
|
if (row && row.email) byEmail.set(row.email, row);
|
||||||
}
|
}
|
||||||
queryClient.setQueryData<ClientPageResponse>(keys.clients.list(queryRef.current), (prev) => {
|
queryClient.setQueryData<ClientPageResponse>(keys.clients.list(active), (prev) => {
|
||||||
if (!prev) return prev;
|
if (!prev) return prev;
|
||||||
let touched = false;
|
let touched = false;
|
||||||
const next = prev.items.slice();
|
const next = prev.items.slice();
|
||||||
@@ -617,7 +708,6 @@ export function useClients() {
|
|||||||
setQuery,
|
setQuery,
|
||||||
inbounds,
|
inbounds,
|
||||||
onlines,
|
onlines,
|
||||||
loading,
|
|
||||||
transitioning,
|
transitioning,
|
||||||
fetched,
|
fetched,
|
||||||
fetchError,
|
fetchError,
|
||||||
@@ -627,6 +717,7 @@ export function useClients() {
|
|||||||
expireDiff,
|
expireDiff,
|
||||||
trafficDiff,
|
trafficDiff,
|
||||||
pageSize,
|
pageSize,
|
||||||
|
settingsReady,
|
||||||
refresh,
|
refresh,
|
||||||
create,
|
create,
|
||||||
bulkCreate,
|
bulkCreate,
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
||||||
|
|
||||||
|
export function useServerDraft<T>(server: T | undefined, clone: (value: T) => T, equals: (left: T, right: T) => boolean) {
|
||||||
|
const cloneRef = useRef(clone);
|
||||||
|
const equalsRef = useRef(equals);
|
||||||
|
cloneRef.current = clone;
|
||||||
|
equalsRef.current = equals;
|
||||||
|
|
||||||
|
const [draft, setDraft] = useState<T | undefined>();
|
||||||
|
const [baseline, setBaseline] = useState<T | undefined>();
|
||||||
|
const draftRef = useRef(draft);
|
||||||
|
const baselineRef = useRef(baseline);
|
||||||
|
draftRef.current = draft;
|
||||||
|
baselineRef.current = baseline;
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (server === undefined) return;
|
||||||
|
const currentDraft = draftRef.current;
|
||||||
|
const currentBaseline = baselineRef.current;
|
||||||
|
const isDirty = currentDraft !== undefined
|
||||||
|
&& (currentBaseline === undefined || !equalsRef.current(currentDraft, currentBaseline));
|
||||||
|
setBaseline(server);
|
||||||
|
if (isDirty && !equalsRef.current(currentDraft, server)) return;
|
||||||
|
setDraft(cloneRef.current(server));
|
||||||
|
}, [server]);
|
||||||
|
|
||||||
|
const markSaved = useCallback((value: T) => {
|
||||||
|
setBaseline(cloneRef.current(value));
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const isDirty = useMemo(
|
||||||
|
() => draft !== undefined && (baseline === undefined || !equalsRef.current(draft, baseline)),
|
||||||
|
[baseline, draft],
|
||||||
|
);
|
||||||
|
|
||||||
|
return { draft, setDraft, isDirty, markSaved };
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react';
|
import { createContext, useCallback, useContext, useLayoutEffect, useMemo, useState } from 'react';
|
||||||
import type { ReactNode } from 'react';
|
import type { ReactNode } from 'react';
|
||||||
import { theme as antdTheme } from 'antd';
|
import { theme as antdTheme } from 'antd';
|
||||||
import type { ThemeConfig } from 'antd';
|
import type { ThemeConfig } from 'antd';
|
||||||
@@ -13,14 +13,18 @@ function readBool(key: string, fallback: boolean): boolean {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function applyDom(isDark: boolean, isUltra: boolean) {
|
function applyDom(isDark: boolean, isUltra: boolean) {
|
||||||
document.body.setAttribute('class', isDark ? 'dark' : 'light');
|
document.body.classList.remove('dark', 'light');
|
||||||
|
document.body.classList.add(isDark ? 'dark' : 'light');
|
||||||
if (isUltra) {
|
if (isUltra) {
|
||||||
document.documentElement.setAttribute('data-theme', 'ultra-dark');
|
document.documentElement.setAttribute('data-theme', 'ultra-dark');
|
||||||
} else {
|
} else {
|
||||||
document.documentElement.removeAttribute('data-theme');
|
document.documentElement.removeAttribute('data-theme');
|
||||||
}
|
}
|
||||||
const msg = document.getElementById('message');
|
const msg = document.getElementById('message');
|
||||||
if (msg) msg.className = isDark ? 'dark' : 'light';
|
if (msg) {
|
||||||
|
msg.classList.remove('dark', 'light');
|
||||||
|
msg.classList.add(isDark ? 'dark' : 'light');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// module load so the document is in the right theme before React mounts.
|
// module load so the document is in the right theme before React mounts.
|
||||||
@@ -92,9 +96,24 @@ const LIGHT_BUTTON_TOKENS = {
|
|||||||
colorPrimaryActive: '#073ea8',
|
colorPrimaryActive: '#073ea8',
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// hashed:false drops the `:where(.css-<hash>)` wrapper antd puts around every
|
||||||
|
// rule. It costs nothing in specificity — `:where()` contributes zero, so the
|
||||||
|
// panel's own `.ant-*` overrides still win — and it removes roughly 5,700
|
||||||
|
// wrappers, 16% of the generated stylesheet, from what the browser has to parse.
|
||||||
|
//
|
||||||
|
// cssVar.key pins the CSS-variable scope. Every panel page mounts its own
|
||||||
|
// ConfigProvider (there is no root one), and without a fixed key each mints a
|
||||||
|
// fresh useId-derived scope, so navigating re-serialises and re-injects the whole
|
||||||
|
// token block under a new class instead of reusing the one already in the head.
|
||||||
|
const SHARED_STYLE_CONFIG = {
|
||||||
|
hashed: false,
|
||||||
|
cssVar: { key: 'xui' },
|
||||||
|
} as const;
|
||||||
|
|
||||||
export function buildAntdThemeConfig(isDark: boolean, isUltra: boolean): ThemeConfig {
|
export function buildAntdThemeConfig(isDark: boolean, isUltra: boolean): ThemeConfig {
|
||||||
if (!isDark) {
|
if (!isDark) {
|
||||||
return {
|
return {
|
||||||
|
...SHARED_STYLE_CONFIG,
|
||||||
algorithm: antdTheme.defaultAlgorithm,
|
algorithm: antdTheme.defaultAlgorithm,
|
||||||
token: LIGHT_CONTRAST_TOKENS,
|
token: LIGHT_CONTRAST_TOKENS,
|
||||||
components: {
|
components: {
|
||||||
@@ -104,6 +123,7 @@ export function buildAntdThemeConfig(isDark: boolean, isUltra: boolean): ThemeCo
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
|
...SHARED_STYLE_CONFIG,
|
||||||
algorithm: antdTheme.darkAlgorithm,
|
algorithm: antdTheme.darkAlgorithm,
|
||||||
token: isUltra ? ULTRA_DARK_TOKENS : DARK_TOKENS,
|
token: isUltra ? ULTRA_DARK_TOKENS : DARK_TOKENS,
|
||||||
components: {
|
components: {
|
||||||
@@ -142,7 +162,7 @@ export function ThemeProvider({ children }: { children: ReactNode }) {
|
|||||||
const [isDark, setIsDark] = useState<boolean>(initialDark);
|
const [isDark, setIsDark] = useState<boolean>(initialDark);
|
||||||
const [isUltra, setIsUltra] = useState<boolean>(initialUltra);
|
const [isUltra, setIsUltra] = useState<boolean>(initialUltra);
|
||||||
|
|
||||||
useEffect(() => {
|
useLayoutEffect(() => {
|
||||||
applyDom(isDark, isUltra);
|
applyDom(isDark, isUltra);
|
||||||
localStorage.setItem(STORAGE_DARK, String(isDark));
|
localStorage.setItem(STORAGE_DARK, String(isDark));
|
||||||
localStorage.setItem(STORAGE_ULTRA, String(isUltra));
|
localStorage.setItem(STORAGE_ULTRA, String(isUltra));
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ import {
|
|||||||
type OutboundTrafficRow,
|
type OutboundTrafficRow,
|
||||||
} from '@/schemas/xray';
|
} from '@/schemas/xray';
|
||||||
|
|
||||||
const DIRTY_POLL_MS = 1000;
|
|
||||||
const DEFAULT_TEST_URL = 'https://www.google.com/generate_204';
|
const DEFAULT_TEST_URL = 'https://www.google.com/generate_204';
|
||||||
// One HTTP-mode batch request tests this many outbounds through a single
|
// One HTTP-mode batch request tests this many outbounds through a single
|
||||||
// shared temp xray instance; chunking keeps responses bounded (~30s worst
|
// shared temp xray instance; chunking keeps responses bounded (~30s worst
|
||||||
@@ -22,6 +21,10 @@ const DEFAULT_TEST_URL = 'https://www.google.com/generate_204';
|
|||||||
// results progressively.
|
// results progressively.
|
||||||
const HTTP_BATCH_CHUNK = 16;
|
const HTTP_BATCH_CHUNK = 16;
|
||||||
|
|
||||||
|
function normalizeOutboundTestUrl(url: string) {
|
||||||
|
return url || DEFAULT_TEST_URL;
|
||||||
|
}
|
||||||
|
|
||||||
export function isUdpOutbound(outbound: unknown): boolean {
|
export function isUdpOutbound(outbound: unknown): boolean {
|
||||||
const o = outbound as { protocol?: string; streamSettings?: { network?: string } } | null | undefined;
|
const o = outbound as { protocol?: string; streamSettings?: { network?: string } } | null | undefined;
|
||||||
const p = o?.protocol;
|
const p = o?.protocol;
|
||||||
@@ -125,10 +128,11 @@ export function useXraySetting(): UseXraySettingResult {
|
|||||||
staleTime: Infinity,
|
staleTime: Infinity,
|
||||||
});
|
});
|
||||||
|
|
||||||
const [saveDisabled, setSaveDisabled] = useState(true);
|
|
||||||
const [xraySetting, setXraySettingState] = useState('');
|
const [xraySetting, setXraySettingState] = useState('');
|
||||||
const [templateSettings, setTemplateSettingsState] = useState<XraySettingsValue | null>(null);
|
const [templateSettings, setTemplateSettingsState] = useState<XraySettingsValue | null>(null);
|
||||||
const [outboundTestUrl, setOutboundTestUrlState] = useState(DEFAULT_TEST_URL);
|
const [outboundTestUrl, setOutboundTestUrlState] = useState(DEFAULT_TEST_URL);
|
||||||
|
const [savedXraySetting, setSavedXraySetting] = useState('');
|
||||||
|
const [savedOutboundTestUrl, setSavedOutboundTestUrl] = useState(DEFAULT_TEST_URL);
|
||||||
const [inboundTags, setInboundTags] = useState<string[]>([]);
|
const [inboundTags, setInboundTags] = useState<string[]>([]);
|
||||||
const [clientReverseTags, setClientReverseTags] = useState<string[]>([]);
|
const [clientReverseTags, setClientReverseTags] = useState<string[]>([]);
|
||||||
const [subscriptionOutbounds, setSubscriptionOutbounds] = useState<unknown[]>([]);
|
const [subscriptionOutbounds, setSubscriptionOutbounds] = useState<unknown[]>([]);
|
||||||
@@ -139,38 +143,40 @@ export function useXraySetting(): UseXraySettingResult {
|
|||||||
const [subscriptionTestStates, setSubscriptionTestStates] = useState<Record<string, OutboundTestState>>({});
|
const [subscriptionTestStates, setSubscriptionTestStates] = useState<Record<string, OutboundTestState>>({});
|
||||||
const [testingAll, setTestingAll] = useState(false);
|
const [testingAll, setTestingAll] = useState(false);
|
||||||
|
|
||||||
const oldXraySettingRef = useRef('');
|
|
||||||
const oldOutboundTestUrlRef = useRef('');
|
|
||||||
const syncingRef = useRef(false);
|
const syncingRef = useRef(false);
|
||||||
const xraySettingRef = useRef('');
|
const xraySettingRef = useRef('');
|
||||||
const outboundTestUrlRef = useRef(outboundTestUrl);
|
const outboundTestUrlRef = useRef(outboundTestUrl);
|
||||||
|
const savedXraySettingRef = useRef(savedXraySetting);
|
||||||
|
const savedOutboundTestUrlRef = useRef(savedOutboundTestUrl);
|
||||||
const templateSettingsRef = useRef<XraySettingsValue | null>(null);
|
const templateSettingsRef = useRef<XraySettingsValue | null>(null);
|
||||||
const subscriptionOutboundsRef = useRef<unknown[]>([]);
|
const subscriptionOutboundsRef = useRef<unknown[]>([]);
|
||||||
|
|
||||||
xraySettingRef.current = xraySetting;
|
xraySettingRef.current = xraySetting;
|
||||||
outboundTestUrlRef.current = outboundTestUrl;
|
outboundTestUrlRef.current = outboundTestUrl;
|
||||||
|
savedXraySettingRef.current = savedXraySetting;
|
||||||
|
savedOutboundTestUrlRef.current = savedOutboundTestUrl;
|
||||||
templateSettingsRef.current = templateSettings;
|
templateSettingsRef.current = templateSettings;
|
||||||
subscriptionOutboundsRef.current = subscriptionOutbounds;
|
subscriptionOutboundsRef.current = subscriptionOutbounds;
|
||||||
|
|
||||||
// Seed local editor state from the config query. Runs on first fetch and
|
|
||||||
// every time the query refetches (e.g. after a successful save).
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!configQuery.data) return;
|
if (!configQuery.data) return;
|
||||||
const obj = configQuery.data;
|
const obj = configQuery.data;
|
||||||
const pretty = JSON.stringify(obj.xraySetting, null, 2);
|
const pretty = JSON.stringify(obj.xraySetting, null, 2);
|
||||||
syncingRef.current = true;
|
const nextUrl = normalizeOutboundTestUrl(obj.outboundTestUrl || '');
|
||||||
setXraySettingState(pretty);
|
|
||||||
setTemplateSettingsState(obj.xraySetting);
|
|
||||||
oldXraySettingRef.current = pretty;
|
|
||||||
syncingRef.current = false;
|
|
||||||
setInboundTags(obj.inboundTags || []);
|
setInboundTags(obj.inboundTags || []);
|
||||||
setClientReverseTags(obj.clientReverseTags || []);
|
setClientReverseTags(obj.clientReverseTags || []);
|
||||||
setSubscriptionOutbounds(obj.subscriptionOutbounds || []);
|
setSubscriptionOutbounds(obj.subscriptionOutbounds || []);
|
||||||
setSubscriptionOutboundTags(obj.subscriptionOutboundTags || []);
|
setSubscriptionOutboundTags(obj.subscriptionOutboundTags || []);
|
||||||
const nextUrl = obj.outboundTestUrl || DEFAULT_TEST_URL;
|
const isDirty = savedXraySettingRef.current !== xraySettingRef.current
|
||||||
|
|| savedOutboundTestUrlRef.current !== normalizeOutboundTestUrl(outboundTestUrlRef.current);
|
||||||
|
if (isDirty) return;
|
||||||
|
syncingRef.current = true;
|
||||||
|
setXraySettingState(pretty);
|
||||||
|
setTemplateSettingsState(obj.xraySetting);
|
||||||
|
setSavedXraySetting(pretty);
|
||||||
|
syncingRef.current = false;
|
||||||
setOutboundTestUrlState(nextUrl);
|
setOutboundTestUrlState(nextUrl);
|
||||||
oldOutboundTestUrlRef.current = nextUrl;
|
setSavedOutboundTestUrl(nextUrl);
|
||||||
setSaveDisabled(true);
|
|
||||||
}, [configQuery.data]);
|
}, [configQuery.data]);
|
||||||
|
|
||||||
const fetched = configQuery.data !== undefined || configQuery.isError;
|
const fetched = configQuery.data !== undefined || configQuery.isError;
|
||||||
@@ -220,7 +226,7 @@ export function useXraySetting(): UseXraySettingResult {
|
|||||||
const saveMut = useMutation({
|
const saveMut = useMutation({
|
||||||
mutationFn: async () => {
|
mutationFn: async () => {
|
||||||
const sentXraySetting = xraySettingRef.current;
|
const sentXraySetting = xraySettingRef.current;
|
||||||
const sentTestUrl = outboundTestUrlRef.current || DEFAULT_TEST_URL;
|
const sentTestUrl = normalizeOutboundTestUrl(outboundTestUrlRef.current);
|
||||||
const msg = await HttpUtil.post('/panel/api/xray/update', {
|
const msg = await HttpUtil.post('/panel/api/xray/update', {
|
||||||
xraySetting: sentXraySetting,
|
xraySetting: sentXraySetting,
|
||||||
outboundTestUrl: sentTestUrl,
|
outboundTestUrl: sentTestUrl,
|
||||||
@@ -229,9 +235,8 @@ export function useXraySetting(): UseXraySettingResult {
|
|||||||
},
|
},
|
||||||
onSuccess: ({ msg, sentXraySetting, sentTestUrl }) => {
|
onSuccess: ({ msg, sentXraySetting, sentTestUrl }) => {
|
||||||
if (!msg?.success) return;
|
if (!msg?.success) return;
|
||||||
oldXraySettingRef.current = sentXraySetting;
|
setSavedXraySetting(sentXraySetting);
|
||||||
oldOutboundTestUrlRef.current = sentTestUrl;
|
setSavedOutboundTestUrl(sentTestUrl);
|
||||||
setSaveDisabled(true);
|
|
||||||
queryClient.invalidateQueries({ queryKey: keys.xray.config() });
|
queryClient.invalidateQueries({ queryKey: keys.xray.config() });
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
@@ -425,14 +430,8 @@ export function useXraySetting(): UseXraySettingResult {
|
|||||||
}
|
}
|
||||||
}, [testingAll, testOutbound, testSubscriptionOutbound, postOutboundTestBatch]);
|
}, [testingAll, testOutbound, testSubscriptionOutbound, postOutboundTestBatch]);
|
||||||
|
|
||||||
useEffect(() => {
|
const saveDisabled = savedXraySetting === xraySetting
|
||||||
const timer = window.setInterval(() => {
|
&& savedOutboundTestUrl === normalizeOutboundTestUrl(outboundTestUrl);
|
||||||
const dirtyXray = oldXraySettingRef.current !== xraySettingRef.current;
|
|
||||||
const dirtyUrl = oldOutboundTestUrlRef.current !== outboundTestUrlRef.current;
|
|
||||||
setSaveDisabled(!(dirtyXray || dirtyUrl));
|
|
||||||
}, DIRTY_POLL_MS);
|
|
||||||
return () => window.clearInterval(timer);
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const outboundsTraffic = useMemo(() => trafficQuery.data ?? [], [trafficQuery.data]);
|
const outboundsTraffic = useMemo(() => trafficQuery.data ?? [], [trafficQuery.data]);
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,10 @@
|
|||||||
|
.ant-sidebar {
|
||||||
|
flex: 0 0 var(--sider-rail, 72px);
|
||||||
|
width: var(--sider-rail, 72px);
|
||||||
|
position: relative;
|
||||||
|
z-index: 210;
|
||||||
|
}
|
||||||
|
|
||||||
.ant-sidebar > .ant-layout-sider {
|
.ant-sidebar > .ant-layout-sider {
|
||||||
position: sticky;
|
position: sticky;
|
||||||
top: 0;
|
top: 0;
|
||||||
@@ -5,6 +12,16 @@
|
|||||||
align-self: flex-start;
|
align-self: flex-start;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.ant-sidebar > .ant-layout-sider:not(.ant-layout-sider-collapsed) {
|
||||||
|
box-shadow: 0 0 32px rgba(0, 0, 0, 0.22);
|
||||||
|
}
|
||||||
|
|
||||||
|
.sider-nav .ant-menu-item .anticon,
|
||||||
|
.sider-nav .ant-menu-submenu-title .anticon,
|
||||||
|
.sider-utility .ant-menu-item .anticon {
|
||||||
|
font-size: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
.sider-brand,
|
.sider-brand,
|
||||||
.drawer-brand {
|
.drawer-brand {
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
@@ -18,16 +35,12 @@
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
gap: 8px;
|
gap: 8px;
|
||||||
padding: 14px 16px 14px 24px;
|
height: 58px;
|
||||||
|
padding: 0 16px 0 24px;
|
||||||
border-bottom: 1px solid var(--ant-color-border-secondary);
|
border-bottom: 1px solid var(--ant-color-border-secondary);
|
||||||
user-select: none;
|
user-select: none;
|
||||||
}
|
white-space: nowrap;
|
||||||
|
overflow: hidden;
|
||||||
.sider-brand-collapsed {
|
|
||||||
justify-content: center;
|
|
||||||
font-size: 16px;
|
|
||||||
padding: 14px 4px;
|
|
||||||
letter-spacing: 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.brand-block {
|
.brand-block {
|
||||||
@@ -37,10 +50,6 @@
|
|||||||
line-height: 1.1;
|
line-height: 1.1;
|
||||||
}
|
}
|
||||||
|
|
||||||
.sider-brand-collapsed .brand-block {
|
|
||||||
flex: 0 0 auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.brand-actions {
|
.brand-actions {
|
||||||
display: inline-flex;
|
display: inline-flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
@@ -246,11 +255,6 @@
|
|||||||
outline: none;
|
outline: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.sider-version.is-collapsed {
|
|
||||||
justify-content: center;
|
|
||||||
padding: 8px 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.drawer-footer {
|
.drawer-footer {
|
||||||
flex: 0 0 auto;
|
flex: 0 0 auto;
|
||||||
padding: 8px 8px 12px;
|
padding: 8px 8px 12px;
|
||||||
@@ -261,8 +265,7 @@
|
|||||||
display: inline-flex;
|
display: inline-flex;
|
||||||
}
|
}
|
||||||
|
|
||||||
.ant-sidebar > .ant-layout-sider .ant-layout-sider-children,
|
.ant-sidebar > .ant-layout-sider .ant-layout-sider-children {
|
||||||
.ant-sidebar > .ant-layout-sider .ant-layout-sider-trigger {
|
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -272,6 +275,11 @@
|
|||||||
min-width: 0 !important;
|
min-width: 0 !important;
|
||||||
width: 0 !important;
|
width: 0 !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.ant-sidebar {
|
||||||
|
flex: 0 0 0;
|
||||||
|
width: 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
body.dark .ant-drawer-content,
|
body.dark .ant-drawer-content,
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { useCallback, useEffect, useMemo, useState } from 'react';
|
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
||||||
import type { ComponentType } from 'react';
|
import type { ComponentType, CSSProperties } from 'react';
|
||||||
import { useLocation, useNavigate } from 'react-router';
|
import { useLocation, useNavigate } from 'react-router';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import { Drawer, Layout, Menu } from 'antd';
|
import { Drawer, Layout, Menu } from 'antd';
|
||||||
@@ -39,11 +39,14 @@ import { pauseAnimationsUntilLeave, useTheme } from '@/hooks/useTheme';
|
|||||||
import { useAllSettings } from '@/api/queries/useAllSettings';
|
import { useAllSettings } from '@/api/queries/useAllSettings';
|
||||||
import './AppSidebar.css';
|
import './AppSidebar.css';
|
||||||
|
|
||||||
const SIDEBAR_COLLAPSED_KEY = 'isSidebarCollapsed';
|
|
||||||
const DONATE_URL = 'https://donate.sanaei.dev/';
|
const DONATE_URL = 'https://donate.sanaei.dev/';
|
||||||
const DOCS_URL = 'https://docs.sanaei.dev/';
|
const DOCS_URL = 'https://docs.sanaei.dev/';
|
||||||
const REPO_URL = 'https://github.com/MHSanaei/3x-ui';
|
const REPO_URL = 'https://github.com/MHSanaei/3x-ui';
|
||||||
const LOGOUT_KEY = '__logout__';
|
const LOGOUT_KEY = '__logout__';
|
||||||
|
const RAIL_WIDTH = 72;
|
||||||
|
const railStyle = { '--sider-rail': `${RAIL_WIDTH}px` } as CSSProperties;
|
||||||
|
|
||||||
|
let hoveredAcrossRemounts = false;
|
||||||
|
|
||||||
type IconName = 'dashboard' | 'inbound' | 'team' | 'groups' | 'setting' | 'tool' | 'cluster' | 'hosts' | 'logout' | 'apidocs' | 'outbound' | 'routing';
|
type IconName = 'dashboard' | 'inbound' | 'team' | 'groups' | 'setting' | 'tool' | 'cluster' | 'hosts' | 'logout' | 'apidocs' | 'outbound' | 'routing';
|
||||||
|
|
||||||
@@ -62,14 +65,6 @@ const iconByName: Record<IconName, ComponentType> = {
|
|||||||
routing: SwapOutlined,
|
routing: SwapOutlined,
|
||||||
};
|
};
|
||||||
|
|
||||||
function readCollapsed(): boolean {
|
|
||||||
try {
|
|
||||||
return JSON.parse(localStorage.getItem(SIDEBAR_COLLAPSED_KEY) || 'false');
|
|
||||||
} catch {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function DonateButton({ ariaLabel }: { ariaLabel: string }) {
|
function DonateButton({ ariaLabel }: { ariaLabel: string }) {
|
||||||
return (
|
return (
|
||||||
<a
|
<a
|
||||||
@@ -108,7 +103,7 @@ function VersionBadge({ version, collapsed }: { version: string; collapsed?: boo
|
|||||||
href={REPO_URL}
|
href={REPO_URL}
|
||||||
target="_blank"
|
target="_blank"
|
||||||
rel="noopener noreferrer"
|
rel="noopener noreferrer"
|
||||||
className={`sider-version${collapsed ? ' is-collapsed' : ''}`}
|
className="sider-version"
|
||||||
aria-label={`GitHub ${label}`}
|
aria-label={`GitHub ${label}`}
|
||||||
title={label}
|
title={label}
|
||||||
>
|
>
|
||||||
@@ -148,8 +143,23 @@ export default function AppSidebar() {
|
|||||||
const { allSetting } = useAllSettings();
|
const { allSetting } = useAllSettings();
|
||||||
const showSubFormats = !!(allSetting.subJsonEnable || allSetting.subClashEnable);
|
const showSubFormats = !!(allSetting.subJsonEnable || allSetting.subClashEnable);
|
||||||
|
|
||||||
const [collapsed, setCollapsed] = useState<boolean>(() => readCollapsed());
|
const [hovered, setHovered] = useState(() => hoveredAcrossRemounts);
|
||||||
const [drawerOpen, setDrawerOpen] = useState(false);
|
const [drawerOpen, setDrawerOpen] = useState(false);
|
||||||
|
const railCollapsed = !hovered;
|
||||||
|
const rootRef = useRef<HTMLDivElement>(null);
|
||||||
|
|
||||||
|
const updateHovered = useCallback((value: boolean) => {
|
||||||
|
hoveredAcrossRemounts = value;
|
||||||
|
setHovered(value);
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const timer = window.setTimeout(() => {
|
||||||
|
const el = rootRef.current;
|
||||||
|
if (el) updateHovered(el.matches(':hover'));
|
||||||
|
}, 150);
|
||||||
|
return () => window.clearTimeout(timer);
|
||||||
|
}, [updateHovered]);
|
||||||
|
|
||||||
const currentTheme: 'light' | 'dark' = isDark ? 'dark' : 'light';
|
const currentTheme: 'light' | 'dark' = isDark ? 'dark' : 'light';
|
||||||
const panelVersion = window.X_UI_CUR_VER || '';
|
const panelVersion = window.X_UI_CUR_VER || '';
|
||||||
@@ -218,7 +228,7 @@ export default function AppSidebar() {
|
|||||||
if (tab.key === '/xray') {
|
if (tab.key === '/xray') {
|
||||||
return { key: tab.key, icon: <Icon />, label: tab.title, children: xrayChildren };
|
return { key: tab.key, icon: <Icon />, label: tab.title, children: xrayChildren };
|
||||||
}
|
}
|
||||||
return { key: tab.key, icon: <Icon />, label: tab.title };
|
return { key: tab.key, icon: <Icon />, label: tab.title, title: '' };
|
||||||
}),
|
}),
|
||||||
[settingsChildren, xrayChildren]);
|
[settingsChildren, xrayChildren]);
|
||||||
|
|
||||||
@@ -235,13 +245,6 @@ export default function AppSidebar() {
|
|||||||
openLink(String(key));
|
openLink(String(key));
|
||||||
}, [openLink]);
|
}, [openLink]);
|
||||||
|
|
||||||
const onSiderCollapse = useCallback((isCollapsed: boolean, type: 'clickTrigger' | 'responsive') => {
|
|
||||||
if (type === 'clickTrigger') {
|
|
||||||
localStorage.setItem(SIDEBAR_COLLAPSED_KEY, String(isCollapsed));
|
|
||||||
setCollapsed(isCollapsed);
|
|
||||||
}
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const cycleTheme = useCallback((id: string) => {
|
const cycleTheme = useCallback((id: string) => {
|
||||||
pauseAnimationsUntilLeave(id);
|
pauseAnimationsUntilLeave(id);
|
||||||
if (!isDark) {
|
if (!isDark) {
|
||||||
@@ -256,20 +259,24 @@ export default function AppSidebar() {
|
|||||||
}, [isDark, isUltra, toggleTheme, toggleUltra]);
|
}, [isDark, isUltra, toggleTheme, toggleUltra]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="ant-sidebar">
|
<div
|
||||||
|
ref={rootRef}
|
||||||
|
className="ant-sidebar"
|
||||||
|
style={railStyle}
|
||||||
|
onMouseEnter={() => updateHovered(true)}
|
||||||
|
onMouseLeave={() => updateHovered(false)}
|
||||||
|
>
|
||||||
<Layout.Sider
|
<Layout.Sider
|
||||||
theme={currentTheme}
|
theme={currentTheme}
|
||||||
width={220}
|
width={220}
|
||||||
collapsible
|
collapsedWidth={RAIL_WIDTH}
|
||||||
collapsed={collapsed}
|
collapsed={railCollapsed}
|
||||||
breakpoint="md"
|
|
||||||
onCollapse={onSiderCollapse}
|
|
||||||
>
|
>
|
||||||
<div className={`sider-brand${collapsed ? ' sider-brand-collapsed' : ''}`}>
|
<div className="sider-brand">
|
||||||
<div className="brand-block">
|
<div className="brand-block">
|
||||||
<span className="brand-text">{collapsed ? '3X' : '3X-UI'}</span>
|
<span className="brand-text">{railCollapsed ? '3X' : '3X-UI'}</span>
|
||||||
</div>
|
</div>
|
||||||
{!collapsed && (
|
{!railCollapsed && (
|
||||||
<div className="brand-actions">
|
<div className="brand-actions">
|
||||||
<DocsButton ariaLabel={t('menu.docs') || 'Documentation'} />
|
<DocsButton ariaLabel={t('menu.docs') || 'Documentation'} />
|
||||||
<DonateButton ariaLabel={t('menu.donate') || 'Donate'} />
|
<DonateButton ariaLabel={t('menu.donate') || 'Donate'} />
|
||||||
@@ -287,7 +294,7 @@ export default function AppSidebar() {
|
|||||||
theme={currentTheme}
|
theme={currentTheme}
|
||||||
mode="inline"
|
mode="inline"
|
||||||
selectedKeys={[selectedKey]}
|
selectedKeys={[selectedKey]}
|
||||||
openKeys={collapsed ? undefined : openKeys}
|
openKeys={railCollapsed ? undefined : openKeys}
|
||||||
onOpenChange={(keys) => setOpenKeys(keys as string[])}
|
onOpenChange={(keys) => setOpenKeys(keys as string[])}
|
||||||
className="sider-nav"
|
className="sider-nav"
|
||||||
items={toMenuItems(navItems)}
|
items={toMenuItems(navItems)}
|
||||||
@@ -302,7 +309,7 @@ export default function AppSidebar() {
|
|||||||
onClick={onMenuClick}
|
onClick={onMenuClick}
|
||||||
/>
|
/>
|
||||||
<div className="sider-footer">
|
<div className="sider-footer">
|
||||||
<VersionBadge version={panelVersion} collapsed={collapsed} />
|
<VersionBadge version={panelVersion} collapsed={railCollapsed} />
|
||||||
</div>
|
</div>
|
||||||
</Layout.Sider>
|
</Layout.Sider>
|
||||||
|
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ export interface RawInboundRow {
|
|||||||
enable?: boolean;
|
enable?: boolean;
|
||||||
expiryTime?: number;
|
expiryTime?: number;
|
||||||
trafficReset?: string;
|
trafficReset?: string;
|
||||||
|
trafficResetDay?: number;
|
||||||
lastTrafficResetTime?: number;
|
lastTrafficResetTime?: number;
|
||||||
nodeId?: number | null;
|
nodeId?: number | null;
|
||||||
shareAddrStrategy?: string;
|
shareAddrStrategy?: string;
|
||||||
@@ -60,6 +61,7 @@ export interface WireInboundPayload {
|
|||||||
enable: boolean;
|
enable: boolean;
|
||||||
expiryTime: number;
|
expiryTime: number;
|
||||||
trafficReset: TrafficReset;
|
trafficReset: TrafficReset;
|
||||||
|
trafficResetDay: number;
|
||||||
lastTrafficResetTime: number;
|
lastTrafficResetTime: number;
|
||||||
listen: string;
|
listen: string;
|
||||||
port: number;
|
port: number;
|
||||||
@@ -202,6 +204,7 @@ export function rawInboundToFormValues(row: RawInboundRow): InboundFormValues {
|
|||||||
down: row.down ?? 0,
|
down: row.down ?? 0,
|
||||||
total: row.total ?? 0,
|
total: row.total ?? 0,
|
||||||
trafficReset: coerceTrafficReset(row.trafficReset),
|
trafficReset: coerceTrafficReset(row.trafficReset),
|
||||||
|
trafficResetDay: Math.min(31, Math.max(1, row.trafficResetDay ?? 1)),
|
||||||
lastTrafficResetTime: row.lastTrafficResetTime ?? 0,
|
lastTrafficResetTime: row.lastTrafficResetTime ?? 0,
|
||||||
nodeId: row.nodeId ?? null,
|
nodeId: row.nodeId ?? null,
|
||||||
shareAddrStrategy: coerceShareAddrStrategy(row.shareAddrStrategy),
|
shareAddrStrategy: coerceShareAddrStrategy(row.shareAddrStrategy),
|
||||||
@@ -344,6 +347,7 @@ export function formValuesToWirePayload(values: InboundFormValues): WireInboundP
|
|||||||
enable: values.enable,
|
enable: values.enable,
|
||||||
expiryTime: values.expiryTime,
|
expiryTime: values.expiryTime,
|
||||||
trafficReset: values.trafficReset,
|
trafficReset: values.trafficReset,
|
||||||
|
trafficResetDay: values.trafficResetDay,
|
||||||
lastTrafficResetTime: values.lastTrafficResetTime,
|
lastTrafficResetTime: values.lastTrafficResetTime,
|
||||||
listen: values.listen,
|
listen: values.listen,
|
||||||
port: values.port,
|
port: values.port,
|
||||||
|
|||||||
@@ -42,8 +42,7 @@ function xhttpHostFallback(xhttp: XHttpStreamSettings | undefined): string {
|
|||||||
// Pull the bidirectional SplitHTTPConfig fields out of xhttp into a
|
// Pull the bidirectional SplitHTTPConfig fields out of xhttp into a
|
||||||
// compact extra payload. Server-only fields (noSSEHeader, scMaxBufferedPosts,
|
// compact extra payload. Server-only fields (noSSEHeader, scMaxBufferedPosts,
|
||||||
// scStreamUpServerSecs, serverMaxHeaderBytes) are excluded — the client
|
// scStreamUpServerSecs, serverMaxHeaderBytes) are excluded — the client
|
||||||
// reading the share link wouldn't honor them. Mirrors the legacy
|
// reading the share link wouldn't honor them.
|
||||||
// Inbound.buildXhttpExtra exactly so the shadow link snapshots line up.
|
|
||||||
function buildXhttpExtra(xhttp: XHttpStreamSettings | undefined): Record<string, unknown> | null {
|
function buildXhttpExtra(xhttp: XHttpStreamSettings | undefined): Record<string, unknown> | null {
|
||||||
if (!xhttp) return null;
|
if (!xhttp) return null;
|
||||||
const extra: Record<string, unknown> = {};
|
const extra: Record<string, unknown> = {};
|
||||||
@@ -85,6 +84,15 @@ function buildXhttpExtra(xhttp: XHttpStreamSettings | undefined): Record<string,
|
|||||||
const v = xhttp[k];
|
const v = xhttp[k];
|
||||||
if (typeof v === 'string' && v.length > 0 && v !== coreDefaults[k]) extra[k] = v;
|
if (typeof v === 'string' && v.length > 0 && v !== coreDefaults[k]) extra[k] = v;
|
||||||
}
|
}
|
||||||
|
// xray-core #6258 renamed these fields, but older clients still read the
|
||||||
|
// legacy names from share-link extra. Emit both names so one link works
|
||||||
|
// across old and new clients while the stored panel config stays canonical.
|
||||||
|
if (typeof extra.sessionIDPlacement === 'string') {
|
||||||
|
extra.sessionPlacement = extra.sessionIDPlacement;
|
||||||
|
}
|
||||||
|
if (typeof extra.sessionIDKey === 'string') {
|
||||||
|
extra.sessionKey = extra.sessionIDKey;
|
||||||
|
}
|
||||||
|
|
||||||
// Headers on the wire are a record; emit them as a map upstream's
|
// Headers on the wire are a record; emit them as a map upstream's
|
||||||
// SplitHTTPConfig.headers expects, dropping Host (already on the URL).
|
// SplitHTTPConfig.headers expects, dropping Host (already on the URL).
|
||||||
|
|||||||
@@ -104,6 +104,63 @@ export function validateRealityTarget(target: string): string | undefined {
|
|||||||
return undefined;
|
return undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parses a REALITY client-version string the way xray-core's config loader
|
||||||
|
* does: one to three dot-separated numeric parts, each 0-255. Returns the
|
||||||
|
* parts padded to three entries, or undefined when the string is not a valid
|
||||||
|
* version.
|
||||||
|
*/
|
||||||
|
export function parseRealityClientVer(value: string): [number, number, number] | undefined {
|
||||||
|
const trimmed = value.trim();
|
||||||
|
if (!trimmed) return undefined;
|
||||||
|
const parts = trimmed.split('.');
|
||||||
|
if (parts.length > 3) return undefined;
|
||||||
|
const nums: number[] = [];
|
||||||
|
for (const part of parts) {
|
||||||
|
if (!/^\d+$/.test(part)) return undefined;
|
||||||
|
const n = Number(part);
|
||||||
|
if (n > 255) return undefined;
|
||||||
|
nums.push(n);
|
||||||
|
}
|
||||||
|
while (nums.length < 3) nums.push(0);
|
||||||
|
return nums as [number, number, number];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Validates a REALITY client-version field; empty means "not set" and is
|
||||||
|
* valid. The value is saved exactly as typed and xray-core's part parser
|
||||||
|
* accepts no surrounding whitespace, so a value that differs from its
|
||||||
|
* trimmed form is rejected rather than silently passed to the wire.
|
||||||
|
*/
|
||||||
|
export function validateRealityClientVer(value: string): string | undefined {
|
||||||
|
if (!value) return undefined;
|
||||||
|
if (value !== value.trim() || !parseRealityClientVer(value)) {
|
||||||
|
return 'pages.inbounds.form.clientVerInvalid';
|
||||||
|
}
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Validates the max client-version field: format first, then that a non-empty
|
||||||
|
* max is not below a non-empty min (an inverted range rejects every client).
|
||||||
|
* An empty or malformed min is left to the min field's own validation.
|
||||||
|
*/
|
||||||
|
export function validateRealityMaxClientVer(max: string, min: string): string | undefined {
|
||||||
|
const formatError = validateRealityClientVer(max);
|
||||||
|
if (formatError) return formatError;
|
||||||
|
const maxParts = parseRealityClientVer(max);
|
||||||
|
const minParts = parseRealityClientVer(min);
|
||||||
|
if (!maxParts || !minParts) return undefined;
|
||||||
|
for (let i = 0; i < 3; i++) {
|
||||||
|
if (maxParts[i] !== minParts[i]) {
|
||||||
|
return maxParts[i] < minParts[i]
|
||||||
|
? 'pages.inbounds.form.maxClientVerBelowMin'
|
||||||
|
: undefined;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
function liftLegacyXhttpSessionKeys(obj: Record<string, unknown>): void {
|
function liftLegacyXhttpSessionKeys(obj: Record<string, unknown>): void {
|
||||||
const lift = (legacy: string, renamed: string) => {
|
const lift = (legacy: string, renamed: string) => {
|
||||||
const v = obj[legacy];
|
const v = obj[legacy];
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ export type DBInboundInit = Partial<{
|
|||||||
enable: boolean;
|
enable: boolean;
|
||||||
expiryTime: number;
|
expiryTime: number;
|
||||||
trafficReset: string;
|
trafficReset: string;
|
||||||
|
trafficResetDay: number;
|
||||||
lastTrafficResetTime: number;
|
lastTrafficResetTime: number;
|
||||||
listen: string;
|
listen: string;
|
||||||
port: number;
|
port: number;
|
||||||
@@ -76,6 +77,7 @@ export class DBInbound {
|
|||||||
enable: boolean;
|
enable: boolean;
|
||||||
expiryTime: number;
|
expiryTime: number;
|
||||||
trafficReset: string;
|
trafficReset: string;
|
||||||
|
trafficResetDay: number;
|
||||||
lastTrafficResetTime: number;
|
lastTrafficResetTime: number;
|
||||||
|
|
||||||
listen: string;
|
listen: string;
|
||||||
@@ -105,6 +107,7 @@ export class DBInbound {
|
|||||||
this.enable = true;
|
this.enable = true;
|
||||||
this.expiryTime = 0;
|
this.expiryTime = 0;
|
||||||
this.trafficReset = "never";
|
this.trafficReset = "never";
|
||||||
|
this.trafficResetDay = 1;
|
||||||
this.lastTrafficResetTime = 0;
|
this.lastTrafficResetTime = 0;
|
||||||
|
|
||||||
this.listen = "";
|
this.listen = "";
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ export class AllSetting {
|
|||||||
expireDiff = 0;
|
expireDiff = 0;
|
||||||
trafficDiff = 0;
|
trafficDiff = 0;
|
||||||
remarkTemplate = '{{INBOUND}}-{{EMAIL}}|📊{{TRAFFIC_LEFT}}|⏳{{DAYS_LEFT}}D';
|
remarkTemplate = '{{INBOUND}}-{{EMAIL}}|📊{{TRAFFIC_LEFT}}|⏳{{DAYS_LEFT}}D';
|
||||||
|
subShowIdentityOnAllLinks = false;
|
||||||
datepicker: 'gregorian' | 'jalalian' = 'gregorian';
|
datepicker: 'gregorian' | 'jalalian' = 'gregorian';
|
||||||
tgBotEnable = false;
|
tgBotEnable = false;
|
||||||
tgBotToken = '';
|
tgBotToken = '';
|
||||||
@@ -90,7 +91,7 @@ export class AllSetting {
|
|||||||
ldapDefaultTotalGB = 0;
|
ldapDefaultTotalGB = 0;
|
||||||
ldapDefaultExpiryDays = 0;
|
ldapDefaultExpiryDays = 0;
|
||||||
ldapDefaultLimitIP = 0;
|
ldapDefaultLimitIP = 0;
|
||||||
tgEnabledEvents = '';
|
tgEnabledEvents = 'login.attempt,cpu.high';
|
||||||
smtpEnable = false;
|
smtpEnable = false;
|
||||||
smtpHost = '';
|
smtpHost = '';
|
||||||
smtpPort = 587;
|
smtpPort = 587;
|
||||||
@@ -100,7 +101,7 @@ export class AllSetting {
|
|||||||
smtpFromName = '';
|
smtpFromName = '';
|
||||||
smtpTo = '';
|
smtpTo = '';
|
||||||
smtpEncryptionType = 'starttls';
|
smtpEncryptionType = 'starttls';
|
||||||
smtpEnabledEvents = '';
|
smtpEnabledEvents = 'login.attempt,cpu.high';
|
||||||
smtpCpu = 80;
|
smtpCpu = 80;
|
||||||
smtpMemory = 80;
|
smtpMemory = 80;
|
||||||
outboundDownThreshold = 3;
|
outboundDownThreshold = 3;
|
||||||
|
|||||||
@@ -1,5 +1,10 @@
|
|||||||
import { NumberFormatter } from '@/utils';
|
import { NumberFormatter } from '@/utils';
|
||||||
|
|
||||||
|
export const USAGE_WARN_PERCENT = 80;
|
||||||
|
export const USAGE_CRIT_PERCENT = 90;
|
||||||
|
export const USAGE_WARN_COLOR = '#faad14';
|
||||||
|
export const USAGE_CRIT_COLOR = '#ff4d4f';
|
||||||
|
|
||||||
export class CurTotal {
|
export class CurTotal {
|
||||||
current: number;
|
current: number;
|
||||||
total: number;
|
total: number;
|
||||||
@@ -16,9 +21,9 @@ export class CurTotal {
|
|||||||
|
|
||||||
get color(): string {
|
get color(): string {
|
||||||
const p = this.percent;
|
const p = this.percent;
|
||||||
if (p < 80) return '#1677ff';
|
if (p < USAGE_WARN_PERCENT) return '#1677ff';
|
||||||
if (p < 90) return '#faad14';
|
if (p < USAGE_CRIT_PERCENT) return USAGE_WARN_COLOR;
|
||||||
return '#ff4d4f';
|
return USAGE_CRIT_COLOR;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -254,6 +254,11 @@ export const sections: readonly Section[] = [
|
|||||||
description:
|
description:
|
||||||
'System status, log retrieval, certificate generators, Xray binary management, and backup/restore. All under /panel/api/server.',
|
'System status, log retrieval, certificate generators, Xray binary management, and backup/restore. All under /panel/api/server.',
|
||||||
endpoints: [
|
endpoints: [
|
||||||
|
{
|
||||||
|
method: 'GET',
|
||||||
|
path: '/panel/api/openapi.json',
|
||||||
|
summary: 'Serve this API description as an OpenAPI 3 document — the same file that powers the API Docs page. Requires a session or Bearer token like the rest of /panel/api. Useful for generating clients or importing into API tooling.',
|
||||||
|
},
|
||||||
{
|
{
|
||||||
method: 'GET',
|
method: 'GET',
|
||||||
path: '/panel/api/server/status',
|
path: '/panel/api/server/status',
|
||||||
@@ -559,7 +564,7 @@ export const sections: readonly Section[] = [
|
|||||||
{
|
{
|
||||||
method: 'GET',
|
method: 'GET',
|
||||||
path: '/panel/api/clients/list/paged',
|
path: '/panel/api/clients/list/paged',
|
||||||
summary: 'Filter, sort, and paginate clients on the server. Each item is a slim row (no uuid/password/auth/flow/security/reverse/tgId) so the clients page can ship 25-ish rows in a few KB instead of the full table. The response also includes a summary computed across the full DB row set so dashboard counters stay stable as the user paginates or filters. Page size capped at 200; fetch /get/:email to obtain the full per-client payload for an edit/info modal.',
|
summary: 'Filter, sort, and paginate clients on the server. Each item is a slim row (no uuid/password/auth/flow/security/reverse/tgId) so the clients page can ship 25-ish rows in a few KB instead of the full table. The response also includes a summary computed across the full DB row set so dashboard counters stay stable as the user paginates or filters: the *Count fields are exact, while the email arrays beside them stop at 200 entries so the payload does not grow with the panel. Page size capped at 200; fetch /get/:email to obtain the full per-client payload for an edit/info modal.',
|
||||||
params: [
|
params: [
|
||||||
{ name: 'page', in: 'query', type: 'number', desc: '1-indexed page number. Defaults to 1.' },
|
{ name: 'page', in: 'query', type: 'number', desc: '1-indexed page number. Defaults to 1.' },
|
||||||
{ name: 'pageSize', in: 'query', type: 'number', desc: 'Rows per page. Defaults to 25, capped at 200.' },
|
{ name: 'pageSize', in: 'query', type: 'number', desc: 'Rows per page. Defaults to 25, capped at 200.' },
|
||||||
@@ -570,7 +575,7 @@ export const sections: readonly Section[] = [
|
|||||||
{ name: 'order', in: 'query', type: 'string', desc: 'ascend or descend.' },
|
{ name: 'order', in: 'query', type: 'string', desc: 'ascend or descend.' },
|
||||||
],
|
],
|
||||||
response:
|
response:
|
||||||
'{\n "success": true,\n "obj": {\n "items": [\n {\n "email": "alice@example.com",\n "subId": "abcd1234",\n "enable": true,\n "totalGB": 53687091200,\n "expiryTime": 1735689600000,\n "limitIp": 0,\n "reset": 0,\n "inboundIds": [3, 5],\n "traffic": { "up": 1024, "down": 4096, "enable": true },\n "createdAt": 1735000000000,\n "updatedAt": 1735100000000\n }\n ],\n "total": 2000,\n "filtered": 47,\n "page": 1,\n "pageSize": 25,\n "summary": {\n "total": 2000,\n "active": 1850,\n "online": ["alice@example.com"],\n "depleted": [],\n "expiring": [],\n "deactive": []\n }\n }\n}',
|
'{\n "success": true,\n "obj": {\n "items": [\n {\n "email": "alice@example.com",\n "subId": "abcd1234",\n "enable": true,\n "totalGB": 53687091200,\n "expiryTime": 1735689600000,\n "limitIp": 0,\n "reset": 0,\n "inboundIds": [3, 5],\n "traffic": { "up": 1024, "down": 4096, "enable": true },\n "createdAt": 1735000000000,\n "updatedAt": 1735100000000\n }\n ],\n "total": 2000,\n "filtered": 47,\n "page": 1,\n "pageSize": 25,\n "summary": {\n "total": 2000,\n "active": 1850,\n "onlineCount": 1,\n "depletedCount": 0,\n "expiringCount": 0,\n "deactiveCount": 150,\n "online": ["alice@example.com"],\n "depleted": [],\n "expiring": [],\n "deactive": ["bob@example.com"]\n }\n }\n}',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
method: 'GET',
|
method: 'GET',
|
||||||
@@ -582,6 +587,16 @@ export const sections: readonly Section[] = [
|
|||||||
response:
|
response:
|
||||||
'{\n "success": true,\n "obj": {\n "client": { "id": 1, "email": "alice@example.com", ... },\n "inboundIds": [3, 5],\n "externalLinks": [{ "kind": "link", "value": "vless://...", "remark": "DE" }]\n }\n}',
|
'{\n "success": true,\n "obj": {\n "client": { "id": 1, "email": "alice@example.com", ... },\n "inboundIds": [3, 5],\n "externalLinks": [{ "kind": "link", "value": "vless://...", "remark": "DE" }]\n }\n}',
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
method: 'GET',
|
||||||
|
path: '/panel/api/clients/get/tgId/:tgId',
|
||||||
|
summary: 'Fetch clients by Telegram user ID. Returns an array since multiple clients can share the same Telegram ID.',
|
||||||
|
params: [
|
||||||
|
{ name: 'tgId', in: 'path', type: 'integer', desc: 'Telegram user ID (numeric).' },
|
||||||
|
],
|
||||||
|
response:
|
||||||
|
'{\n "success": true,\n "obj": [\n {\n "client": { "id": 1, "email": "alice@example.com", ... },\n "inboundIds": [3, 5],\n "externalLinks": [],\n "usedTraffic": 1048576\n }\n ]\n}',
|
||||||
|
},
|
||||||
{
|
{
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
path: '/panel/api/clients/add',
|
path: '/panel/api/clients/add',
|
||||||
@@ -1154,6 +1169,11 @@ export const sections: readonly Section[] = [
|
|||||||
path: '/panel/api/setting/defaultSettings',
|
path: '/panel/api/setting/defaultSettings',
|
||||||
summary: 'Return the computed default settings based on the request host. Useful to preview what a fresh install would use.',
|
summary: 'Return the computed default settings based on the request host. Useful to preview what a fresh install would use.',
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
method: 'POST',
|
||||||
|
path: '/panel/api/setting/factoryDefaults',
|
||||||
|
summary: 'Return the shipped (factory) default value per browser-safe setting key, so clients can tell a stored value apart from the default it would fall back to. Per-install material (secret, panelGuid, mTLS keys) and credential fields are never included.',
|
||||||
|
},
|
||||||
{
|
{
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
path: '/panel/api/setting/update',
|
path: '/panel/api/setting/update',
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ export default function ClientBulkAddModal({
|
|||||||
}: ClientBulkAddModalProps) {
|
}: ClientBulkAddModalProps) {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const [messageApi, messageContextHolder] = message.useMessage();
|
const [messageApi, messageContextHolder] = message.useMessage();
|
||||||
const { bulkCreate } = useClients();
|
const { bulkCreate } = useClients({ list: false });
|
||||||
|
|
||||||
const methods = useForm<ClientBulkAddFormValues>({ defaultValues: EMPTY });
|
const methods = useForm<ClientBulkAddFormValues>({ defaultValues: EMPTY });
|
||||||
const inboundIds = useWatch({ control: methods.control, name: 'inboundIds' });
|
const inboundIds = useWatch({ control: methods.control, name: 'inboundIds' });
|
||||||
|
|||||||
@@ -16,6 +16,13 @@
|
|||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.client-email-more {
|
||||||
|
margin-top: 4px;
|
||||||
|
padding-top: 4px;
|
||||||
|
border-top: 1px solid var(--ant-color-border-secondary, rgba(128, 128, 128, 0.2));
|
||||||
|
opacity: 0.65;
|
||||||
|
}
|
||||||
|
|
||||||
.filter-bar {
|
.filter-bar {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { lazy, useCallback, useEffect, useMemo, useState } from 'react';
|
import { lazy, useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import {
|
import {
|
||||||
Badge,
|
Badge,
|
||||||
@@ -16,7 +16,6 @@ import {
|
|||||||
Result,
|
Result,
|
||||||
Row,
|
Row,
|
||||||
Select,
|
Select,
|
||||||
Space,
|
|
||||||
Spin,
|
Spin,
|
||||||
Statistic,
|
Statistic,
|
||||||
Switch,
|
Switch,
|
||||||
@@ -80,12 +79,14 @@ const BulkAttachInboundsModal = lazy(() => import('./BulkAttachInboundsModal'));
|
|||||||
const BulkDetachInboundsModal = lazy(() => import('./BulkDetachInboundsModal'));
|
const BulkDetachInboundsModal = lazy(() => import('./BulkDetachInboundsModal'));
|
||||||
const TextModal = lazy(() => import('@/components/feedback/TextModal'));
|
const TextModal = lazy(() => import('@/components/feedback/TextModal'));
|
||||||
const PromptModal = lazy(() => import('@/components/feedback/PromptModal'));
|
const PromptModal = lazy(() => import('@/components/feedback/PromptModal'));
|
||||||
|
import { ClientInboundChips, ClientRowActions } from './RowCells';
|
||||||
import { emptyFilters, activeFilterCount } from './filters';
|
import { emptyFilters, activeFilterCount } from './filters';
|
||||||
import type { ClientFilters } from './filters';
|
import type { ClientFilters } from './filters';
|
||||||
import './ClientsPage.css';
|
import './ClientsPage.css';
|
||||||
|
|
||||||
const FILTER_STATE_KEY = 'clientsFilterState';
|
const FILTER_STATE_KEY = 'clientsFilterState';
|
||||||
const DISABLED_PAGE_SIZE = 200;
|
const DISABLED_PAGE_SIZE = 200;
|
||||||
|
const DEFAULT_TABLE_PAGE_SIZE = 25;
|
||||||
|
|
||||||
function UngroupIcon() {
|
function UngroupIcon() {
|
||||||
return (
|
return (
|
||||||
@@ -126,12 +127,29 @@ function UngroupIcon() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The server sends exact counters but caps the email arrays behind them, so a
|
||||||
|
// panel with thousands of depleted clients neither ships nor renders them all.
|
||||||
|
// The trailing chip reports what the popover left out.
|
||||||
|
function ClientEmailList({ emails, total }: { emails: string[]; total: number }) {
|
||||||
|
const hidden = total - emails.length;
|
||||||
|
return (
|
||||||
|
<div className="client-email-list">
|
||||||
|
{emails.map((e) => <div key={e}>{e}</div>)}
|
||||||
|
{hidden > 0 && <div className="client-email-more">+{hidden}</div>}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
type Bucket = 'active' | 'deactive' | 'depleted' | 'expiring';
|
type Bucket = 'active' | 'deactive' | 'depleted' | 'expiring';
|
||||||
|
|
||||||
interface PersistedFilterState {
|
interface PersistedFilterState {
|
||||||
searchKey: string;
|
searchKey: string;
|
||||||
filters: ClientFilters;
|
filters: ClientFilters;
|
||||||
sort: string;
|
sort: string;
|
||||||
|
// The page size resolved on the previous visit. Without it the first list
|
||||||
|
// request has to wait for /setting/defaultSettings just to learn how many rows
|
||||||
|
// to ask for, which serialises two round trips on every load.
|
||||||
|
pageSize: number | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
const INBOUND_PROTOCOL_COLORS: Record<string, string> = {
|
const INBOUND_PROTOCOL_COLORS: Record<string, string> = {
|
||||||
@@ -147,6 +165,9 @@ const INBOUND_PROTOCOL_COLORS: Record<string, string> = {
|
|||||||
tunnel: 'orange',
|
tunnel: 'orange',
|
||||||
};
|
};
|
||||||
const INBOUND_CHIP_LIMIT = 1;
|
const INBOUND_CHIP_LIMIT = 1;
|
||||||
|
// A shared empty array keeps the memoised chip cell from seeing a fresh prop for
|
||||||
|
// every unattached client on every render.
|
||||||
|
const EMPTY_INBOUND_IDS: number[] = [];
|
||||||
|
|
||||||
function readFilterState(): PersistedFilterState {
|
function readFilterState(): PersistedFilterState {
|
||||||
try {
|
try {
|
||||||
@@ -164,9 +185,10 @@ function readFilterState(): PersistedFilterState {
|
|||||||
groups: Array.isArray(fromRaw.groups) ? fromRaw.groups : [],
|
groups: Array.isArray(fromRaw.groups) ? fromRaw.groups : [],
|
||||||
},
|
},
|
||||||
sort: typeof raw.sort === 'string' ? raw.sort : '',
|
sort: typeof raw.sort === 'string' ? raw.sort : '',
|
||||||
|
pageSize: typeof raw.pageSize === 'number' && raw.pageSize > 0 ? raw.pageSize : null,
|
||||||
};
|
};
|
||||||
} catch {
|
} catch {
|
||||||
return { searchKey: '', filters: emptyFilters(), sort: '' };
|
return { searchKey: '', filters: emptyFilters(), sort: '', pageSize: null };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -205,11 +227,11 @@ export default function ClientsPage() {
|
|||||||
|
|
||||||
const {
|
const {
|
||||||
clients, total, filtered,
|
clients, total, filtered,
|
||||||
summary: serverSummary,
|
summary,
|
||||||
allGroups,
|
allGroups,
|
||||||
setQuery,
|
setQuery,
|
||||||
inbounds, onlines, loading, transitioning, fetched, fetchError, subSettings,
|
inbounds, onlines, transitioning, fetched, fetchError, subSettings,
|
||||||
tgBotEnable, expireDiff, trafficDiff, pageSize,
|
tgBotEnable, expireDiff, trafficDiff, pageSize, settingsReady,
|
||||||
create, update, remove, bulkDelete, bulkAdjust, bulkEnable, bulkDisable, bulkAddToGroup, bulkRemoveFromGroup, attach, setExternalLinks, bulkAttach, detach, bulkDetach,
|
create, update, remove, bulkDelete, bulkAdjust, bulkEnable, bulkDisable, bulkAddToGroup, bulkRemoveFromGroup, attach, setExternalLinks, bulkAttach, detach, bulkDetach,
|
||||||
resetTraffic, resetAllTraffics, delDepleted, delOrphans, exportClients, importClients, setEnable,
|
resetTraffic, resetAllTraffics, delDepleted, delOrphans, exportClients, importClients, setEnable,
|
||||||
clientSpeed,
|
clientSpeed,
|
||||||
@@ -265,14 +287,31 @@ export default function ClientsPage() {
|
|||||||
const [sortColumn, setSortColumn] = useState<string | null>(initialSort.column);
|
const [sortColumn, setSortColumn] = useState<string | null>(initialSort.column);
|
||||||
const [sortOrder, setSortOrder] = useState<'ascend' | 'descend' | null>(initialSort.order);
|
const [sortOrder, setSortOrder] = useState<'ascend' | 'descend' | null>(initialSort.order);
|
||||||
const [currentPage, setCurrentPage] = useState(1);
|
const [currentPage, setCurrentPage] = useState(1);
|
||||||
const [tablePageSize, setTablePageSize] = useState(25);
|
// Derived, not mirrored into state by an effect: an effect lags one render
|
||||||
|
// behind the settings arriving, and that lag is what made the page fetch the
|
||||||
|
// list once with the placeholder size and again with the real one.
|
||||||
|
const [pageSizeChoice, setPageSizeChoice] = useState<number | null>(null);
|
||||||
|
const settingsPageSize = settingsReady ? (pageSize > 0 ? pageSize : DISABLED_PAGE_SIZE) : null;
|
||||||
|
// Last visit's resolved size stands in until the settings land, so the list
|
||||||
|
// request goes out with the page mount instead of queueing behind them. If the
|
||||||
|
// admin has since changed the setting the authoritative value replaces it and
|
||||||
|
// costs one refetch — only on the load that follows the change. Null means
|
||||||
|
// nothing is known yet, which is the one case worth waiting for.
|
||||||
|
const resolvedPageSize = pageSizeChoice ?? settingsPageSize ?? initial.pageSize;
|
||||||
|
const tablePageSize = resolvedPageSize ?? DEFAULT_TABLE_PAGE_SIZE;
|
||||||
// debouncedSearch lags behind the input so we don't spam the server on every
|
// debouncedSearch lags behind the input so we don't spam the server on every
|
||||||
// keystroke; the search box still feels instant locally.
|
// keystroke; the search box still feels instant locally.
|
||||||
const [debouncedSearch, setDebouncedSearch] = useState(searchKey);
|
const [debouncedSearch, setDebouncedSearch] = useState(searchKey);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
localStorage.setItem(FILTER_STATE_KEY, JSON.stringify({ searchKey, filters, sort: sortValueFor(sortColumn, sortOrder) }));
|
localStorage.setItem(FILTER_STATE_KEY, JSON.stringify({
|
||||||
}, [searchKey, filters, sortColumn, sortOrder]);
|
searchKey,
|
||||||
|
filters,
|
||||||
|
sort: sortValueFor(sortColumn, sortOrder),
|
||||||
|
// Only ever persist a size we actually resolved, never the render fallback.
|
||||||
|
pageSize: resolvedPageSize,
|
||||||
|
}));
|
||||||
|
}, [searchKey, filters, sortColumn, sortOrder, resolvedPageSize]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const handle = window.setTimeout(() => setDebouncedSearch(searchKey), 300);
|
const handle = window.setTimeout(() => setDebouncedSearch(searchKey), 300);
|
||||||
@@ -303,6 +342,10 @@ export default function ClientsPage() {
|
|||||||
}, [filters.nodeIds, filters.inboundIds, inbounds]);
|
}, [filters.nodeIds, filters.inboundIds, inbounds]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
// With no remembered size and no settings yet, any query we build would be a
|
||||||
|
// guess, and issuing it costs a full server round trip that is thrown away as
|
||||||
|
// soon as the real size arrives.
|
||||||
|
if (resolvedPageSize === null) return;
|
||||||
setQuery({
|
setQuery({
|
||||||
page: currentPage,
|
page: currentPage,
|
||||||
pageSize: tablePageSize,
|
pageSize: tablePageSize,
|
||||||
@@ -321,13 +364,21 @@ export default function ClientsPage() {
|
|||||||
sort: sortColumn || undefined,
|
sort: sortColumn || undefined,
|
||||||
order: sortOrder || undefined,
|
order: sortOrder || undefined,
|
||||||
});
|
});
|
||||||
}, [setQuery, currentPage, tablePageSize, debouncedSearch, filters, effectiveInboundCsv, sortColumn, sortOrder]);
|
}, [setQuery, resolvedPageSize, currentPage, tablePageSize, debouncedSearch, filters, effectiveInboundCsv, sortColumn, sortOrder]);
|
||||||
|
|
||||||
const activeCount = activeFilterCount(filters);
|
const activeCount = activeFilterCount(filters);
|
||||||
|
|
||||||
useEffect(() => {
|
// Row handlers take an email and look the row up here at call time. Keying
|
||||||
setTablePageSize(pageSize > 0 ? pageSize : DISABLED_PAGE_SIZE);
|
// them on the record object instead would defeat the memoised cells: every
|
||||||
}, [pageSize]);
|
// traffic push replaces the row object of every client whose counters moved,
|
||||||
|
// so the memo would miss on exactly the rows that are busy. Reading through
|
||||||
|
// the ref also means a modal opened mid-poll shows current usage.
|
||||||
|
const rowsByEmail = useRef(new Map<string, ClientRecord>());
|
||||||
|
rowsByEmail.current = useMemo(() => {
|
||||||
|
const map = new Map<string, ClientRecord>();
|
||||||
|
for (const c of clients) map.set(c.email, c);
|
||||||
|
return map;
|
||||||
|
}, [clients]);
|
||||||
|
|
||||||
const onlineSet = useMemo(() => new Set(onlines || []), [onlines]);
|
const onlineSet = useMemo(() => new Set(onlines || []), [onlines]);
|
||||||
const inboundsById = useMemo(() => {
|
const inboundsById = useMemo(() => {
|
||||||
@@ -385,9 +436,6 @@ export default function ClientsPage() {
|
|||||||
// a rename.
|
// a rename.
|
||||||
const filteredClients = clients;
|
const filteredClients = clients;
|
||||||
|
|
||||||
// Server-computed counts that stay stable as the user paginates/filters.
|
|
||||||
const summary = serverSummary;
|
|
||||||
|
|
||||||
// Sort is server-side now; the page already arrives in the requested
|
// Sort is server-side now; the page already arrives in the requested
|
||||||
// order, so we just hand it through.
|
// order, so we just hand it through.
|
||||||
const sortedClients = filteredClients;
|
const sortedClients = filteredClients;
|
||||||
@@ -457,7 +505,9 @@ export default function ClientsPage() {
|
|||||||
setFormOpen(true);
|
setFormOpen(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function onEdit(row: ClientRecord) {
|
const onEdit = useCallback(async (email: string) => {
|
||||||
|
const row = rowsByEmail.current.get(email);
|
||||||
|
if (!row) return;
|
||||||
setFormMode('edit');
|
setFormMode('edit');
|
||||||
// Paged list omits per-client secrets to keep the row payload tiny;
|
// Paged list omits per-client secrets to keep the row payload tiny;
|
||||||
// edit needs them, so fetch the full record first.
|
// edit needs them, so fetch the full record first.
|
||||||
@@ -468,9 +518,11 @@ export default function ClientsPage() {
|
|||||||
setEditingAttachedIds([...ids]);
|
setEditingAttachedIds([...ids]);
|
||||||
setEditingExternalLinks(Array.isArray(full?.externalLinks) ? [...full.externalLinks] : []);
|
setEditingExternalLinks(Array.isArray(full?.externalLinks) ? [...full.externalLinks] : []);
|
||||||
setFormOpen(true);
|
setFormOpen(true);
|
||||||
}
|
}, [hydrate]);
|
||||||
|
|
||||||
function onDelete(row: ClientRecord) {
|
const onDelete = useCallback((email: string) => {
|
||||||
|
const row = rowsByEmail.current.get(email);
|
||||||
|
if (!row) return;
|
||||||
modal.confirm({
|
modal.confirm({
|
||||||
title: t('pages.clients.deleteConfirmTitle', { email: row.email }),
|
title: t('pages.clients.deleteConfirmTitle', { email: row.email }),
|
||||||
content: t('pages.clients.deleteConfirmContent'),
|
content: t('pages.clients.deleteConfirmContent'),
|
||||||
@@ -482,9 +534,10 @@ export default function ClientsPage() {
|
|||||||
if (msg?.success) messageApi.success(t('pages.clients.toasts.deleted'));
|
if (msg?.success) messageApi.success(t('pages.clients.toasts.deleted'));
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
}
|
}, [modal, t, remove, messageApi]);
|
||||||
|
|
||||||
function onResetTraffic(row: ClientRecord) {
|
const onResetTraffic = useCallback((email: string) => {
|
||||||
|
const row = rowsByEmail.current.get(email);
|
||||||
if (!row?.email) {
|
if (!row?.email) {
|
||||||
messageApi.warning(t('pages.clients.resetNotPossible'));
|
messageApi.warning(t('pages.clients.resetNotPossible'));
|
||||||
return;
|
return;
|
||||||
@@ -499,19 +552,33 @@ export default function ClientsPage() {
|
|||||||
if (msg?.success) messageApi.success(t('pages.clients.toasts.trafficReset'));
|
if (msg?.success) messageApi.success(t('pages.clients.toasts.trafficReset'));
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
}
|
}, [modal, t, resetTraffic, messageApi]);
|
||||||
|
|
||||||
async function onShowInfo(row: ClientRecord) {
|
const onShowInfo = useCallback(async (email: string) => {
|
||||||
|
const row = rowsByEmail.current.get(email);
|
||||||
|
if (!row) return;
|
||||||
const full = await hydrate(row.email);
|
const full = await hydrate(row.email);
|
||||||
setInfoClient(full ? { ...row, ...full.client, inboundIds: full.inboundIds } : row);
|
setInfoClient(full ? { ...row, ...full.client, inboundIds: full.inboundIds } : row);
|
||||||
setInfoOpen(true);
|
setInfoOpen(true);
|
||||||
}
|
}, [hydrate]);
|
||||||
|
|
||||||
async function onShowQr(row: ClientRecord) {
|
const onShowQr = useCallback(async (email: string) => {
|
||||||
|
const row = rowsByEmail.current.get(email);
|
||||||
|
if (!row) return;
|
||||||
const full = await hydrate(row.email);
|
const full = await hydrate(row.email);
|
||||||
setQrClient(full ? { ...row, ...full.client, inboundIds: full.inboundIds } : row);
|
setQrClient(full ? { ...row, ...full.client, inboundIds: full.inboundIds } : row);
|
||||||
setQrOpen(true);
|
setQrOpen(true);
|
||||||
|
}, [hydrate]);
|
||||||
|
|
||||||
|
const [refreshing, setRefreshing] = useState(false);
|
||||||
|
const onRefreshClick = useCallback(async () => {
|
||||||
|
setRefreshing(true);
|
||||||
|
try {
|
||||||
|
await refresh();
|
||||||
|
} finally {
|
||||||
|
setRefreshing(false);
|
||||||
}
|
}
|
||||||
|
}, [refresh]);
|
||||||
|
|
||||||
const openText = useCallback((opts: { title: string; content: string; fileName?: string }) => {
|
const openText = useCallback((opts: { title: string; content: string; fileName?: string }) => {
|
||||||
setTextTitle(opts.title);
|
setTextTitle(opts.title);
|
||||||
@@ -746,7 +813,7 @@ export default function ClientsPage() {
|
|||||||
|
|
||||||
const onTableChange: NonNullable<TableProps<ClientRecord>['onChange']> = (pag) => {
|
const onTableChange: NonNullable<TableProps<ClientRecord>['onChange']> = (pag) => {
|
||||||
if (pag?.current) setCurrentPage(pag.current);
|
if (pag?.current) setCurrentPage(pag.current);
|
||||||
if (pag?.pageSize) setTablePageSize(pag.pageSize);
|
if (pag?.pageSize) setPageSizeChoice(pag.pageSize);
|
||||||
};
|
};
|
||||||
|
|
||||||
const columns = useMemo<ColumnsType<ClientRecord>>(() => [
|
const columns = useMemo<ColumnsType<ClientRecord>>(() => [
|
||||||
@@ -755,23 +822,14 @@ export default function ClientsPage() {
|
|||||||
key: 'actions',
|
key: 'actions',
|
||||||
width: 200,
|
width: 200,
|
||||||
render: (_v, record) => (
|
render: (_v, record) => (
|
||||||
<Space size={4}>
|
<ClientRowActions
|
||||||
<Tooltip title={t('pages.clients.qrCode')}>
|
email={record.email}
|
||||||
<Button size="small" type="text" style={{ fontSize: 16 }} icon={<QrcodeOutlined />} aria-label={t('pages.clients.qrCode')} onClick={() => onShowQr(record)} />
|
onShowQr={onShowQr}
|
||||||
</Tooltip>
|
onShowInfo={onShowInfo}
|
||||||
<Tooltip title={t('pages.clients.clientInfo')}>
|
onResetTraffic={onResetTraffic}
|
||||||
<Button size="small" type="text" style={{ fontSize: 16 }} icon={<InfoCircleOutlined />} aria-label={t('pages.clients.clientInfo')} onClick={() => onShowInfo(record)} />
|
onEdit={onEdit}
|
||||||
</Tooltip>
|
onDelete={onDelete}
|
||||||
<Tooltip title={t('pages.inbounds.resetTraffic')}>
|
/>
|
||||||
<Button size="small" type="text" style={{ fontSize: 16 }} icon={<RetweetOutlined />} aria-label={t('pages.inbounds.resetTraffic')} onClick={() => onResetTraffic(record)} />
|
|
||||||
</Tooltip>
|
|
||||||
<Tooltip title={t('edit')}>
|
|
||||||
<Button size="small" type="text" style={{ fontSize: 16 }} icon={<EditOutlined />} aria-label={t('edit')} onClick={() => onEdit(record)} />
|
|
||||||
</Tooltip>
|
|
||||||
<Tooltip title={t('delete')}>
|
|
||||||
<Button size="small" type="text" danger style={{ fontSize: 16 }} icon={<DeleteOutlined />} aria-label={t('delete')} onClick={() => onDelete(record)} />
|
|
||||||
</Tooltip>
|
|
||||||
</Space>
|
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -853,42 +911,13 @@ export default function ClientsPage() {
|
|||||||
key: 'inboundIds',
|
key: 'inboundIds',
|
||||||
width: 170,
|
width: 170,
|
||||||
render: (_v, record) => {
|
render: (_v, record) => {
|
||||||
const ids = record.inboundIds || [];
|
|
||||||
if (ids.length === 0) return <span style={{ color: 'rgba(0,0,0,0.45)' }}>—</span>;
|
|
||||||
const visible = ids.slice(0, INBOUND_CHIP_LIMIT);
|
|
||||||
const overflow = ids.slice(INBOUND_CHIP_LIMIT);
|
|
||||||
const chip = (id: number, compact: boolean) => {
|
|
||||||
const ib = inboundsById[id];
|
|
||||||
const proto = (ib?.protocol || '').toLowerCase();
|
|
||||||
const color = INBOUND_PROTOCOL_COLORS[proto] ?? 'default';
|
|
||||||
const compactLabel = formatInboundLabel(ib?.tag, ib?.remark);
|
|
||||||
return (
|
return (
|
||||||
<Tooltip key={id} title={inboundLabel(id)}>
|
<ClientInboundChips
|
||||||
<Tag color={color} style={{ margin: 2 }}>
|
ids={record.inboundIds || EMPTY_INBOUND_IDS}
|
||||||
{compact ? compactLabel : inboundLabel(id)}
|
inboundsById={inboundsById}
|
||||||
</Tag>
|
protocolColors={INBOUND_PROTOCOL_COLORS}
|
||||||
</Tooltip>
|
chipLimit={INBOUND_CHIP_LIMIT}
|
||||||
);
|
/>
|
||||||
};
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
{visible.map((id) => chip(id, true))}
|
|
||||||
{overflow.length > 0 && (
|
|
||||||
<Popover
|
|
||||||
trigger="click"
|
|
||||||
placement="bottomRight"
|
|
||||||
content={
|
|
||||||
<div style={{ display: 'flex', flexDirection: 'column', gap: 4, maxWidth: 280, maxHeight: 280, overflowY: 'auto' }}>
|
|
||||||
{overflow.map((id) => chip(id, false))}
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<Tag color="default" style={{ margin: 2, cursor: 'pointer' }}>
|
|
||||||
+{overflow.length}
|
|
||||||
</Tag>
|
|
||||||
</Popover>
|
|
||||||
)}
|
|
||||||
</>
|
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -997,7 +1026,7 @@ export default function ClientsPage() {
|
|||||||
status="error"
|
status="error"
|
||||||
title={t('somethingWentWrong')}
|
title={t('somethingWentWrong')}
|
||||||
subTitle={fetchError}
|
subTitle={fetchError}
|
||||||
extra={<Button type="primary" loading={loading} onClick={refresh}>{t('refresh')}</Button>}
|
extra={<Button type="primary" loading={refreshing} onClick={onRefreshClick}>{t('refresh')}</Button>}
|
||||||
/>
|
/>
|
||||||
) : (
|
) : (
|
||||||
<Row gutter={[isMobile ? 8 : 16, isMobile ? 8 : 12]}>
|
<Row gutter={[isMobile ? 8 : 16, isMobile ? 8 : 12]}>
|
||||||
@@ -1010,37 +1039,37 @@ export default function ClientsPage() {
|
|||||||
<Col xs={12} sm={8} md={4}>
|
<Col xs={12} sm={8} md={4}>
|
||||||
<Popover
|
<Popover
|
||||||
title={t('online')}
|
title={t('online')}
|
||||||
open={summary.online.length ? undefined : false}
|
open={summary.onlineCount ? undefined : false}
|
||||||
content={<div className="client-email-list">{summary.online.map((e) => <div key={e}>{e}</div>)}</div>}
|
content={<ClientEmailList emails={summary.online} total={summary.onlineCount} />}
|
||||||
>
|
>
|
||||||
<Statistic title={t('online')} value={String(summary.online.length)} prefix={<span className="dot dot-blue" />} />
|
<Statistic title={t('online')} value={String(summary.onlineCount)} prefix={<span className="dot dot-blue" />} />
|
||||||
</Popover>
|
</Popover>
|
||||||
</Col>
|
</Col>
|
||||||
<Col xs={12} sm={8} md={4}>
|
<Col xs={12} sm={8} md={4}>
|
||||||
<Popover
|
<Popover
|
||||||
title={t('depleted')}
|
title={t('depleted')}
|
||||||
open={summary.depleted.length ? undefined : false}
|
open={summary.depletedCount ? undefined : false}
|
||||||
content={<div className="client-email-list">{summary.depleted.map((e) => <div key={e}>{e}</div>)}</div>}
|
content={<ClientEmailList emails={summary.depleted} total={summary.depletedCount} />}
|
||||||
>
|
>
|
||||||
<Statistic title={t('depleted')} value={String(summary.depleted.length)} prefix={<span className="dot dot-red" />} />
|
<Statistic title={t('depleted')} value={String(summary.depletedCount)} prefix={<span className="dot dot-red" />} />
|
||||||
</Popover>
|
</Popover>
|
||||||
</Col>
|
</Col>
|
||||||
<Col xs={12} sm={8} md={4}>
|
<Col xs={12} sm={8} md={4}>
|
||||||
<Popover
|
<Popover
|
||||||
title={t('depletingSoon')}
|
title={t('depletingSoon')}
|
||||||
open={summary.expiring.length ? undefined : false}
|
open={summary.expiringCount ? undefined : false}
|
||||||
content={<div className="client-email-list">{summary.expiring.map((e) => <div key={e}>{e}</div>)}</div>}
|
content={<ClientEmailList emails={summary.expiring} total={summary.expiringCount} />}
|
||||||
>
|
>
|
||||||
<Statistic title={t('depletingSoon')} value={String(summary.expiring.length)} prefix={<span className="dot dot-orange" />} />
|
<Statistic title={t('depletingSoon')} value={String(summary.expiringCount)} prefix={<span className="dot dot-orange" />} />
|
||||||
</Popover>
|
</Popover>
|
||||||
</Col>
|
</Col>
|
||||||
<Col xs={12} sm={8} md={4}>
|
<Col xs={12} sm={8} md={4}>
|
||||||
<Popover
|
<Popover
|
||||||
title={t('disabled')}
|
title={t('disabled')}
|
||||||
open={summary.deactive.length ? undefined : false}
|
open={summary.deactiveCount ? undefined : false}
|
||||||
content={<div className="client-email-list">{summary.deactive.map((e) => <div key={e}>{e}</div>)}</div>}
|
content={<ClientEmailList emails={summary.deactive} total={summary.deactiveCount} />}
|
||||||
>
|
>
|
||||||
<Statistic title={t('disabled')} value={String(summary.deactive.length)} prefix={<span className="dot dot-gray" />} />
|
<Statistic title={t('disabled')} value={String(summary.deactiveCount)} prefix={<span className="dot dot-gray" />} />
|
||||||
</Popover>
|
</Popover>
|
||||||
</Col>
|
</Col>
|
||||||
<Col xs={12} sm={8} md={4}>
|
<Col xs={12} sm={8} md={4}>
|
||||||
@@ -1367,7 +1396,7 @@ export default function ClientsPage() {
|
|||||||
showTotal={(n) => `${n}`}
|
showTotal={(n) => `${n}`}
|
||||||
onChange={(p, s) => {
|
onChange={(p, s) => {
|
||||||
setCurrentPage(p);
|
setCurrentPage(p);
|
||||||
if (s && s !== tablePageSize) setTablePageSize(s);
|
if (s && s !== tablePageSize) setPageSizeChoice(s);
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
@@ -1394,8 +1423,8 @@ export default function ClientsPage() {
|
|||||||
role="button"
|
role="button"
|
||||||
tabIndex={0}
|
tabIndex={0}
|
||||||
aria-label={t('pages.clients.clientInfo')}
|
aria-label={t('pages.clients.clientInfo')}
|
||||||
onClick={() => onShowInfo(row)}
|
onClick={() => onShowInfo(row.email)}
|
||||||
onKeyDown={activateOnKey(() => onShowInfo(row))}
|
onKeyDown={activateOnKey(() => onShowInfo(row.email))}
|
||||||
/>
|
/>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
<Switch
|
<Switch
|
||||||
@@ -1412,23 +1441,23 @@ export default function ClientsPage() {
|
|||||||
{
|
{
|
||||||
key: 'qr',
|
key: 'qr',
|
||||||
label: <><QrcodeOutlined /> {t('pages.clients.qrCode')}</>,
|
label: <><QrcodeOutlined /> {t('pages.clients.qrCode')}</>,
|
||||||
onClick: () => onShowQr(row),
|
onClick: () => onShowQr(row.email),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: 'reset',
|
key: 'reset',
|
||||||
label: <><RetweetOutlined /> {t('pages.inbounds.resetTraffic')}</>,
|
label: <><RetweetOutlined /> {t('pages.inbounds.resetTraffic')}</>,
|
||||||
onClick: () => onResetTraffic(row),
|
onClick: () => onResetTraffic(row.email),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: 'edit',
|
key: 'edit',
|
||||||
label: <><EditOutlined /> {t('edit')}</>,
|
label: <><EditOutlined /> {t('edit')}</>,
|
||||||
onClick: () => onEdit(row),
|
onClick: () => onEdit(row.email),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: 'delete',
|
key: 'delete',
|
||||||
danger: true,
|
danger: true,
|
||||||
label: <><DeleteOutlined /> {t('delete')}</>,
|
label: <><DeleteOutlined /> {t('delete')}</>,
|
||||||
onClick: () => onDelete(row),
|
onClick: () => onDelete(row.email),
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
}}
|
}}
|
||||||
|
|||||||
@@ -0,0 +1,154 @@
|
|||||||
|
import { memo } from 'react';
|
||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
|
import { Button, Popover, Space, Tag, Tooltip } from 'antd';
|
||||||
|
import {
|
||||||
|
DeleteOutlined,
|
||||||
|
EditOutlined,
|
||||||
|
InfoCircleOutlined,
|
||||||
|
QrcodeOutlined,
|
||||||
|
RetweetOutlined,
|
||||||
|
} from '@ant-design/icons';
|
||||||
|
|
||||||
|
import { formatInboundLabel } from '@/lib/inbounds/label';
|
||||||
|
import type { InboundOption } from '@/hooks/useClients';
|
||||||
|
|
||||||
|
const ICON_BUTTON_STYLE = { fontSize: 16 } as const;
|
||||||
|
|
||||||
|
interface ClientRowActionsProps {
|
||||||
|
email: string;
|
||||||
|
onShowQr: (email: string) => void;
|
||||||
|
onShowInfo: (email: string) => void;
|
||||||
|
onResetTraffic: (email: string) => void;
|
||||||
|
onEdit: (email: string) => void;
|
||||||
|
onDelete: (email: string) => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Five Tooltip-wrapped buttons per row, none of which depend on traffic. Left
|
||||||
|
// inline they re-ran rc-tooltip's alignment machinery for every visible row on
|
||||||
|
// every traffic push — 125 Tooltips on a 25-row page, five seconds apart.
|
||||||
|
// Keyed on the email rather than the row object, because a push replaces the row
|
||||||
|
// object of every client whose counters moved; the page resolves the live row.
|
||||||
|
export const ClientRowActions = memo(function ClientRowActions({
|
||||||
|
email,
|
||||||
|
onShowQr,
|
||||||
|
onShowInfo,
|
||||||
|
onResetTraffic,
|
||||||
|
onEdit,
|
||||||
|
onDelete,
|
||||||
|
}: ClientRowActionsProps) {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
return (
|
||||||
|
<Space size={4}>
|
||||||
|
<Tooltip title={t('pages.clients.qrCode')}>
|
||||||
|
<Button
|
||||||
|
size="small"
|
||||||
|
type="text"
|
||||||
|
style={ICON_BUTTON_STYLE}
|
||||||
|
icon={<QrcodeOutlined />}
|
||||||
|
aria-label={t('pages.clients.qrCode')}
|
||||||
|
onClick={() => onShowQr(email)}
|
||||||
|
/>
|
||||||
|
</Tooltip>
|
||||||
|
<Tooltip title={t('pages.clients.clientInfo')}>
|
||||||
|
<Button
|
||||||
|
size="small"
|
||||||
|
type="text"
|
||||||
|
style={ICON_BUTTON_STYLE}
|
||||||
|
icon={<InfoCircleOutlined />}
|
||||||
|
aria-label={t('pages.clients.clientInfo')}
|
||||||
|
onClick={() => onShowInfo(email)}
|
||||||
|
/>
|
||||||
|
</Tooltip>
|
||||||
|
<Tooltip title={t('pages.inbounds.resetTraffic')}>
|
||||||
|
<Button
|
||||||
|
size="small"
|
||||||
|
type="text"
|
||||||
|
style={ICON_BUTTON_STYLE}
|
||||||
|
icon={<RetweetOutlined />}
|
||||||
|
aria-label={t('pages.inbounds.resetTraffic')}
|
||||||
|
onClick={() => onResetTraffic(email)}
|
||||||
|
/>
|
||||||
|
</Tooltip>
|
||||||
|
<Tooltip title={t('edit')}>
|
||||||
|
<Button
|
||||||
|
size="small"
|
||||||
|
type="text"
|
||||||
|
style={ICON_BUTTON_STYLE}
|
||||||
|
icon={<EditOutlined />}
|
||||||
|
aria-label={t('edit')}
|
||||||
|
onClick={() => onEdit(email)}
|
||||||
|
/>
|
||||||
|
</Tooltip>
|
||||||
|
<Tooltip title={t('delete')}>
|
||||||
|
<Button
|
||||||
|
size="small"
|
||||||
|
type="text"
|
||||||
|
danger
|
||||||
|
style={ICON_BUTTON_STYLE}
|
||||||
|
icon={<DeleteOutlined />}
|
||||||
|
aria-label={t('delete')}
|
||||||
|
onClick={() => onDelete(email)}
|
||||||
|
/>
|
||||||
|
</Tooltip>
|
||||||
|
</Space>
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
const CHIP_STYLE = { margin: 2 } as const;
|
||||||
|
const OVERFLOW_CHIP_STYLE = { margin: 2, cursor: 'pointer' } as const;
|
||||||
|
const OVERFLOW_LIST_STYLE = {
|
||||||
|
display: 'flex',
|
||||||
|
flexDirection: 'column' as const,
|
||||||
|
gap: 4,
|
||||||
|
maxWidth: 280,
|
||||||
|
maxHeight: 280,
|
||||||
|
overflowY: 'auto' as const,
|
||||||
|
};
|
||||||
|
|
||||||
|
interface ClientInboundChipsProps {
|
||||||
|
ids: number[];
|
||||||
|
inboundsById: Record<number, InboundOption>;
|
||||||
|
protocolColors: Record<string, string>;
|
||||||
|
chipLimit: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Attachments never change on a traffic push either, so the same memoisation
|
||||||
|
// applies: one Tooltip per visible chip plus a Popover for the overflow.
|
||||||
|
export const ClientInboundChips = memo(function ClientInboundChips({
|
||||||
|
ids,
|
||||||
|
inboundsById,
|
||||||
|
protocolColors,
|
||||||
|
chipLimit,
|
||||||
|
}: ClientInboundChipsProps) {
|
||||||
|
if (ids.length === 0) return <span className="cell-empty">—</span>;
|
||||||
|
|
||||||
|
const label = (id: number) => {
|
||||||
|
const ib = inboundsById[id];
|
||||||
|
return formatInboundLabel(ib?.tag, ib?.remark);
|
||||||
|
};
|
||||||
|
const chip = (id: number) => {
|
||||||
|
const proto = (inboundsById[id]?.protocol || '').toLowerCase();
|
||||||
|
return (
|
||||||
|
<Tooltip key={id} title={label(id)}>
|
||||||
|
<Tag color={protocolColors[proto] ?? 'default'} style={CHIP_STYLE}>{label(id)}</Tag>
|
||||||
|
</Tooltip>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const visible = ids.slice(0, chipLimit);
|
||||||
|
const overflow = ids.slice(chipLimit);
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
{visible.map(chip)}
|
||||||
|
{overflow.length > 0 && (
|
||||||
|
<Popover
|
||||||
|
trigger="click"
|
||||||
|
placement="bottomRight"
|
||||||
|
content={<div style={OVERFLOW_LIST_STYLE}>{overflow.map(chip)}</div>}
|
||||||
|
>
|
||||||
|
<Tag color="default" style={OVERFLOW_CHIP_STYLE}>+{overflow.length}</Tag>
|
||||||
|
</Popover>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
});
|
||||||
@@ -93,7 +93,7 @@ export default function GroupsPage() {
|
|||||||
useEffect(() => { setMessageInstance(messageApi); }, [messageApi]);
|
useEffect(() => { setMessageInstance(messageApi); }, [messageApi]);
|
||||||
const queryClient = useQueryClient();
|
const queryClient = useQueryClient();
|
||||||
|
|
||||||
const { subSettings, bulkAdjust, bulkAddToGroup, bulkRemoveFromGroup, bulkDelete } = useClients();
|
const { subSettings, bulkAdjust, bulkAddToGroup, bulkRemoveFromGroup, bulkDelete } = useClients({ list: false });
|
||||||
|
|
||||||
const groupsQuery = useQuery({
|
const groupsQuery = useQuery({
|
||||||
queryKey: keys.clients.groups(),
|
queryKey: keys.clients.groups(),
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ import {
|
|||||||
isSS2022,
|
isSS2022,
|
||||||
} from '@/lib/xray/protocol-capabilities';
|
} from '@/lib/xray/protocol-capabilities';
|
||||||
import {
|
import {
|
||||||
|
InboundDbFieldsSchema,
|
||||||
InboundFormBaseSchema,
|
InboundFormBaseSchema,
|
||||||
InboundFormSchema,
|
InboundFormSchema,
|
||||||
type InboundFormValues,
|
type InboundFormValues,
|
||||||
@@ -255,6 +256,7 @@ export default function InboundFormModal({
|
|||||||
const wTunnelNetwork = useWatch({ control, name: 'settings.allowedNetwork' });
|
const wTunnelNetwork = useWatch({ control, name: 'settings.allowedNetwork' });
|
||||||
const wTotal = (useWatch({ control, name: 'total' }) as number | undefined) ?? 0;
|
const wTotal = (useWatch({ control, name: 'total' }) as number | undefined) ?? 0;
|
||||||
const wExpiry = (useWatch({ control, name: 'expiryTime' }) as number | undefined) ?? 0;
|
const wExpiry = (useWatch({ control, name: 'expiryTime' }) as number | undefined) ?? 0;
|
||||||
|
const trafficReset = useWatch({ control, name: 'trafficReset' }) ?? 'never';
|
||||||
const autoTagRef = useRef(true);
|
const autoTagRef = useRef(true);
|
||||||
const lastWrittenTagRef = useRef('');
|
const lastWrittenTagRef = useRef('');
|
||||||
const currentTagInput = (): InboundTagInput => ({
|
const currentTagInput = (): InboundTagInput => ({
|
||||||
@@ -619,6 +621,16 @@ export default function InboundFormModal({
|
|||||||
/>
|
/>
|
||||||
</FormField>
|
</FormField>
|
||||||
|
|
||||||
|
{trafficReset === 'monthly' && (
|
||||||
|
<FormField
|
||||||
|
name="trafficResetDay"
|
||||||
|
label={t('pages.inbounds.periodicTrafficResetDay')}
|
||||||
|
rules={{ validate: rhfZodValidate(InboundDbFieldsSchema.shape.trafficResetDay) }}
|
||||||
|
>
|
||||||
|
<InputNumber min={1} max={31} />
|
||||||
|
</FormField>
|
||||||
|
)}
|
||||||
|
|
||||||
<Form.Item
|
<Form.Item
|
||||||
label={
|
label={
|
||||||
<Tooltip title={t('pages.inbounds.leaveBlankToNeverExpire')}>
|
<Tooltip title={t('pages.inbounds.leaveBlankToNeverExpire')}>
|
||||||
|
|||||||
@@ -1,11 +1,16 @@
|
|||||||
import { useState } from 'react';
|
import { useState } from 'react';
|
||||||
|
import { useFormContext } from 'react-hook-form';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import { Alert, Button, Collapse, Descriptions, Divider, Form, Input, InputNumber, Select, Space, Switch } from 'antd';
|
import { Alert, Button, Collapse, Descriptions, Divider, Form, Input, InputNumber, Select, Space, Switch } from 'antd';
|
||||||
import { RadarChartOutlined, ReloadOutlined, SearchOutlined } from '@ant-design/icons';
|
import { RadarChartOutlined, ReloadOutlined, SearchOutlined } from '@ant-design/icons';
|
||||||
|
|
||||||
import { FormField } from '@/components/form/rhf';
|
import { FormField } from '@/components/form/rhf';
|
||||||
import { UTLS_FINGERPRINT } from '@/schemas/primitives';
|
import { UTLS_FINGERPRINT } from '@/schemas/primitives';
|
||||||
import { validateRealityTarget } from '@/lib/xray/stream-wire-normalize';
|
import {
|
||||||
|
validateRealityClientVer,
|
||||||
|
validateRealityMaxClientVer,
|
||||||
|
validateRealityTarget,
|
||||||
|
} from '@/lib/xray/stream-wire-normalize';
|
||||||
import type { RealityScanResult } from '@/generated/types';
|
import type { RealityScanResult } from '@/generated/types';
|
||||||
import RealityTargetScannerModal from './RealityTargetScannerModal';
|
import RealityTargetScannerModal from './RealityTargetScannerModal';
|
||||||
|
|
||||||
@@ -39,7 +44,14 @@ export default function RealityForm({
|
|||||||
clearMldsa65,
|
clearMldsa65,
|
||||||
}: RealityFormProps) {
|
}: RealityFormProps) {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
|
const { getFieldState, trigger } = useFormContext();
|
||||||
const [scannerOpen, setScannerOpen] = useState(false);
|
const [scannerOpen, setScannerOpen] = useState(false);
|
||||||
|
const maxClientVerPath = 'streamSettings.realitySettings.maxClientVer';
|
||||||
|
const revalidateMaxClientVer = () => {
|
||||||
|
if (getFieldState(maxClientVerPath).error) {
|
||||||
|
void trigger(maxClientVerPath);
|
||||||
|
}
|
||||||
|
};
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<FormField
|
<FormField
|
||||||
@@ -127,14 +139,31 @@ export default function RealityForm({
|
|||||||
<FormField
|
<FormField
|
||||||
name={['streamSettings', 'realitySettings', 'minClientVer']}
|
name={['streamSettings', 'realitySettings', 'minClientVer']}
|
||||||
label={t('pages.inbounds.form.minClientVer')}
|
label={t('pages.inbounds.form.minClientVer')}
|
||||||
|
tooltip={t('pages.inbounds.form.minClientVerHint')}
|
||||||
|
onAfterChange={revalidateMaxClientVer}
|
||||||
|
rules={{
|
||||||
|
validate: (value) => {
|
||||||
|
const errKey = validateRealityClientVer(typeof value === 'string' ? value : '');
|
||||||
|
return errKey ? errKey : true;
|
||||||
|
},
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
<Input placeholder="26.3.27" />
|
<Input placeholder="26.3.27" />
|
||||||
</FormField>
|
</FormField>
|
||||||
<FormField
|
<FormField
|
||||||
name={['streamSettings', 'realitySettings', 'maxClientVer']}
|
name={['streamSettings', 'realitySettings', 'maxClientVer']}
|
||||||
label={t('pages.inbounds.form.maxClientVer')}
|
label={t('pages.inbounds.form.maxClientVer')}
|
||||||
|
tooltip={t('pages.inbounds.form.maxClientVerHint')}
|
||||||
|
rules={{
|
||||||
|
validate: (value, formValues) => {
|
||||||
|
const max = typeof value === 'string' ? value : '';
|
||||||
|
const min = formValues?.streamSettings?.realitySettings?.minClientVer;
|
||||||
|
const errKey = validateRealityMaxClientVer(max, typeof min === 'string' ? min : '');
|
||||||
|
return errKey ? errKey : true;
|
||||||
|
},
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
<Input placeholder="25.9.11" />
|
<Input placeholder="x.y.z" />
|
||||||
</FormField>
|
</FormField>
|
||||||
<Form.Item label={t('pages.inbounds.form.shortIds')}>
|
<Form.Item label={t('pages.inbounds.form.shortIds')}>
|
||||||
<Space.Compact block style={{ display: 'flex' }}>
|
<Space.Compact block style={{ display: 'flex' }}>
|
||||||
|
|||||||
@@ -0,0 +1,74 @@
|
|||||||
|
import { useMemo } from 'react';
|
||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
|
import { Card, theme } from 'antd';
|
||||||
|
|
||||||
|
import { Sparkline } from '@/components/viz';
|
||||||
|
import type { Status } from '@/models/status';
|
||||||
|
|
||||||
|
interface ConnectionsCardProps {
|
||||||
|
status: Status;
|
||||||
|
tcp: number[];
|
||||||
|
udp: number[];
|
||||||
|
labels: string[];
|
||||||
|
isMobile: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function ConnectionsCard({ status, tcp, udp, labels, isMobile }: ConnectionsCardProps) {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const { token } = theme.useToken();
|
||||||
|
const accent = token.colorPrimary;
|
||||||
|
const udpColor = token.colorTextTertiary;
|
||||||
|
|
||||||
|
const referenceLines = useMemo(
|
||||||
|
() => [
|
||||||
|
{ y: status.udpCount, color: udpColor, dash: '2 4' },
|
||||||
|
{ y: status.tcpCount, color: accent, dash: '2 4' },
|
||||||
|
],
|
||||||
|
[status.tcpCount, status.udpCount, accent, udpColor],
|
||||||
|
);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Card hoverable styles={{ body: { padding: 0 } }}>
|
||||||
|
<div className="ov-wide-head ov-wide-head-stack">
|
||||||
|
<div className="ov-kicker">{t('pages.index.connectionCount')}</div>
|
||||||
|
<div className="ov-conn-total">
|
||||||
|
<span className="ov-tile-number">{status.tcpCount + status.udpCount}</span>
|
||||||
|
<span className="ov-tile-unit">{t('pages.index.openSockets')}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="ov-conn-legend">
|
||||||
|
<div className="ov-legend-label">
|
||||||
|
<span className="ov-swatch" style={{ background: accent }} />
|
||||||
|
TCP
|
||||||
|
<span className="ov-legend-num">{status.tcpCount.toLocaleString()}</span>
|
||||||
|
</div>
|
||||||
|
<div className="ov-legend-label">
|
||||||
|
<span className="ov-swatch" style={{ background: udpColor }} />
|
||||||
|
UDP
|
||||||
|
<span className="ov-legend-num">{status.udpCount.toLocaleString()}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="ov-wide-chart">
|
||||||
|
<Sparkline
|
||||||
|
data={tcp}
|
||||||
|
data2={udp}
|
||||||
|
labels={labels}
|
||||||
|
height={isMobile ? 120 : 170}
|
||||||
|
strokeWidth={1.5}
|
||||||
|
fillOpacity={0.24}
|
||||||
|
showTooltip
|
||||||
|
showLegend={false}
|
||||||
|
valueMax={null}
|
||||||
|
stroke={accent}
|
||||||
|
stroke2={udpColor}
|
||||||
|
name1="TCP"
|
||||||
|
name2="UDP"
|
||||||
|
yFormatter={(v) => Math.round(v).toLocaleString()}
|
||||||
|
referenceLines={referenceLines}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</Card>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,51 +1,470 @@
|
|||||||
|
/* Overview page — trend-first layout. Every colour comes from the AntD theme
|
||||||
|
tokens so light / dark / ultra-dark keep working and the sidebar is untouched.
|
||||||
|
Set --ov-accent once here if you want a fixed accent instead of the primary. */
|
||||||
|
|
||||||
|
.index-page {
|
||||||
|
--ov-accent: var(--ant-color-primary);
|
||||||
|
--ov-line: var(--ant-color-border);
|
||||||
|
--ov-label: var(--ant-color-text-secondary);
|
||||||
|
--ov-faint: var(--ant-color-text-tertiary);
|
||||||
|
--ov-gap: 12px;
|
||||||
|
--ov-pad: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
@media (max-width: 768px) {
|
@media (max-width: 768px) {
|
||||||
.index-page .content-area {
|
.index-page .content-area {
|
||||||
padding: 12px;
|
padding: 12px;
|
||||||
padding-top: 64px;
|
padding-top: 64px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.index-page {
|
||||||
|
--ov-gap: 8px;
|
||||||
|
--ov-pad: 14px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.index-page .action {
|
.ov-page {
|
||||||
cursor: pointer;
|
display: flex;
|
||||||
justify-content: center;
|
flex-direction: column;
|
||||||
max-width: 100%;
|
gap: var(--ov-gap);
|
||||||
flex-wrap: nowrap;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.index-page .action > span:not(.anticon) {
|
/* — action bar — */
|
||||||
white-space: nowrap;
|
|
||||||
overflow: hidden;
|
.ov-bar {
|
||||||
text-overflow: ellipsis;
|
display: flex;
|
||||||
min-width: 0;
|
align-items: center;
|
||||||
|
gap: 12px;
|
||||||
|
flex-wrap: wrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
.index-page .action-update {
|
.ov-state {
|
||||||
color: var(--ant-color-warning);
|
|
||||||
font-weight: 600;
|
|
||||||
}
|
|
||||||
|
|
||||||
.index-page .action-update .anticon {
|
|
||||||
color: var(--ant-color-warning);
|
|
||||||
}
|
|
||||||
|
|
||||||
.index-page .history-tag {
|
|
||||||
cursor: pointer;
|
|
||||||
display: inline-flex;
|
display: inline-flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 4px;
|
gap: 8px;
|
||||||
|
padding: 4px 12px;
|
||||||
|
border: 1px solid var(--ov-line);
|
||||||
|
border-radius: 999px;
|
||||||
|
font-size: 13px;
|
||||||
|
color: var(--ant-color-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-state-dot {
|
||||||
|
position: relative;
|
||||||
|
width: 6px;
|
||||||
|
height: 6px;
|
||||||
|
border-radius: 50%;
|
||||||
|
background: currentColor;
|
||||||
|
flex: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-state[data-state='running'] .ov-state-dot::after {
|
||||||
|
content: '';
|
||||||
|
position: absolute;
|
||||||
|
inset: -1px;
|
||||||
|
border-radius: 50%;
|
||||||
|
border: 1px solid currentColor;
|
||||||
|
animation: ovPulse 1.6s infinite ease-out;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes ovPulse {
|
||||||
|
0% { transform: scale(0.9); opacity: 0.5; }
|
||||||
|
100% { transform: scale(2.4); opacity: 0; }
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (prefers-reduced-motion: reduce) {
|
||||||
|
.ov-state[data-state='running'] .ov-state-dot::after {
|
||||||
|
animation: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-state-version,
|
||||||
|
.ov-panel-version {
|
||||||
|
padding: 0;
|
||||||
|
border: 0;
|
||||||
|
background: transparent;
|
||||||
|
font: inherit;
|
||||||
|
cursor: pointer;
|
||||||
|
color: var(--ov-label);
|
||||||
|
transition: color 0.2s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-state-version:hover,
|
||||||
|
.ov-state-version:focus-visible,
|
||||||
|
.ov-panel-version:hover,
|
||||||
|
.ov-panel-version:focus-visible {
|
||||||
|
color: var(--ant-color-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-panel-version {
|
||||||
|
font-size: 12px;
|
||||||
|
color: var(--ov-faint);
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-update-tag {
|
||||||
|
cursor: pointer;
|
||||||
margin-inline-end: 0;
|
margin-inline-end: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.index-page .ip-toggle-icon {
|
.ov-error-detail {
|
||||||
cursor: pointer;
|
white-space: pre-wrap;
|
||||||
font-size: 16px;
|
word-break: break-word;
|
||||||
}
|
}
|
||||||
|
|
||||||
.index-page .ip-hidden .ant-statistic-content-value {
|
.ov-bar-actions {
|
||||||
filter: blur(6px);
|
margin-inline-start: auto;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 4px;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 768px) {
|
||||||
|
.ov-bar-actions {
|
||||||
|
margin-inline-start: 0;
|
||||||
|
width: 100%;
|
||||||
|
justify-content: space-between;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-bar-sep {
|
||||||
|
width: 1px;
|
||||||
|
height: 20px;
|
||||||
|
background: var(--ov-line);
|
||||||
|
margin: 0 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-health {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
font-size: 12.5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-health-mark {
|
||||||
|
width: 14px;
|
||||||
|
height: 1px;
|
||||||
|
background: currentColor;
|
||||||
|
flex: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-rule {
|
||||||
|
height: 1px;
|
||||||
|
border: 0;
|
||||||
|
margin: 0;
|
||||||
|
background: linear-gradient(
|
||||||
|
to right,
|
||||||
|
transparent,
|
||||||
|
var(--ov-line) 48px,
|
||||||
|
var(--ov-line) calc(100% - 48px),
|
||||||
|
transparent
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* — shared type — */
|
||||||
|
|
||||||
|
.ov-kicker {
|
||||||
|
font-size: 11px;
|
||||||
|
letter-spacing: 0.08em;
|
||||||
|
text-transform: uppercase;
|
||||||
|
color: var(--ov-label);
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-kicker-icon {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 7px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-sub {
|
||||||
|
font-size: 12.5px;
|
||||||
|
margin-top: 4px;
|
||||||
|
color: var(--ov-faint);
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-mono {
|
||||||
|
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* — vitals tiles — */
|
||||||
|
|
||||||
|
.ov-vitals {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(4, minmax(0, 1fr));
|
||||||
|
gap: var(--ov-gap);
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 1100px) {
|
||||||
|
.ov-vitals { grid-template-columns: repeat(2, minmax(0, 1fr)); }
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 560px) {
|
||||||
|
.ov-vitals { grid-template-columns: minmax(0, 1fr); }
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-tile {
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-tile-head {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
padding: 14px var(--ov-pad) 0;
|
||||||
|
color: var(--ov-accent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-tile-icon {
|
||||||
|
display: inline-flex;
|
||||||
|
font-size: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-tile-value {
|
||||||
|
display: flex;
|
||||||
|
align-items: baseline;
|
||||||
|
gap: 4px;
|
||||||
|
padding: 12px var(--ov-pad) 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-tile-number {
|
||||||
|
font-size: 34px;
|
||||||
|
font-weight: 600;
|
||||||
|
line-height: 1;
|
||||||
|
letter-spacing: -0.02em;
|
||||||
|
color: var(--ant-color-text);
|
||||||
|
font-variant-numeric: tabular-nums;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-tile-unit {
|
||||||
|
font-size: 14px;
|
||||||
|
color: var(--ov-label);
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-tile-detail {
|
||||||
|
padding: 5px var(--ov-pad) 0;
|
||||||
|
font-size: 12px;
|
||||||
|
color: var(--ov-label);
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-tile-foot {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 8px;
|
||||||
|
padding: 14px var(--ov-pad) 0;
|
||||||
|
font-size: 10px;
|
||||||
|
letter-spacing: 0.06em;
|
||||||
|
text-transform: uppercase;
|
||||||
|
color: var(--ov-faint);
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-tile-chart {
|
||||||
|
margin-top: 6px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* — throughput + connections — */
|
||||||
|
|
||||||
|
.ov-mid {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: minmax(0, 2fr) minmax(0, 1fr);
|
||||||
|
gap: var(--ov-gap);
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 1100px) {
|
||||||
|
.ov-mid { grid-template-columns: minmax(0, 1fr); }
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-wide-head {
|
||||||
|
display: flex;
|
||||||
|
align-items: flex-start;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 16px;
|
||||||
|
padding: var(--ov-pad) var(--ov-pad) 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-wide-head-stack {
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-wide-legend {
|
||||||
|
margin-inline-start: auto;
|
||||||
|
display: flex;
|
||||||
|
gap: 22px;
|
||||||
|
text-align: end;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-legend-label {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: flex-end;
|
||||||
|
gap: 6px;
|
||||||
|
font-size: 11px;
|
||||||
|
color: var(--ov-label);
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-legend-num {
|
||||||
|
font-size: 13px;
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--ant-color-text);
|
||||||
|
font-variant-numeric: tabular-nums;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-conn-total {
|
||||||
|
display: flex;
|
||||||
|
align-items: baseline;
|
||||||
|
gap: 6px;
|
||||||
|
margin-top: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-conn-legend {
|
||||||
|
display: flex;
|
||||||
|
gap: 16px;
|
||||||
|
padding: 16px var(--ov-pad) 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-conn-legend > div {
|
||||||
|
flex: 1 1 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-conn-legend .ov-legend-label {
|
||||||
|
justify-content: flex-start;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-swatch {
|
||||||
|
width: 14px;
|
||||||
|
height: 2px;
|
||||||
|
flex: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-wide-chart {
|
||||||
|
padding: 12px 8px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-wide-foot {
|
||||||
|
display: flex;
|
||||||
|
gap: 16px;
|
||||||
|
margin: 12px var(--ov-pad) 0;
|
||||||
|
padding: 14px 0 var(--ov-pad);
|
||||||
|
border-top: 1px solid var(--ov-line);
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-wide-foot > div {
|
||||||
|
flex: 1 1 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-foot-sep {
|
||||||
|
width: 1px;
|
||||||
|
background: var(--ov-line);
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-foot-value {
|
||||||
|
font-size: 18px;
|
||||||
|
font-weight: 600;
|
||||||
|
margin-top: 4px;
|
||||||
|
color: var(--ant-color-text);
|
||||||
|
font-variant-numeric: tabular-nums;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-foot-part {
|
||||||
|
display: inline-block;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 560px) {
|
||||||
|
.ov-wide-foot {
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-wide-foot .ov-foot-sep {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* — system strip — */
|
||||||
|
|
||||||
|
/* tracks follow SystemStrip's cell order:
|
||||||
|
uptime (xray | os) · panel (memory | threads) · ip addresses */
|
||||||
|
.ov-strip-grid {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns:
|
||||||
|
minmax(max-content, 1.2fr) minmax(max-content, 1.2fr) minmax(0, 1.6fr);
|
||||||
|
gap: 16px;
|
||||||
|
padding: var(--ov-pad);
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 1439px) {
|
||||||
|
.ov-strip-grid { grid-template-columns: repeat(3, minmax(0, 1fr)); }
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 1100px) {
|
||||||
|
.ov-strip-grid { grid-template-columns: repeat(2, minmax(0, 1fr)); }
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 560px) {
|
||||||
|
.ov-strip-grid { grid-template-columns: minmax(0, 1fr); }
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (min-width: 1440px) {
|
||||||
|
.ov-strip-cell + .ov-strip-cell {
|
||||||
|
border-inline-start: 1px solid var(--ov-line);
|
||||||
|
padding-inline-start: 16px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-strip-value {
|
||||||
|
font-size: 19px;
|
||||||
|
font-weight: 600;
|
||||||
|
margin-top: 6px;
|
||||||
|
color: var(--ant-color-text);
|
||||||
|
font-variant-numeric: tabular-nums;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-strip-split {
|
||||||
|
display: flex;
|
||||||
|
align-items: stretch;
|
||||||
|
gap: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-strip-split-sep {
|
||||||
|
width: 1px;
|
||||||
|
background: var(--ov-line);
|
||||||
|
margin-top: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-strip-sub {
|
||||||
|
font-size: 10px;
|
||||||
|
letter-spacing: 0.06em;
|
||||||
|
text-transform: uppercase;
|
||||||
|
margin-top: 8px;
|
||||||
|
color: var(--ov-faint);
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-strip-sub + .ov-strip-value {
|
||||||
|
margin-top: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ov-ip {
|
||||||
|
margin-top: 7px;
|
||||||
|
font-size: 13px;
|
||||||
|
overflow-wrap: anywhere;
|
||||||
transition: filter 0.2s ease;
|
transition: filter 0.2s ease;
|
||||||
}
|
}
|
||||||
|
|
||||||
.index-page .ip-visible .ant-statistic-content-value {
|
.ov-ip-v6 {
|
||||||
filter: none;
|
margin-top: 3px;
|
||||||
|
color: var(--ov-label);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* — preserved from the previous overview — */
|
||||||
|
|
||||||
|
.index-page .ip-toggle-icon {
|
||||||
|
cursor: pointer;
|
||||||
|
font-size: 15px;
|
||||||
|
margin-inline-start: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.index-page .ip-hidden {
|
||||||
|
filter: blur(6px);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,53 +1,29 @@
|
|||||||
import { lazy, useCallback, useEffect, useMemo, useState } from 'react';
|
import { lazy, useCallback, useEffect, useMemo, useState } from 'react';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
|
import { Button, ConfigProvider, Layout, Modal, Result, Spin, message } from 'antd';
|
||||||
import {
|
import {
|
||||||
Button,
|
|
||||||
Card,
|
|
||||||
Col,
|
|
||||||
ConfigProvider,
|
|
||||||
Layout,
|
|
||||||
message,
|
|
||||||
Modal,
|
|
||||||
Result,
|
|
||||||
Row,
|
|
||||||
Space,
|
|
||||||
Spin,
|
|
||||||
Statistic,
|
|
||||||
Tag,
|
|
||||||
Tooltip,
|
|
||||||
} from 'antd';
|
|
||||||
import {
|
|
||||||
BarsOutlined,
|
|
||||||
ControlOutlined,
|
|
||||||
CloudServerOutlined,
|
|
||||||
CloudDownloadOutlined,
|
|
||||||
CloudUploadOutlined,
|
|
||||||
ArrowUpOutlined,
|
|
||||||
ArrowDownOutlined,
|
|
||||||
AreaChartOutlined,
|
|
||||||
GlobalOutlined,
|
|
||||||
SwapOutlined,
|
|
||||||
EyeOutlined,
|
|
||||||
EyeInvisibleOutlined,
|
|
||||||
ThunderboltOutlined,
|
|
||||||
DesktopOutlined,
|
|
||||||
DatabaseOutlined,
|
|
||||||
ForkOutlined,
|
|
||||||
CopyOutlined,
|
CopyOutlined,
|
||||||
TelegramFilled,
|
CloudDownloadOutlined,
|
||||||
|
DashboardOutlined,
|
||||||
|
DatabaseOutlined,
|
||||||
|
HddOutlined,
|
||||||
|
SwapOutlined,
|
||||||
} from '@ant-design/icons';
|
} from '@ant-design/icons';
|
||||||
|
|
||||||
import { HttpUtil, SizeFormatter, TimeFormatter, ClipboardManager, FileManager } from '@/utils';
|
import { HttpUtil, CPUFormatter, SizeFormatter, ClipboardManager, FileManager } from '@/utils';
|
||||||
import { formatPanelVersion } from '@/lib/panel-version';
|
import { USAGE_CRIT_COLOR, USAGE_CRIT_PERCENT, USAGE_WARN_COLOR, USAGE_WARN_PERCENT } from '@/models/status';
|
||||||
import { activateOnKey } from '@/utils/a11y';
|
|
||||||
import { useTheme } from '@/hooks/useTheme';
|
import { useTheme } from '@/hooks/useTheme';
|
||||||
import { useStatusQuery } from '@/api/queries/useStatusQuery';
|
import { useStatusQuery } from '@/api/queries/useStatusQuery';
|
||||||
import { useMediaQuery } from '@/hooks/useMediaQuery';
|
import { useMediaQuery } from '@/hooks/useMediaQuery';
|
||||||
import AppSidebar from '@/layouts/AppSidebar';
|
import AppSidebar from '@/layouts/AppSidebar';
|
||||||
import { LazyMount } from '@/components/utility';
|
import { LazyMount } from '@/components/utility';
|
||||||
import { setMessageInstance } from '@/utils/messageBus';
|
import { setMessageInstance } from '@/utils/messageBus';
|
||||||
import StatusCard from './StatusCard';
|
import OverviewActionBar from './OverviewActionBar';
|
||||||
import XrayStatusCard from './XrayStatusCard';
|
import VitalTile from './VitalTile';
|
||||||
|
import ThroughputCard from './ThroughputCard';
|
||||||
|
import ConnectionsCard from './ConnectionsCard';
|
||||||
|
import SystemStrip from './SystemStrip';
|
||||||
|
import { mean, peak, useOverviewHistory } from './useOverviewHistory';
|
||||||
import type { PanelUpdateInfo } from './PanelUpdateModal';
|
import type { PanelUpdateInfo } from './PanelUpdateModal';
|
||||||
const JsonEditor = lazy(() => import('@/components/form/JsonEditor'));
|
const JsonEditor = lazy(() => import('@/components/form/JsonEditor'));
|
||||||
const PanelUpdateModal = lazy(() => import('./PanelUpdateModal'));
|
const PanelUpdateModal = lazy(() => import('./PanelUpdateModal'));
|
||||||
@@ -90,6 +66,8 @@ export default function IndexPage() {
|
|||||||
const [loading, setLoading] = useState(false);
|
const [loading, setLoading] = useState(false);
|
||||||
const [loadingTip, setLoadingTip] = useState(t('loading'));
|
const [loadingTip, setLoadingTip] = useState(t('loading'));
|
||||||
|
|
||||||
|
const history = useOverviewHistory(status, fetched && !fetchError);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
HttpUtil.post<{ accessLogEnable?: boolean; devChannelEnable?: boolean }>(
|
HttpUtil.post<{ accessLogEnable?: boolean; devChannelEnable?: boolean }>(
|
||||||
'/panel/api/setting/defaultSettings',
|
'/panel/api/setting/defaultSettings',
|
||||||
@@ -127,10 +105,6 @@ export default function IndexPage() {
|
|||||||
await refresh();
|
await refresh();
|
||||||
}, [refresh]);
|
}, [refresh]);
|
||||||
|
|
||||||
function openPanelVersion() {
|
|
||||||
setPanelUpdateOpen(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
async function handleChannelChange(dev: boolean) {
|
async function handleChannelChange(dev: boolean) {
|
||||||
const res = await HttpUtil.post('/panel/api/server/setUpdateChannel', { dev });
|
const res = await HttpUtil.post('/panel/api/server/setUpdateChannel', { dev });
|
||||||
if (!res?.success) return;
|
if (!res?.success) return;
|
||||||
@@ -139,10 +113,6 @@ export default function IndexPage() {
|
|||||||
if (msg?.success && msg.obj) setPanelUpdateInfo(msg.obj);
|
if (msg?.success && msg.obj) setPanelUpdateInfo(msg.obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
function openTelegram() {
|
|
||||||
window.open('https://t.me/XrayUI', '_blank', 'noopener,noreferrer');
|
|
||||||
}
|
|
||||||
|
|
||||||
async function openConfig() {
|
async function openConfig() {
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
try {
|
try {
|
||||||
@@ -165,6 +135,23 @@ export default function IndexPage() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const pageClass = `index-page ${isDark ? 'is-dark' : ''} ${isUltra ? 'is-ultra' : ''}`.trim();
|
const pageClass = `index-page ${isDark ? 'is-dark' : ''} ${isUltra ? 'is-ultra' : ''}`.trim();
|
||||||
|
const totalDisk = status.disk.total;
|
||||||
|
const freeDisk = Math.max(0, totalDisk - status.disk.current);
|
||||||
|
|
||||||
|
const health = useMemo(() => {
|
||||||
|
const items = [
|
||||||
|
{ name: t('pages.index.cpu'), value: status.cpu.percent },
|
||||||
|
{ name: t('pages.index.memory'), value: status.mem.percent },
|
||||||
|
{ name: t('pages.index.swap'), value: status.swap.percent },
|
||||||
|
{ name: t('pages.index.storage'), value: status.disk.percent },
|
||||||
|
];
|
||||||
|
const list = (xs: typeof items) => xs.map((i) => `${i.name} ${i.value.toFixed(0)}%`).join(', ');
|
||||||
|
const crit = items.filter((i) => i.value >= USAGE_CRIT_PERCENT);
|
||||||
|
if (crit.length) return { text: t('pages.index.healthCritical', { list: list(crit) }), color: USAGE_CRIT_COLOR };
|
||||||
|
const warm = items.filter((i) => i.value >= USAGE_WARN_PERCENT);
|
||||||
|
if (warm.length) return { text: t('pages.index.healthWarm', { list: list(warm) }), color: USAGE_WARN_COLOR };
|
||||||
|
return null;
|
||||||
|
}, [status, t]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ConfigProvider theme={antdThemeConfig}>
|
<ConfigProvider theme={antdThemeConfig}>
|
||||||
@@ -190,277 +177,105 @@ export default function IndexPage() {
|
|||||||
extra={<Button type="primary" onClick={refresh}>{t('refresh')}</Button>}
|
extra={<Button type="primary" onClick={refresh}>{t('refresh')}</Button>}
|
||||||
/>
|
/>
|
||||||
) : (
|
) : (
|
||||||
<Row gutter={[isMobile ? 8 : 16, 12]}>
|
<div className="ov-page">
|
||||||
<Col span={24}>
|
<OverviewActionBar
|
||||||
<StatusCard status={status} isMobile={isMobile} />
|
|
||||||
</Col>
|
|
||||||
|
|
||||||
<Col xs={24} lg={12}>
|
|
||||||
<XrayStatusCard
|
|
||||||
status={status}
|
status={status}
|
||||||
isMobile={isMobile}
|
isMobile={isMobile}
|
||||||
accessLogEnable={accessLogEnable}
|
accessLogEnable={accessLogEnable}
|
||||||
|
panelVersion={displayVersion}
|
||||||
|
latestVersion={panelUpdateInfo.latestVersion}
|
||||||
|
updateAvailable={panelUpdateInfo.updateAvailable}
|
||||||
onStopXray={stopXray}
|
onStopXray={stopXray}
|
||||||
onRestartXray={restartXray}
|
onRestartXray={restartXray}
|
||||||
onOpenXrayLogs={() => setXrayLogsOpen(true)}
|
|
||||||
onOpenLogs={() => setLogsOpen(true)}
|
onOpenLogs={() => setLogsOpen(true)}
|
||||||
|
onOpenXrayLogs={() => setXrayLogsOpen(true)}
|
||||||
|
onOpenConfig={openConfig}
|
||||||
|
onOpenBackup={() => setBackupOpen(true)}
|
||||||
|
onOpenSystemHistory={() => setSysHistoryOpen(true)}
|
||||||
|
onOpenXrayMetrics={() => setXrayMetricsOpen(true)}
|
||||||
|
onOpenPanelUpdate={() => setPanelUpdateOpen(true)}
|
||||||
onOpenVersionSwitch={() => setVersionOpen(true)}
|
onOpenVersionSwitch={() => setVersionOpen(true)}
|
||||||
/>
|
/>
|
||||||
</Col>
|
|
||||||
|
|
||||||
<Col xs={24} lg={12}>
|
{health && (
|
||||||
<Card
|
<div className="ov-health" style={{ color: health.color }}>
|
||||||
title={t('menu.link')}
|
<span className="ov-health-mark" />
|
||||||
hoverable
|
{health.text}
|
||||||
actions={[
|
</div>
|
||||||
<Space className="action" key="logs" role="button" tabIndex={0} aria-label={t('pages.index.logs')} onClick={() => setLogsOpen(true)} onKeyDown={activateOnKey(() => setLogsOpen(true))}>
|
|
||||||
<BarsOutlined />
|
|
||||||
{!isMobile && <span>{t('pages.index.logs')}</span>}
|
|
||||||
</Space>,
|
|
||||||
<Space className="action" key="config" role="button" tabIndex={0} aria-label={t('pages.index.config')} onClick={openConfig} onKeyDown={activateOnKey(openConfig)}>
|
|
||||||
<ControlOutlined />
|
|
||||||
{!isMobile && <span>{t('pages.index.config')}</span>}
|
|
||||||
</Space>,
|
|
||||||
<Space className="action" key="backup" role="button" tabIndex={0} aria-label={t('pages.index.backupTitle')} onClick={() => setBackupOpen(true)} onKeyDown={activateOnKey(() => setBackupOpen(true))}>
|
|
||||||
<CloudServerOutlined />
|
|
||||||
{!isMobile && <span>{t('pages.index.backupTitle')}</span>}
|
|
||||||
</Space>,
|
|
||||||
]}
|
|
||||||
/>
|
|
||||||
</Col>
|
|
||||||
|
|
||||||
<Col xs={24} lg={12}>
|
|
||||||
<Card
|
|
||||||
title={
|
|
||||||
<Space>
|
|
||||||
<span>3X-UI</span>
|
|
||||||
{isMobile && displayVersion && (
|
|
||||||
<Tag color={panelUpdateInfo.updateAvailable ? 'orange' : 'green'}>
|
|
||||||
{panelUpdateInfo.updateAvailable
|
|
||||||
? formatPanelVersion(panelUpdateInfo.latestVersion)
|
|
||||||
: formatPanelVersion(displayVersion)}
|
|
||||||
</Tag>
|
|
||||||
)}
|
)}
|
||||||
</Space>
|
|
||||||
}
|
|
||||||
hoverable
|
|
||||||
actions={[
|
|
||||||
<Space className="action" key="tg" role="button" tabIndex={0} aria-label="@XrayUI" onClick={openTelegram} onKeyDown={activateOnKey(openTelegram)}>
|
|
||||||
<TelegramFilled aria-hidden="true" />
|
|
||||||
{!isMobile && <span>@XrayUI</span>}
|
|
||||||
</Space>,
|
|
||||||
<Space
|
|
||||||
key="panel-version"
|
|
||||||
className={`action ${panelUpdateInfo.updateAvailable ? 'action-update' : ''}`}
|
|
||||||
role="button"
|
|
||||||
tabIndex={0}
|
|
||||||
aria-label={t('pages.index.updatePanel')}
|
|
||||||
onClick={openPanelVersion}
|
|
||||||
onKeyDown={activateOnKey(openPanelVersion)}
|
|
||||||
>
|
|
||||||
<CloudDownloadOutlined />
|
|
||||||
{!isMobile && (
|
|
||||||
<span>
|
|
||||||
{panelUpdateInfo.updateAvailable
|
|
||||||
? `${t('update')} ${formatPanelVersion(panelUpdateInfo.latestVersion)}`
|
|
||||||
: formatPanelVersion(displayVersion)}
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
</Space>,
|
|
||||||
]}
|
|
||||||
/>
|
|
||||||
</Col>
|
|
||||||
|
|
||||||
<Col xs={24} lg={12}>
|
<hr className="ov-rule" />
|
||||||
<Card
|
|
||||||
title={t('pages.index.charts')}
|
|
||||||
hoverable
|
|
||||||
actions={[
|
|
||||||
<Space
|
|
||||||
className="action"
|
|
||||||
key="sys-history"
|
|
||||||
role="button"
|
|
||||||
tabIndex={0}
|
|
||||||
aria-label={t('pages.index.systemHistoryTitle')}
|
|
||||||
onClick={() => setSysHistoryOpen(true)}
|
|
||||||
onKeyDown={activateOnKey(() => setSysHistoryOpen(true))}
|
|
||||||
>
|
|
||||||
<AreaChartOutlined />
|
|
||||||
{!isMobile && <span>{t('pages.index.systemHistoryTitle')}</span>}
|
|
||||||
</Space>,
|
|
||||||
<Space
|
|
||||||
className="action"
|
|
||||||
key="xray-metrics"
|
|
||||||
role="button"
|
|
||||||
tabIndex={0}
|
|
||||||
aria-label={t('pages.index.xrayMetricsTitle')}
|
|
||||||
onClick={() => setXrayMetricsOpen(true)}
|
|
||||||
onKeyDown={activateOnKey(() => setXrayMetricsOpen(true))}
|
|
||||||
>
|
|
||||||
<AreaChartOutlined />
|
|
||||||
{!isMobile && <span>{t('pages.index.xrayMetricsTitle')}</span>}
|
|
||||||
</Space>,
|
|
||||||
]}
|
|
||||||
/>
|
|
||||||
</Col>
|
|
||||||
|
|
||||||
<Col xs={24} lg={12}>
|
<div className="ov-vitals">
|
||||||
<Card title={t('pages.index.operationHours')} hoverable>
|
<VitalTile
|
||||||
<Row gutter={isMobile ? [8, 8] : 0}>
|
icon={<DashboardOutlined />}
|
||||||
<Col span={12}>
|
label={t('pages.index.cpu')}
|
||||||
<Statistic
|
percent={status.cpu.percent}
|
||||||
title="Xray"
|
statusColor={status.cpu.color}
|
||||||
value={TimeFormatter.formatSecond(status.appStats.uptime)}
|
detail={`${CPUFormatter.cpuCoreFormat(status.cpuCores)} / ${status.logicalPro}T · ${CPUFormatter.cpuSpeedFormat(status.cpuSpeedMhz)}`}
|
||||||
prefix={<ThunderboltOutlined />}
|
footLeft={`${t('pages.index.avg')} ${mean(history.series.cpu).toFixed(0)}%`}
|
||||||
|
footRight={`${t('pages.index.peak')} ${peak(history.series.cpu).toFixed(0)}%`}
|
||||||
|
data={history.series.cpu}
|
||||||
|
isMobile={isMobile}
|
||||||
/>
|
/>
|
||||||
</Col>
|
<VitalTile
|
||||||
<Col span={12}>
|
icon={<DatabaseOutlined />}
|
||||||
<Statistic
|
label={t('pages.index.memory')}
|
||||||
title="OS"
|
percent={status.mem.percent}
|
||||||
value={TimeFormatter.formatSecond(status.uptime)}
|
statusColor={status.mem.color}
|
||||||
prefix={<DesktopOutlined />}
|
detail={`${SizeFormatter.sizeFormat(status.mem.current)} / ${SizeFormatter.sizeFormat(status.mem.total)}`}
|
||||||
|
footLeft={`${t('pages.index.avg')} ${mean(history.series.mem).toFixed(0)}%`}
|
||||||
|
footRight={`${t('pages.index.peak')} ${peak(history.series.mem).toFixed(0)}%`}
|
||||||
|
data={history.series.mem}
|
||||||
|
isMobile={isMobile}
|
||||||
/>
|
/>
|
||||||
</Col>
|
<VitalTile
|
||||||
</Row>
|
icon={<SwapOutlined />}
|
||||||
</Card>
|
label={t('pages.index.swap')}
|
||||||
</Col>
|
percent={status.swap.percent}
|
||||||
|
statusColor={status.swap.color}
|
||||||
|
detail={`${SizeFormatter.sizeFormat(status.swap.current)} / ${SizeFormatter.sizeFormat(status.swap.total)}`}
|
||||||
|
footLeft={`${t('pages.index.avg')} ${mean(history.series.swap).toFixed(1)}%`}
|
||||||
|
footRight={`${t('pages.index.peak')} ${peak(history.series.swap).toFixed(0)}%`}
|
||||||
|
data={history.series.swap}
|
||||||
|
isMobile={isMobile}
|
||||||
|
/>
|
||||||
|
<VitalTile
|
||||||
|
icon={<HddOutlined />}
|
||||||
|
label={t('pages.index.storage')}
|
||||||
|
percent={status.disk.percent}
|
||||||
|
statusColor={status.disk.color}
|
||||||
|
detail={`${SizeFormatter.sizeFormat(status.disk.current)} / ${SizeFormatter.sizeFormat(totalDisk)}`}
|
||||||
|
footLeft={`${t('pages.index.free')} ${SizeFormatter.sizeFormat(freeDisk)}`}
|
||||||
|
footRight={`${t('pages.index.avg')} ${mean(history.series.diskUsage).toFixed(1)}%`}
|
||||||
|
data={history.series.diskUsage}
|
||||||
|
isMobile={isMobile}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
<Col xs={24} lg={12}>
|
<div className="ov-mid">
|
||||||
<Card title={t('usage')} hoverable>
|
<ThroughputCard
|
||||||
<Row gutter={isMobile ? [8, 8] : 0}>
|
status={status}
|
||||||
<Col span={12}>
|
up={history.series.netUp}
|
||||||
<Statistic
|
down={history.series.netDown}
|
||||||
title={t('pages.index.memory')}
|
labels={history.labels}
|
||||||
value={SizeFormatter.sizeFormat(status.appStats.mem)}
|
isMobile={isMobile}
|
||||||
prefix={<DatabaseOutlined />}
|
|
||||||
/>
|
/>
|
||||||
</Col>
|
<ConnectionsCard
|
||||||
<Col span={12}>
|
status={status}
|
||||||
<Statistic
|
tcp={history.series.tcpCount}
|
||||||
title={t('pages.index.threads')}
|
udp={history.series.udpCount}
|
||||||
value={status.appStats.threads}
|
labels={history.labels}
|
||||||
prefix={<ForkOutlined />}
|
isMobile={isMobile}
|
||||||
/>
|
/>
|
||||||
</Col>
|
</div>
|
||||||
</Row>
|
|
||||||
</Card>
|
|
||||||
</Col>
|
|
||||||
|
|
||||||
<Col xs={24} lg={12}>
|
<SystemStrip
|
||||||
<Card title={t('pages.index.overallSpeed')} hoverable>
|
status={status}
|
||||||
<Row gutter={isMobile ? [8, 8] : 0}>
|
showIp={showIp}
|
||||||
<Col span={12}>
|
onToggleIp={() => setShowIp((v) => !v)}
|
||||||
<Statistic
|
|
||||||
title={t('pages.index.upload')}
|
|
||||||
value={SizeFormatter.sizeFormat(status.netIO.up)}
|
|
||||||
prefix={<ArrowUpOutlined />}
|
|
||||||
suffix="/s"
|
|
||||||
/>
|
/>
|
||||||
</Col>
|
</div>
|
||||||
<Col span={12}>
|
|
||||||
<Statistic
|
|
||||||
title={t('pages.index.download')}
|
|
||||||
value={SizeFormatter.sizeFormat(status.netIO.down)}
|
|
||||||
prefix={<ArrowDownOutlined />}
|
|
||||||
suffix="/s"
|
|
||||||
/>
|
|
||||||
</Col>
|
|
||||||
</Row>
|
|
||||||
</Card>
|
|
||||||
</Col>
|
|
||||||
|
|
||||||
<Col xs={24} lg={12}>
|
|
||||||
<Card title={t('pages.index.totalData')} hoverable>
|
|
||||||
<Row gutter={isMobile ? [8, 8] : 0}>
|
|
||||||
<Col span={12}>
|
|
||||||
<Statistic
|
|
||||||
title={t('pages.index.sent')}
|
|
||||||
value={SizeFormatter.sizeFormat(status.netTraffic.sent)}
|
|
||||||
prefix={<CloudUploadOutlined />}
|
|
||||||
/>
|
|
||||||
</Col>
|
|
||||||
<Col span={12}>
|
|
||||||
<Statistic
|
|
||||||
title={t('pages.index.received')}
|
|
||||||
value={SizeFormatter.sizeFormat(status.netTraffic.recv)}
|
|
||||||
prefix={<CloudDownloadOutlined />}
|
|
||||||
/>
|
|
||||||
</Col>
|
|
||||||
</Row>
|
|
||||||
</Card>
|
|
||||||
</Col>
|
|
||||||
|
|
||||||
<Col xs={24} lg={12}>
|
|
||||||
<Card
|
|
||||||
title={t('pages.index.ipAddresses')}
|
|
||||||
hoverable
|
|
||||||
extra={
|
|
||||||
<Tooltip
|
|
||||||
title={t('pages.index.toggleIpVisibility')}
|
|
||||||
placement={isMobile ? 'topRight' : 'top'}
|
|
||||||
>
|
|
||||||
{showIp ? (
|
|
||||||
<EyeOutlined
|
|
||||||
className="ip-toggle-icon"
|
|
||||||
role="button"
|
|
||||||
tabIndex={0}
|
|
||||||
aria-label={t('pages.index.toggleIpVisibility')}
|
|
||||||
onClick={() => setShowIp(false)}
|
|
||||||
onKeyDown={activateOnKey(() => setShowIp(false))}
|
|
||||||
/>
|
|
||||||
) : (
|
|
||||||
<EyeInvisibleOutlined
|
|
||||||
className="ip-toggle-icon"
|
|
||||||
role="button"
|
|
||||||
tabIndex={0}
|
|
||||||
aria-label={t('pages.index.toggleIpVisibility')}
|
|
||||||
onClick={() => setShowIp(true)}
|
|
||||||
onKeyDown={activateOnKey(() => setShowIp(true))}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</Tooltip>
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<Row className={showIp ? 'ip-visible' : 'ip-hidden'} gutter={isMobile ? [8, 8] : 0}>
|
|
||||||
<Col span={isMobile ? 24 : 12}>
|
|
||||||
<Statistic
|
|
||||||
title="IPv4"
|
|
||||||
value={status.publicIP.ipv4}
|
|
||||||
prefix={<GlobalOutlined />}
|
|
||||||
/>
|
|
||||||
</Col>
|
|
||||||
<Col span={isMobile ? 24 : 12}>
|
|
||||||
<Statistic
|
|
||||||
title="IPv6"
|
|
||||||
value={status.publicIP.ipv6}
|
|
||||||
prefix={<GlobalOutlined />}
|
|
||||||
/>
|
|
||||||
</Col>
|
|
||||||
</Row>
|
|
||||||
</Card>
|
|
||||||
</Col>
|
|
||||||
|
|
||||||
<Col xs={24} lg={12}>
|
|
||||||
<Card title={t('pages.index.connectionCount')} hoverable>
|
|
||||||
<Row gutter={isMobile ? [8, 8] : 0}>
|
|
||||||
<Col span={12}>
|
|
||||||
<Statistic
|
|
||||||
title="TCP"
|
|
||||||
value={status.tcpCount}
|
|
||||||
prefix={<SwapOutlined />}
|
|
||||||
/>
|
|
||||||
</Col>
|
|
||||||
<Col span={12}>
|
|
||||||
<Statistic
|
|
||||||
title="UDP"
|
|
||||||
value={status.udpCount}
|
|
||||||
prefix={<SwapOutlined />}
|
|
||||||
/>
|
|
||||||
</Col>
|
|
||||||
</Row>
|
|
||||||
</Card>
|
|
||||||
</Col>
|
|
||||||
</Row>
|
|
||||||
)}
|
)}
|
||||||
</Spin>
|
</Spin>
|
||||||
</Layout.Content>
|
</Layout.Content>
|
||||||
|
|||||||
@@ -0,0 +1,163 @@
|
|||||||
|
import { Fragment } from 'react';
|
||||||
|
import type { ReactNode } from 'react';
|
||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
|
import { Button, Tag, Tooltip } from 'antd';
|
||||||
|
import {
|
||||||
|
ArrowUpOutlined,
|
||||||
|
AreaChartOutlined,
|
||||||
|
BarsOutlined,
|
||||||
|
CloudDownloadOutlined,
|
||||||
|
CloudServerOutlined,
|
||||||
|
ControlOutlined,
|
||||||
|
FileTextOutlined,
|
||||||
|
PoweroffOutlined,
|
||||||
|
ReloadOutlined,
|
||||||
|
} from '@ant-design/icons';
|
||||||
|
|
||||||
|
import { formatPanelVersion } from '@/lib/panel-version';
|
||||||
|
import type { Status } from '@/models/status';
|
||||||
|
|
||||||
|
interface OverviewActionBarProps {
|
||||||
|
status: Status;
|
||||||
|
isMobile: boolean;
|
||||||
|
accessLogEnable: boolean;
|
||||||
|
panelVersion: string;
|
||||||
|
latestVersion: string;
|
||||||
|
updateAvailable: boolean;
|
||||||
|
onStopXray: () => void;
|
||||||
|
onRestartXray: () => void;
|
||||||
|
onOpenLogs: () => void;
|
||||||
|
onOpenXrayLogs: () => void;
|
||||||
|
onOpenConfig: () => void;
|
||||||
|
onOpenBackup: () => void;
|
||||||
|
onOpenSystemHistory: () => void;
|
||||||
|
onOpenXrayMetrics: () => void;
|
||||||
|
onOpenPanelUpdate: () => void;
|
||||||
|
onOpenVersionSwitch: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface BarAction {
|
||||||
|
key: string;
|
||||||
|
icon: ReactNode;
|
||||||
|
text: string;
|
||||||
|
onClick: () => void;
|
||||||
|
primary?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
const XRAY_STATE_KEYS: Record<string, string> = {
|
||||||
|
running: 'pages.index.xrayStatusRunning',
|
||||||
|
stop: 'pages.index.xrayStatusStop',
|
||||||
|
error: 'pages.index.xrayStatusError',
|
||||||
|
};
|
||||||
|
|
||||||
|
export default function OverviewActionBar({
|
||||||
|
status,
|
||||||
|
isMobile,
|
||||||
|
accessLogEnable,
|
||||||
|
panelVersion,
|
||||||
|
latestVersion,
|
||||||
|
updateAvailable,
|
||||||
|
onStopXray,
|
||||||
|
onRestartXray,
|
||||||
|
onOpenLogs,
|
||||||
|
onOpenXrayLogs,
|
||||||
|
onOpenConfig,
|
||||||
|
onOpenBackup,
|
||||||
|
onOpenSystemHistory,
|
||||||
|
onOpenXrayMetrics,
|
||||||
|
onOpenPanelUpdate,
|
||||||
|
onOpenVersionSwitch,
|
||||||
|
}: OverviewActionBarProps) {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const stateText = t(XRAY_STATE_KEYS[status.xray.state] ?? 'pages.index.xrayStatusUnknown');
|
||||||
|
const hasVersion = !!status.xray.version && status.xray.version !== 'Unknown';
|
||||||
|
const size = isMobile ? ('small' as const) : ('middle' as const);
|
||||||
|
|
||||||
|
const actionGroups: BarAction[][] = [
|
||||||
|
[
|
||||||
|
{ key: 'restart', icon: <ReloadOutlined />, text: t('pages.index.restartXray'), onClick: onRestartXray, primary: true },
|
||||||
|
{ key: 'stop', icon: <PoweroffOutlined />, text: t('pages.index.stopXray'), onClick: onStopXray },
|
||||||
|
],
|
||||||
|
[
|
||||||
|
{ key: 'logs', icon: <BarsOutlined />, text: t('pages.index.logs'), onClick: onOpenLogs },
|
||||||
|
...(accessLogEnable
|
||||||
|
? [{ key: 'accessLogs', icon: <FileTextOutlined />, text: t('pages.index.accessLogs'), onClick: onOpenXrayLogs }]
|
||||||
|
: []),
|
||||||
|
{ key: 'config', icon: <ControlOutlined />, text: t('pages.index.config'), onClick: onOpenConfig },
|
||||||
|
{ key: 'backup', icon: <CloudServerOutlined />, text: t('pages.index.backupTitle'), onClick: onOpenBackup },
|
||||||
|
],
|
||||||
|
[
|
||||||
|
{ key: 'history', icon: <AreaChartOutlined />, text: t('pages.index.systemHistoryTitle'), onClick: onOpenSystemHistory },
|
||||||
|
{ key: 'metrics', icon: <ArrowUpOutlined />, text: t('pages.index.xrayMetricsTitle'), onClick: onOpenXrayMetrics },
|
||||||
|
],
|
||||||
|
];
|
||||||
|
|
||||||
|
const statePill = (
|
||||||
|
<span className="ov-state" data-state={status.xray.state}>
|
||||||
|
<span className="ov-state-dot" style={{ color: status.xray.color }} />
|
||||||
|
<span>{`${t('pages.index.xrayStatus')} · ${stateText}`}</span>
|
||||||
|
{hasVersion && (
|
||||||
|
<Tooltip title={t('pages.index.xraySwitch')}>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="ov-state-version"
|
||||||
|
onClick={onOpenVersionSwitch}
|
||||||
|
>
|
||||||
|
{`v${status.xray.version}`}
|
||||||
|
</button>
|
||||||
|
</Tooltip>
|
||||||
|
)}
|
||||||
|
</span>
|
||||||
|
);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="ov-bar">
|
||||||
|
{status.xray.state === 'error' && status.xray.errorMsg ? (
|
||||||
|
<Tooltip title={<span className="ov-error-detail">{status.xray.errorMsg}</span>}>
|
||||||
|
{statePill}
|
||||||
|
</Tooltip>
|
||||||
|
) : (
|
||||||
|
statePill
|
||||||
|
)}
|
||||||
|
|
||||||
|
{updateAvailable ? (
|
||||||
|
<Tag
|
||||||
|
className="ov-update-tag"
|
||||||
|
color="warning"
|
||||||
|
icon={<CloudDownloadOutlined />}
|
||||||
|
onClick={onOpenPanelUpdate}
|
||||||
|
>
|
||||||
|
{`${t('update')} ${formatPanelVersion(latestVersion)}`}
|
||||||
|
</Tag>
|
||||||
|
) : (
|
||||||
|
<Tooltip title={t('pages.index.updatePanel')}>
|
||||||
|
<button type="button" className="ov-panel-version ov-mono" onClick={onOpenPanelUpdate}>
|
||||||
|
{formatPanelVersion(panelVersion)}
|
||||||
|
</button>
|
||||||
|
</Tooltip>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<div className="ov-bar-actions">
|
||||||
|
{actionGroups.map((group, groupIndex) => (
|
||||||
|
<Fragment key={group[0].key}>
|
||||||
|
{groupIndex > 0 && <span className="ov-bar-sep" />}
|
||||||
|
{group.map((action) => (
|
||||||
|
<Button
|
||||||
|
key={action.key}
|
||||||
|
type={action.primary ? undefined : 'text'}
|
||||||
|
color={action.primary ? 'primary' : undefined}
|
||||||
|
variant={action.primary ? 'outlined' : undefined}
|
||||||
|
size={size}
|
||||||
|
icon={action.icon}
|
||||||
|
aria-label={action.text}
|
||||||
|
onClick={action.onClick}
|
||||||
|
>
|
||||||
|
{isMobile ? undefined : action.text}
|
||||||
|
</Button>
|
||||||
|
))}
|
||||||
|
</Fragment>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
.status-card .text-center {
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.status-card .ant-progress-text,
|
|
||||||
.status-card .ant-progress-indicator {
|
|
||||||
font-size: 12px !important;
|
|
||||||
font-weight: 500;
|
|
||||||
}
|
|
||||||
@@ -1,115 +0,0 @@
|
|||||||
import { useTranslation } from 'react-i18next';
|
|
||||||
import { Card, Col, Progress, Row, Tooltip } from 'antd';
|
|
||||||
import { AreaChartOutlined } from '@ant-design/icons';
|
|
||||||
|
|
||||||
import { CPUFormatter, SizeFormatter } from '@/utils';
|
|
||||||
import { useTheme } from '@/hooks/useTheme';
|
|
||||||
import type { Status } from '@/models/status';
|
|
||||||
import './StatusCard.css';
|
|
||||||
|
|
||||||
interface StatusCardProps {
|
|
||||||
status: Status;
|
|
||||||
isMobile: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function StatusCard({ status, isMobile }: StatusCardProps) {
|
|
||||||
const { t } = useTranslation();
|
|
||||||
const { isDark, isUltra } = useTheme();
|
|
||||||
const gaugeSize = isMobile ? 60 : 90;
|
|
||||||
const strokeWidth = isMobile ? 7 : 5;
|
|
||||||
const railColor = isDark
|
|
||||||
? isUltra ? 'rgba(255, 255, 255, 0.1)' : 'rgba(255, 255, 255, 0.16)'
|
|
||||||
: 'rgba(0, 0, 0, 0.08)';
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Card hoverable className="status-card">
|
|
||||||
<Row gutter={[0, isMobile ? 16 : 0]}>
|
|
||||||
<Col xs={24} md={12}>
|
|
||||||
<Row>
|
|
||||||
<Col span={12} className="text-center">
|
|
||||||
<Progress
|
|
||||||
type="dashboard"
|
|
||||||
status="normal"
|
|
||||||
strokeColor={status.cpu.color}
|
|
||||||
railColor={railColor}
|
|
||||||
strokeWidth={strokeWidth}
|
|
||||||
percent={status.cpu.percent}
|
|
||||||
size={gaugeSize}
|
|
||||||
/>
|
|
||||||
<div>
|
|
||||||
<b>{t('pages.index.cpu')}:</b> {CPUFormatter.cpuCoreFormat(status.cpuCores)}
|
|
||||||
<Tooltip
|
|
||||||
title={
|
|
||||||
<>
|
|
||||||
<div>
|
|
||||||
<b>{t('pages.index.logicalProcessors')}:</b> {status.logicalPro}
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<b>{t('pages.index.frequency')}:</b>{' '}
|
|
||||||
{CPUFormatter.cpuSpeedFormat(status.cpuSpeedMhz)}
|
|
||||||
</div>
|
|
||||||
</>
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<AreaChartOutlined />
|
|
||||||
</Tooltip>
|
|
||||||
</div>
|
|
||||||
</Col>
|
|
||||||
|
|
||||||
<Col span={12} className="text-center">
|
|
||||||
<Progress
|
|
||||||
type="dashboard"
|
|
||||||
status="normal"
|
|
||||||
strokeColor={status.mem.color}
|
|
||||||
railColor={railColor}
|
|
||||||
strokeWidth={strokeWidth}
|
|
||||||
percent={status.mem.percent}
|
|
||||||
size={gaugeSize}
|
|
||||||
/>
|
|
||||||
<div>
|
|
||||||
<b>{t('pages.index.memory')}:</b> {SizeFormatter.sizeFormat(status.mem.current)} /{' '}
|
|
||||||
{SizeFormatter.sizeFormat(status.mem.total)}
|
|
||||||
</div>
|
|
||||||
</Col>
|
|
||||||
</Row>
|
|
||||||
</Col>
|
|
||||||
|
|
||||||
<Col xs={24} md={12}>
|
|
||||||
<Row>
|
|
||||||
<Col span={12} className="text-center">
|
|
||||||
<Progress
|
|
||||||
type="dashboard"
|
|
||||||
status="normal"
|
|
||||||
strokeColor={status.swap.color}
|
|
||||||
railColor={railColor}
|
|
||||||
strokeWidth={strokeWidth}
|
|
||||||
percent={status.swap.percent}
|
|
||||||
size={gaugeSize}
|
|
||||||
/>
|
|
||||||
<div>
|
|
||||||
<b>{t('pages.index.swap')}:</b> {SizeFormatter.sizeFormat(status.swap.current)} /{' '}
|
|
||||||
{SizeFormatter.sizeFormat(status.swap.total)}
|
|
||||||
</div>
|
|
||||||
</Col>
|
|
||||||
|
|
||||||
<Col span={12} className="text-center">
|
|
||||||
<Progress
|
|
||||||
type="dashboard"
|
|
||||||
status="normal"
|
|
||||||
strokeColor={status.disk.color}
|
|
||||||
railColor={railColor}
|
|
||||||
strokeWidth={strokeWidth}
|
|
||||||
percent={status.disk.percent}
|
|
||||||
size={gaugeSize}
|
|
||||||
/>
|
|
||||||
<div>
|
|
||||||
<b>{t('pages.index.storage')}:</b> {SizeFormatter.sizeFormat(status.disk.current)} /{' '}
|
|
||||||
{SizeFormatter.sizeFormat(status.disk.total)}
|
|
||||||
</div>
|
|
||||||
</Col>
|
|
||||||
</Row>
|
|
||||||
</Col>
|
|
||||||
</Row>
|
|
||||||
</Card>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,97 @@
|
|||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
|
import { Card, Tooltip } from 'antd';
|
||||||
|
import {
|
||||||
|
ClockCircleOutlined,
|
||||||
|
DatabaseOutlined,
|
||||||
|
EyeInvisibleOutlined,
|
||||||
|
EyeOutlined,
|
||||||
|
GlobalOutlined,
|
||||||
|
} from '@ant-design/icons';
|
||||||
|
|
||||||
|
import { SizeFormatter, TimeFormatter } from '@/utils';
|
||||||
|
import { activateOnKey } from '@/utils/a11y';
|
||||||
|
import type { Status } from '@/models/status';
|
||||||
|
|
||||||
|
interface SystemStripProps {
|
||||||
|
status: Status;
|
||||||
|
showIp: boolean;
|
||||||
|
onToggleIp: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function SystemStrip({ status, showIp, onToggleIp }: SystemStripProps) {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Card hoverable styles={{ body: { padding: 0 } }}>
|
||||||
|
<div className="ov-strip-grid">
|
||||||
|
<div className="ov-strip-cell">
|
||||||
|
<div className="ov-kicker ov-kicker-icon">
|
||||||
|
<ClockCircleOutlined />
|
||||||
|
{t('pages.index.uptime')}
|
||||||
|
</div>
|
||||||
|
<div className="ov-strip-split">
|
||||||
|
<div>
|
||||||
|
<div className="ov-strip-sub">Xray</div>
|
||||||
|
<div className="ov-strip-value">{TimeFormatter.formatSecond(status.appStats.uptime)}</div>
|
||||||
|
</div>
|
||||||
|
<span className="ov-strip-split-sep" />
|
||||||
|
<div>
|
||||||
|
<div className="ov-strip-sub">OS</div>
|
||||||
|
<div className="ov-strip-value">{TimeFormatter.formatSecond(status.uptime)}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="ov-strip-cell">
|
||||||
|
<div className="ov-kicker ov-kicker-icon">
|
||||||
|
<DatabaseOutlined />
|
||||||
|
{t('pages.index.panel')}
|
||||||
|
</div>
|
||||||
|
<div className="ov-strip-split">
|
||||||
|
<div>
|
||||||
|
<div className="ov-strip-sub">{t('pages.index.memory')}</div>
|
||||||
|
<div className="ov-strip-value">{SizeFormatter.sizeFormat(status.appStats.mem)}</div>
|
||||||
|
</div>
|
||||||
|
<span className="ov-strip-split-sep" />
|
||||||
|
<div>
|
||||||
|
<div className="ov-strip-sub">{t('pages.index.threads')}</div>
|
||||||
|
<div className="ov-strip-value">{status.appStats.threads}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="ov-strip-cell">
|
||||||
|
<div className="ov-kicker ov-kicker-icon">
|
||||||
|
<GlobalOutlined />
|
||||||
|
{t('pages.index.ipAddresses')}
|
||||||
|
<Tooltip title={t('pages.index.toggleIpVisibility')}>
|
||||||
|
{showIp ? (
|
||||||
|
<EyeOutlined
|
||||||
|
className="ip-toggle-icon"
|
||||||
|
role="button"
|
||||||
|
tabIndex={0}
|
||||||
|
aria-label={t('pages.index.toggleIpVisibility')}
|
||||||
|
onClick={onToggleIp}
|
||||||
|
onKeyDown={activateOnKey(onToggleIp)}
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<EyeInvisibleOutlined
|
||||||
|
className="ip-toggle-icon"
|
||||||
|
role="button"
|
||||||
|
tabIndex={0}
|
||||||
|
aria-label={t('pages.index.toggleIpVisibility')}
|
||||||
|
onClick={onToggleIp}
|
||||||
|
onKeyDown={activateOnKey(onToggleIp)}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</Tooltip>
|
||||||
|
</div>
|
||||||
|
<div className={`ov-ip${showIp ? '' : ' ip-hidden'}`}>
|
||||||
|
<div className="ov-mono">{status.publicIP.ipv4}</div>
|
||||||
|
<div className="ov-mono ov-ip-v6">{status.publicIP.ipv6}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</Card>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,97 @@
|
|||||||
|
import { useMemo } from 'react';
|
||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
|
import { Card, theme } from 'antd';
|
||||||
|
import { ArrowDownOutlined, ArrowUpOutlined } from '@ant-design/icons';
|
||||||
|
|
||||||
|
import { SizeFormatter } from '@/utils';
|
||||||
|
import { Sparkline } from '@/components/viz';
|
||||||
|
import type { Status } from '@/models/status';
|
||||||
|
import { mean, peak } from './useOverviewHistory';
|
||||||
|
|
||||||
|
interface ThroughputCardProps {
|
||||||
|
status: Status;
|
||||||
|
up: number[];
|
||||||
|
down: number[];
|
||||||
|
labels: string[];
|
||||||
|
isMobile: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function ThroughputCard({ status, up, down, labels, isMobile }: ThroughputCardProps) {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const { token } = theme.useToken();
|
||||||
|
const accent = token.colorPrimary;
|
||||||
|
const downColor = token.colorTextTertiary;
|
||||||
|
|
||||||
|
const referenceLines = useMemo(
|
||||||
|
() => [
|
||||||
|
{ y: status.netIO.down, color: downColor, dash: '2 4' },
|
||||||
|
{ y: status.netIO.up, color: accent, dash: '2 4' },
|
||||||
|
],
|
||||||
|
[status.netIO.up, status.netIO.down, accent, downColor],
|
||||||
|
);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Card hoverable styles={{ body: { padding: 0 } }}>
|
||||||
|
<div className="ov-wide-head">
|
||||||
|
<div>
|
||||||
|
<div className="ov-kicker">{t('pages.index.overallSpeed')}</div>
|
||||||
|
<div className="ov-sub">
|
||||||
|
{`${t('pages.index.throughputSub')} · ${t('pages.index.peak')} ${SizeFormatter.speedFormat(peak(down))}`}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="ov-wide-legend">
|
||||||
|
<div className="ov-legend-label">
|
||||||
|
<ArrowUpOutlined style={{ color: accent }} />
|
||||||
|
{t('pages.index.upload')}
|
||||||
|
<span className="ov-legend-num">{SizeFormatter.speedFormat(status.netIO.up)}</span>
|
||||||
|
</div>
|
||||||
|
<div className="ov-legend-label">
|
||||||
|
<ArrowDownOutlined style={{ color: downColor }} />
|
||||||
|
{t('pages.index.download')}
|
||||||
|
<span className="ov-legend-num">{SizeFormatter.speedFormat(status.netIO.down)}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="ov-wide-chart">
|
||||||
|
<Sparkline
|
||||||
|
data={up}
|
||||||
|
data2={down}
|
||||||
|
labels={labels}
|
||||||
|
height={isMobile ? 140 : 186}
|
||||||
|
strokeWidth={1.75}
|
||||||
|
fillOpacity={0.24}
|
||||||
|
showTooltip
|
||||||
|
showLegend={false}
|
||||||
|
valueMax={null}
|
||||||
|
stroke={accent}
|
||||||
|
stroke2={downColor}
|
||||||
|
name1={t('pages.index.upload')}
|
||||||
|
name2={t('pages.index.download')}
|
||||||
|
yFormatter={SizeFormatter.speedFormat}
|
||||||
|
referenceLines={referenceLines}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="ov-wide-foot">
|
||||||
|
<div>
|
||||||
|
<div className="ov-kicker">{t('pages.index.sent')}</div>
|
||||||
|
<div className="ov-foot-value">{SizeFormatter.sizeFormat(status.netTraffic.sent)}</div>
|
||||||
|
</div>
|
||||||
|
<span className="ov-foot-sep" />
|
||||||
|
<div>
|
||||||
|
<div className="ov-kicker">{t('pages.index.received')}</div>
|
||||||
|
<div className="ov-foot-value">{SizeFormatter.sizeFormat(status.netTraffic.recv)}</div>
|
||||||
|
</div>
|
||||||
|
<span className="ov-foot-sep" />
|
||||||
|
<div>
|
||||||
|
<div className="ov-kicker">{t('pages.index.avgWindow')}</div>
|
||||||
|
<div className="ov-foot-value">
|
||||||
|
<span className="ov-foot-part">{`↑ ${SizeFormatter.speedFormat(mean(up))}`}</span>{' '}
|
||||||
|
<span className="ov-foot-part">{`↓ ${SizeFormatter.speedFormat(mean(down))}`}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</Card>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,75 @@
|
|||||||
|
import { useMemo } from 'react';
|
||||||
|
import type { ReactNode } from 'react';
|
||||||
|
import { Card, theme } from 'antd';
|
||||||
|
|
||||||
|
import { Sparkline } from '@/components/viz';
|
||||||
|
import { mean, peak } from './useOverviewHistory';
|
||||||
|
|
||||||
|
interface VitalTileProps {
|
||||||
|
icon: ReactNode;
|
||||||
|
label: string;
|
||||||
|
percent: number;
|
||||||
|
statusColor: string;
|
||||||
|
detail: string;
|
||||||
|
footLeft: string;
|
||||||
|
footRight: string;
|
||||||
|
data: number[];
|
||||||
|
isMobile: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function VitalTile({
|
||||||
|
icon,
|
||||||
|
label,
|
||||||
|
percent,
|
||||||
|
statusColor,
|
||||||
|
detail,
|
||||||
|
footLeft,
|
||||||
|
footRight,
|
||||||
|
data,
|
||||||
|
isMobile,
|
||||||
|
}: VitalTileProps) {
|
||||||
|
const { token } = theme.useToken();
|
||||||
|
const meanColor = token.colorTextTertiary;
|
||||||
|
|
||||||
|
const referenceLines = useMemo(
|
||||||
|
() => (data.length > 1 ? [{ y: mean(data), dash: '3 4', color: meanColor }] : []),
|
||||||
|
[data, meanColor],
|
||||||
|
);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Card hoverable className="ov-tile" styles={{ body: { padding: 0 } }}>
|
||||||
|
<div className="ov-tile-head">
|
||||||
|
<span className="ov-tile-icon">{icon}</span>
|
||||||
|
<span className="ov-kicker">{label}</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="ov-tile-value">
|
||||||
|
<span className="ov-tile-number">{percent.toFixed(1)}</span>
|
||||||
|
<span className="ov-tile-unit">%</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="ov-tile-detail">{detail}</div>
|
||||||
|
|
||||||
|
<div className="ov-tile-foot">
|
||||||
|
<span>{footLeft}</span>
|
||||||
|
<span>{footRight}</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="ov-tile-chart">
|
||||||
|
<Sparkline
|
||||||
|
data={data}
|
||||||
|
height={isMobile ? 48 : 62}
|
||||||
|
strokeWidth={1.5}
|
||||||
|
fillOpacity={0.3}
|
||||||
|
showGrid={false}
|
||||||
|
showMarker={false}
|
||||||
|
valueMax={peak(data) > 0 ? null : 100}
|
||||||
|
stroke={statusColor}
|
||||||
|
referenceLines={referenceLines}
|
||||||
|
yFormatter={(v) => `${v.toFixed(0)}%`}
|
||||||
|
name1={label}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</Card>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
.xray-status-card .action {
|
|
||||||
cursor: pointer;
|
|
||||||
justify-content: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.error-line {
|
|
||||||
display: block;
|
|
||||||
max-width: 400px;
|
|
||||||
white-space: pre-wrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cursor-pointer {
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
@@ -1,123 +0,0 @@
|
|||||||
import { useMemo } from 'react';
|
|
||||||
import { useTranslation } from 'react-i18next';
|
|
||||||
import { Badge, Card, Col, Popover, Row, Space, Tag } from 'antd';
|
|
||||||
import {
|
|
||||||
BarsOutlined,
|
|
||||||
PoweroffOutlined,
|
|
||||||
ReloadOutlined,
|
|
||||||
ToolOutlined,
|
|
||||||
} from '@ant-design/icons';
|
|
||||||
|
|
||||||
import type { Status } from '@/models/status';
|
|
||||||
import { activateOnKey } from '@/utils/a11y';
|
|
||||||
import './XrayStatusCard.css';
|
|
||||||
|
|
||||||
interface XrayStatusCardProps {
|
|
||||||
status: Status;
|
|
||||||
isMobile: boolean;
|
|
||||||
accessLogEnable: boolean;
|
|
||||||
onStopXray: () => void;
|
|
||||||
onRestartXray: () => void;
|
|
||||||
onOpenLogs: () => void;
|
|
||||||
onOpenXrayLogs: () => void;
|
|
||||||
onOpenVersionSwitch: () => void;
|
|
||||||
}
|
|
||||||
|
|
||||||
const XRAY_STATE_KEYS: Record<string, string> = {
|
|
||||||
running: 'pages.index.xrayStatusRunning',
|
|
||||||
stop: 'pages.index.xrayStatusStop',
|
|
||||||
error: 'pages.index.xrayStatusError',
|
|
||||||
};
|
|
||||||
|
|
||||||
export default function XrayStatusCard({
|
|
||||||
status,
|
|
||||||
isMobile,
|
|
||||||
accessLogEnable,
|
|
||||||
onStopXray,
|
|
||||||
onRestartXray,
|
|
||||||
onOpenLogs,
|
|
||||||
onOpenXrayLogs,
|
|
||||||
onOpenVersionSwitch,
|
|
||||||
}: XrayStatusCardProps) {
|
|
||||||
const { t } = useTranslation();
|
|
||||||
|
|
||||||
const stateText = t(XRAY_STATE_KEYS[status.xray.state] ?? 'pages.index.xrayStatusUnknown');
|
|
||||||
|
|
||||||
const title = (
|
|
||||||
<Space>
|
|
||||||
<span>{t('pages.index.xrayStatus')}</span>
|
|
||||||
{isMobile && status.xray.version && status.xray.version !== 'Unknown' && (
|
|
||||||
<Tag color="green">v{status.xray.version}</Tag>
|
|
||||||
)}
|
|
||||||
</Space>
|
|
||||||
);
|
|
||||||
|
|
||||||
const errorLines = useMemo(
|
|
||||||
() => (status.xray.errorMsg || '').split('\n'),
|
|
||||||
[status.xray.errorMsg],
|
|
||||||
);
|
|
||||||
|
|
||||||
const extra =
|
|
||||||
status.xray.state !== 'error' ? (
|
|
||||||
<Badge status="processing" text={stateText} color={status.xray.color} />
|
|
||||||
) : (
|
|
||||||
<Popover
|
|
||||||
title={
|
|
||||||
<Row align="middle" justify="space-between">
|
|
||||||
<Col>
|
|
||||||
<span>{t('pages.index.xrayStatusError')}</span>
|
|
||||||
</Col>
|
|
||||||
<Col>
|
|
||||||
<BarsOutlined className="cursor-pointer" role="button" tabIndex={0} aria-label={t('pages.index.logs')} onClick={onOpenLogs} onKeyDown={activateOnKey(onOpenLogs)} />
|
|
||||||
</Col>
|
|
||||||
</Row>
|
|
||||||
}
|
|
||||||
content={
|
|
||||||
<>
|
|
||||||
{errorLines.map((line, i) => (
|
|
||||||
<span key={i} className="error-line">
|
|
||||||
{line}
|
|
||||||
</span>
|
|
||||||
))}
|
|
||||||
</>
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<Badge status="processing" text={stateText} color={status.xray.color} />
|
|
||||||
</Popover>
|
|
||||||
);
|
|
||||||
|
|
||||||
const actions = [
|
|
||||||
// the xray log viewer reads the access log file, so the button only makes
|
|
||||||
// sense when one is configured (unlike IP limit, which no longer needs it)
|
|
||||||
...(accessLogEnable
|
|
||||||
? [
|
|
||||||
<Space className="action" key="xraylogs" role="button" tabIndex={0} aria-label={t('pages.index.accessLogs')} onClick={onOpenXrayLogs} onKeyDown={activateOnKey(onOpenXrayLogs)}>
|
|
||||||
<BarsOutlined />
|
|
||||||
{!isMobile && <span>{t('pages.index.accessLogs')}</span>}
|
|
||||||
</Space>,
|
|
||||||
]
|
|
||||||
: []),
|
|
||||||
<Space className="action" key="stop" role="button" tabIndex={0} aria-label={t('pages.index.stopXray')} onClick={onStopXray} onKeyDown={activateOnKey(onStopXray)}>
|
|
||||||
<PoweroffOutlined />
|
|
||||||
{!isMobile && <span>{t('pages.index.stopXray')}</span>}
|
|
||||||
</Space>,
|
|
||||||
<Space className="action" key="restart" role="button" tabIndex={0} aria-label={t('pages.index.restartXray')} onClick={onRestartXray} onKeyDown={activateOnKey(onRestartXray)}>
|
|
||||||
<ReloadOutlined />
|
|
||||||
{!isMobile && <span>{t('pages.index.restartXray')}</span>}
|
|
||||||
</Space>,
|
|
||||||
<Space className="action" key="switch" role="button" tabIndex={0} aria-label={t('pages.index.xraySwitch')} onClick={onOpenVersionSwitch} onKeyDown={activateOnKey(onOpenVersionSwitch)}>
|
|
||||||
<ToolOutlined />
|
|
||||||
{!isMobile && (
|
|
||||||
<span>
|
|
||||||
{status.xray.version && status.xray.version !== 'Unknown'
|
|
||||||
? `v${status.xray.version}`
|
|
||||||
: t('pages.index.xraySwitch')}
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
</Space>,
|
|
||||||
];
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Card hoverable title={title} extra={extra} actions={actions} className="xray-status-card" />
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,135 @@
|
|||||||
|
import { useEffect, useMemo, useState } from 'react';
|
||||||
|
|
||||||
|
import { HttpUtil, TimeFormatter } from '@/utils';
|
||||||
|
import type { Status } from '@/models/status';
|
||||||
|
|
||||||
|
const OVERVIEW_WINDOW = 72;
|
||||||
|
const SEED_BUCKET_SECONDS = 2;
|
||||||
|
|
||||||
|
const SERIES_KEYS = ['cpu', 'mem', 'swap', 'diskUsage', 'netUp', 'netDown', 'tcpCount', 'udpCount'] as const;
|
||||||
|
|
||||||
|
export type OverviewSeriesKey = (typeof SERIES_KEYS)[number];
|
||||||
|
|
||||||
|
export interface OverviewHistory {
|
||||||
|
series: Record<OverviewSeriesKey, number[]>;
|
||||||
|
labels: string[];
|
||||||
|
}
|
||||||
|
|
||||||
|
interface HistoryPoint {
|
||||||
|
t: number;
|
||||||
|
v: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface HistoryWindow {
|
||||||
|
series: Record<OverviewSeriesKey, number[]>;
|
||||||
|
times: number[];
|
||||||
|
}
|
||||||
|
|
||||||
|
function emptySeries(): Record<OverviewSeriesKey, number[]> {
|
||||||
|
return Object.fromEntries(SERIES_KEYS.map((key) => [key, [] as number[]])) as Record<OverviewSeriesKey, number[]>;
|
||||||
|
}
|
||||||
|
|
||||||
|
function emptyWindow(): HistoryWindow {
|
||||||
|
return { series: emptySeries(), times: [] };
|
||||||
|
}
|
||||||
|
|
||||||
|
function sampleOf(status: Status): Record<OverviewSeriesKey, number> {
|
||||||
|
return {
|
||||||
|
cpu: status.cpu.percent,
|
||||||
|
mem: status.mem.percent,
|
||||||
|
swap: status.swap.percent,
|
||||||
|
diskUsage: status.disk.percent,
|
||||||
|
netUp: status.netIO.up,
|
||||||
|
netDown: status.netIO.down,
|
||||||
|
tcpCount: status.tcpCount,
|
||||||
|
udpCount: status.udpCount,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function tailWindow<T>(values: T[]): T[] {
|
||||||
|
return values.slice(-OVERVIEW_WINDOW);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function mean(values: number[]): number {
|
||||||
|
if (values.length === 0) return 0;
|
||||||
|
let total = 0;
|
||||||
|
for (const v of values) total += v;
|
||||||
|
return total / values.length;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function peak(values: number[]): number {
|
||||||
|
let max = 0;
|
||||||
|
for (const v of values) if (v > max) max = v;
|
||||||
|
return max;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* the seed bucket must be in the backend's allowedHistoryBuckets whitelist;
|
||||||
|
2s is the smallest and matches the status poll cadence */
|
||||||
|
export function useOverviewHistory(status: Status, hasData: boolean): OverviewHistory {
|
||||||
|
const [trend, setTrend] = useState<HistoryWindow>(emptyWindow);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
let cancelled = false;
|
||||||
|
|
||||||
|
const seed = async () => {
|
||||||
|
const responses = new Map<OverviewSeriesKey, HistoryPoint[]>();
|
||||||
|
await Promise.all(
|
||||||
|
SERIES_KEYS.map(async (key) => {
|
||||||
|
const msg = await HttpUtil.get<HistoryPoint[]>(
|
||||||
|
`/panel/api/server/history/${key}/${SEED_BUCKET_SECONDS}`,
|
||||||
|
undefined,
|
||||||
|
{ silent: true },
|
||||||
|
);
|
||||||
|
if (msg?.success && Array.isArray(msg.obj)) responses.set(key, msg.obj);
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
if (cancelled || responses.size === 0) return;
|
||||||
|
|
||||||
|
let axis: HistoryPoint[] = [];
|
||||||
|
for (const points of responses.values()) {
|
||||||
|
if (points.length > axis.length) axis = points;
|
||||||
|
}
|
||||||
|
axis = tailWindow(axis);
|
||||||
|
if (axis.length === 0) return;
|
||||||
|
|
||||||
|
const seedTimes = axis.map((p) => Number(p.t) || 0);
|
||||||
|
const seedSeries = emptySeries();
|
||||||
|
for (const key of SERIES_KEYS) {
|
||||||
|
const byTs = new Map<number, number>();
|
||||||
|
for (const p of responses.get(key) ?? []) byTs.set(Number(p.t) || 0, Number(p.v) || 0);
|
||||||
|
seedSeries[key] = seedTimes.map((ts) => byTs.get(ts) ?? 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
setTrend((prev) => {
|
||||||
|
const merged = emptyWindow();
|
||||||
|
merged.times = tailWindow(seedTimes.concat(prev.times));
|
||||||
|
for (const key of SERIES_KEYS) {
|
||||||
|
merged.series[key] = tailWindow(seedSeries[key].concat(prev.series[key]));
|
||||||
|
}
|
||||||
|
return merged;
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
seed().catch(() => undefined);
|
||||||
|
return () => {
|
||||||
|
cancelled = true;
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!hasData) return;
|
||||||
|
setTrend((prev) => {
|
||||||
|
const point = sampleOf(status);
|
||||||
|
const next = emptyWindow();
|
||||||
|
next.times = tailWindow(prev.times.concat(Math.floor(Date.now() / 1000)));
|
||||||
|
for (const key of SERIES_KEYS) {
|
||||||
|
next.series[key] = tailWindow(prev.series[key].concat(point[key]));
|
||||||
|
}
|
||||||
|
return next;
|
||||||
|
});
|
||||||
|
}, [status, hasData]);
|
||||||
|
|
||||||
|
const labels = useMemo(() => trend.times.map(TimeFormatter.formatClock), [trend.times]);
|
||||||
|
|
||||||
|
return useMemo(() => ({ series: trend.series, labels }), [trend.series, labels]);
|
||||||
|
}
|
||||||
@@ -3,8 +3,9 @@ import { useTranslation } from 'react-i18next';
|
|||||||
import { Alert, Button, Input, InputNumber, Select, Space, Switch, Tabs } from 'antd';
|
import { Alert, Button, Input, InputNumber, Select, Space, Switch, Tabs } from 'antd';
|
||||||
import { MailOutlined, SendOutlined, SettingOutlined } from '@ant-design/icons';
|
import { MailOutlined, SendOutlined, SettingOutlined } from '@ant-design/icons';
|
||||||
import { HttpUtil } from '@/utils';
|
import { HttpUtil } from '@/utils';
|
||||||
|
import { onNumber } from '@/utils/onNumber';
|
||||||
import type { AllSetting } from '@/models/setting';
|
import type { AllSetting } from '@/models/setting';
|
||||||
import { SettingListItem } from '@/components/ui';
|
import { DefaultSettingTag, SettingListItem } from '@/components/ui';
|
||||||
import { EmailNotifications } from '@/components/ui/notifications/EmailNotifications';
|
import { EmailNotifications } from '@/components/ui/notifications/EmailNotifications';
|
||||||
import { useMediaQuery } from '@/hooks/useMediaQuery';
|
import { useMediaQuery } from '@/hooks/useMediaQuery';
|
||||||
import { catTabLabel } from './catTabLabel';
|
import { catTabLabel } from './catTabLabel';
|
||||||
@@ -62,9 +63,9 @@ export default function EmailTab({ allSetting, updateSetting }: EmailTabProps) {
|
|||||||
onChange={(e) => updateSetting({ smtpHost: e.target.value })} />
|
onChange={(e) => updateSetting({ smtpHost: e.target.value })} />
|
||||||
</SettingListItem>
|
</SettingListItem>
|
||||||
|
|
||||||
<SettingListItem paddings="small" title={t('pages.settings.smtpPort')} description={t('pages.settings.smtpPortDesc')}>
|
<SettingListItem paddings="small" title={t('pages.settings.smtpPort')} badge={<DefaultSettingTag settingKey="smtpPort" value={allSetting.smtpPort} />} description={t('pages.settings.smtpPortDesc')}>
|
||||||
<InputNumber value={allSetting.smtpPort} min={1} max={65535} style={{ width: '100%' }}
|
<InputNumber value={allSetting.smtpPort} min={1} max={65535} style={{ width: '100%' }}
|
||||||
onChange={(v) => updateSetting({ smtpPort: Number(v) || 587 })} />
|
onChange={onNumber((v) => updateSetting({ smtpPort: v }))} />
|
||||||
</SettingListItem>
|
</SettingListItem>
|
||||||
|
|
||||||
<SettingListItem paddings="small" title={t('pages.settings.smtpUsername')} description={t('pages.settings.smtpUsernameDesc')}>
|
<SettingListItem paddings="small" title={t('pages.settings.smtpUsername')} description={t('pages.settings.smtpUsernameDesc')}>
|
||||||
|
|||||||
@@ -17,7 +17,8 @@ import {
|
|||||||
} from '@ant-design/icons';
|
} from '@ant-design/icons';
|
||||||
import type { AllSetting } from '@/models/setting';
|
import type { AllSetting } from '@/models/setting';
|
||||||
import { HttpUtil, LanguageManager } from '@/utils';
|
import { HttpUtil, LanguageManager } from '@/utils';
|
||||||
import { SettingListItem } from '@/components/ui';
|
import { onNumber } from '@/utils/onNumber';
|
||||||
|
import { DefaultSettingTag, SettingListItem } from '@/components/ui';
|
||||||
import { useMediaQuery } from '@/hooks/useMediaQuery';
|
import { useMediaQuery } from '@/hooks/useMediaQuery';
|
||||||
import { catTabLabel } from './catTabLabel';
|
import { catTabLabel } from './catTabLabel';
|
||||||
import { sanitizePath } from './uriPath';
|
import { sanitizePath } from './uriPath';
|
||||||
@@ -168,18 +169,18 @@ export default function GeneralTab({ allSetting, updateSetting }: GeneralTabProp
|
|||||||
<Input value={allSetting.webDomain} onChange={(e) => updateSetting({ webDomain: e.target.value })} />
|
<Input value={allSetting.webDomain} onChange={(e) => updateSetting({ webDomain: e.target.value })} />
|
||||||
</SettingListItem>
|
</SettingListItem>
|
||||||
|
|
||||||
<SettingListItem paddings="small" title={t('pages.settings.panelPort')} description={t('pages.settings.panelPortDesc')}>
|
<SettingListItem paddings="small" title={t('pages.settings.panelPort')} badge={<DefaultSettingTag settingKey="webPort" value={allSetting.webPort} />} description={t('pages.settings.panelPortDesc')}>
|
||||||
<InputNumber value={allSetting.webPort} min={1} max={65535} style={{ width: '100%' }}
|
<InputNumber value={allSetting.webPort} min={1} max={65535} style={{ width: '100%' }}
|
||||||
onChange={(v) => updateSetting({ webPort: Number(v) || 0 })} />
|
onChange={onNumber((v) => updateSetting({ webPort: v }))} />
|
||||||
</SettingListItem>
|
</SettingListItem>
|
||||||
|
|
||||||
<SettingListItem paddings="small" title={t('pages.settings.panelUrlPath')} description={t('pages.settings.panelUrlPathDesc')}>
|
<SettingListItem paddings="small" title={t('pages.settings.panelUrlPath')} description={t('pages.settings.panelUrlPathDesc')}>
|
||||||
<Input value={allSetting.webBasePath} onChange={(e) => updateSetting({ webBasePath: sanitizePath(e.target.value) })} />
|
<Input value={allSetting.webBasePath} onChange={(e) => updateSetting({ webBasePath: sanitizePath(e.target.value) })} />
|
||||||
</SettingListItem>
|
</SettingListItem>
|
||||||
|
|
||||||
<SettingListItem paddings="small" title={t('pages.settings.sessionMaxAge')} description={t('pages.settings.sessionMaxAgeDesc')}>
|
<SettingListItem paddings="small" title={t('pages.settings.sessionMaxAge')} badge={<DefaultSettingTag settingKey="sessionMaxAge" value={allSetting.sessionMaxAge} />} description={t('pages.settings.sessionMaxAgeDesc')}>
|
||||||
<InputNumber value={allSetting.sessionMaxAge} min={60} max={525600} style={{ width: '100%' }}
|
<InputNumber value={allSetting.sessionMaxAge} min={60} max={525600} style={{ width: '100%' }}
|
||||||
onChange={(v) => updateSetting({ sessionMaxAge: Number(v) || 0 })} />
|
onChange={onNumber((v) => updateSetting({ sessionMaxAge: v }))} />
|
||||||
</SettingListItem>
|
</SettingListItem>
|
||||||
|
|
||||||
<SettingListItem
|
<SettingListItem
|
||||||
@@ -206,9 +207,9 @@ export default function GeneralTab({ allSetting, updateSetting }: GeneralTabProp
|
|||||||
/>
|
/>
|
||||||
</SettingListItem>
|
</SettingListItem>
|
||||||
|
|
||||||
<SettingListItem paddings="small" title={t('pages.settings.pageSize')} description={t('pages.settings.pageSizeDesc')}>
|
<SettingListItem paddings="small" title={t('pages.settings.pageSize')} badge={<DefaultSettingTag settingKey="pageSize" value={allSetting.pageSize} />} description={t('pages.settings.pageSizeDesc')}>
|
||||||
<InputNumber value={allSetting.pageSize} min={0} max={1000} step={5} style={{ width: '100%' }}
|
<InputNumber value={allSetting.pageSize} min={0} max={1000} step={5} style={{ width: '100%' }}
|
||||||
onChange={(v) => updateSetting({ pageSize: Number(v) || 0 })} />
|
onChange={onNumber((v) => updateSetting({ pageSize: v }))} />
|
||||||
</SettingListItem>
|
</SettingListItem>
|
||||||
|
|
||||||
<SettingListItem paddings="small" title={t('pages.settings.restartXrayOnClientDisable')} description={t('pages.settings.restartXrayOnClientDisableDesc')}>
|
<SettingListItem paddings="small" title={t('pages.settings.restartXrayOnClientDisable')} description={t('pages.settings.restartXrayOnClientDisableDesc')}>
|
||||||
@@ -232,13 +233,13 @@ export default function GeneralTab({ allSetting, updateSetting }: GeneralTabProp
|
|||||||
label: catTabLabel(<BellOutlined />, t('pages.settings.notifications'), isMobile),
|
label: catTabLabel(<BellOutlined />, t('pages.settings.notifications'), isMobile),
|
||||||
children: (
|
children: (
|
||||||
<>
|
<>
|
||||||
<SettingListItem paddings="small" title={t('pages.settings.expireTimeDiff')} description={t('pages.settings.expireTimeDiffDesc')}>
|
<SettingListItem paddings="small" title={t('pages.settings.expireTimeDiff')} badge={<DefaultSettingTag settingKey="expireDiff" value={allSetting.expireDiff} />} description={t('pages.settings.expireTimeDiffDesc')}>
|
||||||
<InputNumber value={allSetting.expireDiff} min={0} style={{ width: '100%' }}
|
<InputNumber value={allSetting.expireDiff} min={0} style={{ width: '100%' }}
|
||||||
onChange={(v) => updateSetting({ expireDiff: Number(v) || 0 })} />
|
onChange={onNumber((v) => updateSetting({ expireDiff: v }))} />
|
||||||
</SettingListItem>
|
</SettingListItem>
|
||||||
<SettingListItem paddings="small" title={t('pages.settings.trafficDiff')} description={t('pages.settings.trafficDiffDesc')}>
|
<SettingListItem paddings="small" title={t('pages.settings.trafficDiff')} badge={<DefaultSettingTag settingKey="trafficDiff" value={allSetting.trafficDiff} />} description={t('pages.settings.trafficDiffDesc')}>
|
||||||
<InputNumber value={allSetting.trafficDiff} min={0} max={100} style={{ width: '100%' }}
|
<InputNumber value={allSetting.trafficDiff} min={0} max={100} style={{ width: '100%' }}
|
||||||
onChange={(v) => updateSetting({ trafficDiff: Number(v) || 0 })} />
|
onChange={onNumber((v) => updateSetting({ trafficDiff: v }))} />
|
||||||
</SettingListItem>
|
</SettingListItem>
|
||||||
</>
|
</>
|
||||||
),
|
),
|
||||||
@@ -306,9 +307,9 @@ export default function GeneralTab({ allSetting, updateSetting }: GeneralTabProp
|
|||||||
<SettingListItem paddings="small" title={t('pages.settings.ldap.host')}>
|
<SettingListItem paddings="small" title={t('pages.settings.ldap.host')}>
|
||||||
<Input value={allSetting.ldapHost} onChange={(e) => updateSetting({ ldapHost: e.target.value })} />
|
<Input value={allSetting.ldapHost} onChange={(e) => updateSetting({ ldapHost: e.target.value })} />
|
||||||
</SettingListItem>
|
</SettingListItem>
|
||||||
<SettingListItem paddings="small" title={t('pages.settings.ldap.port')}>
|
<SettingListItem paddings="small" title={t('pages.settings.ldap.port')} badge={<DefaultSettingTag settingKey="ldapPort" value={allSetting.ldapPort} />}>
|
||||||
<InputNumber value={allSetting.ldapPort} min={1} max={65535} style={{ width: '100%' }}
|
<InputNumber value={allSetting.ldapPort} min={1} max={65535} style={{ width: '100%' }}
|
||||||
onChange={(v) => updateSetting({ ldapPort: Number(v) || 0 })} />
|
onChange={onNumber((v) => updateSetting({ ldapPort: v }))} />
|
||||||
</SettingListItem>
|
</SettingListItem>
|
||||||
<SettingListItem paddings="small" title={t('pages.settings.ldap.useTls')}>
|
<SettingListItem paddings="small" title={t('pages.settings.ldap.useTls')}>
|
||||||
<Switch checked={allSetting.ldapUseTLS} onChange={(v) => updateSetting({ ldapUseTLS: v })} />
|
<Switch checked={allSetting.ldapUseTLS} onChange={(v) => updateSetting({ ldapUseTLS: v })} />
|
||||||
@@ -385,17 +386,17 @@ export default function GeneralTab({ allSetting, updateSetting }: GeneralTabProp
|
|||||||
<SettingListItem paddings="small" title={t('pages.settings.ldap.autoDelete')}>
|
<SettingListItem paddings="small" title={t('pages.settings.ldap.autoDelete')}>
|
||||||
<Switch checked={allSetting.ldapAutoDelete} onChange={(v) => updateSetting({ ldapAutoDelete: v })} />
|
<Switch checked={allSetting.ldapAutoDelete} onChange={(v) => updateSetting({ ldapAutoDelete: v })} />
|
||||||
</SettingListItem>
|
</SettingListItem>
|
||||||
<SettingListItem paddings="small" title={t('pages.settings.ldap.defaultTotalGb')}>
|
<SettingListItem paddings="small" title={t('pages.settings.ldap.defaultTotalGb')} badge={<DefaultSettingTag settingKey="ldapDefaultTotalGB" value={allSetting.ldapDefaultTotalGB} />}>
|
||||||
<InputNumber value={allSetting.ldapDefaultTotalGB} min={0} style={{ width: '100%' }}
|
<InputNumber value={allSetting.ldapDefaultTotalGB} min={0} style={{ width: '100%' }}
|
||||||
onChange={(v) => updateSetting({ ldapDefaultTotalGB: Number(v) || 0 })} />
|
onChange={onNumber((v) => updateSetting({ ldapDefaultTotalGB: v }))} />
|
||||||
</SettingListItem>
|
</SettingListItem>
|
||||||
<SettingListItem paddings="small" title={t('pages.settings.ldap.defaultExpiryDays')}>
|
<SettingListItem paddings="small" title={t('pages.settings.ldap.defaultExpiryDays')} badge={<DefaultSettingTag settingKey="ldapDefaultExpiryDays" value={allSetting.ldapDefaultExpiryDays} />}>
|
||||||
<InputNumber value={allSetting.ldapDefaultExpiryDays} min={0} style={{ width: '100%' }}
|
<InputNumber value={allSetting.ldapDefaultExpiryDays} min={0} style={{ width: '100%' }}
|
||||||
onChange={(v) => updateSetting({ ldapDefaultExpiryDays: Number(v) || 0 })} />
|
onChange={onNumber((v) => updateSetting({ ldapDefaultExpiryDays: v }))} />
|
||||||
</SettingListItem>
|
</SettingListItem>
|
||||||
<SettingListItem paddings="small" title={t('pages.settings.ldap.defaultIpLimit')}>
|
<SettingListItem paddings="small" title={t('pages.settings.ldap.defaultIpLimit')} badge={<DefaultSettingTag settingKey="ldapDefaultLimitIP" value={allSetting.ldapDefaultLimitIP} />}>
|
||||||
<InputNumber value={allSetting.ldapDefaultLimitIP} min={0} style={{ width: '100%' }}
|
<InputNumber value={allSetting.ldapDefaultLimitIP} min={0} style={{ width: '100%' }}
|
||||||
onChange={(v) => updateSetting({ ldapDefaultLimitIP: Number(v) || 0 })} />
|
onChange={onNumber((v) => updateSetting({ ldapDefaultLimitIP: v }))} />
|
||||||
</SettingListItem>
|
</SettingListItem>
|
||||||
</>
|
</>
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ import {
|
|||||||
SettingOutlined,
|
SettingOutlined,
|
||||||
} from '@ant-design/icons';
|
} from '@ant-design/icons';
|
||||||
import type { AllSetting } from '@/models/setting';
|
import type { AllSetting } from '@/models/setting';
|
||||||
|
import { onNumber } from '@/utils/onNumber';
|
||||||
import { SettingListItem } from '@/components/ui';
|
import { SettingListItem } from '@/components/ui';
|
||||||
import { GoRegexInput } from '@/components/form';
|
import { GoRegexInput } from '@/components/form';
|
||||||
import { useMediaQuery } from '@/hooks/useMediaQuery';
|
import { useMediaQuery } from '@/hooks/useMediaQuery';
|
||||||
@@ -279,11 +280,11 @@ export default function SubscriptionFormatsTab({ allSetting, updateSetting }: Su
|
|||||||
<div className="format-settings">
|
<div className="format-settings">
|
||||||
<SettingListItem paddings="small" title={t('pages.settings.subFormats.concurrency')}>
|
<SettingListItem paddings="small" title={t('pages.settings.subFormats.concurrency')}>
|
||||||
<InputNumber value={muxObj.concurrency} min={-1} max={1024} style={{ width: '100%' }}
|
<InputNumber value={muxObj.concurrency} min={-1} max={1024} style={{ width: '100%' }}
|
||||||
onChange={(v) => setMuxField('concurrency', Number(v) || 0)} />
|
onChange={onNumber((v) => setMuxField('concurrency', v))} />
|
||||||
</SettingListItem>
|
</SettingListItem>
|
||||||
<SettingListItem paddings="small" title={t('pages.settings.subFormats.xudpConcurrency')}>
|
<SettingListItem paddings="small" title={t('pages.settings.subFormats.xudpConcurrency')}>
|
||||||
<InputNumber value={muxObj.xudpConcurrency} min={-1} max={1024} style={{ width: '100%' }}
|
<InputNumber value={muxObj.xudpConcurrency} min={-1} max={1024} style={{ width: '100%' }}
|
||||||
onChange={(v) => setMuxField('xudpConcurrency', Number(v) || 0)} />
|
onChange={onNumber((v) => setMuxField('xudpConcurrency', v))} />
|
||||||
</SettingListItem>
|
</SettingListItem>
|
||||||
<SettingListItem paddings="small" title={t('pages.settings.subFormats.xudpUdp443')}>
|
<SettingListItem paddings="small" title={t('pages.settings.subFormats.xudpUdp443')}>
|
||||||
<Select
|
<Select
|
||||||
|
|||||||
@@ -3,7 +3,8 @@ import { BranchesOutlined, CompassOutlined, IdcardOutlined, InfoCircleOutlined,
|
|||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import { useNavigate } from 'react-router';
|
import { useNavigate } from 'react-router';
|
||||||
import type { AllSetting } from '@/models/setting';
|
import type { AllSetting } from '@/models/setting';
|
||||||
import { SettingListItem } from '@/components/ui';
|
import { onNumber } from '@/utils/onNumber';
|
||||||
|
import { DefaultSettingTag, SettingListItem } from '@/components/ui';
|
||||||
import { RemarkTemplateField } from '@/components/form';
|
import { RemarkTemplateField } from '@/components/form';
|
||||||
import { useMediaQuery } from '@/hooks/useMediaQuery';
|
import { useMediaQuery } from '@/hooks/useMediaQuery';
|
||||||
import { catTabLabel } from './catTabLabel';
|
import { catTabLabel } from './catTabLabel';
|
||||||
@@ -55,9 +56,9 @@ export default function SubscriptionGeneralTab({ allSetting, updateSetting }: Su
|
|||||||
<SettingListItem paddings="small" title={t('pages.settings.subDomain')} description={t('pages.settings.subDomainDesc')}>
|
<SettingListItem paddings="small" title={t('pages.settings.subDomain')} description={t('pages.settings.subDomainDesc')}>
|
||||||
<Input value={allSetting.subDomain} onChange={(e) => updateSetting({ subDomain: e.target.value })} />
|
<Input value={allSetting.subDomain} onChange={(e) => updateSetting({ subDomain: e.target.value })} />
|
||||||
</SettingListItem>
|
</SettingListItem>
|
||||||
<SettingListItem paddings="small" title={t('pages.settings.subPort')} description={t('pages.settings.subPortDesc')}>
|
<SettingListItem paddings="small" title={t('pages.settings.subPort')} badge={<DefaultSettingTag settingKey="subPort" value={allSetting.subPort} />} description={t('pages.settings.subPortDesc')}>
|
||||||
<InputNumber value={allSetting.subPort} min={1} max={65535} style={{ width: '100%' }}
|
<InputNumber value={allSetting.subPort} min={1} max={65535} style={{ width: '100%' }}
|
||||||
onChange={(v) => updateSetting({ subPort: Number(v) || 0 })} />
|
onChange={onNumber((v) => updateSetting({ subPort: v }))} />
|
||||||
</SettingListItem>
|
</SettingListItem>
|
||||||
<SettingListItem paddings="small" title={t('pages.settings.subPath')} description={t('pages.settings.subPathDesc')}>
|
<SettingListItem paddings="small" title={t('pages.settings.subPath')} description={t('pages.settings.subPathDesc')}>
|
||||||
<Input
|
<Input
|
||||||
@@ -93,10 +94,20 @@ export default function SubscriptionGeneralTab({ allSetting, updateSetting }: Su
|
|||||||
maxLength={256}
|
maxLength={256}
|
||||||
/>
|
/>
|
||||||
</SettingListItem>
|
</SettingListItem>
|
||||||
|
<SettingListItem
|
||||||
|
paddings="small"
|
||||||
|
title={t('pages.settings.subShowIdentityOnAllLinks')}
|
||||||
|
description={t('pages.settings.subShowIdentityOnAllLinksDesc')}
|
||||||
|
>
|
||||||
|
<Switch
|
||||||
|
checked={allSetting.subShowIdentityOnAllLinks}
|
||||||
|
onChange={(v) => updateSetting({ subShowIdentityOnAllLinks: v })}
|
||||||
|
/>
|
||||||
|
</SettingListItem>
|
||||||
|
|
||||||
<SettingListItem paddings="small" title={t('pages.settings.subUpdates')} description={t('pages.settings.subUpdatesDesc')}>
|
<SettingListItem paddings="small" title={t('pages.settings.subUpdates')} badge={<DefaultSettingTag settingKey="subUpdates" value={allSetting.subUpdates} />} description={t('pages.settings.subUpdatesDesc')}>
|
||||||
<InputNumber value={allSetting.subUpdates} min={0} max={525600} style={{ width: '100%' }}
|
<InputNumber value={allSetting.subUpdates} min={0} max={525600} style={{ width: '100%' }}
|
||||||
onChange={(v) => updateSetting({ subUpdates: Number(v) || 0 })} />
|
onChange={onNumber((v) => updateSetting({ subUpdates: v }))} />
|
||||||
</SettingListItem>
|
</SettingListItem>
|
||||||
</>
|
</>
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import { Alert, Button, Input, InputNumber, Select, Space, Switch, Tabs } from '
|
|||||||
import { BellOutlined, SendOutlined, SettingOutlined } from '@ant-design/icons';
|
import { BellOutlined, SendOutlined, SettingOutlined } from '@ant-design/icons';
|
||||||
import { LanguageManager } from '@/utils';
|
import { LanguageManager } from '@/utils';
|
||||||
import { HttpUtil } from '@/utils';
|
import { HttpUtil } from '@/utils';
|
||||||
|
import { onNumber } from '@/utils/onNumber';
|
||||||
import type { AllSetting } from '@/models/setting';
|
import type { AllSetting } from '@/models/setting';
|
||||||
import { SettingListItem } from '@/components/ui';
|
import { SettingListItem } from '@/components/ui';
|
||||||
import { TelegramNotifications } from '@/components/ui/notifications/TelegramNotifications';
|
import { TelegramNotifications } from '@/components/ui/notifications/TelegramNotifications';
|
||||||
@@ -122,9 +123,10 @@ function NotifyTimeField({ value, onChange }: { value: string; onChange: (v: str
|
|||||||
<Space.Compact style={{ width: '100%' }}>
|
<Space.Compact style={{ width: '100%' }}>
|
||||||
<InputNumber
|
<InputNumber
|
||||||
min={1}
|
min={1}
|
||||||
|
precision={0}
|
||||||
style={{ width: '50%' }}
|
style={{ width: '50%' }}
|
||||||
value={state.num}
|
value={state.num}
|
||||||
onChange={(v) => update({ num: Math.max(1, Number(v) || 1) })}
|
onChange={onNumber((v) => update({ num: Math.max(1, v) }))}
|
||||||
aria-label={t('pages.settings.notifyTime.interval')}
|
aria-label={t('pages.settings.notifyTime.interval')}
|
||||||
/>
|
/>
|
||||||
<Select<Unit>
|
<Select<Unit>
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { useMemo } from 'react';
|
|||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import { Alert, Empty, Input, InputNumber, Select, Space, Switch, Tag } from 'antd';
|
import { Alert, Empty, Input, InputNumber, Select, Space, Switch, Tag } from 'antd';
|
||||||
|
|
||||||
|
import { onNumber } from '@/utils/onNumber';
|
||||||
import { SettingListItem } from '@/components/ui';
|
import { SettingListItem } from '@/components/ui';
|
||||||
import {
|
import {
|
||||||
BurstObservatorySchema,
|
BurstObservatorySchema,
|
||||||
@@ -195,7 +196,7 @@ export default function ObservatorySettingsTab({
|
|||||||
<InputNumber
|
<InputNumber
|
||||||
min={1}
|
min={1}
|
||||||
value={burst.pingConfig.sampling}
|
value={burst.pingConfig.sampling}
|
||||||
onChange={(v) => patchPingConfig({ sampling: typeof v === 'number' ? v : burst.pingConfig.sampling })}
|
onChange={onNumber((v) => patchPingConfig({ sampling: v }))}
|
||||||
style={{ width: '100%' }}
|
style={{ width: '100%' }}
|
||||||
/>
|
/>
|
||||||
</SettingListItem>
|
</SettingListItem>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { useCallback } from 'react';
|
import { useCallback } from 'react';
|
||||||
|
import { onNumber } from '@/utils/onNumber';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import { Alert, Button, Input, InputNumber, Modal, Select, Space, Switch, Tabs } from 'antd';
|
import { Alert, Button, Input, InputNumber, Modal, Select, Space, Switch, Tabs } from 'antd';
|
||||||
import {
|
import {
|
||||||
@@ -216,10 +217,10 @@ export default function BasicsTab({
|
|||||||
style={{ width: '100%' }}
|
style={{ width: '100%' }}
|
||||||
value={directHappyEyeballs.tryDelayMs}
|
value={directHappyEyeballs.tryDelayMs}
|
||||||
placeholder="150"
|
placeholder="150"
|
||||||
onChange={(v) => setDirectHappyEyeballs({
|
onChange={onNumber((v) => setDirectHappyEyeballs({
|
||||||
...directHappyEyeballs,
|
...directHappyEyeballs,
|
||||||
tryDelayMs: typeof v === 'number' ? v : 0,
|
tryDelayMs: v,
|
||||||
})}
|
}))}
|
||||||
/>
|
/>
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { useCallback, useEffect, useMemo, useState } from 'react';
|
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import { Alert, Button, Empty, Input, InputNumber, Modal, Select, Space, Switch, Table, Tabs } from 'antd';
|
import { Alert, Button, Empty, Input, InputNumber, Modal, Select, Space, Switch, Table, Tabs } from 'antd';
|
||||||
import {
|
import {
|
||||||
@@ -11,6 +11,7 @@ import {
|
|||||||
SettingOutlined,
|
SettingOutlined,
|
||||||
} from '@ant-design/icons';
|
} from '@ant-design/icons';
|
||||||
|
|
||||||
|
import { onNumber } from '@/utils/onNumber';
|
||||||
import { SettingListItem } from '@/components/ui';
|
import { SettingListItem } from '@/components/ui';
|
||||||
import { useMediaQuery } from '@/hooks/useMediaQuery';
|
import { useMediaQuery } from '@/hooks/useMediaQuery';
|
||||||
import { catTabLabel } from '@/pages/settings/catTabLabel';
|
import { catTabLabel } from '@/pages/settings/catTabLabel';
|
||||||
@@ -41,6 +42,23 @@ export default function DnsTab({ templateSettings, setTemplateSettings }: DnsTab
|
|||||||
|
|
||||||
const dns = (templateSettings?.dns as DnsConfig | undefined) ?? null;
|
const dns = (templateSettings?.dns as DnsConfig | undefined) ?? null;
|
||||||
const dnsEnabled = !!dns;
|
const dnsEnabled = !!dns;
|
||||||
|
const sourceHosts = dns?.hosts;
|
||||||
|
const incomingHosts = JSON.stringify(sourceHosts ?? {});
|
||||||
|
const lastWrittenHostsRef = useRef<string | null>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!dnsEnabled) {
|
||||||
|
lastWrittenHostsRef.current = '{}';
|
||||||
|
setHostsList([]);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (incomingHosts === lastWrittenHostsRef.current) return;
|
||||||
|
lastWrittenHostsRef.current = incomingHosts;
|
||||||
|
setHostsList(Object.entries(sourceHosts ?? {}).map(([domain, values]) => ({
|
||||||
|
domain,
|
||||||
|
values: Array.isArray(values) ? [...values] : [String(values)],
|
||||||
|
})));
|
||||||
|
}, [dnsEnabled, incomingHosts, sourceHosts]);
|
||||||
|
|
||||||
const mutate = useCallback(
|
const mutate = useCallback(
|
||||||
(mutator: (next: XraySettingsValue) => void) => {
|
(mutator: (next: XraySettingsValue) => void) => {
|
||||||
@@ -78,25 +96,7 @@ export default function DnsTab({ templateSettings, setTemplateSettings }: DnsTab
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (!dns) {
|
|
||||||
setHostsList([]);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const src = dns.hosts || {};
|
|
||||||
setHostsList(
|
|
||||||
Object.entries(src).map(([domain, val]) => ({
|
|
||||||
domain,
|
|
||||||
values: Array.isArray(val) ? [...val] : [String(val)],
|
|
||||||
})),
|
|
||||||
);
|
|
||||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
||||||
}, [dnsEnabled]);
|
|
||||||
|
|
||||||
function syncHosts(next: HostRow[]) {
|
function syncHosts(next: HostRow[]) {
|
||||||
setHostsList(next);
|
|
||||||
mutate((tt) => {
|
|
||||||
if (!tt.dns) return;
|
|
||||||
const obj: Record<string, string | string[]> = {};
|
const obj: Record<string, string | string[]> = {};
|
||||||
for (const row of next) {
|
for (const row of next) {
|
||||||
if (!row.domain) continue;
|
if (!row.domain) continue;
|
||||||
@@ -104,6 +104,10 @@ export default function DnsTab({ templateSettings, setTemplateSettings }: DnsTab
|
|||||||
if (vals.length === 0) continue;
|
if (vals.length === 0) continue;
|
||||||
obj[row.domain] = vals.length === 1 ? vals[0] : vals;
|
obj[row.domain] = vals.length === 1 ? vals[0] : vals;
|
||||||
}
|
}
|
||||||
|
lastWrittenHostsRef.current = JSON.stringify(obj);
|
||||||
|
setHostsList(next);
|
||||||
|
mutate((tt) => {
|
||||||
|
if (!tt.dns) return;
|
||||||
if (Object.keys(obj).length > 0) {
|
if (Object.keys(obj).length > 0) {
|
||||||
(tt.dns as DnsConfig).hosts = obj;
|
(tt.dns as DnsConfig).hosts = obj;
|
||||||
} else if ('hosts' in (tt.dns as DnsConfig)) {
|
} else if ('hosts' in (tt.dns as DnsConfig)) {
|
||||||
@@ -311,7 +315,7 @@ export default function DnsTab({ templateSettings, setTemplateSettings }: DnsTab
|
|||||||
min={0}
|
min={0}
|
||||||
step={60}
|
step={60}
|
||||||
style={{ width: '100%' }}
|
style={{ width: '100%' }}
|
||||||
onChange={(v) => setDnsField('serveExpiredTTL', Number(v) || 0)}
|
onChange={onNumber((v) => setDnsField('serveExpiredTTL', v))}
|
||||||
/>
|
/>
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -4,6 +4,8 @@ import { Button, Dropdown, Input, InputNumber, Space } from 'antd';
|
|||||||
import { MoreOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons';
|
import { MoreOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons';
|
||||||
import type { ColumnsType } from 'antd/es/table';
|
import type { ColumnsType } from 'antd/es/table';
|
||||||
|
|
||||||
|
import { onNumber } from '@/utils/onNumber';
|
||||||
|
|
||||||
import { addrFor, domainsFor, expectedIPsFor } from './helpers';
|
import { addrFor, domainsFor, expectedIPsFor } from './helpers';
|
||||||
import type { DnsServerValue } from './DnsServerModal';
|
import type { DnsServerValue } from './DnsServerModal';
|
||||||
|
|
||||||
@@ -113,7 +115,7 @@ export function useFakednsColumns({
|
|||||||
aria-label={t('pages.xray.fakedns.poolSize')}
|
aria-label={t('pages.xray.fakedns.poolSize')}
|
||||||
min={1}
|
min={1}
|
||||||
size="small"
|
size="small"
|
||||||
onChange={(v) => updateFakednsField(index, 'poolSize', Number(v) || 0)}
|
onChange={onNumber((v) => updateFakednsField(index, 'poolSize', v))}
|
||||||
/>
|
/>
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ import {
|
|||||||
} from '@ant-design/icons';
|
} from '@ant-design/icons';
|
||||||
|
|
||||||
import { HttpUtil } from '@/utils';
|
import { HttpUtil } from '@/utils';
|
||||||
|
import { onNumber } from '@/utils/onNumber';
|
||||||
import PromptModal from '@/components/feedback/PromptModal';
|
import PromptModal from '@/components/feedback/PromptModal';
|
||||||
import TextModal from '@/components/feedback/TextModal';
|
import TextModal from '@/components/feedback/TextModal';
|
||||||
|
|
||||||
@@ -626,14 +627,14 @@ export default function OutboundsTab({
|
|||||||
<InputNumber
|
<InputNumber
|
||||||
min={0}
|
min={0}
|
||||||
value={intervalHours}
|
value={intervalHours}
|
||||||
onChange={(v) => setIntervalHM(Number(v) || 0, intervalMinutes)}
|
onChange={onNumber((v) => setIntervalHM(v, intervalMinutes))}
|
||||||
style={{ width: 80 }}
|
style={{ width: 80 }}
|
||||||
/> {t('pages.xray.outboundSub.hours')}
|
/> {t('pages.xray.outboundSub.hours')}
|
||||||
<InputNumber
|
<InputNumber
|
||||||
min={0}
|
min={0}
|
||||||
max={59}
|
max={59}
|
||||||
value={intervalMinutes}
|
value={intervalMinutes}
|
||||||
onChange={(v) => setIntervalHM(intervalHours, Number(v) || 0)}
|
onChange={onNumber((v) => setIntervalHM(intervalHours, v))}
|
||||||
style={{ width: 80 }}
|
style={{ width: 80 }}
|
||||||
/> {t('pages.xray.outboundSub.minutes')}
|
/> {t('pages.xray.outboundSub.minutes')}
|
||||||
</Space>
|
</Space>
|
||||||
|
|||||||
@@ -68,9 +68,15 @@ export const InboundOptionSchema = z.object({
|
|||||||
|
|
||||||
export const InboundOptionsSchema = z.array(InboundOptionSchema);
|
export const InboundOptionsSchema = z.array(InboundOptionSchema);
|
||||||
|
|
||||||
|
// The *Count fields are exact; the email arrays stop at the server's cap and
|
||||||
|
// only feed the hover popovers, so never derive a counter from their length.
|
||||||
export const ClientsSummarySchema = z.object({
|
export const ClientsSummarySchema = z.object({
|
||||||
total: z.number(),
|
total: z.number(),
|
||||||
active: z.number(),
|
active: z.number(),
|
||||||
|
onlineCount: z.number().optional().default(0),
|
||||||
|
depletedCount: z.number().optional().default(0),
|
||||||
|
expiringCount: z.number().optional().default(0),
|
||||||
|
deactiveCount: z.number().optional().default(0),
|
||||||
online: nullableStringArray,
|
online: nullableStringArray,
|
||||||
depleted: nullableStringArray,
|
depleted: nullableStringArray,
|
||||||
expiring: nullableStringArray,
|
expiring: nullableStringArray,
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ export const InboundDbFieldsSchema = z.object({
|
|||||||
down: z.number().int().min(0).default(0),
|
down: z.number().int().min(0).default(0),
|
||||||
total: z.number().int().min(0).default(0),
|
total: z.number().int().min(0).default(0),
|
||||||
trafficReset: TrafficResetSchema.default('never'),
|
trafficReset: TrafficResetSchema.default('never'),
|
||||||
|
trafficResetDay: z.number().int().min(1).max(31).default(1),
|
||||||
lastTrafficResetTime: z.number().int().default(0),
|
lastTrafficResetTime: z.number().int().default(0),
|
||||||
nodeId: z.number().int().nullable().optional(),
|
nodeId: z.number().int().nullable().optional(),
|
||||||
shareAddrStrategy: ShareAddrStrategySchema.default('node'),
|
shareAddrStrategy: ShareAddrStrategySchema.default('node'),
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ export const AllSettingSchema = z.object({
|
|||||||
expireDiff: nonNegativeInt.optional(),
|
expireDiff: nonNegativeInt.optional(),
|
||||||
trafficDiff: nonNegativeInt.max(100).optional(),
|
trafficDiff: nonNegativeInt.max(100).optional(),
|
||||||
remarkTemplate: z.string().optional(),
|
remarkTemplate: z.string().optional(),
|
||||||
|
subShowIdentityOnAllLinks: z.boolean().optional(),
|
||||||
datepicker: z.enum(['gregorian', 'jalalian']).optional(),
|
datepicker: z.enum(['gregorian', 'jalalian']).optional(),
|
||||||
tgBotEnable: z.boolean().optional(),
|
tgBotEnable: z.boolean().optional(),
|
||||||
tgBotToken: z.string().optional(),
|
tgBotToken: z.string().optional(),
|
||||||
@@ -102,3 +103,7 @@ export const AllSettingSchema = z.object({
|
|||||||
}).loose();
|
}).loose();
|
||||||
|
|
||||||
export type AllSettingInput = z.infer<typeof AllSettingSchema>;
|
export type AllSettingInput = z.infer<typeof AllSettingSchema>;
|
||||||
|
|
||||||
|
export const FactoryDefaultsSchema = z.record(z.string(), z.string());
|
||||||
|
|
||||||
|
export type FactoryDefaults = z.infer<typeof FactoryDefaultsSchema>;
|
||||||
|
|||||||
@@ -0,0 +1,127 @@
|
|||||||
|
import type { ReactNode } from 'react';
|
||||||
|
import { renderHook, waitFor, act } from '@testing-library/react';
|
||||||
|
import { QueryClientProvider } from '@tanstack/react-query';
|
||||||
|
import { afterEach, describe, expect, it, vi } from 'vitest';
|
||||||
|
|
||||||
|
import { useClients } from '@/hooks/useClients';
|
||||||
|
import { makeTestQueryClient } from '@/test/test-utils';
|
||||||
|
import { HttpUtil, Msg } from '@/utils';
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
vi.restoreAllMocks();
|
||||||
|
});
|
||||||
|
|
||||||
|
const emptyPage = {
|
||||||
|
items: [],
|
||||||
|
total: 0,
|
||||||
|
filtered: 0,
|
||||||
|
page: 1,
|
||||||
|
pageSize: 25,
|
||||||
|
groups: [],
|
||||||
|
summary: {
|
||||||
|
total: 0,
|
||||||
|
active: 0,
|
||||||
|
onlineCount: 0,
|
||||||
|
depletedCount: 0,
|
||||||
|
expiringCount: 0,
|
||||||
|
deactiveCount: 0,
|
||||||
|
online: [],
|
||||||
|
depleted: [],
|
||||||
|
expiring: [],
|
||||||
|
deactive: [],
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
function mockPanel(defaults: Record<string, unknown>) {
|
||||||
|
const pagedUrls: string[] = [];
|
||||||
|
vi.spyOn(HttpUtil, 'get').mockImplementation(async (url: string) => {
|
||||||
|
if (url.includes('/clients/list/paged')) {
|
||||||
|
pagedUrls.push(url);
|
||||||
|
return new Msg(true, '', emptyPage);
|
||||||
|
}
|
||||||
|
if (url.includes('/inbounds/options')) return new Msg(true, '', []);
|
||||||
|
return new Msg(true, '', null);
|
||||||
|
});
|
||||||
|
vi.spyOn(HttpUtil, 'post').mockImplementation(async (url: string) => {
|
||||||
|
if (url.includes('/setting/defaultSettings')) return new Msg(true, '', defaults);
|
||||||
|
if (url.includes('/clients/onlines')) return new Msg(true, '', []);
|
||||||
|
return new Msg(true, '', null);
|
||||||
|
});
|
||||||
|
return pagedUrls;
|
||||||
|
}
|
||||||
|
|
||||||
|
function wrapperFor() {
|
||||||
|
const queryClient = makeTestQueryClient();
|
||||||
|
return ({ children }: { children: ReactNode }) => (
|
||||||
|
<QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('useClients query gating', () => {
|
||||||
|
it('does not fetch the list until the page supplies a query', async () => {
|
||||||
|
const pagedUrls = mockPanel({ pageSize: 25 });
|
||||||
|
const { result } = renderHook(() => useClients(), { wrapper: wrapperFor() });
|
||||||
|
|
||||||
|
await waitFor(() => expect(result.current.settingsReady).toBe(true));
|
||||||
|
// The page has not called setQuery yet, so nothing should have gone out —
|
||||||
|
// this is what used to cost a thrown-away round trip on every page load.
|
||||||
|
expect(pagedUrls).toEqual([]);
|
||||||
|
expect(result.current.fetched).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('issues exactly one request for a page load that settles on one query', async () => {
|
||||||
|
const pagedUrls = mockPanel({ pageSize: 50 });
|
||||||
|
const { result } = renderHook(() => useClients(), { wrapper: wrapperFor() });
|
||||||
|
|
||||||
|
await waitFor(() => expect(result.current.settingsReady).toBe(true));
|
||||||
|
act(() => {
|
||||||
|
result.current.setQuery({ page: 1, pageSize: 50, sort: 'createdAt', order: 'ascend' });
|
||||||
|
});
|
||||||
|
|
||||||
|
await waitFor(() => expect(result.current.fetched).toBe(true));
|
||||||
|
expect(pagedUrls).toHaveLength(1);
|
||||||
|
expect(pagedUrls[0]).toContain('pageSize=50');
|
||||||
|
expect(pagedUrls[0]).toContain('sort=createdAt');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('fetches as soon as a query arrives, without waiting for the settings', async () => {
|
||||||
|
// The page remembers the previous visit's page size in localStorage, so on a
|
||||||
|
// return visit it can supply a query on the first render. The hook must not
|
||||||
|
// hold that back behind /setting/defaultSettings, or the two round trips
|
||||||
|
// serialise and the list lands ~160ms later than it needs to.
|
||||||
|
const pagedUrls = mockPanel({ pageSize: 25 });
|
||||||
|
const { result } = renderHook(() => useClients(), { wrapper: wrapperFor() });
|
||||||
|
|
||||||
|
act(() => {
|
||||||
|
result.current.setQuery({ page: 1, pageSize: 25, sort: 'createdAt', order: 'ascend' });
|
||||||
|
});
|
||||||
|
await waitFor(() => expect(pagedUrls).toHaveLength(1));
|
||||||
|
});
|
||||||
|
|
||||||
|
it('reports settingsReady even when the settings request fails, so the page can still render', async () => {
|
||||||
|
vi.spyOn(HttpUtil, 'get').mockResolvedValue(new Msg(true, '', emptyPage));
|
||||||
|
vi.spyOn(HttpUtil, 'post').mockResolvedValue(new Msg(false, 'boom', null));
|
||||||
|
const { result } = renderHook(() => useClients(), { wrapper: wrapperFor() });
|
||||||
|
|
||||||
|
await waitFor(() => expect(result.current.settingsReady).toBe(true));
|
||||||
|
});
|
||||||
|
|
||||||
|
it('skips the list, options and onlines queries for mutation-only callers', async () => {
|
||||||
|
const pagedUrls = mockPanel({ pageSize: 25 });
|
||||||
|
const postSpy = vi.mocked(HttpUtil.post);
|
||||||
|
const { result } = renderHook(() => useClients({ list: false }), { wrapper: wrapperFor() });
|
||||||
|
|
||||||
|
await waitFor(() => expect(result.current.settingsReady).toBe(true));
|
||||||
|
act(() => {
|
||||||
|
result.current.setQuery({ page: 1, pageSize: 25, sort: 'createdAt', order: 'ascend' });
|
||||||
|
});
|
||||||
|
|
||||||
|
await waitFor(() => expect(result.current.settingsReady).toBe(true));
|
||||||
|
expect(pagedUrls).toEqual([]);
|
||||||
|
// subSettings still needs defaultSettings; onlines must not be polled.
|
||||||
|
const posted = postSpy.mock.calls.map((c) => String(c[0]));
|
||||||
|
expect(posted.some((u) => u.includes('/setting/defaultSettings'))).toBe(true);
|
||||||
|
expect(posted.some((u) => u.includes('/clients/onlines'))).toBe(false);
|
||||||
|
expect(vi.mocked(HttpUtil.get).mock.calls.map((c) => String(c[0]))).toEqual([]);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,117 @@
|
|||||||
|
import { useState } from 'react';
|
||||||
|
import { render, screen } from '@testing-library/react';
|
||||||
|
import userEvent from '@testing-library/user-event';
|
||||||
|
import { describe, expect, it, vi } from 'vitest';
|
||||||
|
|
||||||
|
import { ClientInboundChips, ClientRowActions } from '@/pages/clients/RowCells';
|
||||||
|
import type { InboundOption } from '@/hooks/useClients';
|
||||||
|
|
||||||
|
const PROTOCOL_COLORS = { vless: 'blue', trojan: 'volcano' };
|
||||||
|
|
||||||
|
// Counts how often the cell reads the inbound map, which happens once per chip
|
||||||
|
// per render. A traffic push re-renders the row, so if the cell is not memoised
|
||||||
|
// this climbs every five seconds for every visible row.
|
||||||
|
function countingInboundMap(source: Record<number, InboundOption>) {
|
||||||
|
const reads = { count: 0 };
|
||||||
|
const proxy = new Proxy(source, {
|
||||||
|
get(target, key) {
|
||||||
|
if (typeof key === 'string' && /^\d+$/.test(key)) reads.count += 1;
|
||||||
|
return target[key as unknown as number];
|
||||||
|
},
|
||||||
|
});
|
||||||
|
return { proxy, reads };
|
||||||
|
}
|
||||||
|
|
||||||
|
const INBOUNDS: Record<number, InboundOption> = {
|
||||||
|
1: { id: 1, tag: 'in-vless', remark: 'DE', protocol: 'vless' },
|
||||||
|
2: { id: 2, tag: 'in-trojan', remark: 'NL', protocol: 'trojan' },
|
||||||
|
};
|
||||||
|
|
||||||
|
function Harness({ children }: { children: (bump: () => void) => React.ReactNode }) {
|
||||||
|
const [, setTick] = useState(0);
|
||||||
|
return <>{children(() => setTick((n) => n + 1))}</>;
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('clients table row cells', () => {
|
||||||
|
it('does not re-render the inbound chips when the row re-renders with the same attachments', async () => {
|
||||||
|
const { proxy, reads } = countingInboundMap(INBOUNDS);
|
||||||
|
const ids = [1, 2];
|
||||||
|
let bump: () => void = () => {};
|
||||||
|
|
||||||
|
render(
|
||||||
|
<Harness>
|
||||||
|
{(doBump) => {
|
||||||
|
bump = doBump;
|
||||||
|
return (
|
||||||
|
<ClientInboundChips ids={ids} inboundsById={proxy} protocolColors={PROTOCOL_COLORS} chipLimit={1} />
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
</Harness>,
|
||||||
|
);
|
||||||
|
|
||||||
|
const afterFirstRender = reads.count;
|
||||||
|
expect(afterFirstRender).toBeGreaterThan(0);
|
||||||
|
|
||||||
|
// Three simulated traffic pushes: the parent re-renders, the props do not change.
|
||||||
|
for (let i = 0; i < 3; i++) bump();
|
||||||
|
await Promise.resolve();
|
||||||
|
|
||||||
|
expect(reads.count).toBe(afterFirstRender);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('re-renders the chips when the attachments actually change', async () => {
|
||||||
|
const { proxy, reads } = countingInboundMap(INBOUNDS);
|
||||||
|
|
||||||
|
function Swapper() {
|
||||||
|
const [ids, setIds] = useState<number[]>([1]);
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<button type="button" onClick={() => setIds([1, 2])}>swap</button>
|
||||||
|
<ClientInboundChips ids={ids} inboundsById={proxy} protocolColors={PROTOCOL_COLORS} chipLimit={1} />
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
render(<Swapper />);
|
||||||
|
const before = reads.count;
|
||||||
|
await userEvent.click(screen.getByRole('button', { name: 'swap' }));
|
||||||
|
expect(reads.count).toBeGreaterThan(before);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('keeps the row actions wired to the right client across re-renders', async () => {
|
||||||
|
const onShowQr = vi.fn();
|
||||||
|
const onEdit = vi.fn();
|
||||||
|
const noop = vi.fn();
|
||||||
|
let bump: () => void = () => {};
|
||||||
|
|
||||||
|
render(
|
||||||
|
<Harness>
|
||||||
|
{(doBump) => {
|
||||||
|
bump = doBump;
|
||||||
|
return (
|
||||||
|
<ClientRowActions
|
||||||
|
email="alice@x"
|
||||||
|
onShowQr={onShowQr}
|
||||||
|
onShowInfo={noop}
|
||||||
|
onResetTraffic={noop}
|
||||||
|
onEdit={onEdit}
|
||||||
|
onDelete={noop}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
</Harness>,
|
||||||
|
);
|
||||||
|
|
||||||
|
for (let i = 0; i < 3; i++) bump();
|
||||||
|
|
||||||
|
// Queried by position rather than label: the suite loads the real en-US
|
||||||
|
// bundle, so the aria-labels are translated strings, not keys. Order is
|
||||||
|
// QR, info, reset traffic, edit, delete.
|
||||||
|
const buttons = screen.getAllByRole('button');
|
||||||
|
expect(buttons).toHaveLength(5);
|
||||||
|
await userEvent.click(buttons[0]);
|
||||||
|
await userEvent.click(buttons[3]);
|
||||||
|
|
||||||
|
expect(onShowQr).toHaveBeenCalledExactlyOnceWith('alice@x');
|
||||||
|
expect(onEdit).toHaveBeenCalledExactlyOnceWith('alice@x');
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
import { describe, it, expect } from 'vitest';
|
import { describe, it, expect } from 'vitest';
|
||||||
|
|
||||||
import { computeClientsSummary } from '@/hooks/useClients';
|
import { computeClientsSummary, pickClientsSummary, sameSpeedMap, sameSummaryInputs } from '@/hooks/useClients';
|
||||||
import type { ClientTraffic } from '@/schemas/client';
|
import type { ClientTraffic, ClientsSummary } from '@/schemas/client';
|
||||||
|
|
||||||
// Parity with web/service/client.go buildClientsSummary: the same client must
|
// Parity with web/service/client.go buildClientsSummary: the same client must
|
||||||
// land in the same bucket whether the count comes from the server (list fetch)
|
// land in the same bucket whether the count comes from the server (list fetch)
|
||||||
@@ -42,6 +42,24 @@ describe('computeClientsSummary', () => {
|
|||||||
expect(s.active).toBe(2); // online@x + offline@x
|
expect(s.active).toBe(2); // online@x + offline@x
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('reports a counter alongside every bucket list', () => {
|
||||||
|
const stats: Row[] = [
|
||||||
|
row({ email: 'online@x', enable: true }),
|
||||||
|
row({ email: 'disabled@x', enable: false }),
|
||||||
|
row({ email: 'exhausted@x', enable: true, total: 1 * GB, up: 1 * GB }),
|
||||||
|
row({ email: 'nearlimit@x', enable: true, total: 10 * GB, up: 9.9 * GB }),
|
||||||
|
];
|
||||||
|
const s = computeClientsSummary(stats, new Set(['online@x']), 3 * DAY, 1 * GB);
|
||||||
|
|
||||||
|
// The server caps its lists but never its counters; the live recompute has
|
||||||
|
// both, so the summary card reads the same either way.
|
||||||
|
expect(s.onlineCount).toBe(s.online.length);
|
||||||
|
expect(s.depletedCount).toBe(s.depleted.length);
|
||||||
|
expect(s.expiringCount).toBe(s.expiring.length);
|
||||||
|
expect(s.deactiveCount).toBe(s.deactive.length);
|
||||||
|
expect(s.active + s.depletedCount + s.expiringCount + s.deactiveCount).toBe(s.total);
|
||||||
|
});
|
||||||
|
|
||||||
it('depleted wins over disabled and over online', () => {
|
it('depleted wins over disabled and over online', () => {
|
||||||
const stats: Row[] = [
|
const stats: Row[] = [
|
||||||
row({ email: 'a@x', enable: false, total: 1 * GB, up: 2 * GB }),
|
row({ email: 'a@x', enable: false, total: 1 * GB, up: 2 * GB }),
|
||||||
@@ -60,3 +78,65 @@ describe('computeClientsSummary', () => {
|
|||||||
expect(s.depleted).toEqual([]);
|
expect(s.depleted).toEqual([]);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('pickClientsSummary', () => {
|
||||||
|
const serverSummary: ClientsSummary = {
|
||||||
|
total: 67, active: 58,
|
||||||
|
onlineCount: 0, depletedCount: 4, expiringCount: 3, deactiveCount: 2,
|
||||||
|
online: [], depleted: [], expiring: [], deactive: [],
|
||||||
|
};
|
||||||
|
|
||||||
|
it('keeps the server summary when the snapshot is short of the server total (#6102)', () => {
|
||||||
|
const shortSnapshot: Row[] = Array.from({ length: 58 }, (_, i) => row({ email: `c${i}@x`, enable: true }));
|
||||||
|
const s = pickClientsSummary(serverSummary, shortSnapshot, new Set(), 3 * DAY, 1 * GB);
|
||||||
|
expect(s).toEqual(serverSummary);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('uses the live recompute when the snapshot covers every client', () => {
|
||||||
|
const fullSnapshot: Row[] = Array.from({ length: 67 }, (_, i) => row({ email: `c${i}@x`, enable: true }));
|
||||||
|
const s = pickClientsSummary(serverSummary, fullSnapshot, new Set(), 3 * DAY, 1 * GB);
|
||||||
|
expect(s.total).toBe(67);
|
||||||
|
expect(s.active).toBe(67);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('falls back to the server summary before the first WS snapshot arrives', () => {
|
||||||
|
const s = pickClientsSummary(serverSummary, [], new Set(), 3 * DAY, 1 * GB);
|
||||||
|
expect(s).toEqual(serverSummary);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('websocket payload identity preservation', () => {
|
||||||
|
const speed = (up: number, down: number) => ({ up, down });
|
||||||
|
|
||||||
|
it('treats an unchanged speed map as unchanged', () => {
|
||||||
|
const a = { 'a@x': speed(1, 2), 'b@x': speed(3, 4) };
|
||||||
|
expect(sameSpeedMap(a, { 'a@x': speed(1, 2), 'b@x': speed(3, 4) })).toBe(true);
|
||||||
|
expect(sameSpeedMap(a, { 'a@x': speed(1, 2) })).toBe(false);
|
||||||
|
expect(sameSpeedMap(a, { 'a@x': speed(1, 2), 'b@x': speed(3, 5) })).toBe(false);
|
||||||
|
expect(sameSpeedMap(a, { 'a@x': speed(1, 2), 'c@x': speed(3, 4) })).toBe(false);
|
||||||
|
expect(sameSpeedMap({}, {})).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('compares exactly the fields the summary reads, and ignores lastOnline', () => {
|
||||||
|
const base: Row[] = [row({ email: 'a@x', up: 1, down: 2, total: 10, expiryTime: 99 })];
|
||||||
|
|
||||||
|
// lastOnline moves for every online client on every push and no counter
|
||||||
|
// depends on it, so it must not force a new snapshot.
|
||||||
|
const onlyLastOnlineMoved: Row[] = [
|
||||||
|
row({ email: 'a@x', up: 1, down: 2, total: 10, expiryTime: 99, lastOnline: 12345 }),
|
||||||
|
];
|
||||||
|
expect(sameSummaryInputs(base, onlyLastOnlineMoved)).toBe(true);
|
||||||
|
|
||||||
|
for (const changed of [
|
||||||
|
row({ email: 'b@x', up: 1, down: 2, total: 10, expiryTime: 99 }),
|
||||||
|
row({ email: 'a@x', up: 2, down: 2, total: 10, expiryTime: 99 }),
|
||||||
|
row({ email: 'a@x', up: 1, down: 3, total: 10, expiryTime: 99 }),
|
||||||
|
row({ email: 'a@x', up: 1, down: 2, total: 11, expiryTime: 99 }),
|
||||||
|
row({ email: 'a@x', up: 1, down: 2, total: 10, expiryTime: 100 }),
|
||||||
|
row({ email: 'a@x', up: 1, down: 2, total: 10, expiryTime: 99, enable: false }),
|
||||||
|
]) {
|
||||||
|
expect(sameSummaryInputs(base, [changed])).toBe(false);
|
||||||
|
}
|
||||||
|
expect(sameSummaryInputs(base, [])).toBe(false);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|||||||
@@ -0,0 +1,43 @@
|
|||||||
|
import { fireEvent } from '@testing-library/react';
|
||||||
|
import dayjs from 'dayjs';
|
||||||
|
import type { Dayjs } from 'dayjs';
|
||||||
|
import { describe, expect, it, vi } from 'vitest';
|
||||||
|
|
||||||
|
import DateTimePicker from '@/components/form/DateTimePicker';
|
||||||
|
import { renderWithProviders } from './test-utils';
|
||||||
|
|
||||||
|
function openPicker(): void {
|
||||||
|
const input = document.querySelector('.ant-picker input');
|
||||||
|
if (!input) throw new Error('picker input not rendered');
|
||||||
|
fireEvent.mouseDown(input);
|
||||||
|
fireEvent.click(input);
|
||||||
|
}
|
||||||
|
|
||||||
|
function clickDayCell(title: string): void {
|
||||||
|
const cell = document.querySelector(`.ant-picker-cell[title="${title}"] .ant-picker-cell-inner`);
|
||||||
|
if (!cell) throw new Error(`day cell ${title} not rendered`);
|
||||||
|
fireEvent.click(cell);
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('DateTimePicker', () => {
|
||||||
|
it('commits a clicked calendar date without an OK press', () => {
|
||||||
|
const onChange = vi.fn<(next: Dayjs | null) => void>();
|
||||||
|
renderWithProviders(<DateTimePicker value={null} onChange={onChange} />);
|
||||||
|
|
||||||
|
openPicker();
|
||||||
|
const tomorrow = dayjs().add(1, 'day').format('YYYY-MM-DD');
|
||||||
|
clickDayCell(tomorrow);
|
||||||
|
|
||||||
|
expect(onChange).toHaveBeenCalled();
|
||||||
|
const committed = onChange.mock.calls.at(-1)?.[0];
|
||||||
|
expect(committed?.format('YYYY-MM-DD HH:mm:ss')).toBe(`${tomorrow} 00:00:00`);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('renders no OK confirm button in the picker footer', () => {
|
||||||
|
renderWithProviders(<DateTimePicker value={null} onChange={vi.fn()} />);
|
||||||
|
|
||||||
|
openPicker();
|
||||||
|
|
||||||
|
expect(document.querySelector('.ant-picker-ok')).toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,64 @@
|
|||||||
|
import { screen } from '@testing-library/react';
|
||||||
|
import { describe, expect, it } from 'vitest';
|
||||||
|
|
||||||
|
import { keys } from '@/api/queryKeys';
|
||||||
|
import DefaultSettingTag, { matchesFactoryDefault } from '@/components/ui/DefaultSettingTag';
|
||||||
|
import { makeTestQueryClient, renderWithProviders } from './test-utils';
|
||||||
|
|
||||||
|
function clientWithDefaults(defaults: Record<string, string>) {
|
||||||
|
const queryClient = makeTestQueryClient();
|
||||||
|
queryClient.setQueryData(keys.settings.factoryDefaults(), defaults);
|
||||||
|
return queryClient;
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('matchesFactoryDefault', () => {
|
||||||
|
it('compares by value with type-aware coercion', () => {
|
||||||
|
expect(matchesFactoryDefault(2096, '2096')).toBe(true);
|
||||||
|
expect(matchesFactoryDefault(8443, '2096')).toBe(false);
|
||||||
|
expect(matchesFactoryDefault(true, 'true')).toBe(true);
|
||||||
|
expect(matchesFactoryDefault(false, 'true')).toBe(false);
|
||||||
|
expect(matchesFactoryDefault('/sub/', '/sub/')).toBe(true);
|
||||||
|
expect(matchesFactoryDefault('/other/', '/sub/')).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('never matches when the key has no shipped default', () => {
|
||||||
|
expect(matchesFactoryDefault(2096, undefined)).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects blank or unparsable defaults instead of coercing them', () => {
|
||||||
|
expect(matchesFactoryDefault(0, '')).toBe(false);
|
||||||
|
expect(matchesFactoryDefault(0, ' ')).toBe(false);
|
||||||
|
expect(matchesFactoryDefault(0, 'none')).toBe(false);
|
||||||
|
expect(matchesFactoryDefault(false, '')).toBe(false);
|
||||||
|
expect(matchesFactoryDefault(false, 'no')).toBe(false);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('DefaultSettingTag', () => {
|
||||||
|
it('shows the tag when the current value equals the shipped default, however it got there', () => {
|
||||||
|
renderWithProviders(
|
||||||
|
<DefaultSettingTag settingKey="subPort" value={2096} />,
|
||||||
|
{ queryClient: clientWithDefaults({ subPort: '2096' }) },
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(screen.getByText('Default')).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('renders nothing when the value differs from the default', () => {
|
||||||
|
renderWithProviders(
|
||||||
|
<DefaultSettingTag settingKey="subPort" value={8443} />,
|
||||||
|
{ queryClient: clientWithDefaults({ subPort: '2096' }) },
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(screen.queryByText('Default')).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('renders nothing while defaults are unknown', () => {
|
||||||
|
renderWithProviders(
|
||||||
|
<DefaultSettingTag settingKey="subPort" value={2096} />,
|
||||||
|
{ queryClient: makeTestQueryClient() },
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(screen.queryByText('Default')).toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,107 @@
|
|||||||
|
import { useState } from 'react';
|
||||||
|
import { describe, expect, it } from 'vitest';
|
||||||
|
import { fireEvent, screen } from '@testing-library/react';
|
||||||
|
|
||||||
|
import DnsTab from '@/pages/xray/dns/DnsTab';
|
||||||
|
import type { SetTemplate, XraySettingsValue } from '@/hooks/useXraySetting';
|
||||||
|
import { renderWithProviders } from './test-utils';
|
||||||
|
|
||||||
|
function withHosts(hosts: Record<string, string>): XraySettingsValue {
|
||||||
|
return {
|
||||||
|
dns: {
|
||||||
|
hosts,
|
||||||
|
servers: [],
|
||||||
|
},
|
||||||
|
} as unknown as XraySettingsValue;
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('DnsTab', () => {
|
||||||
|
it('keeps an empty row after adding a host', () => {
|
||||||
|
function Harness() {
|
||||||
|
const [templateSettings, setTemplateSettings] = useState<XraySettingsValue | null>(withHosts({ 'first.example': '1.1.1.1' }));
|
||||||
|
const updateTemplate: SetTemplate = (next) => {
|
||||||
|
setTemplateSettings((current) => (typeof next === 'function' ? next(current) : next));
|
||||||
|
};
|
||||||
|
|
||||||
|
return <DnsTab templateSettings={templateSettings} setTemplateSettings={updateTemplate} />;
|
||||||
|
}
|
||||||
|
|
||||||
|
renderWithProviders(
|
||||||
|
<Harness />,
|
||||||
|
);
|
||||||
|
|
||||||
|
fireEvent.click(screen.getByRole('tab', { name: /Hosts$/ }));
|
||||||
|
fireEvent.click(screen.getByRole('button', { name: /Add Host$/ }));
|
||||||
|
|
||||||
|
expect(screen.getAllByLabelText('Domain (e.g. domain:example.com)')).toHaveLength(2);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('keeps a row visible while its domain is incomplete', () => {
|
||||||
|
function Harness() {
|
||||||
|
const [templateSettings, setTemplateSettings] = useState<XraySettingsValue | null>(withHosts({ 'first.example': '1.1.1.1' }));
|
||||||
|
const updateTemplate: SetTemplate = (next) => {
|
||||||
|
setTemplateSettings((current) => (typeof next === 'function' ? next(current) : next));
|
||||||
|
};
|
||||||
|
|
||||||
|
return <DnsTab templateSettings={templateSettings} setTemplateSettings={updateTemplate} />;
|
||||||
|
}
|
||||||
|
|
||||||
|
renderWithProviders(<Harness />);
|
||||||
|
fireEvent.click(screen.getByRole('tab', { name: /Hosts$/ }));
|
||||||
|
fireEvent.change(screen.getByLabelText('Domain (e.g. domain:example.com)'), { target: { value: '' } });
|
||||||
|
|
||||||
|
expect((screen.getByLabelText('Domain (e.g. domain:example.com)') as HTMLInputElement).value).toBe('');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('shows hosts from an externally refreshed configuration', () => {
|
||||||
|
function Harness() {
|
||||||
|
const [templateSettings, setTemplateSettings] = useState<XraySettingsValue | null>(withHosts({ 'first.example': '1.1.1.1' }));
|
||||||
|
const updateTemplate: SetTemplate = (next) => {
|
||||||
|
setTemplateSettings((current) => (typeof next === 'function' ? next(current) : next));
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<button type="button" onClick={() => setTemplateSettings(withHosts({ 'second.example': '2.2.2.2' }))}>
|
||||||
|
Refresh hosts
|
||||||
|
</button>
|
||||||
|
<DnsTab templateSettings={templateSettings} setTemplateSettings={updateTemplate} />
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
renderWithProviders(<Harness />);
|
||||||
|
|
||||||
|
fireEvent.click(screen.getByRole('tab', { name: /Hosts$/ }));
|
||||||
|
expect((screen.getByLabelText('Domain (e.g. domain:example.com)') as HTMLInputElement).value).toBe('first.example');
|
||||||
|
|
||||||
|
fireEvent.click(screen.getByRole('button', { name: 'Refresh hosts' }));
|
||||||
|
expect((screen.getByLabelText('Domain (e.g. domain:example.com)') as HTMLInputElement).value).toBe('second.example');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('clears an incomplete host draft when DNS is disabled', () => {
|
||||||
|
function Harness() {
|
||||||
|
const [templateSettings, setTemplateSettings] = useState<XraySettingsValue | null>(withHosts({ 'first.example': '1.1.1.1' }));
|
||||||
|
const updateTemplate: SetTemplate = (next) => {
|
||||||
|
setTemplateSettings((current) => (typeof next === 'function' ? next(current) : next));
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<button type="button" onClick={() => setTemplateSettings({})}>Disable DNS</button>
|
||||||
|
<button type="button" onClick={() => setTemplateSettings(withHosts({}))}>Enable DNS</button>
|
||||||
|
<DnsTab templateSettings={templateSettings} setTemplateSettings={updateTemplate} />
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
renderWithProviders(<Harness />);
|
||||||
|
fireEvent.click(screen.getByRole('tab', { name: /Hosts$/ }));
|
||||||
|
fireEvent.change(screen.getByLabelText('Domain (e.g. domain:example.com)'), { target: { value: '' } });
|
||||||
|
fireEvent.click(screen.getByRole('button', { name: 'Disable DNS' }));
|
||||||
|
fireEvent.click(screen.getByRole('button', { name: 'Enable DNS' }));
|
||||||
|
fireEvent.click(screen.getByRole('tab', { name: /Hosts$/ }));
|
||||||
|
|
||||||
|
expect(screen.queryByLabelText('Domain (e.g. domain:example.com)')).toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
import { readFileSync } from 'node:fs';
|
||||||
|
import { resolve } from 'node:path';
|
||||||
|
|
||||||
|
import { describe, expect, it } from 'vitest';
|
||||||
|
|
||||||
|
import { matchesFactoryDefault } from '@/components/ui/DefaultSettingTag';
|
||||||
|
import { AllSetting } from '@/models/setting';
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Contract test between the three homes of a setting's default value: the Go
|
||||||
|
* defaultValueMap (authoritative, served by /setting/factoryDefaults), the
|
||||||
|
* frontend AllSetting class defaults (what the form shows when the API omits
|
||||||
|
* a value), and the tag's own comparison. If someone bumps a default on one
|
||||||
|
* side only, the Default tag would start calling a different value "Default"
|
||||||
|
* than the one the form displays — this test fails instead.
|
||||||
|
*/
|
||||||
|
|
||||||
|
function goDefaultLiterals(): Record<string, string> {
|
||||||
|
const source = readFileSync(
|
||||||
|
resolve(process.cwd(), '..', 'internal', 'web', 'service', 'setting.go'),
|
||||||
|
'utf8',
|
||||||
|
);
|
||||||
|
const start = source.indexOf('var defaultValueMap = map[string]string{');
|
||||||
|
const end = source.indexOf('\n}', start);
|
||||||
|
const block = source.slice(start, end);
|
||||||
|
const literals: Record<string, string> = {};
|
||||||
|
for (const match of block.matchAll(/"([A-Za-z0-9]+)":\s+"((?:[^"\\]|\\.)*)"\s*,/g)) {
|
||||||
|
literals[match[1]] = JSON.parse(`"${match[2]}"`);
|
||||||
|
}
|
||||||
|
return literals;
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('factory defaults contract', () => {
|
||||||
|
const goDefaults = goDefaultLiterals();
|
||||||
|
const frontend = new AllSetting() as unknown as Record<string, unknown>;
|
||||||
|
const sharedKeys = Object.keys(goDefaults).filter((key) => {
|
||||||
|
const value = frontend[key];
|
||||||
|
return typeof value === 'number' || typeof value === 'boolean' || typeof value === 'string';
|
||||||
|
});
|
||||||
|
|
||||||
|
it('parses a plausible slice of the Go map', () => {
|
||||||
|
expect(goDefaults.webPort).toBe('2053');
|
||||||
|
expect(goDefaults.subPort).toBe('2096');
|
||||||
|
expect(sharedKeys.length).toBeGreaterThan(20);
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each(sharedKeys)('frontend default for %s matches the shipped default', (key) => {
|
||||||
|
expect(
|
||||||
|
matchesFactoryDefault(frontend[key], goDefaults[key]),
|
||||||
|
`AllSetting.${key} = ${JSON.stringify(frontend[key])} vs defaultValueMap ${JSON.stringify(goDefaults[key])}`,
|
||||||
|
).toBe(true);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
import { fireEvent, screen } from '@testing-library/react';
|
||||||
|
import { MemoryRouter } from 'react-router';
|
||||||
|
import { describe, expect, it, vi } from 'vitest';
|
||||||
|
|
||||||
|
import { AllSetting } from '@/models/setting';
|
||||||
|
import GeneralTab from '@/pages/settings/GeneralTab';
|
||||||
|
import { renderWithProviders } from './test-utils';
|
||||||
|
|
||||||
|
describe('GeneralTab', () => {
|
||||||
|
it('keeps the stored page size when the field is cleared', () => {
|
||||||
|
const updateSetting = vi.fn();
|
||||||
|
|
||||||
|
renderWithProviders(
|
||||||
|
<MemoryRouter initialEntries={['/settings']}>
|
||||||
|
<GeneralTab allSetting={new AllSetting({ pageSize: 25 })} updateSetting={updateSetting} />
|
||||||
|
</MemoryRouter>,
|
||||||
|
);
|
||||||
|
|
||||||
|
const pageSizeInput = screen.getByDisplayValue('25');
|
||||||
|
fireEvent.change(pageSizeInput, { target: { value: '' } });
|
||||||
|
fireEvent.blur(pageSizeInput);
|
||||||
|
|
||||||
|
expect(updateSetting).not.toHaveBeenCalled();
|
||||||
|
expect((pageSizeInput as HTMLInputElement).value).toBe('25');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('forwards typed page sizes unchanged, zero included', () => {
|
||||||
|
const updateSetting = vi.fn();
|
||||||
|
|
||||||
|
renderWithProviders(
|
||||||
|
<MemoryRouter initialEntries={['/settings']}>
|
||||||
|
<GeneralTab allSetting={new AllSetting({ pageSize: 25 })} updateSetting={updateSetting} />
|
||||||
|
</MemoryRouter>,
|
||||||
|
);
|
||||||
|
|
||||||
|
fireEvent.change(screen.getByDisplayValue('25'), { target: { value: '0' } });
|
||||||
|
|
||||||
|
expect(updateSetting).toHaveBeenCalledWith({ pageSize: 0 });
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -193,4 +193,87 @@ describe('http-init fetch wrapper', () => {
|
|||||||
|
|
||||||
expect(initOf().signal).toBeInstanceOf(AbortSignal);
|
expect(initOf().signal).toBeInstanceOf(AbortSignal);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('preserves a caller cancellation signal when a timeout is set', async () => {
|
||||||
|
http.setupHttp();
|
||||||
|
fetchMock.mockResolvedValue(okEnvelope());
|
||||||
|
const controller = new AbortController();
|
||||||
|
|
||||||
|
await http.httpRequest('GET', '/x', undefined, { timeout: 1_000, signal: controller.signal });
|
||||||
|
controller.abort();
|
||||||
|
|
||||||
|
expect(initOf().signal?.aborted).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('preserves both cancellation paths when AbortSignal.any is unavailable', async () => {
|
||||||
|
const timeout = AbortSignal.timeout.bind(AbortSignal);
|
||||||
|
vi.resetModules();
|
||||||
|
vi.stubGlobal('AbortSignal', { timeout });
|
||||||
|
http = await import('@/api/http-init');
|
||||||
|
http.setupHttp();
|
||||||
|
fetchMock.mockResolvedValue(okEnvelope());
|
||||||
|
const controller = new AbortController();
|
||||||
|
|
||||||
|
await http.httpRequest('GET', '/x', undefined, { timeout: 1_000, signal: controller.signal });
|
||||||
|
controller.abort();
|
||||||
|
|
||||||
|
expect(initOf().signal?.aborted).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('times out when AbortSignal.any is unavailable', async () => {
|
||||||
|
const timeout = AbortSignal.timeout.bind(AbortSignal);
|
||||||
|
vi.resetModules();
|
||||||
|
vi.stubGlobal('AbortSignal', { timeout });
|
||||||
|
http = await import('@/api/http-init');
|
||||||
|
http.setupHttp();
|
||||||
|
fetchMock.mockResolvedValue(okEnvelope());
|
||||||
|
const controller = new AbortController();
|
||||||
|
|
||||||
|
await http.httpRequest('GET', '/x', undefined, { timeout: 20, signal: controller.signal });
|
||||||
|
const signal = initOf().signal as AbortSignal;
|
||||||
|
await new Promise<void>((resolve) => signal.addEventListener('abort', () => resolve(), { once: true }));
|
||||||
|
|
||||||
|
expect(signal.aborted).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('aborts on the timeout when a caller signal is present', async () => {
|
||||||
|
http.setupHttp();
|
||||||
|
fetchMock.mockResolvedValue(okEnvelope());
|
||||||
|
const controller = new AbortController();
|
||||||
|
|
||||||
|
await http.httpRequest('GET', '/x', undefined, { timeout: 20, signal: controller.signal });
|
||||||
|
const signal = initOf().signal as AbortSignal;
|
||||||
|
await new Promise<void>((resolve) => {
|
||||||
|
if (signal.aborted) {
|
||||||
|
resolve();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
signal.addEventListener('abort', () => resolve(), { once: true });
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(signal.aborted).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each([
|
||||||
|
['/x?keep=1', '/x?keep=1&added=yes'],
|
||||||
|
['/x?', '/x?added=yes'],
|
||||||
|
['/x#frag', '/x?added=yes#frag'],
|
||||||
|
['/x?keep=1#frag', '/x?keep=1&added=yes#frag'],
|
||||||
|
])('appends encoded params to %s', async (url, expected) => {
|
||||||
|
http.setupHttp();
|
||||||
|
fetchMock.mockResolvedValue(okEnvelope());
|
||||||
|
|
||||||
|
await http.httpRequest('GET', url, undefined, { params: { added: 'yes' } });
|
||||||
|
|
||||||
|
expect(urlOf()).toBe(expected);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('preserves the URL when no params are supplied', async () => {
|
||||||
|
http.setupHttp();
|
||||||
|
fetchMock.mockResolvedValue(okEnvelope());
|
||||||
|
|
||||||
|
await http.httpRequest('GET', '/x?keep=1#frag');
|
||||||
|
|
||||||
|
expect(urlOf()).toBe('/x?keep=1#frag');
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -0,0 +1,91 @@
|
|||||||
|
import { readFileSync, readdirSync, statSync } from 'node:fs';
|
||||||
|
import { fileURLToPath } from 'node:url';
|
||||||
|
import { join, resolve } from 'node:path';
|
||||||
|
|
||||||
|
import { describe, expect, it } from 'vitest';
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Guards the 13-locale translation set two ways: every key in en-US must be
|
||||||
|
* referenced somewhere in the frontend or Go sources (dead keys accumulate
|
||||||
|
* silently — this test deleted over two hundred of them when it was
|
||||||
|
* introduced), and every locale must carry exactly the en-US key set
|
||||||
|
* (missing keys fall back to en-US at runtime, so nothing else fails the
|
||||||
|
* build when a translation is forgotten).
|
||||||
|
*
|
||||||
|
* References are matched as whole dotted tokens, not substrings, so a dead
|
||||||
|
* key cannot hide behind a longer live sibling. Dynamically built keys are
|
||||||
|
* covered by harvesting the string-literal prefixes that appear next to
|
||||||
|
* concatenation or template-literal interpolation; the prefix needs at
|
||||||
|
* least one dot but need not end on one, so a literal that stops mid-leaf
|
||||||
|
* right before the interpolation still keeps its subtree alive. This file
|
||||||
|
* excludes itself from the scan so the prose above cannot whitelist
|
||||||
|
* anything.
|
||||||
|
*/
|
||||||
|
|
||||||
|
const repoRoot = resolve(process.cwd(), '..');
|
||||||
|
const translationDir = join(repoRoot, 'internal', 'web', 'translation');
|
||||||
|
const selfPath = fileURLToPath(import.meta.url);
|
||||||
|
|
||||||
|
function flattenKeys(obj: Record<string, unknown>, prefix = ''): string[] {
|
||||||
|
const keys: string[] = [];
|
||||||
|
for (const [k, v] of Object.entries(obj)) {
|
||||||
|
const key = `${prefix}${k}`;
|
||||||
|
if (v !== null && typeof v === 'object') {
|
||||||
|
keys.push(...flattenKeys(v as Record<string, unknown>, `${key}.`));
|
||||||
|
} else {
|
||||||
|
keys.push(key);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return keys;
|
||||||
|
}
|
||||||
|
|
||||||
|
function collectSources(dir: string, exts: string[], out: string[]): void {
|
||||||
|
for (const entry of readdirSync(dir)) {
|
||||||
|
if (['node_modules', 'dist', 'generated', '.git', '.local', 'storybook-static'].includes(entry)) continue;
|
||||||
|
const full = join(dir, entry);
|
||||||
|
if (statSync(full).isDirectory()) {
|
||||||
|
collectSources(full, exts, out);
|
||||||
|
} else if (exts.some((ext) => entry.endsWith(ext)) && resolve(full) !== selfPath) {
|
||||||
|
out.push(readFileSync(full, 'utf8'));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('i18n keys', () => {
|
||||||
|
const enUS = JSON.parse(readFileSync(join(translationDir, 'en-US.json'), 'utf8'));
|
||||||
|
const enKeys = flattenKeys(enUS);
|
||||||
|
|
||||||
|
const sources: string[] = [];
|
||||||
|
collectSources(join(repoRoot, 'frontend', 'src'), ['.ts', '.tsx'], sources);
|
||||||
|
collectSources(join(repoRoot, 'internal'), ['.go'], sources);
|
||||||
|
const blob = sources.join('\n');
|
||||||
|
|
||||||
|
const tokens = new Set(blob.match(/[A-Za-z][A-Za-z0-9_.]*/g) ?? []);
|
||||||
|
|
||||||
|
const prefixes: string[] = [];
|
||||||
|
for (const match of blob.matchAll(/['"`]([A-Za-z][A-Za-z0-9_]*(?:\.[A-Za-z0-9_]+)+\.?)['"`]\s*\+/g)) {
|
||||||
|
prefixes.push(match[1]);
|
||||||
|
}
|
||||||
|
for (const match of blob.matchAll(/[`']([A-Za-z][A-Za-z0-9_]*(?:\.[A-Za-z0-9_]+)+\.?)\$\{/g)) {
|
||||||
|
prefixes.push(match[1]);
|
||||||
|
}
|
||||||
|
|
||||||
|
it('every en-US key is referenced by the frontend or Go sources', () => {
|
||||||
|
const dead = enKeys.filter(
|
||||||
|
(key) => !tokens.has(key) && !prefixes.some((p) => key.startsWith(p)),
|
||||||
|
);
|
||||||
|
expect(dead, `dead i18n keys (delete from all 13 locales):\n ${dead.join('\n ')}`).toEqual([]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('every locale carries exactly the en-US key set', () => {
|
||||||
|
const enSet = new Set(enKeys);
|
||||||
|
for (const file of readdirSync(translationDir)) {
|
||||||
|
if (!file.endsWith('.json') || file === 'en-US.json') continue;
|
||||||
|
const keys = new Set(flattenKeys(JSON.parse(readFileSync(join(translationDir, file), 'utf8'))));
|
||||||
|
const missing = enKeys.filter((k) => !keys.has(k));
|
||||||
|
const orphans = [...keys].filter((k) => !enSet.has(k));
|
||||||
|
expect(missing, `${file} is missing keys:\n ${missing.join('\n ')}`).toEqual([]);
|
||||||
|
expect(orphans, `${file} has keys absent from en-US:\n ${orphans.join('\n ')}`).toEqual([]);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -32,6 +32,7 @@ const vlessRow: RawInboundRow = {
|
|||||||
total: 1_000_000_000,
|
total: 1_000_000_000,
|
||||||
expiryTime: 0,
|
expiryTime: 0,
|
||||||
trafficReset: 'monthly',
|
trafficReset: 'monthly',
|
||||||
|
trafficResetDay: 15,
|
||||||
lastTrafficResetTime: 0,
|
lastTrafficResetTime: 0,
|
||||||
tag: 'inbound-1',
|
tag: 'inbound-1',
|
||||||
nodeId: null,
|
nodeId: null,
|
||||||
@@ -267,6 +268,7 @@ describe('formValuesToWirePayload', () => {
|
|||||||
enable: payload.enable,
|
enable: payload.enable,
|
||||||
expiryTime: payload.expiryTime,
|
expiryTime: payload.expiryTime,
|
||||||
trafficReset: payload.trafficReset,
|
trafficReset: payload.trafficReset,
|
||||||
|
trafficResetDay: payload.trafficResetDay,
|
||||||
lastTrafficResetTime: payload.lastTrafficResetTime,
|
lastTrafficResetTime: payload.lastTrafficResetTime,
|
||||||
nodeId: payload.nodeId ?? null,
|
nodeId: payload.nodeId ?? null,
|
||||||
});
|
});
|
||||||
@@ -276,8 +278,13 @@ describe('formValuesToWirePayload', () => {
|
|||||||
expect(replay.listen).toBe(original.listen);
|
expect(replay.listen).toBe(original.listen);
|
||||||
expect(replay.up).toBe(original.up);
|
expect(replay.up).toBe(original.up);
|
||||||
expect(replay.down).toBe(original.down);
|
expect(replay.down).toBe(original.down);
|
||||||
|
expect(replay.trafficResetDay).toBe(original.trafficResetDay);
|
||||||
expect(replay.streamSettings).toEqual(original.streamSettings);
|
expect(replay.streamSettings).toEqual(original.streamSettings);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('defaults a missing monthly reset day to the first', () => {
|
||||||
|
expect(rawInboundToFormValues({ ...vlessRow, trafficResetDay: undefined }).trafficResetDay).toBe(1);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('subSortIndex', () => {
|
describe('subSortIndex', () => {
|
||||||
|
|||||||
@@ -745,3 +745,73 @@ describe('genVlessLink flow gating (#5322)', () => {
|
|||||||
expect(new URL(link).searchParams.get('flow')).toBe('xtls-rprx-vision');
|
expect(new URL(link).searchParams.get('flow')).toBe('xtls-rprx-vision');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('genVlessLink XHTTP extra compatibility', () => {
|
||||||
|
it('emits both sessionID and legacy session keys in XHTTP extra', () => {
|
||||||
|
const typed = InboundSchema.parse({
|
||||||
|
id: 1,
|
||||||
|
up: 0,
|
||||||
|
down: 0,
|
||||||
|
total: 0,
|
||||||
|
remark: 'xhttp-session',
|
||||||
|
enable: true,
|
||||||
|
expiryTime: 0,
|
||||||
|
listen: '',
|
||||||
|
port: 443,
|
||||||
|
tag: 'inbound-vless-xhttp',
|
||||||
|
sniffing: {
|
||||||
|
enabled: false,
|
||||||
|
destOverride: [],
|
||||||
|
metadataOnly: false,
|
||||||
|
routeOnly: false,
|
||||||
|
ipsExcluded: [],
|
||||||
|
domainsExcluded: [],
|
||||||
|
},
|
||||||
|
protocol: 'vless',
|
||||||
|
settings: {
|
||||||
|
clients: [
|
||||||
|
{
|
||||||
|
id: '11111111-2222-3333-4444-555555555555',
|
||||||
|
email: 'a@example.test',
|
||||||
|
flow: '',
|
||||||
|
limitIp: 0,
|
||||||
|
totalGB: 0,
|
||||||
|
expiryTime: 0,
|
||||||
|
enable: true,
|
||||||
|
tgId: 0,
|
||||||
|
subId: 's1',
|
||||||
|
comment: '',
|
||||||
|
reset: 0,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
decryption: 'none',
|
||||||
|
encryption: 'none',
|
||||||
|
fallbacks: [],
|
||||||
|
},
|
||||||
|
streamSettings: {
|
||||||
|
network: 'xhttp',
|
||||||
|
security: 'none',
|
||||||
|
xhttpSettings: {
|
||||||
|
path: '/sp',
|
||||||
|
host: 'edge.example.test',
|
||||||
|
mode: 'auto',
|
||||||
|
sessionIDPlacement: 'header',
|
||||||
|
sessionIDKey: 'X-Session',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const link = genVlessLink({
|
||||||
|
inbound: typed,
|
||||||
|
address: 'example.test',
|
||||||
|
port: 443,
|
||||||
|
clientId: '11111111-2222-3333-4444-555555555555',
|
||||||
|
});
|
||||||
|
const extra = JSON.parse(new URL(link).searchParams.get('extra') ?? '{}') as Record<string, unknown>;
|
||||||
|
|
||||||
|
expect(extra.sessionIDPlacement).toBe('header');
|
||||||
|
expect(extra.sessionIDKey).toBe('X-Session');
|
||||||
|
expect(extra.sessionPlacement).toBe('header');
|
||||||
|
expect(extra.sessionKey).toBe('X-Session');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
import { describe, expect, it, vi } from 'vitest';
|
||||||
|
|
||||||
|
import { onNumber } from '@/utils/onNumber';
|
||||||
|
|
||||||
|
describe('onNumber', () => {
|
||||||
|
it('forwards numeric values, including zero and negatives', () => {
|
||||||
|
const apply = vi.fn();
|
||||||
|
const handler = onNumber(apply);
|
||||||
|
handler(8443);
|
||||||
|
handler(0);
|
||||||
|
handler(-1);
|
||||||
|
expect(apply.mock.calls).toEqual([[8443], [0], [-1]]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('ignores cleared events instead of writing a synthetic value', () => {
|
||||||
|
const apply = vi.fn();
|
||||||
|
const handler = onNumber(apply);
|
||||||
|
handler(null);
|
||||||
|
handler(undefined);
|
||||||
|
handler(NaN);
|
||||||
|
expect(apply).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
import { describe, it, expect } from 'vitest';
|
||||||
|
import { AllSettingSchema } from '@/schemas/setting';
|
||||||
|
import { AllSetting } from '@/models/setting';
|
||||||
|
|
||||||
|
describe('subShowIdentityOnAllLinks', () => {
|
||||||
|
it('defaults to false on AllSetting', () => {
|
||||||
|
expect(new AllSetting().subShowIdentityOnAllLinks).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('accepts boolean values in the settings schema', () => {
|
||||||
|
for (const v of [true, false]) {
|
||||||
|
const r = AllSettingSchema.safeParse({ subShowIdentityOnAllLinks: v });
|
||||||
|
expect(r.success, `subShowIdentityOnAllLinks=${v}`).toBe(true);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects non-boolean values', () => {
|
||||||
|
for (const v of ['true', 1, null]) {
|
||||||
|
expect(AllSettingSchema.safeParse({ subShowIdentityOnAllLinks: v }).success).toBe(false);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
import { render } from '@testing-library/react';
|
||||||
|
import { afterEach, expect, test } from 'vitest';
|
||||||
|
|
||||||
|
import { withTheme } from '../../.storybook/preview';
|
||||||
|
import { ThemeProvider } from '@/hooks/useTheme';
|
||||||
|
|
||||||
|
function Story() {
|
||||||
|
return <div>Story</div>;
|
||||||
|
}
|
||||||
|
|
||||||
|
function StorybookTheme({ theme }: { theme: 'light' | 'dark' }) {
|
||||||
|
return withTheme(Story, { globals: { theme } } as Partial<Parameters<typeof withTheme>[1]> as Parameters<typeof withTheme>[1]);
|
||||||
|
}
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
document.body.className = '';
|
||||||
|
document.documentElement.removeAttribute('data-theme');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('preserves unrelated body classes when applying the Storybook theme', () => {
|
||||||
|
document.body.className = 'storybook-fixture dark';
|
||||||
|
document.documentElement.setAttribute('data-theme', 'ultra-dark');
|
||||||
|
const { rerender } = render(<StorybookTheme theme="light" />);
|
||||||
|
|
||||||
|
expect(document.body.classList.contains('storybook-fixture')).toBe(true);
|
||||||
|
expect(document.body.classList.contains('light')).toBe(true);
|
||||||
|
expect(document.body.classList.contains('dark')).toBe(false);
|
||||||
|
expect(document.documentElement.hasAttribute('data-theme')).toBe(false);
|
||||||
|
|
||||||
|
rerender(<StorybookTheme theme="dark" />);
|
||||||
|
|
||||||
|
expect(document.body.classList.contains('storybook-fixture')).toBe(true);
|
||||||
|
expect(document.body.classList.contains('dark')).toBe(true);
|
||||||
|
expect(document.body.classList.contains('light')).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('preserves unrelated body classes when applying the panel theme', () => {
|
||||||
|
document.body.className = 'panel-fixture';
|
||||||
|
const message = document.createElement('div');
|
||||||
|
message.id = 'message';
|
||||||
|
message.className = 'message-fixture';
|
||||||
|
document.body.append(message);
|
||||||
|
|
||||||
|
render(<ThemeProvider><div>Panel</div></ThemeProvider>);
|
||||||
|
|
||||||
|
expect(document.body.classList.contains('panel-fixture')).toBe(true);
|
||||||
|
expect(document.body.classList.contains('dark')).toBe(true);
|
||||||
|
expect(document.body.classList.contains('light')).toBe(false);
|
||||||
|
expect(message.classList.contains('message-fixture')).toBe(true);
|
||||||
|
expect(message.classList.contains('dark')).toBe(true);
|
||||||
|
});
|
||||||
@@ -7,6 +7,8 @@ import {
|
|||||||
normalizeSockoptForWire,
|
normalizeSockoptForWire,
|
||||||
normalizeStreamSettingsForWire,
|
normalizeStreamSettingsForWire,
|
||||||
normalizeXhttpForWire,
|
normalizeXhttpForWire,
|
||||||
|
validateRealityClientVer,
|
||||||
|
validateRealityMaxClientVer,
|
||||||
validateRealityTarget,
|
validateRealityTarget,
|
||||||
} from '@/lib/xray/stream-wire-normalize';
|
} from '@/lib/xray/stream-wire-normalize';
|
||||||
import { InboundFormSchema } from '@/schemas/forms/inbound-form';
|
import { InboundFormSchema } from '@/schemas/forms/inbound-form';
|
||||||
@@ -26,6 +28,64 @@ describe('validateRealityTarget', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('validateRealityClientVer', () => {
|
||||||
|
it('accepts empty (not set) and core-style versions', () => {
|
||||||
|
expect(validateRealityClientVer('')).toBeUndefined();
|
||||||
|
expect(validateRealityClientVer('26.3.27')).toBeUndefined();
|
||||||
|
expect(validateRealityClientVer('1.0.0')).toBeUndefined();
|
||||||
|
expect(validateRealityClientVer('26')).toBeUndefined();
|
||||||
|
expect(validateRealityClientVer('26.3')).toBeUndefined();
|
||||||
|
expect(validateRealityClientVer('0.0.255')).toBeUndefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects untrimmed values because the save path ships them verbatim', () => {
|
||||||
|
expect(validateRealityClientVer('26.3.27 ')).toBe('pages.inbounds.form.clientVerInvalid');
|
||||||
|
expect(validateRealityClientVer(' 26.3.27')).toBe('pages.inbounds.form.clientVerInvalid');
|
||||||
|
expect(validateRealityClientVer(' ')).toBe('pages.inbounds.form.clientVerInvalid');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects what the core parser rejects', () => {
|
||||||
|
expect(validateRealityClientVer('26.3.27.1')).toBe('pages.inbounds.form.clientVerInvalid');
|
||||||
|
expect(validateRealityClientVer('26.3.256')).toBe('pages.inbounds.form.clientVerInvalid');
|
||||||
|
expect(validateRealityClientVer('v26.3.27')).toBe('pages.inbounds.form.clientVerInvalid');
|
||||||
|
expect(validateRealityClientVer('26..27')).toBe('pages.inbounds.form.clientVerInvalid');
|
||||||
|
expect(validateRealityClientVer('26.3.')).toBe('pages.inbounds.form.clientVerInvalid');
|
||||||
|
expect(validateRealityClientVer('-1.0.0')).toBe('pages.inbounds.form.clientVerInvalid');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('validateRealityMaxClientVer', () => {
|
||||||
|
it('accepts an empty max, an empty min, and a valid range', () => {
|
||||||
|
expect(validateRealityMaxClientVer('', '26.3.27')).toBeUndefined();
|
||||||
|
expect(validateRealityMaxClientVer('27.0.0', '')).toBeUndefined();
|
||||||
|
expect(validateRealityMaxClientVer('26.3.27', '26.3.27')).toBeUndefined();
|
||||||
|
expect(validateRealityMaxClientVer('27.1.2', '26.3.27')).toBeUndefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects a max below the min, the stale-placeholder trap included', () => {
|
||||||
|
expect(validateRealityMaxClientVer('25.9.11', '26.3.27')).toBe(
|
||||||
|
'pages.inbounds.form.maxClientVerBelowMin',
|
||||||
|
);
|
||||||
|
expect(validateRealityMaxClientVer('26.3.26', '26.3.27')).toBe(
|
||||||
|
'pages.inbounds.form.maxClientVerBelowMin',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('pads short versions like the core does before comparing', () => {
|
||||||
|
expect(validateRealityMaxClientVer('26', '26.0.0')).toBeUndefined();
|
||||||
|
expect(validateRealityMaxClientVer('26', '26.3')).toBe(
|
||||||
|
'pages.inbounds.form.maxClientVerBelowMin',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('reports format errors before range errors and skips a malformed min', () => {
|
||||||
|
expect(validateRealityMaxClientVer('25.9', 'not-a-version')).toBeUndefined();
|
||||||
|
expect(validateRealityMaxClientVer('nope', '26.3.27')).toBe(
|
||||||
|
'pages.inbounds.form.clientVerInvalid',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
describe('normalizeXhttpForWire stream-one', () => {
|
describe('normalizeXhttpForWire stream-one', () => {
|
||||||
it('drops packet-up and stream-up-only fields on inbound', () => {
|
it('drops packet-up and stream-up-only fields on inbound', () => {
|
||||||
const out = normalizeXhttpForWire({
|
const out = normalizeXhttpForWire({
|
||||||
|
|||||||
@@ -12,6 +12,37 @@ function LocationProbe() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
describe('SubscriptionGeneralTab', () => {
|
describe('SubscriptionGeneralTab', () => {
|
||||||
|
it('keeps the stored subscription port when the field is cleared', () => {
|
||||||
|
const updateSetting = vi.fn();
|
||||||
|
|
||||||
|
renderWithProviders(
|
||||||
|
<MemoryRouter initialEntries={['/settings#subscription']}>
|
||||||
|
<SubscriptionGeneralTab allSetting={new AllSetting({ subPort: 2096 })} updateSetting={updateSetting} />
|
||||||
|
</MemoryRouter>,
|
||||||
|
);
|
||||||
|
|
||||||
|
const portInput = screen.getByDisplayValue('2096');
|
||||||
|
fireEvent.change(portInput, { target: { value: '' } });
|
||||||
|
fireEvent.blur(portInput);
|
||||||
|
|
||||||
|
expect(updateSetting).not.toHaveBeenCalled();
|
||||||
|
expect((portInput as HTMLInputElement).value).toBe('2096');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('forwards typed subscription ports unchanged', () => {
|
||||||
|
const updateSetting = vi.fn();
|
||||||
|
|
||||||
|
renderWithProviders(
|
||||||
|
<MemoryRouter initialEntries={['/settings#subscription']}>
|
||||||
|
<SubscriptionGeneralTab allSetting={new AllSetting({ subPort: 2096 })} updateSetting={updateSetting} />
|
||||||
|
</MemoryRouter>,
|
||||||
|
);
|
||||||
|
|
||||||
|
fireEvent.change(screen.getByDisplayValue('2096'), { target: { value: '8443' } });
|
||||||
|
|
||||||
|
expect(updateSetting).toHaveBeenCalledWith({ subPort: 8443 });
|
||||||
|
});
|
||||||
|
|
||||||
it('uses router navigation to open subscription format settings', () => {
|
it('uses router navigation to open subscription format settings', () => {
|
||||||
const allSetting = new AllSetting({ subClashEnable: true });
|
const allSetting = new AllSetting({ subClashEnable: true });
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,20 @@
|
|||||||
import type { ReactElement } from 'react';
|
import type { ReactElement } from 'react';
|
||||||
import { render, fireEvent } from '@testing-library/react';
|
import { render, fireEvent } from '@testing-library/react';
|
||||||
|
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
|
||||||
|
|
||||||
import { ThemeProvider } from '@/hooks/useTheme';
|
import { ThemeProvider } from '@/hooks/useTheme';
|
||||||
|
|
||||||
export function renderWithProviders(ui: ReactElement) {
|
export function makeTestQueryClient() {
|
||||||
return render(<ThemeProvider>{ui}</ThemeProvider>);
|
return new QueryClient({ defaultOptions: { queries: { retry: false } } });
|
||||||
|
}
|
||||||
|
|
||||||
|
export function renderWithProviders(ui: ReactElement, options?: { queryClient?: QueryClient }) {
|
||||||
|
const queryClient = options?.queryClient ?? makeTestQueryClient();
|
||||||
|
return render(
|
||||||
|
<QueryClientProvider client={queryClient}>
|
||||||
|
<ThemeProvider>{ui}</ThemeProvider>
|
||||||
|
</QueryClientProvider>,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function fieldLabels(): string[] {
|
export function fieldLabels(): string[] {
|
||||||
|
|||||||
@@ -0,0 +1,105 @@
|
|||||||
|
import type { ReactNode } from 'react';
|
||||||
|
import { act, renderHook, waitFor } from '@testing-library/react';
|
||||||
|
import { QueryClientProvider } from '@tanstack/react-query';
|
||||||
|
import { afterEach, describe, expect, it, vi } from 'vitest';
|
||||||
|
|
||||||
|
import { useAllSettings } from '@/api/queries/useAllSettings';
|
||||||
|
import { keys } from '@/api/queryKeys';
|
||||||
|
import { makeTestQueryClient } from '@/test/test-utils';
|
||||||
|
import { HttpUtil, Msg } from '@/utils';
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
vi.restoreAllMocks();
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('useAllSettings', () => {
|
||||||
|
it('keeps backend-accepted settings editable when the frontend schema is stricter', async () => {
|
||||||
|
const subJsonUserAgentRegex = 'x'.repeat(2_049);
|
||||||
|
vi.spyOn(HttpUtil, 'post').mockResolvedValue(new Msg(true, '', { subJsonUserAgentRegex }));
|
||||||
|
const queryClient = makeTestQueryClient();
|
||||||
|
const wrapper = ({ children }: { children: ReactNode }) => (
|
||||||
|
<QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
|
||||||
|
);
|
||||||
|
|
||||||
|
const { result } = renderHook(() => useAllSettings(), { wrapper });
|
||||||
|
|
||||||
|
await waitFor(() => expect(result.current.fetched).toBe(true));
|
||||||
|
expect(result.current.allSetting.subJsonUserAgentRegex).toBe(subJsonUserAgentRegex);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('keeps an edited setting when a refetch returns older server data', async () => {
|
||||||
|
const values = [
|
||||||
|
{ webPort: 2053 },
|
||||||
|
{ webPort: 2054 },
|
||||||
|
];
|
||||||
|
let index = 0;
|
||||||
|
vi.spyOn(HttpUtil, 'post').mockImplementation(async () => new Msg(true, '', values[index++]));
|
||||||
|
const queryClient = makeTestQueryClient();
|
||||||
|
const wrapper = ({ children }: { children: ReactNode }) => (
|
||||||
|
<QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
|
||||||
|
);
|
||||||
|
const { result } = renderHook(() => useAllSettings(), { wrapper });
|
||||||
|
|
||||||
|
await waitFor(() => expect(result.current.fetched).toBe(true));
|
||||||
|
act(() => result.current.updateSetting({ webPort: 3000 }));
|
||||||
|
await queryClient.invalidateQueries({ queryKey: keys.settings.all() });
|
||||||
|
|
||||||
|
await waitFor(() => expect(HttpUtil.post).toHaveBeenCalledTimes(2));
|
||||||
|
expect(result.current.allSetting.webPort).toBe(3000);
|
||||||
|
expect(result.current.saveDisabled).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('hydrates redacted secrets after a successful save', async () => {
|
||||||
|
let fetchCount = 0;
|
||||||
|
vi.spyOn(HttpUtil, 'post').mockImplementation(async (url) => {
|
||||||
|
if (url === '/panel/api/setting/all') {
|
||||||
|
fetchCount += 1;
|
||||||
|
return new Msg(true, '', fetchCount === 1 ? { hasTgBotToken: false } : { hasTgBotToken: true, tgBotToken: '' });
|
||||||
|
}
|
||||||
|
return new Msg(true, '');
|
||||||
|
});
|
||||||
|
const queryClient = makeTestQueryClient();
|
||||||
|
const wrapper = ({ children }: { children: ReactNode }) => (
|
||||||
|
<QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
|
||||||
|
);
|
||||||
|
const { result } = renderHook(() => useAllSettings(), { wrapper });
|
||||||
|
|
||||||
|
await waitFor(() => expect(result.current.fetched).toBe(true));
|
||||||
|
act(() => result.current.updateSetting({ tgBotToken: 'secret' }));
|
||||||
|
await act(async () => {
|
||||||
|
await result.current.saveAll();
|
||||||
|
});
|
||||||
|
|
||||||
|
await waitFor(() => expect(HttpUtil.post).toHaveBeenCalledTimes(3));
|
||||||
|
expect(result.current.allSetting.tgBotToken).toBe('');
|
||||||
|
expect(result.current.allSetting.hasTgBotToken).toBe(true);
|
||||||
|
expect(result.current.saveDisabled).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('establishes a saved baseline for a full-payload security save', async () => {
|
||||||
|
let fetchCount = 0;
|
||||||
|
vi.spyOn(HttpUtil, 'post').mockImplementation(async (url) => {
|
||||||
|
if (url === '/panel/api/setting/all') {
|
||||||
|
fetchCount += 1;
|
||||||
|
return new Msg(true, '', fetchCount === 1 ? { hasTgBotToken: false } : { hasTgBotToken: true, tgBotToken: '' });
|
||||||
|
}
|
||||||
|
return new Msg(true, '');
|
||||||
|
});
|
||||||
|
const queryClient = makeTestQueryClient();
|
||||||
|
const wrapper = ({ children }: { children: ReactNode }) => (
|
||||||
|
<QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
|
||||||
|
);
|
||||||
|
const { result } = renderHook(() => useAllSettings(), { wrapper });
|
||||||
|
|
||||||
|
await waitFor(() => expect(result.current.fetched).toBe(true));
|
||||||
|
act(() => result.current.updateSetting({ tgBotToken: 'secret' }));
|
||||||
|
await act(async () => {
|
||||||
|
await result.current.savePayload({ ...result.current.allSetting, twoFactorEnable: false, twoFactorToken: '' });
|
||||||
|
});
|
||||||
|
|
||||||
|
await waitFor(() => expect(HttpUtil.post).toHaveBeenCalledTimes(3));
|
||||||
|
expect(result.current.allSetting.tgBotToken).toBe('');
|
||||||
|
expect(result.current.allSetting.hasTgBotToken).toBe(true);
|
||||||
|
expect(result.current.saveDisabled).toBe(true);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
import type { ReactNode } from 'react';
|
||||||
|
import { act, renderHook, waitFor } from '@testing-library/react';
|
||||||
|
import { QueryClientProvider } from '@tanstack/react-query';
|
||||||
|
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
||||||
|
|
||||||
|
import { useXraySetting } from '@/hooks/useXraySetting';
|
||||||
|
import { makeTestQueryClient } from '@/test/test-utils';
|
||||||
|
import { HttpUtil, Msg } from '@/utils';
|
||||||
|
|
||||||
|
function xrayPayload(overrides: Record<string, unknown> = {}) {
|
||||||
|
return {
|
||||||
|
xraySetting: {},
|
||||||
|
inboundTags: [],
|
||||||
|
clientReverseTags: [],
|
||||||
|
outboundTestUrl: 'https://test.example',
|
||||||
|
subscriptionOutbounds: [],
|
||||||
|
subscriptionOutboundTags: [],
|
||||||
|
...overrides,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
vi.restoreAllMocks();
|
||||||
|
});
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
vi.spyOn(HttpUtil, 'get').mockResolvedValue(new Msg(true, '', []));
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('useXraySetting', () => {
|
||||||
|
it('refreshes server-derived outbounds while the editor is dirty', async () => {
|
||||||
|
let payload = xrayPayload({ subscriptionOutbounds: [{ tag: 'before' }] });
|
||||||
|
vi.spyOn(HttpUtil, 'post').mockImplementation(async (url) => {
|
||||||
|
if (url === '/panel/api/xray/') return new Msg(true, '', JSON.stringify(payload));
|
||||||
|
return new Msg(true, '');
|
||||||
|
});
|
||||||
|
const queryClient = makeTestQueryClient();
|
||||||
|
const wrapper = ({ children }: { children: ReactNode }) => (
|
||||||
|
<QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
|
||||||
|
);
|
||||||
|
const { result } = renderHook(() => useXraySetting(), { wrapper });
|
||||||
|
|
||||||
|
await waitFor(() => expect(result.current.fetched).toBe(true));
|
||||||
|
act(() => result.current.setXraySetting('{"outbounds":[]}'));
|
||||||
|
payload = xrayPayload({ subscriptionOutbounds: [{ tag: 'after' }] });
|
||||||
|
await act(async () => result.current.fetchAll());
|
||||||
|
|
||||||
|
await waitFor(() => expect(result.current.subscriptionOutbounds).toEqual([{ tag: 'after' }]));
|
||||||
|
expect(result.current.xraySetting).toBe('{"outbounds":[]}');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('keeps the outbound test URL input empty when it is cleared', async () => {
|
||||||
|
const payload = xrayPayload({ outboundTestUrl: 'https://www.google.com/generate_204' });
|
||||||
|
vi.spyOn(HttpUtil, 'post').mockImplementation(async (url) => {
|
||||||
|
if (url === '/panel/api/xray/') return new Msg(true, '', JSON.stringify(payload));
|
||||||
|
return new Msg(true, '');
|
||||||
|
});
|
||||||
|
const queryClient = makeTestQueryClient();
|
||||||
|
const wrapper = ({ children }: { children: ReactNode }) => (
|
||||||
|
<QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
|
||||||
|
);
|
||||||
|
const { result } = renderHook(() => useXraySetting(), { wrapper });
|
||||||
|
|
||||||
|
await waitFor(() => expect(result.current.fetched).toBe(true));
|
||||||
|
act(() => result.current.setOutboundTestUrl(''));
|
||||||
|
|
||||||
|
expect(result.current.outboundTestUrl).toBe('');
|
||||||
|
expect(result.current.saveDisabled).toBe(true);
|
||||||
|
});
|
||||||
|
});
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user