mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-09-03 17:07:15 +00:00
DIMFLIX
7100fbcd08
* feat(model): add MemberWeights to SubBalancer Per-inbound leastLoad weights, stored with the same gorm json serializer as InboundIds so AutoMigrate adds the text column on every dialect (postgresModelSettled sees the missing column and re-runs). Absent entries mean weight 1.0; only meaningful for strategy leastLoad. * feat(sub): accept memberWeights on the sub-balancer API Parsed as one JSON form field (gin cannot bind bracket-keyed maps from urlencoded bodies). validate() rejects weights under any strategy but leastLoad — xray would silently ignore costs there, so storing them would pretend a knob exists. Non-positive weights error instead of defaulting: a zero usually means a typo'd "never pick this node". Entries for inbounds no longer selected are dropped on save. * feat(sub): emit leastLoad strategy costs from member weights costs[] is built after the tagging loop reuses the exact retagged tags (bal-N-protocol[-k]) and each member's owning inbound id. Members without a configured weight default to 1.0, but costs are omitted entirely unless at least one explicit weight survives — an all-1.0 array would bloat every subscription response for no effect. * feat(sub-balancers): leastLoad member weight inputs Weight fields render only under leastLoad and hide on strategy change without dropping their values, so an accidental toggle away and back loses nothing until save; non-leastLoad submits strip them entirely because xray would ignore costs. Weights travel as one JSON form field (gin cannot bind bracket-keyed maps) and every locale gets the three new keys in the same commit per the dead-keys rule. * docs(api): document memberWeights on sub-balancers leastLoad-only JSON form field; update notes that omitting it clears stored weights. Regenerated openapi artifacts via make gen + the docs copy/gen:api step nothing checks automatically. * fix(api-docs): use the allowed object ParamType for memberWeights * fix(sub-balancers): cap the member-weight list height Many selected inbounds pushed the modal body past the viewport. The weight rows now scroll inside a 220px viewport, mirroring the inbound picker's listHeight so both lists read the same. * fix(sub): anchor leastLoad cost matches to exact member tags Verified against xray-core: without regexp, WeightManager matches costs by substring (strings.Index), so the bare tag "bal-1-vless" also hits the deduplicated "bal-1-vless-2" and both members get the first entry's weight. Anchored ^tag$ regexps make every cost entry match only its own member. Also confirmed value<=0 makes xray derive a weight from the first digit of the matched tag — validating weights > 0 server-side was the right call. * fix(sub-balancers): keep member weights across the enabled toggle The table's toggleEnabled re-posted a full-row payload without memberWeights, and the update path treats an absent key as "erase" — flipping the switch silently dropped every configured weight. Round-trip the stored weights through the toggle payload, and prove persistence with a re-Get in the weight-validation test (the returned struct alone would stay green even if Save skipped the column). * fix(sub-balancers): address review on member weights - omitempty on MemberWeights: the panel sends null for every pre-existing and non-leastLoad balancer, which failed the hand-written zod response schema on every fetch (zod .optional() accepts undefined only; switched to .nullish() per repo convention) and drifted the generated contract. Regenerated openapi artifacts + docs copy + MDX. - Bound weights to the positive float32 range: xray decodes costs as float32, so an over-range value makes clients reject the whole subscription document and an underflow decays to the tag-digit fallback weight. Tests for both directions. - Trim six comment blocks to the 2-line cap from CLAUDE.md. --------- Co-authored-by: DIMFLIX <dimflix@users.noreply.github.com>
47 lines
1.6 KiB
TypeScript
47 lines
1.6 KiB
TypeScript
import { z } from 'zod';
|
|
|
|
export const SubBalancerStrategySchema = z.enum(['leastLoad', 'leastPing', 'random', 'roundRobin']);
|
|
export type SubBalancerStrategy = z.infer<typeof SubBalancerStrategySchema>;
|
|
|
|
export const SubBalancerSchema = z.object({
|
|
id: z.number(),
|
|
remark: z.string(),
|
|
strategy: SubBalancerStrategySchema,
|
|
inboundIds: z.array(z.number()),
|
|
memberWeights: z.record(z.string(), z.number()).nullish(),
|
|
sortOrder: z.number(),
|
|
enabled: z.boolean(),
|
|
createdAt: z.number().optional(),
|
|
updatedAt: z.number().optional(),
|
|
});
|
|
export type SubBalancer = z.infer<typeof SubBalancerSchema>;
|
|
|
|
export const SubBalancerListSchema = z.array(SubBalancerSchema);
|
|
|
|
export const SubBalancerFormSchema = z.object({
|
|
remark: z
|
|
.string()
|
|
.trim()
|
|
.min(1, 'pages.settings.subBalancers.errRemarkRequired')
|
|
.max(256, 'pages.settings.subBalancers.errRemarkRequired'),
|
|
strategy: SubBalancerStrategySchema,
|
|
inboundIds: z
|
|
.array(z.number().int().positive())
|
|
.min(1, 'pages.settings.subBalancers.errInboundsRequired'),
|
|
// inboundId (stringified) -> leastLoad weight; absent members weigh 1.0.
|
|
memberWeights: z
|
|
.record(
|
|
z.string(),
|
|
z
|
|
.number({ message: 'pages.settings.subBalancers.errWeightPositive' })
|
|
.positive('pages.settings.subBalancers.errWeightPositive'),
|
|
)
|
|
.optional(),
|
|
sortOrder: z
|
|
.number({ message: 'pages.settings.subBalancers.errSortOrder' })
|
|
.int('pages.settings.subBalancers.errSortOrder')
|
|
.min(1, 'pages.settings.subBalancers.errSortOrder'),
|
|
enabled: z.boolean(),
|
|
});
|
|
export type SubBalancerFormValues = z.infer<typeof SubBalancerFormSchema>;
|