mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-08-27 05:27:14 +00:00
Sanaei
b9eda09da9
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.
58 lines
1.7 KiB
TypeScript
58 lines
1.7 KiB
TypeScript
import { useEffect, useRef, useState } from 'react';
|
|
import { Form } from 'antd';
|
|
|
|
import { FinalMaskForm } from '@/lib/xray/forms/transport';
|
|
import type { FinalMaskStreamSettings } from '@/schemas/protocols/stream/finalmask';
|
|
|
|
interface SubJsonFinalMaskFormProps {
|
|
value: string;
|
|
onChange: (next: string) => void;
|
|
}
|
|
|
|
function hasValue(v: unknown): boolean {
|
|
if (v == null) return false;
|
|
if (Array.isArray(v)) return v.some(hasValue);
|
|
if (typeof v === 'object') return Object.values(v as Record<string, unknown>).some(hasValue);
|
|
if (typeof v === 'string') return v.length > 0;
|
|
return true;
|
|
}
|
|
|
|
function parseFinalMask(raw: string): FinalMaskStreamSettings {
|
|
try {
|
|
if (raw) return JSON.parse(raw) as FinalMaskStreamSettings;
|
|
} catch {
|
|
return { tcp: [], udp: [] };
|
|
}
|
|
return { tcp: [], udp: [] };
|
|
}
|
|
|
|
export default function SubJsonFinalMaskForm({ value, onChange }: SubJsonFinalMaskFormProps) {
|
|
const [form] = Form.useForm();
|
|
const [initial] = useState(() => parseFinalMask(value));
|
|
const onChangeRef = useRef(onChange);
|
|
useEffect(() => {
|
|
onChangeRef.current = onChange;
|
|
});
|
|
|
|
const finalmask = Form.useWatch('finalmask', form) as FinalMaskStreamSettings | undefined;
|
|
|
|
useEffect(() => {
|
|
if (finalmask === undefined) return;
|
|
const next = hasValue(finalmask) ? JSON.stringify(finalmask) : '';
|
|
if (next !== value) onChangeRef.current(next);
|
|
}, [finalmask, value]);
|
|
|
|
return (
|
|
<Form
|
|
form={form}
|
|
layout="horizontal"
|
|
labelCol={{ flex: '160px' }}
|
|
wrapperCol={{ flex: 'auto' }}
|
|
colon={false}
|
|
initialValues={{ finalmask: initial }}
|
|
>
|
|
<FinalMaskForm name="finalmask" network="" protocol="" form={form} showAll />
|
|
</Form>
|
|
);
|
|
}
|