update version

This reverts commit 414a67c10d.

app/bot.php

@@ -13,6 +13,7 @@ class Bot
     public $mtu;
     public $logs;
     public $reg;
+    public $pool;
 
     public function __construct($key, $i18n)
     {
@@ -161,6 +162,9 @@ class Bot
             case preg_match('~^/switchBanIp$~', $this->input['callback'], $m):
                 $this->switchBanIp();
                 break;
+            case preg_match('~^/setIpLimit$~', $this->input['callback'], $m):
+                $this->setIpLimit();
+                break;
             case preg_match('~^/searchLogs (.+)$~', $this->input['message'], $m):
                 $this->searchLogs($m[1]);
                 break;
@@ -238,6 +242,7 @@ class Bot
                 break;
             case preg_match('~^/id$~', $this->input['message'], $m):
                 $this->send($this->input['chat'], $this->input['from'], $this->input['message_id']);
+                $this->send($this->input['chat'], $this->input['chat'], $this->input['message_id']);
                 break;
             case preg_match('~^/adguardChBr$~', $this->input['callback'], $m):
                 $this->adguardChBr();
@@ -296,7 +301,7 @@ class Bot
             case preg_match('~^/delLog (?P<arg>\d+(?:_(?:-)?\d+)?)$~', $this->input['callback'], $m):
                 $this->delLog(...explode('_', $m['arg']));
                 break;
-            case preg_match('~^/debug$~', $this->input['callback'], $m):
+            case preg_match('~^/debug$~', $this->input['message'], $m):
                 $this->debug();
                 break;
             case preg_match('~^/backup$~', $this->input['callback'], $m):
@@ -377,6 +382,12 @@ class Bot
             case preg_match('~^/renameXrUser (\d+)$~', $this->input['callback'], $m):
                 $this->renameXrUser($m[1]);
                 break;
+            case preg_match('~^/resetXrUser (\d+)$~', $this->input['callback'], $m):
+                $this->resetXrUser($m[1]);
+                break;
+            case preg_match('~^/resetXrStats$~', $this->input['callback'], $m):
+                $this->resetXrStats();
+                break;
             case preg_match('~^/v2ray$~', $this->input['callback'], $m):
                 $this->v2ray();
                 break;
@@ -540,6 +551,9 @@ class Bot
             case preg_match('~^/xtlsprocess(?: (\d+))?$~', $this->input['callback'], $m):
                 $this->xtlsprocess($m[1] ?: 0);
                 break;
+            case preg_match('~^/xtlssubnet(?: (\d+))?$~', $this->input['callback'], $m):
+                $this->xtlssubnet($m[1] ?: 0);
+                break;
             case preg_match('~^/xtlsrulesset(?: (\d+))?$~', $this->input['callback'], $m):
                 $this->xtlsrulesset($m[1] ?: 0);
                 break;
@@ -570,6 +584,9 @@ class Bot
             case preg_match('~^/changeFakeDomain$~', $this->input['callback'], $m):
                 $this->changeFakeDomain();
                 break;
+            case preg_match('~^/autoCleanLogs$~', $this->input['callback'], $m):
+                $this->autoCleanLogs();
+                break;
             case preg_match('~^/selfFakeDomain$~', $this->input['callback'], $m):
                 $this->selfFakeDomain();
                 break;
@@ -667,13 +684,84 @@ class Bot
         }
     }
 
-    public function restartXray($c)
+    public function restartXray($c, $norestart = false)
     {
         $c['inbounds'][0]['settings']['clients'] = array_values($c['inbounds'][0]['settings']['clients']);
         $c['log']['access'] = '/logs/xray';
-        $this->ssh('pkill xray', 'xr');
-        file_put_contents('/config/xray.json', json_encode($c, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES));
-        $this->ssh('xray run -config /xray.json > /dev/null 2>&1 &', 'xr');
+        foreach ($c['inbounds'] as $v) {
+            if ($v['tag'] == 'api') {
+                $inbound = true;
+                break;
+            }
+        }
+        if (empty($inbound)) {
+            $c['inbounds'][] = [
+                "listen"   => "127.0.0.1",
+                "port"     => 8080,
+                "protocol" => "dokodemo-door",
+                "settings" => [
+                    "address" => "127.0.0.1"
+                ],
+                "tag" => "api"
+            ];
+        }
+        foreach ($c['routing']['rules'] as $v) {
+            if ($v['outboundTag'] == 'api') {
+                $rule = true;
+                break;
+            }
+        }
+        if (empty($rule)) {
+            $c['routing']['rules'][] = [
+                "inboundTag"  => ["api"],
+                "outboundTag" => "api",
+                "type"        => "field"
+            ];
+        }
+        $c['stats'] = new stdClass();
+        $c['api'] = [
+            'services' => ['StatsService'],
+            'tag'      => 'api'
+        ];
+        $l = new stdClass();
+        $l->{'0'} = [
+            "statsUserUplink"   => true,
+            "statsUserDownlink" => true
+        ];
+        $c['policy']['levels'] = $l;
+        $c['policy']['system'] = [
+            "statsInboundUplink"    => true,
+            "statsInboundDownlink"  => true,
+            "statsOutboundUplink"   => true,
+            "statsOutboundDownlink" => true
+        ];
+        if (empty($norestart)) {
+            $this->collectSession();
+            file_put_contents('/config/xray.json', json_encode($c, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES));
+            $this->ssh('pkill xray', 'xr');
+            $this->ssh('xray run -config /xray.json > /dev/null 2>&1 &', 'xr');
+        } else {
+            file_put_contents('/config/xray.json', json_encode($c, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES));
+        }
+    }
+
+    public function collectSession() {
+        $p = $this->getXrayStats();
+        $p['global'] = [
+            'download' => $p['global']['download'] + $p['session']['download'],
+            'upload'   => $p['global']['upload'] + $p['session']['upload'],
+        ];
+        $p['session'] = [
+            'download' => 0,
+            'upload'   => 0,
+        ];
+        foreach ($p['clients'] as $k => $v) {
+            $p['clients'][$k]['global']['download']  += $v['session']['download'];
+            $p['clients'][$k]['session']['download']  = 0;
+            $p['clients'][$k]['global']['upload']    += $v['session']['upload'];
+            $p['clients'][$k]['session']['upload']    = 0;
+        }
+        $this->setXrayStats($p);
     }
 
     public function linkMtproto()
