|
@@ -165,7 +165,7 @@ class TcpStreamSettings extends CommonClass {
|
|
|
|
|
|
|
|
class KcpStreamSettings extends CommonClass {
|
|
class KcpStreamSettings extends CommonClass {
|
|
|
constructor(
|
|
constructor(
|
|
|
- mtu = 1250,
|
|
|
|
|
|
|
+ mtu = 1350,
|
|
|
tti = 50,
|
|
tti = 50,
|
|
|
uplinkCapacity = 5,
|
|
uplinkCapacity = 5,
|
|
|
downlinkCapacity = 20,
|
|
downlinkCapacity = 20,
|
|
@@ -558,27 +558,49 @@ class SockoptStreamSettings extends CommonClass {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-class UdpMask extends CommonClass {
|
|
|
|
|
- constructor(type = 'salamander', password = '') {
|
|
|
|
|
|
|
+class FinalMask extends CommonClass {
|
|
|
|
|
+ constructor(type = 'salamander', settings = {}) {
|
|
|
super();
|
|
super();
|
|
|
this.type = type;
|
|
this.type = type;
|
|
|
- this.password = password;
|
|
|
|
|
|
|
+ this.settings = this._getDefaultSettings(type, settings);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ _getDefaultSettings(type, settings = {}) {
|
|
|
|
|
+ switch (type) {
|
|
|
|
|
+ case 'salamander':
|
|
|
|
|
+ case 'mkcp-aes128gcm':
|
|
|
|
|
+ return { password: settings.password || '' };
|
|
|
|
|
+ case 'header-dns':
|
|
|
|
|
+ case 'xdns':
|
|
|
|
|
+ return { domain: settings.domain || '' };
|
|
|
|
|
+ case 'mkcp-original':
|
|
|
|
|
+ case 'header-dtls':
|
|
|
|
|
+ case 'header-srtp':
|
|
|
|
|
+ case 'header-utp':
|
|
|
|
|
+ case 'header-wechat':
|
|
|
|
|
+ case 'header-wireguard':
|
|
|
|
|
+ return {}; // No settings needed
|
|
|
|
|
+ default:
|
|
|
|
|
+ return settings;
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
static fromJson(json = {}) {
|
|
static fromJson(json = {}) {
|
|
|
- return new UdpMask(
|
|
|
|
|
- json.type,
|
|
|
|
|
- json.settings?.password || ''
|
|
|
|
|
|
|
+ return new FinalMask(
|
|
|
|
|
+ json.type || 'salamander',
|
|
|
|
|
+ json.settings || {}
|
|
|
);
|
|
);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
toJson() {
|
|
toJson() {
|
|
|
- return {
|
|
|
|
|
- type: this.type,
|
|
|
|
|
- settings: {
|
|
|
|
|
- password: this.password
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ const result = {
|
|
|
|
|
+ type: this.type
|
|
|
};
|
|
};
|
|
|
|
|
+ // Only include settings if they exist and are not empty
|
|
|
|
|
+ if (this.settings && Object.keys(this.settings).length > 0) {
|
|
|
|
|
+ result.settings = this.settings;
|
|
|
|
|
+ }
|
|
|
|
|
+ return result;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -595,7 +617,7 @@ class StreamSettings extends CommonClass {
|
|
|
httpupgradeSettings = new HttpUpgradeStreamSettings(),
|
|
httpupgradeSettings = new HttpUpgradeStreamSettings(),
|
|
|
xhttpSettings = new xHTTPStreamSettings(),
|
|
xhttpSettings = new xHTTPStreamSettings(),
|
|
|
hysteriaSettings = new HysteriaStreamSettings(),
|
|
hysteriaSettings = new HysteriaStreamSettings(),
|
|
|
- udpmasks = [],
|
|
|
|
|
|
|
+ finalmask = { udp: [] },
|
|
|
sockopt = undefined,
|
|
sockopt = undefined,
|
|
|
) {
|
|
) {
|
|
|
super();
|
|
super();
|
|
@@ -610,16 +632,21 @@ class StreamSettings extends CommonClass {
|
|
|
this.httpupgrade = httpupgradeSettings;
|
|
this.httpupgrade = httpupgradeSettings;
|
|
|
this.xhttp = xhttpSettings;
|
|
this.xhttp = xhttpSettings;
|
|
|
this.hysteria = hysteriaSettings;
|
|
this.hysteria = hysteriaSettings;
|
|
|
- this.udpmasks = udpmasks;
|
|
|
|
|
|
|
+ this.finalmask = finalmask;
|
|
|
this.sockopt = sockopt;
|
|
this.sockopt = sockopt;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- addUdpMask() {
|
|
|
|
|
- this.udpmasks.push(new UdpMask());
|
|
|
|
|
|
|
+ addUdpMask(type = 'salamander') {
|
|
|
|
|
+ if (!this.finalmask.udp) {
|
|
|
|
|
+ this.finalmask.udp = [];
|
|
|
|
|
+ }
|
|
|
|
|
+ this.finalmask.udp.push(new FinalMask(type));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
delUdpMask(index) {
|
|
delUdpMask(index) {
|
|
|
- this.udpmasks.splice(index, 1);
|
|
|
|
|
|
|
+ if (this.finalmask.udp) {
|
|
|
|
|
+ this.finalmask.udp.splice(index, 1);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
get isTls() {
|
|
get isTls() {
|
|
@@ -639,7 +666,16 @@ class StreamSettings extends CommonClass {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
static fromJson(json = {}) {
|
|
static fromJson(json = {}) {
|
|
|
- const udpmasks = json.udpmasks ? json.udpmasks.map(mask => UdpMask.fromJson(mask)) : [];
|
|
|
|
|
|
|
+ let finalmask = { udp: [] };
|
|
|
|
|
+ if (json.finalmask) {
|
|
|
|
|
+ if (Array.isArray(json.finalmask)) {
|
|
|
|
|
+ // Legacy format: direct array (backward compatibility)
|
|
|
|
|
+ finalmask.udp = json.finalmask.map(mask => FinalMask.fromJson(mask));
|
|
|
|
|
+ } else if (json.finalmask.udp) {
|
|
|
|
|
+ // New format: object with udp array
|
|
|
|
|
+ finalmask.udp = json.finalmask.udp.map(mask => FinalMask.fromJson(mask));
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
return new StreamSettings(
|
|
return new StreamSettings(
|
|
|
json.network,
|
|
json.network,
|
|
|
json.security,
|
|
json.security,
|
|
@@ -652,7 +688,7 @@ class StreamSettings extends CommonClass {
|
|
|
HttpUpgradeStreamSettings.fromJson(json.httpupgradeSettings),
|
|
HttpUpgradeStreamSettings.fromJson(json.httpupgradeSettings),
|
|
|
xHTTPStreamSettings.fromJson(json.xhttpSettings),
|
|
xHTTPStreamSettings.fromJson(json.xhttpSettings),
|
|
|
HysteriaStreamSettings.fromJson(json.hysteriaSettings),
|
|
HysteriaStreamSettings.fromJson(json.hysteriaSettings),
|
|
|
- udpmasks,
|
|
|
|
|
|
|
+ finalmask,
|
|
|
SockoptStreamSettings.fromJson(json.sockopt),
|
|
SockoptStreamSettings.fromJson(json.sockopt),
|
|
|
);
|
|
);
|
|
|
}
|
|
}
|
|
@@ -671,7 +707,9 @@ class StreamSettings extends CommonClass {
|
|
|
httpupgradeSettings: network === 'httpupgrade' ? this.httpupgrade.toJson() : undefined,
|
|
httpupgradeSettings: network === 'httpupgrade' ? this.httpupgrade.toJson() : undefined,
|
|
|
xhttpSettings: network === 'xhttp' ? this.xhttp.toJson() : undefined,
|
|
xhttpSettings: network === 'xhttp' ? this.xhttp.toJson() : undefined,
|
|
|
hysteriaSettings: network === 'hysteria' ? this.hysteria.toJson() : undefined,
|
|
hysteriaSettings: network === 'hysteria' ? this.hysteria.toJson() : undefined,
|
|
|
- udpmasks: this.udpmasks.length > 0 ? this.udpmasks.map(mask => mask.toJson()) : undefined,
|
|
|
|
|
|
|
+ finalmask: (this.finalmask.udp && this.finalmask.udp.length > 0) ? {
|
|
|
|
|
+ udp: this.finalmask.udp.map(mask => mask.toJson())
|
|
|
|
|
+ } : undefined,
|
|
|
sockopt: this.sockopt != undefined ? this.sockopt.toJson() : undefined,
|
|
sockopt: this.sockopt != undefined ? this.sockopt.toJson() : undefined,
|
|
|
};
|
|
};
|
|
|
}
|
|
}
|
|
@@ -1285,11 +1323,14 @@ Outbound.VLESSSettings = class extends CommonClass {
|
|
|
flow: this.flow,
|
|
flow: this.flow,
|
|
|
encryption: this.encryption,
|
|
encryption: this.encryption,
|
|
|
};
|
|
};
|
|
|
- if (this.testpre > 0) {
|
|
|
|
|
- result.testpre = this.testpre;
|
|
|
|
|
- }
|
|
|
|
|
- if (this.testseed && this.testseed.length >= 4) {
|
|
|
|
|
- result.testseed = this.testseed;
|
|
|
|
|
|
|
+ // Only include Vision settings when flow is set
|
|
|
|
|
+ if (this.flow && this.flow !== '') {
|
|
|
|
|
+ if (this.testpre > 0) {
|
|
|
|
|
+ result.testpre = this.testpre;
|
|
|
|
|
+ }
|
|
|
|
|
+ if (this.testseed && this.testseed.length >= 4) {
|
|
|
|
|
+ result.testseed = this.testseed;
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
return result;
|
|
return result;
|
|
|
}
|
|
}
|
|
@@ -1422,7 +1463,7 @@ Outbound.HttpSettings = class extends CommonClass {
|
|
|
|
|
|
|
|
Outbound.WireguardSettings = class extends CommonClass {
|
|
Outbound.WireguardSettings = class extends CommonClass {
|
|
|
constructor(
|
|
constructor(
|
|
|
- mtu = 1250,
|
|
|
|
|
|
|
+ mtu = 1420,
|
|
|
secretKey = '',
|
|
secretKey = '',
|
|
|
address = [''],
|
|
address = [''],
|
|
|
workers = 2,
|
|
workers = 2,
|