Merge branch 'MHSanaei:main' into main

web/assets/js/model/inbound.js

@@ -728,8 +728,8 @@ class RealityStreamSettings extends XrayCommonClass {
         dest = 'tesla.com:443',
         serverNames = 'tesla.com,www.tesla.com',
         privateKey = '',
-        minClient = '',
+        minClientVer = '',
-        maxClient = '',
+        maxClientVer = '',
         maxTimediff = 0,
         shortIds = RandomUtil.randomShortIds(),
         mldsa65Seed = '',
@@ -741,8 +741,8 @@ class RealityStreamSettings extends XrayCommonClass {
         this.dest = dest;
         this.serverNames = Array.isArray(serverNames) ? serverNames.join(",") : serverNames;
         this.privateKey = privateKey;
-        this.minClient = minClient;
+        this.minClientVer = minClientVer;
-        this.maxClient = maxClient;
+        this.maxClientVer = maxClientVer;
         this.maxTimediff = maxTimediff;
         this.shortIds = Array.isArray(shortIds) ? shortIds.join(",") : shortIds;
         this.mldsa65Seed = mldsa65Seed;
@@ -766,8 +766,8 @@ class RealityStreamSettings extends XrayCommonClass {
             json.dest,
             json.serverNames,
             json.privateKey,
-            json.minClient,
+            json.minClientVer,
-            json.maxClient,
+            json.maxClientVer,
             json.maxTimediff,
             json.shortIds,
             json.mldsa65Seed,
@@ -782,8 +782,8 @@ class RealityStreamSettings extends XrayCommonClass {
             dest: this.dest,
             serverNames: this.serverNames.split(","),
             privateKey: this.privateKey,
-            minClient: this.minClient,
+            minClientVer: this.minClientVer,
-            maxClient: this.maxClient,
+            maxClientVer: this.maxClientVer,
             maxTimediff: this.maxTimediff,
             shortIds: this.shortIds.split(","),
             mldsa65Seed: this.mldsa65Seed,

web/html/form/reality_settings.html

@@ -21,14 +21,12 @@
     <a-form-item label='Max Time Diff (ms)'>
         <a-input-number v-model.number="inbound.stream.reality.maxTimediff" :min="0"></a-input-number>
     </a-form-item>
-    <!-- we also have this but i think it's not necessary
+    <a-form-item label='Min Client Ver'>
-    <a-form-item label='Min Client'>
+        <a-input v-model.trim="inbound.stream.reality.minClientVer"></a-input>
-        <a-input v-model.trim="inbound.stream.reality.minClient"></a-input>
     </a-form-item>
-    <a-form-item label='Max Client'>
+    <a-form-item label='Max Client Ver'>
-        <a-input v-model.trim="inbound.stream.reality.maxClient"></a-input>
+        <a-input v-model.trim="inbound.stream.reality.maxClientVer"></a-input>
     </a-form-item>
-    -->
     <a-form-item>
         <template slot="label">
             <a-tooltip>
@@ -47,7 +45,7 @@
         <a-input v-model="inbound.stream.reality.settings.publicKey"></a-input>
     </a-form-item>
     <a-form-item label='{{ i18n "pages.inbounds.privatekey" }}'>
-        <a-input type="password" v-model="inbound.stream.reality.privateKey"></a-input>
+        <a-input v-model="inbound.stream.reality.privateKey"></a-input>
     </a-form-item>
     <a-form-item label=" ">
         <a-button type="primary" icon="import" @click="getNewX25519Cert">Get New Cert（随机获取新证书）</a-button>

web/html/form/tls_settings.html

@@ -88,7 +88,7 @@
           <a-input v-model="cert.cert"></a-input>
         </a-form-item>
         <a-form-item label='{{ i18n "pages.inbounds.privatekey" }}'>
-          <a-input type="password" v-model="cert.key"></a-input>
+          <a-input v-model="cert.key"></a-input>
         </a-form-item>
       </template>
       <a-form-item label='OCSP stapling'>