@@ -939,7 +1027,7 @@ class Bot
             $this->input['chat'],
             "@{$this->input['username']} enter name",
             $this->input['message_id'],
-            reply: 'enter password',
+            reply: 'enter name:uuid [,name:uuid]',
         );
         $_SESSION['reply'][$r['result']['message_id']] = [
             'start_message'  => $this->input['message_id'],
@@ -1249,12 +1337,40 @@ class Bot
             $this->shutdownClientXr();
             $this->checkVersion();
             $this->checkBackup($period);
+            $this->checkLogs($period);
             $this->checkCert();
             $this->autoAnalyzeLogs();
+            $this->xrayStatsUser();
             sleep($period);
         }
     }
 
+    public function xrayStatsUser()
+    {
+        try {
+            $x  = $this->getXray();
+            $td = json_decode($this->ssh('xray api stats --server=127.0.0.1:8080 -name "inbound>>>vless_tls>>>traffic>>>downlink" 2>&1', 'xr'), true)['stat']['value'] ?: 0;
+            $tu = json_decode($this->ssh('xray api stats --server=127.0.0.1:8080 -name "inbound>>>vless_tls>>>traffic>>>uplink" 2>&1', 'xr'), true)['stat']['value'] ?: 0;
+            $p  = $this->getXrayStats();
+            $p['session'] = [
+                'download' => $td,
+                'upload'   => $tu,
+            ];
+            if (!empty($users = $x['inbounds'][0]['settings']['clients'])) {
+                foreach ($users as $k => $v) {
+                    $d = json_decode($this->ssh('xray api stats --server=127.0.0.1:8080 -name "user>>>' . $v['email'] . '>>>traffic>>>downlink" 2>&1', 'xr'), true)['stat']['value'] ?: 0;
+                    $u = json_decode($this->ssh('xray api stats --server=127.0.0.1:8080 -name "user>>>' . $v['email'] . '>>>traffic>>>uplink" 2>&1', 'xr'), true)['stat']['value'] ?: 0;
+                    $p['users'][$k]['session'] = [
+                        'download' => $d,
+                        'upload'   => $u,
+                    ];
+                }
+            }
+            $this->setXrayStats($p);
+        } catch (\Throwable $th) {
+        }
+    }
+
     public function autoAnalyzeLogs()
     {
         try {
@@ -1321,6 +1437,26 @@ class Bot
         }
     }
 
+    public function checkLogs($delta)
+    {
+        $c = $this->getPacConf();
+        if (!empty($c['autocleanlogs'])) {
+            $now = strtotime(date('Y-m-d H:i:s'));
+            [$start, $period] = explode('/', $c['autocleanlogs']);
+            $start  = strtotime(trim($start));
+            $period = strtotime(trim($period), 0);
+            if (
+                !empty($start)
+                && !empty($period)
+                && empty($this->backup)
+                && $now - $start >= 0
+                && (($now - $start) % $period < $delta)
+            ) {
+                $this->cleanLog();
+            }
+        }
+    }
+
     public function cleanQueue(): void
     {
         $r = $this->request('deleteWebhook', []);
@@ -1533,7 +1669,7 @@ class Bot
             'ocu'           => file_get_contents('/config/ocserv.passwd'),
             'ss'            => $this->getSSConfig(),
             'sl'            => $this->getSSLocalConfig(),
-
+            'xraystats'     => $this->getXrayStats(),
         ];
         return json_encode($conf, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
     }
