mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-11-17 18:45:03 +03:00
style: trim MASQUE and XDRIVE comment blocks to two lines
The MASQUE and XDRIVE commits left four comment blocks over the two-line cap CLAUDE.md sets for committed Go/TS.
This commit is contained in:
@@ -1,8 +1,7 @@
|
|||||||
import { z } from 'zod';
|
import { z } from 'zod';
|
||||||
|
|
||||||
// MASQUE inbound (CONNECT-IP over HTTP/3 or HTTP/2). Clients log in with their email
|
// MASQUE clients log in with email and password over Basic auth; the panel stores
|
||||||
// and password over Basic auth; the panel stores `password` and the backend hands it
|
// `password` and the backend hands it to xray-core as `pass`.
|
||||||
// to xray-core as `pass`.
|
|
||||||
export const MasqueClientSchema = z.object({
|
export const MasqueClientSchema = z.object({
|
||||||
password: z.string().min(1),
|
password: z.string().min(1),
|
||||||
email: z.string().min(1),
|
email: z.string().min(1),
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
import { z } from 'zod';
|
import { z } from 'zod';
|
||||||
|
|
||||||
// XDRIVE tunnels the stream through files in shared cloud storage, so both ends
|
// Both XDRIVE ends carry the same service, folder and secrets; an absent tuning knob takes
|
||||||
// carry the same service, folder and secrets. Zero/absent tuning knobs take the
|
// the core's default (segmentBytes and concurrency are capped there at 16 MiB / 64).
|
||||||
// core's defaults; segmentBytes and concurrency are capped there at 16 MiB / 64.
|
|
||||||
export const XDriveServiceSchema = z.enum(['Google Drive', 'local', 'template']);
|
export const XDriveServiceSchema = z.enum(['Google Drive', 'local', 'template']);
|
||||||
export type XDriveService = z.infer<typeof XDriveServiceSchema>;
|
export type XDriveService = z.infer<typeof XDriveServiceSchema>;
|
||||||
|
|
||||||
|
|||||||
@@ -247,7 +247,7 @@ describe('createTlsSettingsWithDefaultCert', () => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
it("defaults ALPN to http/1.1 for WebSocket (issue #6782)", () => {
|
it('defaults ALPN to http/1.1 for WebSocket (issue #6782)', () => {
|
||||||
const tls = createTlsSettingsWithDefaultCert('ws');
|
const tls = createTlsSettingsWithDefaultCert('ws');
|
||||||
expect(tls.alpn).toEqual(['http/1.1']);
|
expect(tls.alpn).toEqual(['http/1.1']);
|
||||||
// The overridden value must still satisfy the TLS settings schema.
|
// The overridden value must still satisfy the TLS settings schema.
|
||||||
|
|||||||
@@ -816,11 +816,8 @@ func mergeStreamFromMaster(childStream, masterStream string) string {
|
|||||||
return string(out)
|
return string(out)
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetLink dispatches to the protocol-specific generator for one (inbound, client)
|
// GetLink returns one (inbound, client) pair's links, `\n`-separated per externalProxy;
|
||||||
// pair. Returns "" when the inbound's protocol doesn't produce a subscription URL
|
// "" for a protocol (socks, http, mixed, wireguard, tunnel) or transport (xdrive) without one.
|
||||||
// (socks, http, mixed, wireguard, dokodemo, tunnel) or its transport has no link
|
|
||||||
// format (xdrive). The returned string may contain multiple `\n`-separated URLs
|
|
||||||
// when the inbound has externalProxy set.
|
|
||||||
func (s *SubService) GetLink(inbound *model.Inbound, email string) string {
|
func (s *SubService) GetLink(inbound *model.Inbound, email string) string {
|
||||||
if network, _ := unmarshalStreamSettings(inbound.StreamSettings)["network"].(string); network == "xdrive" {
|
if network, _ := unmarshalStreamSettings(inbound.StreamSettings)["network"].(string); network == "xdrive" {
|
||||||
return ""
|
return ""
|
||||||
|
|||||||
@@ -6,9 +6,8 @@ import (
|
|||||||
"github.com/xtls/xray-core/proxy/masque"
|
"github.com/xtls/xray-core/proxy/masque"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Panel paths hand AddUser the client's "password"; the hot diff hands it the user
|
// Panel paths hand AddUser the client's "password", the hot diff the emitted user's
|
||||||
// as GetXrayConfig emitted it, keyed "pass". Without an account the core adds a
|
// "pass"; without an account the core adds a MASQUE user it can never authenticate.
|
||||||
// MASQUE user it can never authenticate.
|
|
||||||
func TestBuildUserAccountMasque(t *testing.T) {
|
func TestBuildUserAccountMasque(t *testing.T) {
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
name string
|
name string
|
||||||
|
|||||||
Reference in New Issue
Block a user