소스 검색

removed - timeout

mhsanaei 5 달 전
부모
커밋
16b4795956
4개의 변경된 파일1개의 추가작업 그리고 15개의 파일을 삭제
  1. 0 4
      web/assets/js/model/outbound.js
  2. 1 5
      web/assets/js/model/xray.js
  3. 0 3
      web/html/xui/form/outbound.html
  4. 0 3
      web/html/xui/form/protocol/dokodemo.html

+ 0 - 4
web/assets/js/model/outbound.js

@@ -851,14 +851,12 @@ Outbound.Settings = class extends CommonClass {
 Outbound.FreedomSettings = class extends CommonClass {
     constructor(
         domainStrategy = '',
-        timeout = 10,
         redirect = '',
         fragment = {},
         noises = []
     ) {
         super();
         this.domainStrategy = domainStrategy;
-        this.timeout = timeout;
         this.redirect = redirect;
         this.fragment = fragment;
         this.noises = noises;
@@ -875,7 +873,6 @@ Outbound.FreedomSettings = class extends CommonClass {
     static fromJson(json = {}) {
         return new Outbound.FreedomSettings(
             json.domainStrategy,
-            json.timeout,
             json.redirect,
             json.fragment ? Outbound.FreedomSettings.Fragment.fromJson(json.fragment) : undefined,
             json.noises ? json.noises.map(noise => Outbound.FreedomSettings.Noise.fromJson(noise)) : [new Outbound.FreedomSettings.Noise()],
@@ -885,7 +882,6 @@ Outbound.FreedomSettings = class extends CommonClass {
     toJson() {
         return {
             domainStrategy: ObjectUtil.isEmpty(this.domainStrategy) ? undefined : this.domainStrategy,
-            timeout: this.timeout,
             redirect: this.redirect,
             fragment: Object.keys(this.fragment).length === 0 ? undefined : this.fragment,
             noises: Outbound.FreedomSettings.Noise.toJsonArray(this.noises),

+ 1 - 5
web/assets/js/model/xray.js

@@ -2513,15 +2513,13 @@ Inbound.DokodemoSettings = class extends Inbound.Settings {
         address,
         port,
         network = 'tcp,udp',
-        followRedirect = false,
-        timeout = 30
+        followRedirect = false
     ) {
         super(protocol);
         this.address = address;
         this.port = port;
         this.network = network;
         this.followRedirect = followRedirect;
-        this.timeout = timeout;
     }
 
     static fromJson(json = {}) {
@@ -2531,7 +2529,6 @@ Inbound.DokodemoSettings = class extends Inbound.Settings {
             json.port,
             json.network,
             json.followRedirect,
-            json.timeout,
         );
     }
 
@@ -2541,7 +2538,6 @@ Inbound.DokodemoSettings = class extends Inbound.Settings {
             port: this.port,
             network: this.network,
             followRedirect: this.followRedirect,
-            timeout: this.timeout,
         };
     }
 };

+ 0 - 3
web/html/xui/form/outbound.html

@@ -22,9 +22,6 @@
             <a-select-option v-for="s in OutboundDomainStrategies" :value="s">[[ s ]]</a-select-option>
           </a-select>
         </a-form-item>
-        <a-form-item label='Timeout'>
-          <a-input-number v-model.number="outbound.settings.timeout" min="0" ></a-input-number>
-        </a-form-item>
         <a-form-item label='Redirect'>
           <a-input v-model="outbound.settings.redirect"></a-input>
         </a-form-item>

+ 0 - 3
web/html/xui/form/protocol/dokodemo.html

@@ -16,8 +16,5 @@
     <a-form-item label='Follow Redirect'>
         <a-switch v-model="inbound.settings.followRedirect"></a-switch>
     </a-form-item>
-    <a-form-item label='Timeout'>
-        <a-input-number v-model.number="inbound.settings.timeout" :min="0"></a-input-number>
-    </a-form-item>
 </a-form>
 {{end}}