Compare commits

..

No commits in common. "73a5722cca0b4c06f58630ace5d90f36dc544833" and "7a57b31ff3ed9c42f7ba736c09b4baeb2060c2b5" have entirely different histories.

5 changed files with 6 additions and 16 deletions

View file

@ -1 +1 @@
2.6.3 2.6.2

View file

@ -725,8 +725,8 @@ class RealityStreamSettings extends XrayCommonClass {
constructor( constructor(
show = false, show = false,
xver = 0, xver = 0,
dest = 'google.com:443', dest = 'yahoo.com:443',
serverNames = 'google.com,www.google.com', serverNames = 'yahoo.com,www.yahoo.com',
privateKey = '', privateKey = '',
minClientVer = '', minClientVer = '',
maxClientVer = '', maxClientVer = '',
@ -1385,7 +1385,6 @@ class Inbound extends XrayCommonClass {
params.set("security", "reality"); params.set("security", "reality");
params.set("pbk", this.stream.reality.settings.publicKey); params.set("pbk", this.stream.reality.settings.publicKey);
params.set("fp", this.stream.reality.settings.fingerprint); params.set("fp", this.stream.reality.settings.fingerprint);
params.set("pqv", this.stream.reality.settings.mldsa65Verify);
if (!ObjectUtil.isArrEmpty(this.stream.reality.serverNames)) { if (!ObjectUtil.isArrEmpty(this.stream.reality.serverNames)) {
params.set("sni", this.stream.reality.serverNames.split(",")[0]); params.set("sni", this.stream.reality.serverNames.split(",")[0]);
} }
@ -1560,7 +1559,6 @@ class Inbound extends XrayCommonClass {
params.set("security", "reality"); params.set("security", "reality");
params.set("pbk", this.stream.reality.settings.publicKey); params.set("pbk", this.stream.reality.settings.publicKey);
params.set("fp", this.stream.reality.settings.fingerprint); params.set("fp", this.stream.reality.settings.fingerprint);
params.set("pqv", this.stream.reality.settings.mldsa65Verify);
if (!ObjectUtil.isArrEmpty(this.stream.reality.serverNames)) { if (!ObjectUtil.isArrEmpty(this.stream.reality.serverNames)) {
params.set("sni", this.stream.reality.serverNames.split(",")[0]); params.set("sni", this.stream.reality.serverNames.split(",")[0]);
} }

View file

@ -388,8 +388,7 @@ class RealityStreamSettings extends CommonClass {
fingerprint = '', fingerprint = '',
serverName = '', serverName = '',
shortId = '', shortId = '',
spiderX = '', spiderX = '/'
mldsa65Verify = ''
) { ) {
super(); super();
this.publicKey = publicKey; this.publicKey = publicKey;
@ -397,7 +396,6 @@ class RealityStreamSettings extends CommonClass {
this.serverName = serverName; this.serverName = serverName;
this.shortId = shortId this.shortId = shortId
this.spiderX = spiderX; this.spiderX = spiderX;
this.mldsa65Verify = mldsa65Verify;
} }
static fromJson(json = {}) { static fromJson(json = {}) {
return new RealityStreamSettings( return new RealityStreamSettings(
@ -406,7 +404,6 @@ class RealityStreamSettings extends CommonClass {
json.serverName, json.serverName,
json.shortId, json.shortId,
json.spiderX, json.spiderX,
json.mldsa65Verify
); );
} }
toJson() { toJson() {
@ -416,7 +413,6 @@ class RealityStreamSettings extends CommonClass {
serverName: this.serverName, serverName: this.serverName,
shortId: this.shortId, shortId: this.shortId,
spiderX: this.spiderX, spiderX: this.spiderX,
mldsa65Verify: this.mldsa65Verify
}; };
} }
}; };
@ -791,8 +787,7 @@ class Outbound extends CommonClass {
let sni = url.searchParams.get('sni') ?? ''; let sni = url.searchParams.get('sni') ?? '';
let sid = url.searchParams.get('sid') ?? ''; let sid = url.searchParams.get('sid') ?? '';
let spx = url.searchParams.get('spx') ?? ''; let spx = url.searchParams.get('spx') ?? '';
let pqv = url.searchParams.get('pqv') ?? ''; stream.reality = new RealityStreamSettings(pbk, fp, sni, sid, spx);
stream.reality = new RealityStreamSettings(pbk, fp, sni, sid, spx, pqv);
} }
const regex = /([^@]+):\/\/([^@]+)@(.+):(\d+)(.*)$/; const regex = /([^@]+):\/\/([^@]+)@(.+):(\d+)(.*)$/;

View file

@ -452,9 +452,6 @@
<a-form-item label="Public Key"> <a-form-item label="Public Key">
<a-input v-model.trim="outbound.stream.reality.publicKey"></a-input> <a-input v-model.trim="outbound.stream.reality.publicKey"></a-input>
</a-form-item> </a-form-item>
<a-form-item label="mldsa65 Verify">
<a-input v-model.trim="outbound.stream.reality.mldsa65Verify"></a-input>
</a-form-item>
</template> </template>
</template> </template>

View file

@ -329,7 +329,7 @@ func (s *ServerService) GetXrayVersions() ([]string, error) {
continue continue
} }
if major > 25 || (major == 25 && minor > 7) || (major == 25 && minor == 7 && patch >= 26) { if major > 25 || (major == 25 && minor > 6) || (major == 25 && minor == 6 && patch >= 8) {
versions = append(versions, release.TagName) versions = append(versions, release.TagName)
} }
} }