mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-08-25 04:17:15 +00:00
chore(frontend): update dependencies and adapt to oxlint 1.79
npm install was failing with ERESOLVE: the lockfile pinned storybook 10.5.7 and vitest 4.1.10 as peers while package.json asked for ^10.5.9 and ^4.1.11, and npm would not move either. Neither npm update, a targeted install, nor --package-lock-only broke the cycle, so node_modules and package-lock.json were regenerated from scratch (601 packages, 0 vulnerabilities). oxlint 1.79.0 then promoted five React Compiler rules into the correctness category, flagging 101 pre-existing sites. 1.78.0 exits 0 on the same tree, so nothing in our code changed - the rule set grew. They are fixed rather than suppressed: - refs (31): latest-value ref writes moved out of render into an effect. onlineClientsRef turned out to be write-only and is gone; expireDiffRef and trafficDiffRef were replaced by reading the values directly. - set-state-in-effect (55): reset-on-open modals now adjust state during render; where an effect mixed a synchronous reset with an async fetch, the reset moved to render and the effect kept only the request. useMediaQuery became useSyncExternalStore. - preserve-manual-memoization (11): optional-chained deps the compiler cannot match, hoisted to locals or dropped where the memo wrapped a string concat. - purity (3): Date.now() in render replaced by a state-backed clock, which also refreshes the expiry tag every 60s instead of freezing it until the next unrelated re-render. - immutability (1): applyClientStatsEvent merged websocket traffic into DBInbound rows in place; it now rebuilds only the rows it touches. Two things fell out of that. clientCount is derived with useMemo instead of an imperative rebuildClientCount() called from five sites, which also fixes a staleness bug where changing the expiry or traffic threshold left the counts alone until some later rebuild. statsVersion existed only to force a re-render after an in-place mutation, is meaningless now that rows are replaced, and nothing read it, so it is removed. Also adds a lint:fix script - oxlint --fix was previously only reachable through the lint-staged hook.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
import { useEffect, useMemo, useState } from 'react';
|
||||
import { useMemo, useState } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { Alert, Modal, Select, Typography, message } from 'antd';
|
||||
|
||||
@@ -37,9 +37,13 @@ export default function BulkAttachInboundsModal({
|
||||
const [targetIds, setTargetIds] = useState<number[]>([]);
|
||||
const [submitting, setSubmitting] = useState(false);
|
||||
|
||||
useEffect(() => {
|
||||
// React resets this during render rather than in an effect so the modal's
|
||||
// first open frame already shows cleared fields.
|
||||
const [wasOpen, setWasOpen] = useState(false);
|
||||
if (open !== wasOpen) {
|
||||
setWasOpen(open);
|
||||
if (open) setTargetIds([]);
|
||||
}, [open]);
|
||||
}
|
||||
|
||||
const targetOptions = useMemo(() => {
|
||||
return (inbounds || [])
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useEffect, useMemo, useState } from 'react';
|
||||
import { useMemo, useState } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { Alert, Modal, Select, Typography, message } from 'antd';
|
||||
|
||||
@@ -37,9 +37,13 @@ export default function BulkDetachInboundsModal({
|
||||
const [targetIds, setTargetIds] = useState<number[]>([]);
|
||||
const [submitting, setSubmitting] = useState(false);
|
||||
|
||||
useEffect(() => {
|
||||
// React resets this during render rather than in an effect so the modal's
|
||||
// first open frame already shows cleared fields.
|
||||
const [wasOpen, setWasOpen] = useState(false);
|
||||
if (open !== wasOpen) {
|
||||
setWasOpen(open);
|
||||
if (open) setTargetIds([]);
|
||||
}, [open]);
|
||||
}
|
||||
|
||||
const targetOptions = useMemo(() => {
|
||||
return (inbounds || [])
|
||||
|
||||
@@ -95,12 +95,14 @@ export default function ClientBulkAddModal({
|
||||
const limitIpDisabled = !fail2ban.usable;
|
||||
const limitIpNotice = getLimitIpNotice(fail2ban, t);
|
||||
|
||||
useEffect(() => {
|
||||
if (!open) return;
|
||||
|
||||
methods.reset(EMPTY);
|
||||
setDelayedStart(false);
|
||||
}, [open, methods]);
|
||||
const [wasOpen, setWasOpen] = useState(false);
|
||||
if (open !== wasOpen) {
|
||||
setWasOpen(open);
|
||||
if (open) {
|
||||
methods.reset(EMPTY);
|
||||
setDelayedStart(false);
|
||||
}
|
||||
}
|
||||
|
||||
const flowCapableIds = useMemo(() => {
|
||||
const ids = new Set<number>();
|
||||
|
||||
@@ -109,14 +109,20 @@ export default function ClientInfoModal({
|
||||
keyof typeof SUBSCRIPTION_DOWNLOAD_NAMES | null
|
||||
>(null);
|
||||
|
||||
useEffect(() => {
|
||||
if (!open) {
|
||||
// Clearing on close happens during render; the effect owns only the fetch.
|
||||
const openSubId = open ? (client?.subId ?? '') : null;
|
||||
const [syncedSubId, setSyncedSubId] = useState(openSubId);
|
||||
if (openSubId !== syncedSubId) {
|
||||
setSyncedSubId(openSubId);
|
||||
if (openSubId === null) {
|
||||
setLinks([]);
|
||||
setClientIps([]);
|
||||
setIpsModalOpen(false);
|
||||
return;
|
||||
}
|
||||
if (!client?.subId) return;
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
if (!open || !client?.subId) return;
|
||||
let cancelled = false;
|
||||
(async () => {
|
||||
const msg = (await HttpUtil.get(
|
||||
@@ -139,22 +145,16 @@ export default function ClientInfoModal({
|
||||
return r > 0 ? r : 0;
|
||||
}, [totalBytes, used]);
|
||||
|
||||
const subLink = useMemo(() => {
|
||||
if (!client?.subId || !subSettings?.subURI) return '';
|
||||
return subSettings.subURI + client.subId;
|
||||
}, [client?.subId, subSettings?.subURI]);
|
||||
|
||||
const subJsonLink = useMemo(() => {
|
||||
if (!client?.subId) return '';
|
||||
if (!subSettings?.subJsonEnable || !subSettings?.subJsonURI) return '';
|
||||
return subSettings.subJsonURI + client.subId;
|
||||
}, [client?.subId, subSettings?.subJsonEnable, subSettings?.subJsonURI]);
|
||||
|
||||
const subClashLink = useMemo(() => {
|
||||
if (!client?.subId) return '';
|
||||
if (!subSettings?.subClashEnable || !subSettings?.subClashURI) return '';
|
||||
return subSettings.subClashURI + client.subId;
|
||||
}, [client?.subId, subSettings?.subClashEnable, subSettings?.subClashURI]);
|
||||
const subId = client?.subId;
|
||||
const subLink = subId && subSettings?.subURI ? subSettings.subURI + subId : '';
|
||||
const subJsonLink =
|
||||
subId && subSettings?.subJsonEnable && subSettings?.subJsonURI
|
||||
? subSettings.subJsonURI + subId
|
||||
: '';
|
||||
const subClashLink =
|
||||
subId && subSettings?.subClashEnable && subSettings?.subClashURI
|
||||
? subSettings.subClashURI + subId
|
||||
: '';
|
||||
|
||||
const showSubscription = !!(subSettings?.enable && client?.subId);
|
||||
const wgInbound = useMemo(
|
||||
|
||||
@@ -52,16 +52,13 @@ export default function ClientQrModal({
|
||||
const [links, setLinks] = useState<string[]>([]);
|
||||
const [loading, setLoading] = useState(false);
|
||||
|
||||
const subLink = useMemo(() => {
|
||||
if (!client?.subId || !subSettings?.enable || !subSettings?.subURI) return '';
|
||||
return subSettings.subURI + client.subId;
|
||||
}, [client?.subId, subSettings?.enable, subSettings?.subURI]);
|
||||
|
||||
const subJsonLink = useMemo(() => {
|
||||
if (!client?.subId || !subSettings?.enable) return '';
|
||||
if (!subSettings?.subJsonEnable || !subSettings?.subJsonURI) return '';
|
||||
return subSettings.subJsonURI + client.subId;
|
||||
}, [client?.subId, subSettings?.enable, subSettings?.subJsonEnable, subSettings?.subJsonURI]);
|
||||
const subId = client?.subId;
|
||||
const subEnabled = !!subSettings?.enable;
|
||||
const subLink = subId && subEnabled && subSettings?.subURI ? subSettings.subURI + subId : '';
|
||||
const subJsonLink =
|
||||
subId && subEnabled && subSettings?.subJsonEnable && subSettings?.subJsonURI
|
||||
? subSettings.subJsonURI + subId
|
||||
: '';
|
||||
|
||||
const wgInbound = useMemo(
|
||||
() => findWireguardInbound(client, inboundsById),
|
||||
@@ -79,13 +76,18 @@ export default function ClientQrModal({
|
||||
|
||||
const hasAnything = !!subLink || !!subJsonLink || !!wgConfigText || links.length > 0;
|
||||
|
||||
// The reset runs during render so the effect only carries the request.
|
||||
const openSubId = open ? (client?.subId ?? '') : '';
|
||||
const [syncedSubId, setSyncedSubId] = useState(openSubId);
|
||||
if (openSubId !== syncedSubId) {
|
||||
setSyncedSubId(openSubId);
|
||||
setLinks([]);
|
||||
setLoading(!!openSubId);
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
if (!open || !client?.subId) {
|
||||
setLinks([]);
|
||||
return;
|
||||
}
|
||||
if (!open || !client?.subId) return;
|
||||
let cancelled = false;
|
||||
setLoading(true);
|
||||
(async () => {
|
||||
try {
|
||||
const msg = (await HttpUtil.get(
|
||||
@@ -166,13 +168,13 @@ export default function ClientQrModal({
|
||||
return out;
|
||||
}, [subLink, subJsonLink, wgConfigText, links, client?.email, t]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!open) {
|
||||
setActiveKey([]);
|
||||
return;
|
||||
}
|
||||
setActiveKey(items.length > 0 ? [items[0].key] : []);
|
||||
}, [open, items]);
|
||||
// Expanding the first panel is a render-time adjustment, not a side effect.
|
||||
const firstKey = open && items.length > 0 ? items[0].key : null;
|
||||
const [syncedFirstKey, setSyncedFirstKey] = useState<string | null>(null);
|
||||
if (firstKey !== syncedFirstKey) {
|
||||
setSyncedFirstKey(firstKey);
|
||||
setActiveKey(firstKey ? [firstKey] : []);
|
||||
}
|
||||
|
||||
return (
|
||||
<Modal
|
||||
|
||||
Reference in New Issue
Block a user