mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-07-18 02:26:11 +00:00
814cda3fb4
Bump xtls/xray-core to 50231eaf (v26.7.11) and the three binary pins (DockerInit.sh, release.yml x2) in lockstep. Adapt the panel to the upstream changes: - Shadowsocks "none"/"plain" and VMess "none"/"zero" were removed from the core. A migration rewrites stored none/plain SS methods to a supported cipher and none/zero VMess security to "auto" (on both the clients column and inbound settings JSON); the SS build-time heal does the same so a row injected after boot cannot brick startup. The removed values are dropped from every frontend option list, schema and adapter, and coerced to "auto" at the Go link/sub/Clash emit sites and both link importers. Fix the CipherType_NONE sentinel that no longer compiles. - Unencrypted vless/trojan outbounds to a public address are now refused by the core. Validate outbounds through the vendored config loader when saving the xray template and when storing/merging outbound subscriptions, so one such outbound cannot keep the core from starting. - New TCP finalmask type "xmc" (Minecraft mimicry): add it to the sub link allowlist, the frontend enum and the FinalMask form (hostname, usernames, required password), and document it. - streamSettings gained a "method" alias for "network"; canonicalize it to "network" at inbound save time and in the form adapters/schema so a method-keyed config keeps its transport. - New root "env" config key is passed through xray.Config, compared in Equals, and forces a restart in the hot diff. - REALITY now defaults minClientVer to 26.3.27; update the form placeholder.
40 lines
1.4 KiB
TypeScript
40 lines
1.4 KiB
TypeScript
/// <reference types="vite/client" />
|
|
import { describe, expect, it } from 'vitest';
|
|
|
|
import { NetworkSettingsSchema } from '@/schemas/protocols';
|
|
|
|
const streamFixtures = import.meta.glob<unknown>(
|
|
'./golden/fixtures/stream/*.json',
|
|
{ eager: true, import: 'default' },
|
|
);
|
|
|
|
function fixtureName(path: string): string {
|
|
const file = path.split('/').pop() ?? path;
|
|
return file.replace(/\.json$/, '');
|
|
}
|
|
|
|
describe('NetworkSettingsSchema fixtures', () => {
|
|
const entries = Object.entries(streamFixtures).sort(([a], [b]) => a.localeCompare(b));
|
|
expect(entries.length, 'expected at least one fixture under golden/fixtures/stream').toBeGreaterThan(0);
|
|
|
|
for (const [path, raw] of entries) {
|
|
it(`parses ${fixtureName(path)} byte-stably`, () => {
|
|
const parsed = NetworkSettingsSchema.parse(raw);
|
|
expect(parsed).toMatchSnapshot();
|
|
});
|
|
}
|
|
});
|
|
|
|
describe('NetworkSettingsSchema method alias', () => {
|
|
it('folds xray-core v26.7.11 method alias back into network', () => {
|
|
const parsed = NetworkSettingsSchema.parse({ method: 'ws', wsSettings: {} });
|
|
expect((parsed as { network?: string }).network).toBe('ws');
|
|
expect((parsed as Record<string, unknown>).method).toBeUndefined();
|
|
});
|
|
|
|
it('prefers method over network when both are present', () => {
|
|
const parsed = NetworkSettingsSchema.parse({ method: 'grpc', network: 'tcp', grpcSettings: {} });
|
|
expect((parsed as { network?: string }).network).toBe('grpc');
|
|
});
|
|
});
|