Merge pull request MHSanaei#14 from MHSanaei/dev

Update xray.js - JSON.parse
AghaFarokh · Feb 28, 2023 · b37b127 · b37b127
2 parents 7a4523d + c7ca4c2
commit b37b127
Showing 1 changed file with 14 additions and 15 deletions.
diff --git a/web/assets/js/model/xray.js b/web/assets/js/model/xray.js
@@ -1227,7 +1227,7 @@ class Inbound extends XrayCommonClass {
         return url.toString();
     }
 
-    genLink(address='', remark='', clientIndex=0) {
+    genLink(address='', remark='') {
         switch (this.protocol) {
             case Protocols.VMESS:
                 if (this.settings.vmesses[clientIndex].email != ""){
@@ -1249,21 +1249,20 @@ class Inbound extends XrayCommonClass {
         }
     }
     genInboundLinks(address = '', remark = '') {
-    let link = '';
-    JSON.parse(this.settings)
-    switch (this.protocol) {
-        case Protocols.VMESS:
-        case Protocols.VLESS:
-        case Protocols.TROJAN:
-            JSON.parse(this.settings).clients.forEach((client,index) => {
-                link += this.genLink(address, remark, index) + '\r\n';
-            });
-            return link;
-        case Protocols.SHADOWSOCKS:
-            return (this.genSSLink(address, remark) + '\r\n');
-        default: return '';
+        let link = '';
+        switch (this.protocol) {
+            case Protocols.VMESS:
+            case Protocols.VLESS:
+            case Protocols.TROJAN:
+                JSON.parse(this.settings).clients.forEach((_,index) => {
+                    link += this.genLink(address, remark, index) + '\r\n';
+                });
+                return link;
+            case Protocols.SHADOWSOCKS:
+                return (this.genSSLink(address, remark) + '\r\n');
+            default: return '';
+        }
     }
-}
 
     static fromJson(json={}) {
         return new Inbound(