fix ip limit user off

update version
2025-03-02 18:41:18 +04:00 · 2025-02-22 18:56:42 +04:00 · 2025-02-22 18:52:17 +04:00 · 2025-02-22 18:51:49 +04:00 · 2025-02-22 18:50:32 +04:00 · 2025-02-22 18:47:36 +04:00
3 changed files with 95 additions and 60 deletions
@@ -736,7 +736,7 @@ class Bot
            "statsOutboundDownlink" => true
        ];
        if (empty($norestart)) {
-            $c = $this->collectSession($c);
+            $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');
@@ -745,24 +745,23 @@ class Bot
        }
    }

-    public function collectSession($c) {
-        $p = $this->getPacConf();
-        $p['vlessstat']['global'] = [
-            'download' => $p['vlessstat']['global']['download'] + $p['vlessstat']['session']['download'],
-            'upload'   => $p['vlessstat']['global']['upload'] + $p['vlessstat']['session']['upload'],
+    public function collectSession() {
+        $p = $this->getXrayStats();
+        $p['global'] = [
+            'download' => $p['global']['download'] + $p['session']['download'],
+            'upload'   => $p['global']['upload'] + $p['session']['upload'],
        ];
-        $p['vlessstat']['session'] = [
+        $p['session'] = [
            'download' => 0,
            'upload'   => 0,
        ];
-        $this->setPacConf($p);
-        foreach ($c['inbounds'][0]['settings']['clients'] as $k => $v) {
-            $c['inbounds'][0]['settings']['clients'][$k]['global']['download'] += $v['session']['download'];
-            $c['inbounds'][0]['settings']['clients'][$k]['session']['download'] = 0;
-            $c['inbounds'][0]['settings']['clients'][$k]['global']['upload']   += $v['session']['upload'];
-            $c['inbounds'][0]['settings']['clients'][$k]['session']['upload'] = 0;
+        foreach ($p['users'] as $k => $v) {
+            $p['users'][$k]['global']['download']  += $v['session']['download'];
+            $p['users'][$k]['session']['download']  = 0;
+            $p['users'][$k]['global']['upload']    += $v['session']['upload'];
+            $p['users'][$k]['session']['upload']    = 0;
        }
-        return $c;
+        $this->setXrayStats($p);
    }

    public function linkMtproto()
@@ -994,7 +993,7 @@ class Bot
    {
        $r = $this->send(
            $this->input['chat'],
-            "@{$this->input['username']} enter pass",
+            "@{$this->input['username']} enter password",
            $this->input['message_id'],
            reply: 'enter password',
        );
@@ -1012,7 +1011,7 @@ class Bot
            $this->input['chat'],
            "@{$this->input['username']} enter name",
            $this->input['message_id'],
-            reply: 'enter password',
+            reply: 'enter name',
        );
        $_SESSION['reply'][$r['result']['message_id']] = [
            'start_message'  => $this->input['message_id'],
@@ -1350,23 +1349,32 @@ class Bot
    {
        try {
            $x  = $this->getXray();
-            $p  = $this->getPacConf();
            $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['vlessstat']['session']['download'] = $td;
-            $p['vlessstat']['session']['upload']   = $tu;
-            $this->setPacConf($p);
+            $p  = $this->getXrayStats();
+            $p['session'] = [
+                'download' => $td,
+                'upload'   => $tu,
+            ];
            if (!empty($users = $x['inbounds'][0]['settings']['clients'])) {
+                $tmp = [];
                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;
-                    $x['inbounds'][0]['settings']['clients'][$k]['session'] = [
-                        'download' => $d,
-                        'upload'   => $u,
+                    $tmp[$k] = [
+                        'session' => [
+                            'download' => $d,
+                            'upload'   => $u,
+                        ],
+                        'global' => [
+                            'download' => $p['users'][$k]['global']['download'],
+                            'upload'   => $p['users'][$k]['global']['upload'],
+                        ]
                    ];
                }
-                $this->restartXray($x, norestart: 1);
+                $p['users'] = $tmp;
            }
+            $this->setXrayStats($p);
        } catch (\Throwable $th) {
        }
    }
@@ -1669,7 +1677,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);
    }
@@ -1782,6 +1790,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';
@@ -2421,9 +2435,9 @@ class Bot
    {
        $r = $this->send(
            $this->input['chat'],
-            "@{$this->input['username']} enter seconds",
+            "@{$this->input['username']} enter seconds and count ip",
            $this->input['message_id'],
-            reply: 'enter seconds',
+            reply: 'enter seconds:count_ip',
        );
        $_SESSION['reply'][$r['result']['message_id']] = [
            'start_message' => $this->input['message_id'],
@@ -4446,13 +4460,16 @@ DNS-over-HTTPS with IP:
        $this->ipMenu();
    }

-    public function switchIpLimit(int $limit)
+    public function switchIpLimit($limit)
    {
+        $limit = explode(':', $limit);
        $c = $this->getPacConf();
-        if ($limit <= 0) {
+        if ((int) $limit[0] <= 0) {
            unset($c['ip_limit']);
+            unset($c['ip_count']);
        } else {
-            $c['ip_limit'] = $limit;
+            $c['ip_limit'] = (int) $limit[0];
+            $c['ip_count'] = (int) $limit[1] ?: 1;
        }
        $this->setPacConf($c);
        $this->xray();
@@ -5295,10 +5312,13 @@ DNS-over-HTTPS with IP:

    public function delxr($i)
    {
-        $r = $this->getXray();
+        $r  = $this->getXray();
+        $st = $this->getXrayStats();
        foreach ($r['inbounds'][0]['settings']['clients'] as $k => $v) {
            if ($i == $k) {
                unset($r['inbounds'][0]['settings']['clients'][$k]);
+                unset($st['users'][$k]);
+                $this->setXrayStats($st);
                $this->restartXray($r);
                $this->adguardXrayClients();
                break;
@@ -5393,28 +5413,28 @@ 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->getXray();
-        $c['inbounds'][0]['settings']['clients'][$i]['global'] = [
-            'download' => 0,
-            'upload'   => 0,
-        ];
-        $this->restartXray($c);
+        $c = $this->getXrayStats();
+        unset($c['users'][$i]);
+        $this->restartXray($this->getXray());
        $this->userXr($i);
    }

    public function resetXrStats()
    {
-        $x = $this->getXray();
-        $p = $this->getPacConf();
-        unset($p['vlessstat']);
-        foreach ($x['inbounds'][0]['settings']['clients'] as $k => $v) {
-            unset($x['inbounds'][0]['settings']['clients'][$k]['global']);
-            unset($x['inbounds'][0]['settings']['clients'][$k]['session']);
-        }
-        $this->restartXray($x);
-        $this->setPacConf($p);
+        $this->restartXray($this->getXray());
+        $this->setXrayStats([]);
        $this->xray();
    }

@@ -5718,8 +5738,9 @@ DNS-over-HTTPS with IP:
            $text[] = "fake domain: <code>$fake</code>";
        }
        $text[] = 'transport: ' . ($p['transport'] ?: 'Websocket');
-        $td = $this->getBytes($p['vlessstat']['global']['download'] + $p['vlessstat']['session']['download']);
-        $tu = $this->getBytes($p['vlessstat']['global']['upload'] + $p['vlessstat']['session']['upload']);
+        $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",
@@ -5747,8 +5768,11 @@ DNS-over-HTTPS with IP:
                'text'          => $this->i18n('Websocket') . ' ' . ($p['transport'] != 'Reality' ? $this->i18n('on') : $this->i18n('off')),
                'callback_data' => "/changeTransport 1",
            ],
+        ];
+        $ip_count = $p['ip_count'] ?: 1;
+        $data[] = [
            [
-                'text'          => $this->i18n('ip limit') . ' ' . ($p['ip_limit'] ? ": {$p['ip_limit']} sec" : $this->i18n('off')),
+                'text'          => $this->i18n('ip limit') . ' ' . ($p['ip_limit'] ? ": {$p['ip_limit']} sec & $ip_count" : $this->i18n('off')),
                'callback_data' => "/setIpLimit",
            ],
        ];
@@ -5800,8 +5824,8 @@ 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) {
-            $download = $this->getBytes($v['global']['download'] + $v['session']['download']);
-            $upload   = $this->getBytes($v['global']['upload'] + $v['session']['upload']);
+            $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[]   = [
                [
@@ -5991,13 +6015,13 @@ DNS-over-HTTPS with 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']) > 1) {
+            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)");
+                        foreach ($c['admin'] as $admin) {
+                            $this->send($admin, "vless: {$m['email']} is turned off (limit by one IP)");
                        }
                        unset($this->pool[$m['email']]);
                        $this->switchXr($k, 1);
@@ -6166,10 +6190,11 @@ 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>";
-        $download = $this->getBytes($c['global']['download'] + $c['session']['download']);
-        $upload   = $this->getBytes($c['global']['upload'] + $c['session']['upload']);
-        $data[] = [
+        $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",
@@ -6629,7 +6654,7 @@ DNS-over-HTTPS with IP:
        if (!empty($route['rules'])) {
            foreach ($route['rules'] as $k => $v) {
                if (!empty($v['addruleset'])) {
-                    $t[$v['outbound']] = $k;
+                    $t[$v['outbound'] ?: 'block'] = $k;
                }
            }
            $p = $this->getPacConf();
@@ -27,7 +27,9 @@
        },
        {
            "type": "mixed",
-            "tag": "in"
+            "tag": "in",
+            "listen": "127.0.0.1",
+            "listen_port": 2080
        }
    ],
    "dns": {
@@ -1,3 +1,11 @@
+02.03.2025 v2.14
+- vless ip limit: фикс выключения юзера
+22.02.2025 v2.13
+- vless: улучшение сбора статы
+- vless: фикс добавления правил srs для block outbound
+11.02.2025 v2.12
+- vless: хранение статы в отдельном файле
+- vless ip limit: возможность указать кол-во айпи
 08.02.2025 v2.11
 - vless: singbox 1.11
 07.02.2025 v2.10
Author	SHA1	Message	Date
mercury	a94cab7dc1	fix ip limit user off	2025-03-02 18:41:18 +04:00
mercury	694d446402	update version	2025-02-22 18:56:42 +04:00
mercury	6074d40643	update version	2025-02-22 18:52:17 +04:00
mercury	4b1df94325	Revert "add clash mode selector for sing-box clients" This reverts commit `fb22744fa7`.	2025-02-22 18:51:49 +04:00
mercury	232c75d5bf	Merge branch 'dev' of github.com:mercurykd/vpnbot into dev	2025-02-22 18:50:32 +04:00
mercury	5e860a4896	fix addruleset for block outbound	2025-02-22 18:47:36 +04:00
Konstantin	5b05486b98	Merge pull request #35 from legiz-ru/dev add clash mode selector for sing-box clients	2025-02-13 10:13:38 +04:00
legiz-ru	fb22744fa7	add clash mode selector for sing-box clients	2025-02-13 08:11:20 +03:00
mercury	af812b7c93	vless: stats collect improve	2025-02-12 13:29:08 +04:00
mercury	3302ca8871	vless stats: fix delete user	2025-02-12 12:50:39 +04:00
mercury	2c5eff03d5	vless stats: fix reset user stats	2025-02-12 00:25:23 +04:00
mercury	a8a203041f	vless stats: fix reset user stats	2025-02-11 22:48:47 +04:00
mercury	a21c9b5fe9	update version	2025-02-11 00:14:07 +04:00
mercury	696779450f	ip limit: count ip	2025-02-11 00:12:21 +04:00
mercury	7c5b3dfa3a	xray: fix stats user	2025-02-10 23:58:17 +04:00
mercury	74404559f9	xray: stats to separate file	2025-02-10 23:33:38 +04:00
mercury	11e8fb468b	singbox: return mixed-in port	2025-02-10 10:03:27 +04:00