Merge pull request #34 from MHSanaei/devv1.1.1

i hate myself

1 files changed, 9 insertions, 3 deletions

diff --git a/web/assets/js/model/xray.js b/web/assets/js/model/xray.js
index 7fdf557c..360f4bae 100644
--- a/web/assets/js/model/xray.js
+++ b/web/assets/js/model/xray.js
@@ -1157,8 +1157,11 @@ class Inbound extends XrayCommonClass {
         }
 		
 		 if (this.XTLS) {
-                    params.set("flow", this.settings.vlesses[clientIndex].flow);
+				if (!ObjectUtil.isEmpty(this.stream.tls.server)) {
+				address = this.stream.tls.server;
 				}
+			params.set("flow", this.settings.vlesses[clientIndex].flow);
+			}
 
         const link = `vless://${uuid}@${address}:${port}`;
         const url = new URL(link);
@@ -1246,8 +1249,11 @@ class Inbound extends XrayCommonClass {
             }
         }
 		
-		if (this.XTLS) {
-                    params.set("flow", this.settings.trojans[clientIndex].flow);
+		 if (this.XTLS) {
+				if (!ObjectUtil.isEmpty(this.stream.tls.server)) {
+				address = this.stream.tls.server;
+				}
+			params.set("flow", this.settings.trojans[clientIndex].flow);
 			}
         
         const link = `trojan://${settings.trojans[clientIndex].password}@${address}:${this.port}#${encodeURIComponent(remark)}`;