diff --git a/debian/changelog b/debian/changelog index 81a2e8d..9ec46b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +omr-vps-admin (0.3+20230828) unstable; urgency=medium + + * Fix V2Ray stats + + -- OpenMPTCProuter Fri, 28 Aug 2023 10:15:54 +0200 + omr-vps-admin (0.3+20230825) unstable; urgency=medium * Add V2Ray VMESS, SOCKS and TROJAN protocols support diff --git a/omr-admin.py b/omr-admin.py index be898a2..f2a0e41 100755 --- a/omr-admin.py +++ b/omr-admin.py @@ -114,7 +114,8 @@ def get_bytes_v2ray(t,user): else: side="uplink" try: - data = subprocess.check_output('/usr/bin/v2ctl api --server=127.0.0.1:10085 StatsService.GetStats ' + "'" + 'name: "user>>>' + user + '>>>traffic>>>' + side + '"' + "'" + ' 2>/dev/null | grep value | cut -d: -f2 | tr -d " "', shell = True) + data = subprocess.check_output('/usr/bin/v2ray api stats --server=127.0.0.1:10085 -json ' + "'" + 'user>>>' + user + '>>>traffic>>>' + side + "'" + ' 2>/dev/null | jq -r .stat[0].value | tr -d " "', shell = True) + #data = subprocess.check_output('/usr/bin/v2ctl api --server=127.0.0.1:10085 StatsService.GetStats ' + "'" + 'name: "user>>>' + user + '>>>traffic>>>' + side + '"' + "'" + ' 2>/dev/null | grep value | cut -d: -f2 | tr -d " "', shell = True) except: return 0 if data.decode("utf-8") != '': @@ -1096,7 +1097,7 @@ async def status(userid: Optional[int] = Query(None), serial: Optional[str] = Qu ss_traffic = 0 v2ray_tx = 0 v2ray_rx = 0 - if os.path.isfile('/etc/v2ray/v2ray-server.json') and proxy == 'v2ray' and checkIfProcessRunning('v2ray'): + if os.path.isfile('/etc/v2ray/v2ray-server.json') and 'v2ray' in proxy and checkIfProcessRunning('v2ray'): v2ray_tx = get_bytes_v2ray('tx',username) v2ray_rx = get_bytes_v2ray('rx',username) vpn = 'glorytun_tcp'