Add Inbound

Export Links @@ -67,6 +77,12 @@ {{ i18n "edit" }} + {{ i18n "pages.inbounds.resetTraffic" }} @@ -202,7 +218,7 @@ { title: '{{ i18n "pages.inbounds.client" }}', width: 60, scopedSlots: { customRender: 'client' } }, { title: '{{ i18n "pages.inbounds.traffic" }}↑|↓', width: 100, scopedSlots: { customRender: 'traffic' } }, { title: '{{ i18n "pages.inbounds.expireDate" }}', width: 70, scopedSlots: { customRender: 'expiryTime' } }, - { title: 'UID', width: 120, dataIndex: "id" }, + { title: 'UID', width: 150, dataIndex: "id" }, ]; @@ -281,6 +297,9 @@ case "qrcode": this.showQrcode(dbInbound); break; + case "export": + this.inboundLinks(dbInbound.id); + break; case "edit": this.openEditInbound(dbInbound.id); break; @@ -372,18 +391,6 @@ }, }); }, - exportAllLinks() { - let copyText = ''; - for (const dbInbound of this.dbInbounds) { - copyText += dbInbound.genInboundLinks - } - const clipboard = new ClipboardJS('.copy-btn', { - text: function () { - return copyText; - } - }); - clipboard.on('success', () => { this.$message.success('Export Links succeed'); }); - }, delInbound(dbInbound) { this.$confirm({ title: '{{ i18n "pages.inbounds.deleteInbound"}}', @@ -393,7 +400,15 @@ onOk: () => this.submit('/xui/inbound/del/' + dbInbound.id), }); }, - showQrcode(dbInbound, clientIndex) { + getClients(protocol, clientSettings) { + switch(protocol){ + case Protocols.VMESS: return clientSettings.vmesses; + case Protocols.VLESS: return clientSettings.vlesses; + case Protocols.TROJAN: return clientSettings.trojans; + default: return null; + } + }, + showQrcode(dbInbound, clientIndex) { const link = dbInbound.genLink(clientIndex); qrModal.show('{{ i18n "qrCode"}}', link, dbInbound); }, @@ -451,60 +466,34 @@ return dbInbound.toInbound().isExpiry(index) }, getUpStats(dbInbound, email) { - clientStats = dbInbound.clientStats - if(clientStats.length > 0) - { - for (const key in clientStats) { - if (Object.hasOwnProperty.call(clientStats, key)) { - if(clientStats[key]['email'] == email) - return clientStats[key]['up'] - - } - } - } - + if(email.length == 0) return 0 + clientStats = dbInbound.clientStats.find(stats => stats.email === email) + return clientStats ? clientStats.up : 0 }, getDownStats(dbInbound, email) { - clientStats = dbInbound.clientStats - if(clientStats.length > 0) - { - for (const key in clientStats) { - if (Object.hasOwnProperty.call(clientStats, key)) { - if(clientStats[key]['email'] == email) - return clientStats[key]['down'] - - } - } - } + if(email.length == 0) return 0 + clientStats = dbInbound.clientStats.find(stats => stats.email === email) + return clientStats ? clientStats.down : 0 }, isTrafficExhausted(dbInbound, email) { - clientStats = dbInbound.clientStats - if(clientStats.length > 0) - { - for (const key in clientStats) { - if (Object.hasOwnProperty.call(clientStats, key)) { - if(clientStats[key]['email'] == email) - return clientStats[key]['down']+clientStats[key]['up'] > clientStats[key]['total'] - - } - } + if(email.length == 0) return false + clientStats = dbInbound.clientStats.find(stats => stats.email === email) + return clientStats ? clientStats.down + clientStats.up > clientStats.total : false + }, + inboundLinks(dbInboundId) { + dbInbound = this.dbInbounds.find(row => row.id === dbInboundId); + txtModal.show('{{ i18n "pages.inbounds.export"}}',dbInbound.genInboundLinks,dbInbound.remark); + }, + exportAllLinks() { + let copyText = ''; + for (const dbInbound of this.dbInbounds) { + copyText += dbInbound.genInboundLinks } + txtModal.show('{{ i18n "pages.inbounds.export"}}',copyText,'All-Inbounds'); }, isClientEnabled(dbInbound, email) { - clientStats = dbInbound.clientStats - if(clientStats.length > 0) - { - for (const key in clientStats) { - if (Object.hasOwnProperty.call(clientStats, key)) { - if(clientStats[key]['email'] == email) - return clientStats[key]['enable'] - - } - } - } - else{ - return true - } + clientStats = dbInbound.clientStats ? dbInbound.clientStats.find(stats => stats.email === email) : null + return clientStats ? clientStats['enable'] : true }, }, watch: { @@ -518,13 +507,32 @@ computed: { total() { let down = 0, up = 0; - for (let i = 0; i < this.dbInbounds.length; ++i) { - down += this.dbInbounds[i].down; - up += this.dbInbounds[i].up; - } + let clients = 0, active = 0, deactive = 0; + this.dbInbounds.forEach(dbInbound => { + down += dbInbound.down; + up += dbInbound.up; + inbound = dbInbound.toInbound(); + clients = this.getClients(dbInbound.protocol, inbound.settings); + if(clients){ + if(dbInbound.enable){ + isClientEnable = false; + clients.forEach(client => { + isClientEnable = client.email == "" ? true: this.isClientEnabled(dbInbound,client.email); + isClientEnable ? active++ : deactive++; + }); + } else { + deactive += clients.length; + } + } else { + dbInbound.enable ? active++ : deactive++; + } + }); return { down: down, up: up, + clients: active + deactive, + active: active, + deactive: deactive, }; } }, diff --git a/web/html/xui/index.html b/web/html/xui/index.html index 141174dc..604c6621 100644 --- a/web/html/xui/index.html +++ b/web/html/xui/index.html @@ -15,24 +15,26 @@ {{ template "commonSider" . }} - +

- +

CPU

{{ i18n "pages.index.memory"}}: [[ sizeFormat(status.mem.current) ]] / [[ sizeFormat(status.mem.total) ]] @@ -45,6 +47,7 @@

Swap: [[ sizeFormat(status.swap.current) ]] / [[ sizeFormat(status.swap.total) ]] @@ -53,6 +56,7 @@

{{ i18n "pages.index.hard"}}: [[ sizeFormat(status.disk.current) ]] / [[ sizeFormat(status.disk.total) ]] @@ -67,7 +71,7 @@

- + {{ i18n "pages.index.xrayStatus" }}: [[ status.xray.state ]]

@@ -77,11 +81,13 @@

[[ status.xray.version ]] - {{ i18n "pages.index.xraySwitch"}} + {{ i18n "pages.index.stopXray" }} + {{ i18n "pages.index.restartXray" }} + {{ i18n "pages.index.xraySwitch" }}

- + {{ i18n "pages.index.operationHours" }}: [[ formatSecond(status.uptime) ]]

@@ -93,12 +99,12 @@

- + {{ i18n "pages.index.systemLoad" }}: [[ status.loads[0] ]] | [[ status.loads[1] ]] | [[ status.loads[2] ]]

- + TCP / UDP {{ i18n "pages.index.connectionCount" }}: [[ status.tcpCount ]] / [[ status.udpCount ]]