@@ -1646,6 +1782,12 @@ class Bot
                 $this->adguardXrayClients();
                 $this->setUpstreamDomain($json['pac']['transport'] != 'Reality' ? 't' : ($json['pac']['reality']['domain'] ?: $json['xray']['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0]));
             }
+            // xraystats
+            if (!empty($json['xraystats'])) {
+                $out[] = 'update xray stats';
+                $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
+                $this->setXrayStats($json['xraystats']);
+            }
             // ocserv
             if (!empty($json['oc'])) {
                 $out[] = 'update ocserv';
@@ -2281,6 +2423,21 @@ class Bot
         ];
     }
 
+    public function setIpLimit()
+    {
+        $r = $this->send(
+            $this->input['chat'],
+            "@{$this->input['username']} enter seconds and count ip",
+            $this->input['message_id'],
+            reply: 'enter seconds:count_ip',
+        );
+        $_SESSION['reply'][$r['result']['message_id']] = [
+            'start_message' => $this->input['message_id'],
+            'callback'      => 'switchIpLimit',
+            'args'          => [],
+        ];
+    }
+
     public function addLinkDomain()
     {
         $r = $this->send(
@@ -2612,15 +2769,15 @@ DNS-over-HTTPS with IP:
                 $this->xtlswarp();
                 break;
             case 'processlist':
-                $this->xrayUpdateRules();
                 $this->xtlsprocess();
                 break;
             case 'packagelist':
-                $this->xrayUpdateRules();
                 $this->xtlsapp();
                 break;
+            case 'subnetlist':
+                $this->xtlssubnet();
+                break;
             case 'rulessetlist':
-                $this->xrayUpdateRules();
                 $this->xtlsrulesset();
                 break;
             case 'white':
@@ -3435,8 +3592,6 @@ DNS-over-HTTPS with IP:
                             'text'          => $this->i18n('delete'),
                             'callback_data' => "/delete {$client}_$page",
                         ],
-                    ],
-                    [
                         [
                             'text'          => $this->i18n('back'),
                             'callback_data' => "/menu wg $page",
@@ -3670,6 +3825,12 @@ DNS-over-HTTPS with IP:
             case 'packagelist':
                 $dir = 'PACKAGE';
                 break;
+            case 'processlist':
+                $dir = 'PROCESS';
+                break;
+            case 'subnetlist':
+                $dir = 'SUBNET';
+                break;
             case 'rulessetlist':
                 $dir = 'rulesset';
                 break;
@@ -3716,6 +3877,22 @@ DNS-over-HTTPS with IP:
                     ],
                 ];
                 break;
+            case 'processlist':
+                $data[] = [
+                    [
+                        'text'          => $this->i18n('back'),
+                        'callback_data' => "/xtlsprocess",
+                    ],
+                ];
+                break;
+            case 'subnetlist':
+                $data[] = [
+                    [
+                        'text'          => $this->i18n('back'),
+                        'callback_data' => "/xtlssubnet",
+                    ],
+                ];
+                break;
             case 'rulessetlist':
                 $data[] = [
                     [
@@ -3863,7 +4040,25 @@ DNS-over-HTTPS with IP:
         $text[] = "Menu -> " . $this->i18n('xray') . ' -> ' . $this->i18n('routes') . ' -> process list';
 
         [$data] = $this->listPac('processlist', $page, 'xtlsprocess');
-        $p      = $this->getPacConf();
+        $data[] = [
+            [
+                'text'          => $this->i18n('back'),
+                'callback_data' => "/routes",
+            ],
+        ];
+        $this->update(
+            $this->input['chat'],
+            $this->input['message_id'],
+            implode("\n", $text ?: ['...']),
+            $data ?: false,
+        );
+    }
+
+    public function xtlssubnet($page = 0)
+    {
+        $text[] = "Menu -> " . $this->i18n('xray') . ' -> ' . $this->i18n('routes') . ' -> subnet';
+
+        [$data] = $this->listPac('subnetlist', $page, 'xtlssubnet');
         $data[] = [
             [
                 'text'          => $this->i18n('back'),
@@ -3919,7 +4114,7 @@ DNS-over-HTTPS with IP:
                 }
                 $data[] = [
                     [
-                        'text'          => $this->i18n($v ? 'on' : 'off') . ' ' . ($basename ? basename($k) . ' ' : '') . (in_array($type, ['rulessetlist', 'packagelist', 'processlist']) ? $k : idn_to_utf8($k)),
+                        'text'          => $this->i18n($v ? 'on' : 'off') . ' ' . ($basename ? basename($k) . ' ' : '') . (in_array($type, ['rulessetlist', 'packagelist', 'processlist', 'subnetlist']) ? $k : idn_to_utf8($k)),
                         'callback_data' => "/change$type " . ($i + $page * $this->limit),
                     ],
                     [
@@ -4119,12 +4314,6 @@ DNS-over-HTTPS with IP:
             'main' => [
                 'text' => implode("\n", $main ?: []),
                 'data' => [
-                    [
-                        [
-                            'text'          => $this->i18n('config'),
-                            'callback_data' => "/menu config",
-                        ],
-                    ],
                     [
                         [
                             'text'          => $this->i18n($this->getPacConf()['amnezia'] ? 'amnezia' : 'wg_title'),
@@ -4175,10 +4364,16 @@ DNS-over-HTTPS with IP:
                             'callback_data' => "/pacMenu 0",
                         ],
                     ],
+                    [
+                        [
+                            'text'          => $this->i18n('config'),
+                            'callback_data' => "/menu config",
+                        ],
+                    ],
                     [
                         [
                             'text' => $this->i18n('chat'),
-                            'url'  => "https://t.me/+Wfxg6-nrokBlMmYy",
+                            'url'  => base64_decode('aHR0cHM6Ly90Lm1lLytXZnhnNi1ucm9rQmxNbVl5'),
                         ],
                         [
                             'text' => $this->i18n('donate'),
@@ -4257,6 +4452,21 @@ DNS-over-HTTPS with IP:
         $this->ipMenu();
     }
 
+    public function switchIpLimit($limit)
+    {
+        $limit = explode(':', $limit);
+        $c = $this->getPacConf();
+        if ((int) $limit[0] <= 0) {
+            unset($c['ip_limit']);
+            unset($c['ip_count']);
+        } else {
+            $c['ip_limit'] = (int) $limit[0];
+            $c['ip_count'] = (int) $limit[1] ?: 1;
+        }
+        $this->setPacConf($c);
+        $this->xray();
+    }
+
     public function switchSilence()
     {
         $c = $this->getPacConf();
@@ -4271,12 +4481,6 @@ DNS-over-HTTPS with IP:
         $pac    = $this->getPacConf();
         $d      = count($pac['deny'] ?: []);
         $w      = count($pac['white'] ?: []);
-        $data[] = [
-            [
-                'text'          => $this->i18n('logs'),
-                'callback_data' => "/logs",
-            ],
-        ];
         $data[] = [
             [
                 'text'          => $this->i18n('autoscan') . ': ' . ($pac['autoscan'] ? $this->getTime(strtotime(($pac['autoscan_timeout'] ?: 3600) . ' seconds')) : $this->i18n('off')),
@@ -4426,7 +4630,6 @@ DNS-over-HTTPS with IP:
         }
 
         $t = [
-            $this->suspicious('~\d+\.\d+\.\d+\.\d+.+200\s\d+\s0$~', '/logs/upstream_access', $xr, 'possibly a Reality Degenerate'),
             $this->suspicious($this->reg, '/logs/nginx_default_access', $xr, 'possibly a scanner', true),
             $this->suspicious($this->reg, '/logs/nginx_domain_access', $xr, 'possibly a scanner', true),
         ];
@@ -4438,6 +4641,15 @@ DNS-over-HTTPS with IP:
             }
         }
 
+        $r = $this->suspicious('~\d+\.\d+\.\d+\.\d+.+200\s\d+\s0$~', '/logs/upstream_access', $xr, 'possibly a Reality Degenerate');
+        if (!empty($r)) {
+            foreach ($r as $k => $v) {
+                if (count($v) > 30) {
+                    $ip[$k] = $v;
+                }
+            }
+        }
+
         if (!empty($return)) {
             return $ip;
         }
@@ -5117,35 +5329,43 @@ DNS-over-HTTPS with IP:
         $this->menu('oc');
     }
 
-    public function addxrus($user)
+    public function addxrus($users)
     {
-        $c    = $this->getXray();
-        $p    = $this->getPacConf();
-        $uuid = trim($this->ssh('xray uuid', 'xr'));
-        $c['inbounds'][0]['settings']['clients'][] = $p['transport'] != 'Reality' ? [
-                'id'    => $uuid,
-                'email' => $user,
-            ] : [
-                'id'    => $uuid,
-                'flow'  => 'xtls-rprx-vision',
-                'email' => $user,
-        ];
+        $c     = $this->getXray();
+        $p     = $this->getPacConf();
+        $users = array_map(fn ($e) => trim($e), explode(',', $users));
+        $users = array_map(fn ($e) => explode(':', $e), $users);
+        foreach ($users as $user) {
+            $uuid = $user[1] ?: trim($this->ssh('xray uuid', 'xr'));
+            $c['inbounds'][0]['settings']['clients'][] = $p['transport'] != 'Reality' ? [
+                    'id'    => $uuid,
+                    'email' => $user[0],
+                ] : [
+                    'id'    => $uuid,
+                    'flow'  => 'xtls-rprx-vision',
+                    'email' => $user[0],
+            ];
+        }
         $this->restartXray($c);
         $this->adguardXrayClients();
-        $this->userXr(count($c['inbounds'][0]['settings']['clients']) - 1);
+        if (count($users) == 1) {
+            $this->userXr(count($c['inbounds'][0]['settings']['clients']) - 1);
+        } else {
+            $this->xray();
+        }
     }
 
     public function setTimerXr($time, $i)
     {
-        $time = strtotime($time);
-        if ($time === false) {
-            $this->send($this->input['chat'], 'wrong format');
-            return;
-        }
         $c = $this->getXray();
         if (empty($time)) {
             unset($c['inbounds'][0]['settings']['clients'][$i]['time']);
         } else {
+            $time = strtotime($time);
+            if ($time === false) {
+                $this->send($this->input['chat'], 'wrong format');
+                return;
+            }
             if (!empty($c['inbounds'][0]['settings']['clients'][$i]['off'])) {
                 $this->switchXr($i, 1);
                 $c = $this->getXray();
@@ -5182,6 +5402,34 @@ DNS-over-HTTPS with IP:
         $this->userXr($i);
     }
 
+    public function getXrayStats()
+    {
+        return json_decode(file_get_contents('/config/xray.stats'), true) ?: [];
+    }
+
+    public function setXrayStats($x)
+    {
+        file_put_contents('/config/xray.stats', json_encode($x));
+    }
+
+    public function resetXrUser($i)
+    {
+        $c = $this->getXrayStats();
+        $c['clients'][$i]['global'] = [
+            'download' => 0,
+            'upload'   => 0,
+        ];
+        $this->restartXray($this->getXray());
+        $this->userXr($i);
+    }
+
+    public function resetXrStats()
+    {
+        $this->restartXray($this->getXray());
+        $this->setXrayStats([]);
+        $this->xray();
+    }
+
     public function listXr($i)
     {
         $c = $this->getPacConf();
@@ -5314,14 +5562,7 @@ DNS-over-HTTPS with IP:
 
     public function downloadOrigin($type)
     {
-        switch ($type) {
-            case 'sing':
-                $f = new \CURLFile('/config/sing.json', 'application/json', 'origin.json');
-                break;
-            case 'v2ray':
-                $f = new \CURLFile('/config/v2ray.json', 'application/json', 'origin.json');
-                break;
-        }
+        $f = new \CURLFile("/config/$type.json", 'application/json', 'origin.json');
         $this->sendFile($this->input['chat'], $f);
     }
 
@@ -5355,6 +5596,7 @@ DNS-over-HTTPS with IP:
             <code>~pac~</code>
             <code>~package~</code>
             <code>~process~</code>
+            <code>~subnet~</code>
             <code>~block~</code>
             <code>~warp~</code>
             <code>~dns~</code>
@@ -5363,6 +5605,7 @@ DNS-over-HTTPS with IP:
             <code>~directdomain~</code>
             <code>~cdndomain~</code>
             <code>~short_id~</code>
+            <code>~email~</code>
             <code>~public_key~</code>
             <code>~server_name~</code>
             <code>~ip~</code>
@@ -5456,6 +5699,25 @@ DNS-over-HTTPS with IP:
         $this->xray();
     }
 
+    public function getBytes($bytes)
+    {
+        $t = [
+            'B',
+            'KB',
+            'MB',
+            'GB',
+            'TB',
+        ];
+        foreach ($t as $k => $v) {
+            if ($k == 0) {
+                continue;
+            }
+            if ($bytes / (1024 ** $k) < 1) {
+                return round($bytes / (1024 ** ($k - 1)), 2) . " {$t[$k - 1]}";
+            }
+        }
+    }
+
     public function xray($page = 0)
     {
         if (!$this->ssh('pgrep xray', 'xr')) {
@@ -5468,6 +5730,15 @@ DNS-over-HTTPS with IP:
             $text[] = "fake domain: <code>$fake</code>";
         }
         $text[] = 'transport: ' . ($p['transport'] ?: 'Websocket');
+        $st = $this->getXrayStats();
+        $td = $this->getBytes($st['global']['download'] + $st['session']['download']);
+        $tu = $this->getBytes($st['global']['upload'] + $st['session']['upload']);
+        $data[] = [
+            [
+                'text'          => $this->i18n('reset stats') . ": ↓$td  ↑$tu",
+                'callback_data' => '/resetXrStats',
+            ],
+        ];
         $data[] = [
             [
                 'text'          => $this->i18n('main outbound name: ') . ($p['outbound'] ?: 'proxy'),
@@ -5480,6 +5751,7 @@ DNS-over-HTTPS with IP:
                 'callback_data' => '/addLinkDomain',
             ],
         ];
+        $ip_count = $p['ip_count'] ?: 1;
         $data[] = [
             [
                 'text'          => $this->i18n('Reality') . ' ' . ($p['transport'] == 'Reality' ? $this->i18n('on') : $this->i18n('off')),
@@ -5489,6 +5761,10 @@ DNS-over-HTTPS with IP:
                 'text'          => $this->i18n('Websocket') . ' ' . ($p['transport'] != 'Reality' ? $this->i18n('on') : $this->i18n('off')),
                 'callback_data' => "/changeTransport 1",
             ],
+            [
+                'text'          => $this->i18n('ip limit') . ' ' . ($p['ip_limit'] ? ": {$p['ip_limit']} sec & $ip_count" : $this->i18n('off')),
+                'callback_data' => "/setIpLimit",
+            ],
         ];
         if ($p['transport'] == 'Reality') {
             $data[] = [
@@ -5538,10 +5814,12 @@ DNS-over-HTTPS with IP:
         $page    = $page == -2 ? $all - 1 : $page;
         $clients = $page != -1 ? array_slice($clients, $page * $this->limit, $this->limit, true) : $clients;
         foreach ($clients as $k => $v) {
-            $time   = $v['time'] ? $this->getTime($v['time']) : '';
-            $data[] = [
+            $download = $this->getBytes($st['users'][$k]['global']['download'] + $st['users'][$k]['session']['download']);
+            $upload   = $this->getBytes($st['users'][$k]['global']['upload'] + $st['users'][$k]['session']['upload']);
+            $time     = $v['time'] ? $this->getTime($v['time']) : '';
+            $data[]   = [
                 [
-                    'text'          => "{$v['email']}" . ($time ? ": $time" : ''),
+                    'text'          => "{$v['email']}" . ($time ? ": $time" : '') . " (↓$download  ↑$upload)",
                     'callback_data' => "/userXr $k",
                 ],
             ];
@@ -5591,9 +5869,6 @@ DNS-over-HTTPS with IP:
     {
         $text[] = "Menu -> " . $this->i18n('xray') . ' -> routes';
 
-        $p = $this->getPacConf();
-        $outbound = $p['outbound'] ?: 'proxy';
-
         $data = [
             [[
                 'text'          => $this->i18n('block'),
@@ -5607,6 +5882,10 @@ DNS-over-HTTPS with IP:
                 'text'          => 'domains',
                 'callback_data' => "/xtlsproxy",
             ]],
+            [[
+                'text'          => "subnet",
+                'callback_data' => "/xtlssubnet",
+            ]],
             [[
                 'text'          => 'process',
                 'callback_data' => "/xtlsprocess",
@@ -5674,6 +5953,79 @@ DNS-over-HTTPS with IP:
         return 'off';
     }
 
+    public function analyzeXray()
+    {
+        while (true) {
+            if (!empty($this->getPacConf()['ip_limit'])) {
+                $this->pool = [];
+                $log = '/logs/xray';
+                $r   = fopen($log, 'r');
+                fseek($r, 0, SEEK_END);
+                while (true) {
+                    $pac = $this->getPacConf();
+                    if (empty($pac['ip_limit'])) {
+                        break;
+                    }
+                    $currentPosition = ftell($r);
+                    clearstatcache();
+                    $fileSize = filesize($log);
+                    if ($fileSize > $currentPosition) {
+                        fseek($r, $currentPosition); // сброс флага feof
+                        while (!feof($r)) {
+                            $line = fgets($r);
+                            if ($line !== false) {
+                                $this->frequencyAnalyze($line, $pac);
+                            }
+                        }
+                    }
+                    sleep(1);
+                }
+                fclose($r);
+            }
+            sleep(10);
+        }
+    }
+
+    public function frequencyAnalyze($line, $pac)
+    {
+        preg_match('~(?<date>.+)\sfrom\s(?<ip>\d+\.\d+\.\d+\.\d+)(?=.+email:\s(?<email>.+))~', $line, $m);
+        if (!empty($this->pool)) {
+            foreach ($this->pool as $i => $j) {
+                if (!empty($j['ips'])) {
+                    foreach ($j['ips'] as $k => $v) {
+                        if ($v + $pac['ip_limit'] < time()) {
+                            unset($this->pool[$i]['ips'][$k]);
+                        }
+                    }
+                }
+            }
+        }
+        if (!empty($m['ip']) && !empty($m['email'])) {
+            $ip = ip2long($m['ip']);
+            if (!empty($this->pool[$m['email']]['ip']) && $this->pool[$m['email']]['ip'] != $ip) {
+                $this->pool[$m['email']]['ips'][$ip] = time();
+            }
+            if (!empty($this->pool[$m['email']]['ips']) && count($this->pool[$m['email']]['ips']) > ($pac['ip_count'] ?: 1)) {
+                $xr = $this->getXray();
+                foreach ($xr['inbounds'][0]['settings']['clients'] as $k => $v) {
+                    if (empty($v['off']) && $v['email'] == $m['email']) {
+                        require __DIR__ . '/config.php';
+                        foreach ($c['admin'] as $k => $v) {
+                            $this->send($v, "vless: {$m['email']} is turned off (limit by one IP)");
+                        }
+                        unset($this->pool[$m['email']]);
+                        $this->switchXr($k, 1);
+                        $flag = 1;
+                        break;
+                    }
+                }
+            }
+            if (empty($flag)) {
+                $this->pool[$m['email']]['ip'] = $ip;
+            }
+        }
+    }
+
     public function offWarp()
     {
         $p    = $this->getPacConf();
@@ -5828,8 +6180,16 @@ DNS-over-HTTPS with IP:
         $text[] = "sing-box config: <pre><code>$si</code></pre>";
         $text[] = "mihomo config: <pre><code>$cl</code></pre>";
 
-        $text[] = "sing-box windows: <a href='$scheme://{$domain}/pac$hash?t=si&r=w&s={$c['id']}'>windows service</a>";
-
+        $text[]   = "sing-box windows: <a href='$scheme://{$domain}/pac$hash?t=si&r=w&s={$c['id']}'>windows service</a>";
+        $st       = $this->getXrayStats();
+        $download = $this->getBytes($st['users'][$i]['global']['download'] + $st['users'][$i]['session']['download']);
+        $upload   = $this->getBytes($st['users'][$i]['global']['upload'] + $st['users'][$i]['session']['upload']);
+        $data[]   = [
+            [
+                'text'          => $this->i18n('reset stats') . ": ↓$download  ↑$upload",
+                'callback_data' => "/resetXrUser $i",
+            ],
+        ];
         $data[] = [
             [
                 'text'    => $this->i18n('v2ray'),
@@ -6125,12 +6485,14 @@ DNS-over-HTTPS with IP:
             '"~warp~"'       => json_encode(array_keys(array_filter($pac['warplist'] ?: []))),
             '"~process~"'    => json_encode(array_keys(array_filter($pac['processlist'] ?: []))),
             '"~package~"'    => json_encode(array_keys(array_filter($pac['packagelist'] ?: []))),
+            '"~subnet~"'     => json_encode(array_keys(array_filter($pac['subnetlist'] ?: []))),
             '~dns~'          => "https://$domain/dns-query$hash/$uid",
             '~uid~'          => $uid,
             '~domain~'       => $domain,
             '~directdomain~' => $pac['domain'],
             '~cdndomain~'    => $pac['linkdomain'],
             '~short_id~'     => $xr['inbounds'][0]['streamSettings']['realitySettings']['shortIds'][0],
+            '~email~'        => $email,
             '~public_key~'   => $pac['xray'],
             '~server_name~'  => $xr['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0],
             '~ip~'           => $this->ip,
@@ -6152,7 +6514,7 @@ DNS-over-HTTPS with IP:
                 $c['route'] = $this->createRuleSet($c['route'], $uid, $domain);
                 if (!empty($c['route']['rules'])) {
                     foreach ($c['route']['rules'] as $k => $v) {
-                        if (count($v) < 2) {
+                        if (count($v) == 1 && array_key_exists('outbound', $v)) {
                             unset($c['route']['rules'][$k]);
                         }
                     }
@@ -6234,6 +6596,9 @@ DNS-over-HTTPS with IP:
                             case 'domain':
                                 echo yaml_emit(['payload' => array_map(fn($e) => "+.$e", $v['list'])]);
                                 break;
+                            case 'ipcidr':
+                                echo yaml_emit(['payload' => array_map(fn($e) => $e, $v['list'])]);
+                                break;
 
                             default:
                                 echo yaml_emit(['payload' => array_map(fn($e) => "PROCESS-NAME,$e", $v['list'])]);
@@ -6430,7 +6795,13 @@ DNS-over-HTTPS with IP:
 
     public function getHashBot()
     {
-        return substr(hash('sha256', $this->key), 0, 8);
+        $p = $this->getPacConf();
+        if (!empty($p['hashbot'])) {
+            return $p['hashbot'];
+        }
+        $p['hashbot'] = substr(hash('sha256', $this->key), 0, 8);
+        $this->setPacConf($p);
+        return $p['hashbot'];
     }
 
     public function cloakNginx()
@@ -6830,7 +7201,11 @@ DNS-over-HTTPS with IP:
                 'callback_data' => "/ports",
             ],
             [
-                'text'          => $this->i18n('IP ban & Logs'),
+                'text'          => $this->i18n('logs'),
+                'callback_data' => "/logs",
+            ],
+            [
+                'text'          => $this->i18n('IP ban'),
                 'callback_data' => "/ipMenu",
             ],
         ];
@@ -6919,6 +7294,7 @@ DNS-over-HTTPS with IP:
         $text[] = 'Settings -> Ports';
         $f      = '/docker/compose';
         $c      = yaml_parse_file($f)['services'];
+        $pac = $this->getPacConf();
         $data   = [
             [[
                 'text'          => $this->i18n($c['wg'] ? 'on' : 'off') . ' ' . getenv('WGPORT') . ' Wireguard',
@@ -6941,6 +7317,14 @@ DNS-over-HTTPS with IP:
                 'callback_data' => "/hidePort ss",
             ]],
         ];
+        if (!empty($pac['restart'])) {
+            $data[] = [
+                [
+                    'text'          => $this->i18n('restart'),
+                    'callback_data' => "/restart",
+                ],
+            ];
+        }
         $data[] = [
             [
                 'text'          => $this->i18n('back'),
@@ -6976,7 +7360,10 @@ DNS-over-HTTPS with IP:
         } else {
             yaml_emit_file($f, $c);
         }
-        $this->restart();
+        $pac = $this->getPacConf();
+        $pac['restart'] = 1;
+        $this->setPacConf($pac);
+        $this->ports();
     }
 
     public function branches()
@@ -7014,6 +7401,7 @@ DNS-over-HTTPS with IP:
 
     public function logs()
     {
+        $p = $this->getPacConf();
         foreach (scandir('/logs/') as $k => $v) {
             if (!preg_match('~^\.~', $v)) {
                 $size   = filesize("/logs/$v");
@@ -7035,10 +7423,24 @@ DNS-over-HTTPS with IP:
                 'callback_data' => "/cleanLog",
             ],
         ];
+        $autocleanlogs = array_filter(explode('/', $p['autocleanlogs']));
+        if (!empty($autocleanlogs)) {
+            if (!empty(strtotime($autocleanlogs[0])) && !empty(strtotime($autocleanlogs[1]))) {
+                $autocleanlogs = "{$autocleanlogs[0]} start / {$autocleanlogs[1]} period";
+            } else {
+                $autocleanlogs = $this->i18n('off') . " {$p['autocleanlogs']} - wrong format";
+            }
+        }
+        $data[] = [
+            [
+                'text'          => $this->i18n('autoclean'). ': ' . ($autocleanlogs ?: $this->i18n('off')),
+                'callback_data' => "/autoCleanLogs",
+            ],
+        ];
         $data[] = [
             [
                 'text'          => $this->i18n('back'),
-                'callback_data' => "/ipMenu",
+                'callback_data' => "/menu config",
             ],
         ];
         $this->update(
@@ -7113,6 +7515,9 @@ DNS-over-HTTPS with IP:
         }
         file_put_contents('/update/message', '');
         file_put_contents('/update/reload_message', '');
+        $pac = $this->getPacConf();
+        unset($pac['restart']);
+        $this->setPacConf($pac);
     }
 
     public function backup()
@@ -7131,6 +7536,22 @@ DNS-over-HTTPS with IP:
         ];
     }
 
+    public function autoCleanLogs()
+    {
+        $r = $this->send(
+            $this->input['chat'],
+            "@{$this->input['username']} enter like: start / period",
+            $this->input['message_id'],
+            reply: 'enter like: now / 12 hours',
+        );
+        $_SESSION['reply'][$r['result']['message_id']] = [
+            'start_message'  => $this->input['message_id'],
+            'start_callback' => $this->input['callback_id'],
+            'callback'       => 'setAutoCleanLogs',
+            'args'           => [],
+        ];
+    }
+
     public function changeFakeDomain()
     {
         $r = $this->send(
@@ -7264,6 +7685,24 @@ DNS-over-HTTPS with IP:
         $this->menu('config');
     }
 
+    public function setAutoCleanLogs($text)
+    {
+        $text = trim($text);
+        $c    = $this->getPacConf();
+        if (empty($text)) {
+            $c['autocleanlogs'] = '';
+        } else {
+            [$start, $period] = explode('/', $text);
+            if (!empty(strtotime($start)) && !empty(strtotime($period))) {
+                $c['autocleanlogs'] = implode(' / ', [date('Y-m-d H:i', strtotime($start)), trim($period)]);
+            } else {
+                $this->send($this->input['from'], $this->input['message'] . ' - wrong format');
+            }
+        }
+        $this->setPacConf($c);
+        $this->logs();
+    }
+
     public function debug()
     {
         $file = __DIR__ . '/config.php';

app/i18n.php

@@ -30,7 +30,7 @@ $i = [
         'ru' => 'PAC',
     ],
     'chat'                 => [
-        'en' => 'discussion group',
+        'en' => 'chat',
         'ru' => 'чат поддержки',
     ],
     'back'                 => [

app/iplimit.php

@@ -0,0 +1,10 @@
+<?php
+
+require __DIR__ . '/timezone.php';
+
+// require __DIR__ . '/debug.php';
+require __DIR__ . '/bot.php';
+require __DIR__ . '/config.php';
+require __DIR__ . '/i18n.php';
+
+(new Bot($c['key'], $i))->analyzeXray();

config/clash.json

@@ -133,6 +133,14 @@
             "behavior": "domain",
             "name": "pac"
         },
+        {
+            "type": "RULE-SET",
+            "list": "~subnet~",
+            "action": "PROXY",
+            "interval": 30,
+            "behavior": "ipcidr",
+            "name": "subnet"
+        },
         {
             "type": "MATCH",
             "action": "DIRECT"

config/sing.json

@@ -9,12 +9,12 @@
             "tag": "tun-in",
             "domain_strategy": "prefer_ipv4",
             "interface_name": "sing-tun",
-            "address": ["172.19.0.1\/30"],
+            "address": [
+                "172.19.0.1\/30"
+            ],
             "mtu": 1400,
-            "gso": true,
             "auto_route": true,
             "strict_route": true,
-            "sniff": true,
             "endpoint_independent_nat": false,
             "stack": "mixed",
             "platform": {
@@ -27,14 +27,9 @@
         },
         {
             "type": "mixed",
-            "tag": "mixed-in",
-            "domain_strategy": "prefer_ipv4",
+            "tag": "in",
             "listen": "127.0.0.1",
-            "listen_port": 2080,
-            "tcp_fast_open": true,
-            "sniff": true,
-            "sniff_override_destination": false,
-            "users": []
+            "listen_port": 2080
         }
     ],
     "dns": {
@@ -92,23 +87,28 @@
         {
             "type": "direct",
             "tag": "direct"
-        },
-        {
-            "type": "block",
-            "tag": "block"
-        },
-        {
-            "type": "dns",
-            "tag": "dns-out"
         }
     ],
     "route": {
         "auto_detect_interface": true,
         "override_android_vpn": true,
         "rules": [
+            {
+                "action": "sniff"
+            },
             {
                 "protocol": "dns",
-                "outbound": "dns-out"
+                "action": "hijack-dns"
+            },
+            {
+                "inbound": "in",
+                "action": "resolve",
+                "strategy": "prefer_ipv4"
+            },
+            {
+                "inbound": "in",
+                "action": "sniff",
+                "timeout": "1s"
             },
             {
                 "addruleset": true,
@@ -129,6 +129,21 @@
                 ],
                 "outbound": "~outbound~"
             },
+            {
+                "addruleset": true,
+                "createruleset": [
+                    {
+                        "name": "subnet",
+                        "interval": "30s",
+                        "rules": [
+                            {
+                                "ip_cidr": "~subnet~"
+                            }
+                        ]
+                    }
+                ],
+                "outbound": "~outbound~"
+            },
             {
                 "addruleset": true,
                 "createruleset": [
@@ -172,7 +187,7 @@
                         ]
                     }
                 ],
-                "outbound": "block"
+                "action": "reject"
             },
             {
                 "addruleset": true,
@@ -192,4 +207,4 @@
         ],
         "final": "direct"
     }
-}
+}

config/v2ray.json

@@ -4,92 +4,122 @@
         "error": "",
         "loglevel": "warning"
     },
-    "inbounds": [{
-        "tag": "socks",
-        "port": 10808,
-        "listen": "127.0.0.1",
-        "protocol": "socks",
-        "sniffing": {
-            "enabled": true,
-            "destOverride": ["http", "tls"],
-            "routeOnly": false
-        },
-        "settings": {
-            "auth": "noauth",
-            "udp": true,
-            "allowTransparent": false
-        }
-    }, {
-        "tag": "http",
-        "port": 10809,
-        "listen": "127.0.0.1",
-        "protocol": "http",
-        "sniffing": {
-            "enabled": true,
-            "destOverride": ["http", "tls"],
-            "routeOnly": false
-        },
-        "settings": {
-            "auth": "noauth",
-            "udp": true,
-            "allowTransparent": false
-        }
-    }],
-    "outbounds": [{
-        "tag": "~outbound~",
-        "protocol": "vless",
-        "settings": {
-            "vnext": [{
-                "address": "~domain~",
-                "port": 443,
-                "users": [{
-                    "id": "~uid~",
-                    "alterId": 0,
-                    "email": "t@t.tt",
-                    "security": "auto",
-                    "encryption": "none",
-                    "flow": "xtls-rprx-vision"
-                }]
-            }]
-        },
-        "streamSettings": {
-            "network": "tcp",
-            "security": "reality",
-            "realitySettings": {
-                "serverName": "~server_name~",
-                "fingerprint": "chrome",
-                "show": false,
-                "publicKey": "~public_key~",
-                "shortId": "~short_id~",
-                "spiderX": ""
+    "inbounds": [
+        {
+            "tag": "socks",
+            "port": 10808,
+            "listen": "127.0.0.1",
+            "protocol": "socks",
+            "sniffing": {
+                "enabled": true,
+                "destOverride": [
+                    "http",
+                    "tls"
+                ],
+                "routeOnly": false
+            },
+            "settings": {
+                "auth": "noauth",
+                "udp": true,
+                "allowTransparent": false
             }
         },
-        "mux": {
-            "enabled": false,
-            "concurrency": -1
-        }
-    }, {
-        "tag": "direct",
-        "protocol": "freedom"
-    }, {
-        "tag": "block",
-        "protocol": "blackhole",
-        "settings": {
-            "response": {
-                "type": "http"
+        {
+            "tag": "http",
+            "port": 10809,
+            "listen": "127.0.0.1",
+            "protocol": "http",
+            "sniffing": {
+                "enabled": true,
+                "destOverride": [
+                    "http",
+                    "tls"
+                ],
+                "routeOnly": false
+            },
+            "settings": {
+                "auth": "noauth",
+                "udp": true,
+                "allowTransparent": false
             }
         }
-    }],
+    ],
+    "outbounds": [
+        {
+            "tag": "direct",
+            "protocol": "freedom"
+        },
+        {
+            "tag": "~outbound~",
+            "protocol": "vless",
+            "settings": {
+                "vnext": [
+                    {
+                        "address": "~domain~",
+                        "port": 443,
+                        "users": [
+                            {
+                                "id": "~uid~",
+                                "alterId": 0,
+                                "email": "t@t.tt",
+                                "security": "auto",
+                                "encryption": "none",
+                                "flow": "xtls-rprx-vision"
+                            }
+                        ]
+                    }
+                ]
+            },
+            "streamSettings": {
+                "network": "tcp",
+                "security": "reality",
+                "realitySettings": {
+                    "serverName": "~server_name~",
+                    "fingerprint": "chrome",
+                    "show": false,
+                    "publicKey": "~public_key~",
+                    "shortId": "~short_id~",
+                    "spiderX": ""
+                }
+            },
+            "mux": {
+                "enabled": false,
+                "concurrency": -1
+            }
+        },
+        {
+            "tag": "block",
+            "protocol": "blackhole",
+            "settings": {
+                "response": {
+                    "type": "http"
+                }
+            }
+        }
+    ],
     "routing": {
         "domainStrategy": "AsIs",
-        "rules": [{
-            "type": "field",
-            "outboundTag": "~outbound~",
-            "domain": "~pac~"
-        }, {
-            "type": "field",
-            "port": "0-65535",
-            "outboundTag": "direct"
-        }]
+        "rules": [
+            {
+                "type": "field",
+                "outboundTag": "block",
+                "domain": "~block~"
+            },
+            {
+                "type": "field",
+                "outboundTag": "~outbound~",
+                "domain": "~pac~"
+            },
+            {
+                "type": "field",
+                "outboundTag": "~outbound~",
+                "ip": "~subnet~"
+            },
+            {
+                "type": "field",
+                "outboundTag": "~outbound~",
+                "domain": "~warp~"
+            }
+        ]
     }
 }

config/xray.json

@@ -22,6 +22,15 @@
                 }
             },
             "tag": "vless_tls"
+        },
+        {
+            "listen": "127.0.0.1",
+            "port": 8080,
+            "protocol": "dokodemo-door",
+            "settings": {
+                "address": "127.0.0.1"
+            },
+            "tag": "api"
         }
     ],
     "log": {
@@ -40,6 +49,35 @@
     ],
     "routing": {
         "domainStrategy": "AsIs",
-        "rules": []
+        "rules": [
+            {
+                "inboundTag": [
+                    "api"
+                ],
+                "outboundTag": "api",
+                "type": "field"
+            }
+        ]
+    },
+    "stats": {},
+    "api": {
+        "services": [
+            "StatsService"
+        ],
+        "tag": "api"
+    },
+    "policy": {
+        "levels": {
+            "0": {
+                "statsUserUplink": true,
+                "statsUserDownlink": true
+            }
+        },
+        "system": {
+            "statsInboundUplink": true,
+            "statsInboundDownlink": true,
+            "statsOutboundUplink": true,
+            "statsOutboundDownlink": true
+        }
     }
 }

readme.md

@@ -13,8 +13,17 @@ telegram bot to manage servers (inside the bot)
 ---
 environment: ubuntu 22.04/24.04, debian 11/12
 
-### Install:
+## Install:
 
 ```shell
 wget -O- https://raw.githubusercontent.com/mercurykd/vpnbot/master/scripts/init.sh | sh -s YOUR_TELEGRAM_BOT_KEY master
 ```
+#### Restart:
+```shell
+make r
+```
+#### autoload:
+```shell
+crontab -e
+```
+add `@reboot cd /root/vpnbot && make r` and save

scripts/start_service.sh

@@ -2,4 +2,5 @@ cat /ssh/key.pub > /root/.ssh/authorized_keys
 ssh-keygen -A
 exec /usr/sbin/sshd -D -e "$@" &
 php service.php
+php iplimit.php &
 php cron.php

version

@@ -1,3 +1,30 @@
+11.02.2025 v2.12
+- vless: хранение статы в отдельном файле
+- vless ip limit: возможность указать кол-во айпи
+08.02.2025 v2.11
+- vless: singbox 1.11
+07.02.2025 v2.10
+- vless: ip limit
+- vless: общая стата
+- vless: пакетное добавление профилей
+- vless: при добавлении можно указывать свой uuid (name:uuid, name:uuid, ...)
+- автоудаление логов
+- хэш бота сохраняется в настройках и восстанавливается с бэкапом. можно накатывать бэкап на нового бота
+02.02.2025 v2.9
+- откат sing-box 1.11
+02.02.2025 v2.8
+- vless: корректировка статы юзера
+- sing-box 1.11
+29.01.2025 v2.7
+- vless: сброс статистики юзера
+24.01.2025 v2.6
+- правки меню
+- vless:добавлена возможность маршрутизировать список ip-сетей
+18.01.2025 v2.5
+- фикс скачивания шаблона михомо
+- обновлен singbox.exe
+- вывод статистики vless пользователей
+- смягчил паттерн поиска reality degenerate в логах
 07.01.2025 v2.4
 - вернул shadowsocks (спасибо за донат)
 04.01.2025