mptcp/openmptcprouter-vps-admin
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-vps-admin.git synced 2025-03-09 15:40:05 +00:00
Code Issues Releases Wiki Activity

Fix v2ray stats

Browse source
This commit is contained in:
Ycarus 2020-09-11 20:58:38 +02:00
parent 422fb4deb4
commit c399ecc384
1 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

26
omr-admin.py
View file

@ -18,6 +18,7 @@ import socket
import re import re
import hashlib import hashlib
import pathlib import pathlib
import psutil
import time import time
from pprint import pprint from pprint import pprint
from datetime import datetime, timedelta from datetime import datetime, timedelta
@ -109,12 +110,24 @@ def get_bytes_v2ray(t,user):
side="downlink" side="downlink"
else: else:
side="uplink" side="uplink"
data = subprocess.check_output('/bin/v2ray/v2ctl api --server=127.0.0.1:10085 StatsService.GetStats ' + "'" + 'name: "user>>>' + user + '>>>traffic>>>' + side + '"' + "'" + ' | grep value | cut -d: -f2 | tr -d " "', shell = True) try:
if data != '': data = subprocess.check_output('/bin/v2ray/v2ctl api --server=127.0.0.1:10085 StatsService.GetStats ' + "'" + 'name: "user>>>' + user + '>>>traffic>>>' + side + '"' + "'" + ' | grep value | cut -d: -f2 | tr -d " "', shell = True)
except:
return 0
if data.decode("utf-8") != '':
return int(data.decode("utf-8")) return int(data.decode("utf-8"))
else: else:
return 0 return 0
def checkIfProcessRunning(processName):
for proc in psutil.process_iter():
try:
if processName.lower() in proc.name().lower():
return True
except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):
pass
return False;
def file_as_bytes(file): def file_as_bytes(file):
with file: with file:
return file.read() return file.read()
@ -840,7 +853,7 @@ async def status(userid: Optional[int] = Query(None), current_user: User = Depen
ss_traffic = 0 ss_traffic = 0
v2ray_tx = 0 v2ray_tx = 0
v2ray_rx = 0 v2ray_rx = 0
if os.path.isfile('/etc/v2ray/v2ray-server.json'): if os.path.isfile('/etc/v2ray/v2ray-server.json') and checkIfProcessRunning(v2ray):
v2ray_tx = get_bytes_v2ray('tx',username) v2ray_tx = get_bytes_v2ray('tx',username)
v2ray_rx = get_bytes_v2ray('rx',username) v2ray_rx = get_bytes_v2ray('rx',username)
vpn = 'glorytun_tcp' vpn = 'glorytun_tcp'
@ -1121,8 +1134,9 @@ async def config(userid: Optional[int] = Query(None), current_user: User = Depen
modif_config_user(username, {'v2ray': v2ray_conf}) modif_config_user(username, {'v2ray': v2ray_conf})
else: else:
v2ray_conf = omr_config_data['users'][0][username]['v2ray'] v2ray_conf = omr_config_data['users'][0][username]['v2ray']
v2ray_tx = get_bytes_v2ray('tx',username) if checkIfProcessRunning('v2ray'):
v2ray_rx = get_bytes_v2ray('rx',username) v2ray_tx = get_bytes_v2ray('tx',username)
v2ray_rx = get_bytes_v2ray('rx',username)
LOG.debug('Get config... mptcp') LOG.debug('Get config... mptcp')
mptcp_enabled = os.popen('sysctl -n net.mptcp.mptcp_enabled').read().rstrip() mptcp_enabled = os.popen('sysctl -n net.mptcp.mptcp_enabled').read().rstrip()
@ -1622,7 +1636,7 @@ def proxy(*, proxyconfig: Proxy, current_user: User = Depends(get_current_user))
return {'result': 'error', 'reason': 'Invalid parameters', 'route': 'proxy'} return {'result': 'error', 'reason': 'Invalid parameters', 'route': 'proxy'}
os.system('echo ' + proxy + ' > /etc/openmptcprouter-vps-admin/current-proxy') os.system('echo ' + proxy + ' > /etc/openmptcprouter-vps-admin/current-proxy')
modif_config_user(current_user.username, {'proxy': proxy}) modif_config_user(current_user.username, {'proxy': proxy})
current_user.proxy = proxy #current_user.proxy = proxy
set_lastchange() set_lastchange()
return {'result': 'done', 'reason': 'changes applied'} return {'result': 'done', 'reason': 'changes applied'}