diff options
Diffstat (limited to 'web/assets/js/model/outbound.js')
| -rw-r--r-- | web/assets/js/model/outbound.js | 165 |
1 files changed, 158 insertions, 7 deletions
diff --git a/web/assets/js/model/outbound.js b/web/assets/js/model/outbound.js index aa90d20d..6be2ec1b 100644 --- a/web/assets/js/model/outbound.js +++ b/web/assets/js/model/outbound.js @@ -690,7 +690,8 @@ class UdpMask extends CommonClass { if (out.type === 'array') { delete out.packet; } else { - out.rand = 0; + delete out.rand; + delete out.randRange; } return out; }; @@ -713,21 +714,158 @@ class UdpMask extends CommonClass { } } -class FinalMaskStreamSettings extends CommonClass { - constructor(udp = []) { +class TcpMask extends CommonClass { + constructor(type = 'fragment', settings = {}) { super(); - this.udp = Array.isArray(udp) ? udp.map(u => new UdpMask(u.type, u.settings)) : [new UdpMask(udp.type, udp.settings)]; + this.type = type; + this.settings = this._getDefaultSettings(type, settings); + } + + _getDefaultSettings(type, settings = {}) { + switch (type) { + case 'fragment': + return { + packets: settings.packets ?? 'tlshello', + length: settings.length ?? '', + delay: settings.delay ?? '', + maxSplit: settings.maxSplit ?? '', + }; + case 'sudoku': + return { + password: settings.password ?? '', + ascii: settings.ascii ?? '', + customTable: settings.customTable ?? '', + customTables: Array.isArray(settings.customTables) ? settings.customTables : [], + paddingMin: settings.paddingMin ?? 0, + paddingMax: settings.paddingMax ?? 0, + }; + case 'header-custom': + return { + clients: Array.isArray(settings.clients) ? settings.clients : [], + servers: Array.isArray(settings.servers) ? settings.servers : [], + }; + default: + return settings; + } } static fromJson(json = {}) { - return new FinalMaskStreamSettings(json.udp || []); + return new TcpMask( + json.type || 'fragment', + json.settings || {} + ); } toJson() { + const cleanItem = item => { + const out = { ...item }; + if (out.type === 'array') { + delete out.packet; + } else { + delete out.rand; + delete out.randRange; + } + return out; + }; + + let settings = this.settings; + if (this.type === 'header-custom' && settings) { + const cleanGroup = group => Array.isArray(group) ? group.map(cleanItem) : group; + settings = { + ...settings, + clients: Array.isArray(settings.clients) ? settings.clients.map(cleanGroup) : settings.clients, + servers: Array.isArray(settings.servers) ? settings.servers.map(cleanGroup) : settings.servers, + }; + } + return { - udp: this.udp.map(udp => udp.toJson()) + type: this.type, + settings: (settings && Object.keys(settings).length > 0) ? settings : undefined }; + } +} +class QuicParams extends CommonClass { + constructor( + congestion = 'bbr', + debug = false, + brutalUp = '', + brutalDown = '', + udpHop = undefined, + ) { + super(); + this.congestion = congestion; + this.debug = debug; + this.brutalUp = brutalUp; + this.brutalDown = brutalDown; + this.udpHop = udpHop; + } + + get hasUdpHop() { + return this.udpHop != null; + } + + set hasUdpHop(value) { + this.udpHop = value ? (this.udpHop || { ports: '20000-50000', interval: '5-10' }) : undefined; + } + + static fromJson(json = {}) { + if (!json || Object.keys(json).length === 0) return undefined; + return new QuicParams( + json.congestion, + json.debug, + json.brutalUp, + json.brutalDown, + json.udpHop ? { ports: json.udpHop.ports, interval: json.udpHop.interval } : undefined, + ); + } + + toJson() { + const result = { congestion: this.congestion }; + if (this.debug) result.debug = this.debug; + if (this.brutalUp) result.brutalUp = this.brutalUp; + if (this.brutalDown) result.brutalDown = this.brutalDown; + if (this.udpHop) result.udpHop = { ports: this.udpHop.ports, interval: this.udpHop.interval }; + return result; + } +} + +class FinalMaskStreamSettings extends CommonClass { + constructor(tcp = [], udp = [], quicParams = undefined) { + super(); + this.tcp = Array.isArray(tcp) ? tcp.map(t => t instanceof TcpMask ? t : new TcpMask(t.type, t.settings)) : []; + this.udp = Array.isArray(udp) ? udp.map(u => new UdpMask(u.type, u.settings)) : [new UdpMask(udp.type, udp.settings)]; + this.quicParams = quicParams instanceof QuicParams ? quicParams : (quicParams ? QuicParams.fromJson(quicParams) : undefined); + } + + get enableQuicParams() { + return this.quicParams != null; + } + + set enableQuicParams(value) { + this.quicParams = value ? (this.quicParams || new QuicParams()) : undefined; + } + + static fromJson(json = {}) { + return new FinalMaskStreamSettings( + json.tcp || [], + json.udp || [], + json.quicParams ? QuicParams.fromJson(json.quicParams) : undefined, + ); + } + + toJson() { + const result = {}; + if (this.tcp && this.tcp.length > 0) { + result.tcp = this.tcp.map(t => t.toJson()); + } + if (this.udp && this.udp.length > 0) { + result.udp = this.udp.map(udp => udp.toJson()); + } + if (this.quicParams) { + result.quicParams = this.quicParams.toJson(); + } + return result; } } @@ -763,6 +901,16 @@ class StreamSettings extends CommonClass { this.sockopt = sockopt; } + addTcpMask(type = 'fragment') { + this.finalmask.tcp.push(new TcpMask(type)); + } + + delTcpMask(index) { + if (this.finalmask.tcp) { + this.finalmask.tcp.splice(index, 1); + } + } + addUdpMask(type = 'salamander') { this.finalmask.udp.push(new UdpMask(type)); } @@ -774,7 +922,10 @@ class StreamSettings extends CommonClass { } get hasFinalMask() { - return this.finalmask.udp && this.finalmask.udp.length > 0; + const hasTcp = this.finalmask.tcp && this.finalmask.tcp.length > 0; + const hasUdp = this.finalmask.udp && this.finalmask.udp.length > 0; + const hasQuicParams = this.finalmask.quicParams != null; + return hasTcp || hasUdp || hasQuicParams; } get isTls() { |