update version

Migrate to sing-box 1.11

app/bot.php

@@ -378,6 +378,9 @@ 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('~^/v2ray$~', $this->input['callback'], $m):
                 $this->v2ray();
                 break;
@@ -541,6 +544,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;
@@ -732,7 +738,9 @@ class Bot
     public function collectSession($c) {
         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;
         }
         return $c;
     }
@@ -2693,15 +2701,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':
@@ -3516,8 +3524,6 @@ DNS-over-HTTPS with IP:
                             'text'          => $this->i18n('delete'),
                             'callback_data' => "/delete {$client}_$page",
                         ],
-                    ],
-                    [
                         [
                             'text'          => $this->i18n('back'),
                             'callback_data' => "/menu wg $page",
@@ -3751,6 +3757,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;
@@ -3797,6 +3809,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[] = [
                     [
@@ -3944,7 +3972,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'),
@@ -4000,7 +4046,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),
                     ],
                     [
@@ -4200,12 +4246,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'),
@@ -4256,10 +4296,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'),
@@ -5271,6 +5317,17 @@ DNS-over-HTTPS with IP:
         $this->userXr($i);
     }
 
+    public function resetXrUser($i)
+    {
+        $c = $this->getXray();
+        $c['inbounds'][0]['settings']['clients'][$i]['global'] = [
+            'download' => 0,
+            'upload'   => 0,
+        ];
+        $this->restartXray($c);
+        $this->userXr($i);
+    }
+
     public function listXr($i)
     {
         $c = $this->getPacConf();
@@ -5437,6 +5494,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>
@@ -5445,6 +5503,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>
@@ -5694,9 +5753,6 @@ DNS-over-HTTPS with IP:
     {
         $text[] = "Menu -> " . $this->i18n('xray') . ' -> routes';
 
-        $p = $this->getPacConf();
-        $outbound = $p['outbound'] ?: 'proxy';
-
         $data = [
             [[
                 'text'          => $this->i18n('block'),
@@ -5710,6 +5766,10 @@ DNS-over-HTTPS with IP:
                 'text'          => 'domains',
                 'callback_data' => "/xtlsproxy",
             ]],
+            [[
+                'text'          => "subnet",
+                'callback_data' => "/xtlssubnet",
+            ]],
             [[
                 'text'          => 'process',
                 'callback_data' => "/xtlsprocess",
@@ -5988,6 +6048,14 @@ DNS-over-HTTPS with IP:
                 'callback_data' => "/qrXray {$i}_2",
             ],
         ];
+        $download = $this->getBytes($c['global']['download'] + $c['session']['download']);
+        $upload   = $this->getBytes($c['global']['upload'] + $c['session']['upload']);
+        $data[] = [
+            [
+                'text'          => $this->i18n('reset stats') . ": ↓$download  ↑$upload",
+                'callback_data' => "/resetXrUser $i",
+            ],
+        ];
         $data[] = [
             [
                 'text'          => $this->i18n('rename'),
@@ -6228,12 +6296,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,
@@ -6254,11 +6324,11 @@ DNS-over-HTTPS with IP:
                 $c['route'] = $this->addRuleSet($c['route']);
                 $c['route'] = $this->createRuleSet($c['route'], $uid, $domain);
                 if (!empty($c['route']['rules'])) {
-                    foreach ($c['route']['rules'] as $k => $v) {
+                    /* foreach ($c['route']['rules'] as $k => $v) {
                         if (count($v) < 2) {
                             unset($c['route']['rules'][$k]);
                         }
-                    }
+                    } */
                     $c['route']['rules'] = array_values($c['route']['rules']);
                 }
                 break;
@@ -6337,6 +6407,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'])]);
@@ -6932,6 +7005,8 @@ DNS-over-HTTPS with IP:
                 'text'          => $this->i18n('Ports'),
                 'callback_data' => "/ports",
             ],
+        ];
+        $data[] = [
             [
                 'text'          => $this->i18n('IP ban & Logs'),
                 'callback_data' => "/ipMenu",

app/i18n.php

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

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,9 +9,10 @@
             "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,
@@ -48,7 +49,7 @@
             },
             {
                 "tag": "dns-remote",
-                "address": "tcp:\/\/8.8.8.8",
+                "address": "tcp://8.8.8.8",
                 "address_strategy": "prefer_ipv4",
                 "strategy": "prefer_ipv4",
                 "detour": "direct"
@@ -92,28 +93,23 @@
         {
             "type": "direct",
             "tag": "direct"
-        },
-        {
-            "type": "block",
-            "tag": "block"
-        },
-        {
-            "type": "dns",
-            "tag": "dns-out"
         }
     ],
     "route": {
         "auto_detect_interface": true,
         "override_android_vpn": true,
         "rules": [
-            {
-                "protocol": "dns",
-                "outbound": "dns-out"
-            },
             {
                 "addruleset": true,
                 "outbound": "direct"
             },
+            {
+                "action": "sniff"
+            },
+            {
+                "protocol": "dns",
+                "action": "hijack-dns"
+            },
             {
                 "addruleset": true,
                 "createruleset": [
@@ -129,6 +125,21 @@
                 ],
                 "outbound": "~outbound~"
             },
+            {
+                "addruleset": true,
+                "createruleset": [
+                    {
+                        "name": "subnet",
+                        "interval": "30s",
+                        "rules": [
+                            {
+                                "ip_cidr": "~subnet~"
+                            }
+                        ]
+                    }
+                ],
+                "outbound": "~outbound~"
+            },
             {
                 "addruleset": true,
                 "createruleset": [
@@ -172,7 +183,7 @@
                         ]
                     }
                 ],
-                "outbound": "block"
+                "action": "reject"
             },
             {
                 "addruleset": true,
@@ -192,4 +203,4 @@
         ],
         "final": "direct"
     }
-}
+}

config/v2ray.json

@@ -110,6 +110,11 @@
                 "outboundTag": "~outbound~",
                 "domain": "~pac~"
             },
+            {
+                "type": "field",
+                "outboundTag": "~outbound~",
+                "ip": "~subnet~"
+            },
             {
                 "type": "field",
                 "outboundTag": "~outbound~",

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

version

@@ -1,3 +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