singbox: domain -> domain_suffix

app/bot.php

@@ -121,7 +121,7 @@ class Bot
             case preg_match('~^/menu (?P<type>addpeer) (?P<arg>(?:-)?\d+)$~', $this->input['callback'], $m):
             case preg_match('~^/menu (?P<type>wg) (?P<arg>(?:-)?\d+)$~', $this->input['callback'], $m):
             case preg_match('~^/menu (?P<type>client) (?P<arg>\d+(?:_(?:-)?\d+)?)$~', $this->input['callback'], $m):
-            case preg_match('~^/menu (?P<type>pac|adguard|config|ss|lang|oc|naive|mirror)$~', $this->input['callback'], $m):
+            case preg_match('~^/menu (?P<type>pac|adguard|config|ss|lang|oc|naive|mirror|update)$~', $this->input['callback'], $m):
             case preg_match('~^/menu (?P<type>subzoneslist|reverselist|includelist|excludelist) (?P<arg>(?:-)?\d+)$~', $this->input['callback'], $m):
                 $this->menu(type: $m['type'] ?? false, arg: $m['arg'] ?? false);
                 break;
@@ -137,8 +137,8 @@ class Bot
             case preg_match('~^/mtproto$~', $this->input['callback'], $m):
                 $this->mtproto();
                 break;
-            case preg_match('~^/updatebot$~', $this->input['callback'], $m):
-                $this->updatebot();
+            case preg_match('~^/applyupdatebot$~', $this->input['callback'], $m):
+                $this->applyupdatebot();
                 break;
             case preg_match('~^/branches$~', $this->input['callback'], $m):
                 $this->branches();
@@ -221,6 +221,12 @@ class Bot
             case preg_match('~^/addOcUser$~', $this->input['callback'], $m):
                 $this->addOcUser();
                 break;
+            case preg_match('~^/addXrUser$~', $this->input['callback'], $m):
+                $this->addXrUser();
+                break;
+            case preg_match('~^/renameXrUser (\d+)$~', $this->input['callback'], $m):
+                $this->renameXrUser($m[1]);
+                break;
             case preg_match('~^/v2ray$~', $this->input['callback'], $m):
                 $this->v2ray();
                 break;
@@ -269,6 +275,12 @@ class Bot
             case preg_match('~^/deloc (\d+)$~', $this->input['callback'], $m):
                 $this->deloc($m[1]);
                 break;
+            case preg_match('~^/userXr (\d+)$~', $this->input['callback'], $m):
+                $this->userXr($m[1]);
+                break;
+            case preg_match('~^/delxr (\d+)$~', $this->input['callback'], $m):
+                $this->delxr($m[1]);
+                break;
             case preg_match('~^/switchTorrent (\d+)$~', $this->input['callback'], $m):
                 $this->switchTorrent($m[1]);
                 break;
@@ -294,8 +306,8 @@ class Bot
             case preg_match('~^/qrSS$~', $this->input['callback'], $m):
                 $this->qrSS();
                 break;
-            case preg_match('~^/qrXray$~', $this->input['callback'], $m):
-                $this->qrXray();
+            case preg_match('~^/qrXray (\d+)$~', $this->input['callback'], $m):
+                $this->qrXray($m[1]);
                 break;
             case preg_match('~^/qrMtproto$~', $this->input['callback'], $m):
                 $this->qrMtproto();
@@ -663,6 +675,38 @@ class Bot
         ];
     }
 
+    public function addXrUser()
+    {
+        $r = $this->send(
+            $this->input['chat'],
+            "@{$this->input['username']} enter name",
+            $this->input['message_id'],
+            reply: 'enter password',
+        );
+        $_SESSION['reply'][$r['result']['message_id']] = [
+            'start_message'  => $this->input['message_id'],
+            'start_callback' => $this->input['callback_id'],
+            'callback'       => 'addxrus',
+            'args'           => [],
+        ];
+    }
+
+    public function renameXrUser($i)
+    {
+        $r = $this->send(
+            $this->input['chat'],
+            "@{$this->input['username']} enter name",
+            $this->input['message_id'],
+            reply: 'enter password',
+        );
+        $_SESSION['reply'][$r['result']['message_id']] = [
+            'start_message'  => $this->input['message_id'],
+            'start_callback' => $this->input['callback_id'],
+            'callback'       => 'renXrUs',
+            'args'           => [$i],
+        ];
+    }
+
     public function restartOcserv($conf)
     {
         file_put_contents('/config/ocserv.conf', $conf);
@@ -907,10 +951,10 @@ class Bot
                 $last       = file_get_contents('https://raw.githubusercontent.com/mercurykd/vpnbot/master/version');
                 if (!empty($last) && $last != $this->last && $last != $current) {
                     $this->last = $last;
-                    $diff = implode("\n", array_slice(explode("\n", $last), 0, count(explode("\n", $last)) - count(explode("\n", $current))));
+                    $diff       = array_slice(explode("\n", $last), 0, count(explode("\n", $last)) - count(explode("\n", $current)));
                     if (!empty($diff)) {
                         foreach ($c['admin'] as $k => $v) {
-                            $this->send($v, "update:\n$diff");
+                            $this->send($v, "update:\n{$diff[0]}");
                         }
                     }
                 }
@@ -1039,7 +1083,7 @@ class Bot
             ] : false,
             'mtproto'       => file_get_contents('/config/mtprotosecret'),
             'mtprotodomain' => file_get_contents('/config/mtprotodomain'),
-            'xray'          => json_decode(file_get_contents('/config/xray.json'), true),
+            'xray'          => $this->getXray(),
             'oc'            => file_get_contents('/config/ocserv.conf'),
             'ocu'           => file_get_contents('/config/ocserv.passwd'),
 
@@ -1407,9 +1451,9 @@ class Bot
         }
     }
 
-    public function qrXray()
+    public function qrXray($i)
     {
-        $link    = $this->linkXray();
+        $link    = $this->linkXray($i);
         $qr_file = __DIR__ . "/qr/xray.png";
         exec("qrencode -t png -o $qr_file '$link'");
         $r = $this->sendPhoto(
@@ -2776,9 +2820,9 @@ DNS-over-HTTPS with IP:
 
                 <code>RU blacklist:</code> <code>https://github.com/zapret-info/z-i</code>
 
-                {$this->i18n('self list')}{$this->i18n('self list explain')}
+                {$this->i18n('proxy')}{$this->i18n('self list explain')}
 
-                {$this->i18n('reverse list')}{$this->i18n('reverse list explain')}
+                {$this->i18n('direct')}{$this->i18n('reverse list explain')}
                 text;
         if ($pac) {
             $pac['time']  = date('d.m.Y H:i:s', $pac['mtime']);
@@ -2868,15 +2912,16 @@ DNS-over-HTTPS with IP:
         }
         $data[] = [
             [
-                'text'          => $this->i18n('self list'),
+                'text'          => $this->i18n('proxy'),
+                'callback_data' => "/menu includelist 0",
                 'callback_data' => "/menu includelist 0",
             ],
+            // [
+            //     'text'          => $this->i18n('subzones'),
+            //     'callback_data' => "/menu subzoneslist 0",
+            // ],
             [
-                'text'          => $this->i18n('subzones'),
-                'callback_data' => "/menu subzoneslist 0",
-            ],
-            [
-                'text'          => $this->i18n('reverse list'),
+                'text'          => $this->i18n('direct'),
                 'callback_data' => "/menu reverselist 0",
             ],
         ];
@@ -2908,7 +2953,15 @@ DNS-over-HTTPS with IP:
     {
         $count  = $this->limit;
         $name   = str_replace('list', '', $type);
-        $text   = "Menu -> pac -> {$name}list\n\n";
+        switch ($name) {
+            case 'include':
+                $additional = $this->i18n('self list explain');
+                break;
+            case 'reverse':
+                $additional = $this->i18n('reverse list explain');
+                break;
+        }
+        $text   = "Menu -> pac -> {$name}list\n\n$additional";
         $data[] = [
             [
                 'text'          => $this->i18n('add'),
@@ -3134,7 +3187,7 @@ DNS-over-HTTPS with IP:
                     [
                         [
                             'text' => $this->i18n('chat'),
-                            'url'  => "https://t.me/+bUuWfsKzaMZhNjQy",
+                            'url'  => "https://t.me/vpnbot_group",
                         ],
                         [
                             'text' => $this->i18n('donate'),
@@ -3160,6 +3213,7 @@ DNS-over-HTTPS with IP:
             'oc'           => $type == 'oc'           ? $this->ocMenu() : false,
             'naive'        => $type == 'naive'        ? $this->naiveMenu() : false,
             'mirror'       => $type == 'mirror'       ? $this->mirrorMenu() : false,
+            'update'       => $type == 'update'       ? $this->updatebot() : false,
         ];
 
         $text = $menu[$type ?: 'main' ]['text'];
@@ -3191,12 +3245,12 @@ DNS-over-HTTPS with IP:
         $this->answer($this->input['callback_id'], 'in developing...');
     }
 
-    public function linkXray()
+    public function linkXray($i)
     {
         $c      = $this->getXray();
         $pac    = $this->getPacConf();
         $domain = $pac['domain'] ?: $this->ip;
-        return "vless://{$c['inbounds'][0]['settings']['clients'][0]['id']}@$domain:443?security=reality&sni={$c['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0]}&fp=chrome&pbk={$pac['xray']}&sid={$c['inbounds'][0]['streamSettings']['realitySettings']['shortIds'][0]}&type=tcp&flow=xtls-rprx-vision#vpnbot";
+        return "vless://{$c['inbounds'][0]['settings']['clients'][$i]['id']}@$domain:443?security=reality&sni={$c['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0]}&fp=chrome&pbk={$pac['xray']}&sid={$c['inbounds'][0]['streamSettings']['realitySettings']['shortIds'][0]}&type=tcp&flow=xtls-rprx-vision#vpnbot";
     }
 
     public function naiveMenu()
@@ -3358,6 +3412,19 @@ DNS-over-HTTPS with IP:
         $this->menu('oc');
     }
 
+    public function delxr($i)
+    {
+        $r = $this->getXray();
+        foreach ($r['inbounds'][0]['settings']['clients'] as $k => $v) {
+            if ($i == $k) {
+                unset($r['inbounds'][0]['settings']['clients'][$k]);
+                $this->restartXray($r);
+                break;
+            }
+        }
+        $this->xray();
+    }
+
     public function getClientsOc()
     {
         $users = array_filter(explode("\n", file_get_contents('/config/ocserv.passwd')), fn ($e) => !empty($e));
@@ -3371,28 +3438,35 @@ DNS-over-HTTPS with IP:
         $this->menu('oc');
     }
 
+    public function addxrus($user)
+    {
+        $c    = $this->getXray();
+        $uuid = trim($this->ssh('xray uuid', 'xr'));
+        $c['inbounds'][0]['settings']['clients'][] = [
+            'id'    => $uuid,
+            'flow'  => 'xtls-rprx-vision',
+            'email' => $user,
+        ];
+        $this->restartXray($c);
+        $this->xray();
+    }
+
+    public function renXrUs($name, $i)
+    {
+        $c = $this->getXray();
+        $c['inbounds'][0]['settings']['clients'][$i]['email'] = $name;
+        $this->restartXray($c);
+        $this->userXr($i);
+    }
+
     public function xray()
     {
-        $c      = $this->getXray();
-        $pac    = $this->getPacConf();
-        $domain = $pac['domain'] ?: $this->ip;
-        $st     = $this->ssh('pgrep xray', 'xr') ? 'on' : 'off';
-        $text[] = "Menu -> " . $this->i18n('xray') . "\n";
-        $text[] = "uuid: <code>{$c['inbounds'][0]['settings']['clients'][0]['id']}</code>";
-        $text[] = "shortId: <code>{$c['inbounds'][0]['streamSettings']['realitySettings']['shortIds'][0]}</code>";
-        $text[] = "pubkey: <code>{$pac['xray']}</code>";
-        $text[] = "fake domain: <code>{$c['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0]}</code>";
-        if ($c['inbounds'][0]['settings']['clients'][0]['id']) {
-            $text[] = "\n<code>{$this->linkXray()}</code>";
+        if (!$this->ssh('pgrep xray', 'xr')) {
+            $this->generateSecretXray();
         }
-        $text[] = "\nstatus: $st";
-
-        $data[] = [
-            [
-                'text'          => $this->i18n('generateSecret'),
-                'callback_data' => "/generateSecretXray",
-            ],
-        ];
+        $c      = $this->getXray();
+        $text[] = "Menu -> " . $this->i18n('xray');
+        $text[] = "fake domain: <code>{$c['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0]}</code>";
         $data[] = [
             [
                 'text'          => $this->i18n('changeFakeDomain'),
@@ -3403,11 +3477,17 @@ DNS-over-HTTPS with IP:
                 'callback_data' => "/selfFakeDomain",
             ],
         ];
-        if ($c['inbounds'][0]['settings']['clients'][0]['id']) {
+        $data[] = [
+            [
+                'text'          => $this->i18n('add peer'),
+                'callback_data' => "/addXrUser",
+            ],
+        ];
+        foreach ($c['inbounds'][0]['settings']['clients'] as $k => $v) {
             $data[] = [
                 [
-                    'text'          => $this->i18n('show QR'),
-                    'callback_data' => "/qrXray",
+                    'text'          => "{$v['email']}",
+                    'callback_data' => "/userXr $k",
                 ],
             ];
         }
@@ -3425,6 +3505,345 @@ DNS-over-HTTPS with IP:
         );
     }
 
+    public function userXr($i, $fs = 0, $fv = 0)
+    {
+        $c         = $this->getXray();
+        $domain    = $this->getPacConf()['domain'] ?: $this->ip;
+        $scheme    = empty($this->nginxGetTypeCert()) ? 'http' : 'https';
+        $hash      = substr(md5($this->key), 0, 8);
+        $v2ray     = "$scheme://{$domain}/pac?h=$hash&t=s&b=1&s={$c['inbounds'][0]['settings']['clients'][$i]['id']}";
+        $sing      = "$scheme://{$domain}/pac?h=$hash&t=si&b=1&s={$c['inbounds'][0]['settings']['clients'][$i]['id']}";
+        $fullsing  = 'sing-box://import-remote-profile/?url=' . urlencode("$scheme://{$domain}/pac?h=$hash&t=si&s={$c['inbounds'][0]['settings']['clients'][$i]['id']}") . "#vpnbot$i";
+        $fullv2ray = 'v2rayng://install-config?url=' . urlencode("$scheme://{$domain}/pac?h=$hash&t=s&s={$c['inbounds'][0]['settings']['clients'][$i]['id']}") . "#vpnbot$i";
+        if (!empty($fs)) {
+            return $fullsing;
+        }
+        if (!empty($fv)) {
+            return $fullv2ray;
+        }
+
+        $text[] = "Menu -> " . $this->i18n('xray') . " -> {$c['inbounds'][0]['settings']['clients'][$i]['email']}\n";
+        $text[] = "<code>{$this->linkXray($i)}</code>\n";
+        $text[] = "v2ray: <a href='$v2ray'>$v2ray</a>\n";
+        $text[] = "sing-box: <a href='$sing'>$sing</a>";
+
+        $data[] = [
+            [
+                'text'          => $this->i18n('show QR'),
+                'callback_data' => "/qrXray $i",
+            ],
+        ];
+        $data[] = [
+            [
+                'text'          => $this->i18n('rename'),
+                'callback_data' => "/renameXrUser $i",
+            ],
+        ];
+        $data[] = [
+            [
+                'text'          => $this->i18n('delete'),
+                'callback_data' => "/delxr $i",
+            ],
+        ];
+        $data[] = [
+            [
+                'text'          => $this->i18n('back'),
+                'callback_data' => "/xray",
+            ],
+        ];
+        $this->update(
+            $this->input['chat'],
+            $this->input['message_id'],
+            implode("\n", $text ?: ['...']),
+            $data ?: false,
+        );
+    }
+
+    public function v2raySubscription($key, $fs = 0)
+    {
+        $pac    = $this->getPacConf();
+        $domain = $pac['domain'] ?: $this->ip;
+        $xr     = $this->getXray();
+
+        $flag = true;
+        foreach ($xr['inbounds'][0]['settings']['clients'] as $k => $v) {
+            if ($v['id'] == $key) {
+                if (!empty($fs)) {
+                    return $this->userXr($k, 0, 1);
+                }
+                $flag = false;
+                break;
+            }
+        }
+        if ($flag) {
+            return;
+        }
+
+        $c = [
+            "log" => [
+                "access"   => "",
+                "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"      => "proxy",
+                    "protocol" => "vless",
+                    "settings" => [
+                        "vnext" => [[
+                            "address" => $domain,
+                            "port"    => 443,
+                            "users"   => [[
+                                "id"         => $key,
+                                "alterId"    => 0,
+                                "email"      => "t@t.tt",
+                                "security"   => "auto",
+                                "encryption" => "none",
+                                "flow"       => "xtls-rprx-vision"
+                            ]]
+                        ]]
+                    ],
+                    "streamSettings" => [
+                        "network"         => "tcp",
+                        "security"        => "reality",
+                        "realitySettings" => [
+                            "serverName"  => $xr['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0],
+                            "fingerprint" => "chrome",
+                            "show"        => false,
+                            "publicKey"   => $pac['xray'],
+                            "shortId"     => $xr['inbounds'][0]['streamSettings']['realitySettings']['shortIds'][0],
+                            "spiderX"     => ""
+                        ]
+                    ],
+                    "mux" => [
+                        "enabled"     => false,
+                        "concurrency" => -1
+                    ]
+                ],
+                [
+                    "tag"      => "direct",
+                    "protocol" => "freedom",
+                ],
+                [
+                    "tag"      => "block",
+                    "protocol" => "blackhole",
+                    "settings" => [
+                        "response" => [
+                            "type" => "http"
+                        ]
+                    ]
+                ]
+            ],
+            "routing" => [
+                "domainStrategy" => "AsIs",
+                "rules"          => [
+                    [
+                        "type"        => "field",
+                        "outboundTag" => "proxy",
+                        "domain"      => array_keys(array_filter($pac['includelist']))
+                    ],
+                    [
+                        "type"        => "field",
+                        "port"        => "0-65535",
+                        "outboundTag" => "direct"
+                    ]
+                ]
+            ]
+        ];
+        if (empty($c['routing']['rules'][0]['domain'])) {
+            unset($c['routing']['rules'][0]);
+            $c['routing']['rules'] = array_values($c['routing']['rules']);
+
+        }
+        echo json_encode($c);
+    }
+
+    public function singboxSubscription($key, $fs = 0)
+    {
+        $pac    = $this->getPacConf();
+        $domain = $pac['domain'] ?: $this->ip;
+        $xr     = $this->getXray();
+
+        $flag = true;
+        foreach ($xr['inbounds'][0]['settings']['clients'] as $k => $v) {
+            if ($v['id'] == $key) {
+                if (!empty($fs)) {
+                    return $this->userXr($k, 1);
+                }
+                $flag = false;
+                break;
+            }
+        }
+        if ($flag) {
+            return false;
+        }
+
+        $c = [
+            "log" => [
+                "level"     => "error",
+                "timestamp" => true
+            ],
+            "inbounds" => [[
+                    "type"                     => "tun",
+                    "tag"                      => "tun-in",
+                    "domain_strategy"          => "prefer_ipv4",
+                    "interface_name"           => "sing-tun",
+                    "inet4_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"                 => [
+                        "http_proxy" => [
+                            "enabled"     => false,
+                            "server"      => "127.0.0.1",
+                            "server_port" => 2080
+                        ]
+                    ]
+                ],
+                [
+                    "type"                       => "mixed",
+                    "tag"                        => "mixed-in",
+                    "domain_strategy"            => "prefer_ipv4",
+                    "listen"                     => "127.0.0.1",
+                    "listen_port"                => 2080,
+                    "tcp_fast_open"              => true,
+                    "sniff"                      => true,
+                    "sniff_override_destination" => false,
+                    "users"                      => []
+                ]
+            ],
+            "dns" => [
+                "servers" => [[
+                        "tag"              => "dns_direct",
+                        "address"          => "tls://" . ($pac['adguardkey'] ? "{$pac['adguardkey']}." : '') . "$domain",
+                        "address_resolver" => "dns-remote",
+                        "strategy"         => "prefer_ipv4",
+                        "detour"           => "direct"
+                    ],
+                    [
+                        "tag"              => "dns-remote",
+                        "address"          => "tcp://8.8.8.8",
+                        "address_strategy" => "prefer_ipv4",
+                        "strategy"         => "prefer_ipv4",
+                        "detour"           => "direct"
+                    ]
+                ],
+                "rules" => [[
+                    "outbound"      => "any",
+                    "server"        => "dns-direct",
+                    "disable_cache" => false
+                ]],
+                "strategy"          => "ipv4_only",
+                "independent_cache" => true
+            ],
+            "outbounds" => [[
+                    "flow"            => "xtls-rprx-vision",
+                    "packet_encoding" => "",
+                    "server"          => $domain,
+                    "server_port"     => 443,
+                    "tls"             => [
+                        "enabled"  => true,
+                        "insecure" => false,
+                        "reality"  => [
+                            "enabled"    => true,
+                            "public_key" => $pac['xray'],
+                            "short_id"   => $xr['inbounds'][0]['streamSettings']['realitySettings']['shortIds'][0],
+                        ],
+                        "server_name" => $xr['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0],
+                        "utls"        => [
+                            "enabled"     => true,
+                            "fingerprint" => "chrome"
+                        ]
+                    ],
+                    "uuid"            => $key,
+                    "type"            => "vless",
+                    "domain_strategy" => "ipv4_only",
+                    "tag"             => "proxy"
+                ],
+                [
+                    "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"
+                    ],
+                    [
+                        "domain_suffix"   => array_keys(array_filter($pac['includelist'])),
+                        "outbound" => "proxy"
+                    ],
+                    [
+                        "ip_cidr" => [
+                            "0.0.0.0/0"
+                        ],
+                        "outbound" => "direct"
+                    ]
+                ]
+            ]
+        ];
+        if (empty($c['route']['rules'][1]['domain_suffix'])) {
+            unset($c['route']['rules'][1]);
+            $c['route']['rules'] = array_values($c['route']['rules']);
+        }
+        return json_encode($c);
+    }
+
     public function getXray()
     {
         return json_decode(file_get_contents('/config/xray.json'), true);
@@ -3433,21 +3852,18 @@ DNS-over-HTTPS with IP:
     public function generateSecretXray()
     {
         $c       = $this->getXray();
-        $uuid    = trim($this->ssh('xray uuid', 'xr'));
         $shortId = trim($this->ssh('openssl rand -hex 8', 'xr'));
         $keys    = $this->ssh('xray x25519', 'xr');
         preg_match('~^Private key:\s([^\s]+)~m', $keys, $m);
         $private = trim($m[1]);
         preg_match('~^Public key:\s([^\s]+)~m', $keys, $m);
         $public = trim($m[1]);
-        $c['inbounds'][0]['settings']['clients'][0]['id'] = $uuid;
         $c['inbounds'][0]['streamSettings']['realitySettings']['privateKey'] = $private;
         $c['inbounds'][0]['streamSettings']['realitySettings']['shortIds'][0] = $shortId;
         $pac         = $this->getPacConf();
         $pac['xray'] = $public;
         $this->setPacConf($pac);
         $this->restartXray($c);
-        $this->xray();
     }
 
     public function setUpstreamDomain($domain)
@@ -3668,6 +4084,41 @@ DNS-over-HTTPS with IP:
     }
 
     public function updatebot()
+    {
+        $b = exec('git -C / rev-parse --abbrev-ref HEAD');
+        $track  = trim(file_get_contents('/update/branch'));
+        $data = [
+            [
+                [
+                    'text'          => "$b => $track",
+                    'callback_data' => "/branches",
+                ],
+                [
+                    'text'    => $this->i18n('changelog'),
+                    'web_app' => ['url' => "https://raw.githubusercontent.com/mercurykd/vpnbot/$b/version"],
+                ],
+            ],
+            [
+                [
+                    'text'          => $this->i18n('update bot'),
+                    'callback_data' => "/applyupdatebot",
+                ],
+            ],
+        ];
+        $data[] = [
+            [
+                'text'          => $this->i18n('back'),
+                'callback_data' => "/menu config",
+            ],
+        ];
+        exec("git -C / branch -vv", $mm);
+        return [
+            'text' => '<pre><code class="language-shell">' . implode("\n", $mm) . '</code></pre>',
+            'data' => $data,
+        ];
+    }
+
+    public function applyupdatebot()
     {
         $this->exportManual($this->update);
         $r = $this->send($this->input['from'], 'update...');
@@ -3678,6 +4129,7 @@ DNS-over-HTTPS with IP:
 
     public function configMenu()
     {
+        exec('git -C / fetch');
         $conf   = $this->getPacConf();
         $text[] = $conf['domain'] ? "Domains:\n{$conf['domain']}\nnp.{$conf['domain']}\noc.{$conf['domain']}" . ($conf['adguardkey'] ? "\n{$conf['adguardkey']}.{$conf['domain']}" : '') : $this->i18n('domain explain');
         $ssl    = $this->expireCert();
@@ -3789,16 +4241,10 @@ DNS-over-HTTPS with IP:
                 'callback_data' => "/debug",
             ],
         ];
-        exec('git -C / branch', $m);
-        $track  = trim(file_get_contents('/update/branch'));
         $data[] = [
             [
-                'text'          => "{$m[0]} => $track",
-                'callback_data' => "/branches",
-            ],
-            [
-                'text'          => $this->i18n('update bot'),
-                'callback_data' => "/updatebot",
+                'text'          => $this->i18n(exec('git -C / rev-list --count HEAD..@{u}') ? 'have updates' : 'no updates'),
+                'callback_data' => "/menu update",
             ],
         ];
         $data[] = [
@@ -3828,7 +4274,7 @@ DNS-over-HTTPS with IP:
         $data[] = [
             [
                 'text'          => $this->i18n('back'),
-                'callback_data' => "/menu config",
+                'callback_data' => "/menu update",
             ]
         ];
         $this->update($this->input['from'], $this->input['message_id'], 'branches', $data);

app/i18n.php

@@ -166,12 +166,12 @@ $i = [
         'ru' => 'Некоторым клиентам требуется валидный сертификат при подключении, например Windows 11 DoH или ShadowSocks Android (URL-адрес PAC), для этого требуется домен',
     ],
     'self list explain'    => [
-        'en' => ' - domains that will work through a proxy',
-        'ru' => ' - домены, которые будут работать через прокси',
+        'en' => ' - domains that will work through a proxy, all others directly',
+        'ru' => ' - домены, которые будут работать через прокси, все остальные напрямую',
     ],
     'reverse list explain' => [
-        'en' => ' - domains that will work without a proxy, all others through a proxy',
-        'ru' => ' - домены которые будут работать без прокси, все остальные через прокси',
+        'en' => ' - domains that will work directly, all others through a proxy',
+        'ru' => ' - домены которые будут работать напрямую, все остальные через прокси',
     ],
     'timer'                => [
         'en' => 'set timer',
@@ -266,8 +266,8 @@ $i = [
         'ru' => 'фейковый домен',
     ],
     'selfFakeDomain'  => [
-        'en' => 'selfFakeDomain',
-        'ru' => 'домен бота',
+        'en' => 'steal from yourself',
+        'ru' => 'steal from yourself',
     ],
     'page'  => [
         'en' => 'pagination',
@@ -321,4 +321,12 @@ $i = [
         'en' => 'web panel is only available from telegram',
         'ru' => 'веб панель доступна только из телеграмма',
     ],
+    'no updates'  => [
+        'en' => 'no updates',
+        'ru' => 'нет обновлений',
+    ],
+    'have updates'  => [
+        'en' => '🟢 have updates',
+        'ru' => '🟢 есть обновления',
+    ],
 ];

app/index.php

@@ -22,24 +22,56 @@ $address = $_GET['a'] ?: '127.0.0.1';
 $port = $_GET['p'] ?: '1080';
 $hash = $_GET['h'];
 if ($hash == substr(md5($c['key']), 0, 8)) {
-    if ($type == 'mirror') {
-        require __DIR__ . '/bot.php';
-        require __DIR__ . '/i18n.php';
-        $bot = new Bot($c['key'], $i);
-        $bot->getMirror();
-    } else {
-        if (file_exists($file = __DIR__ . "/zapretlists/$type")) {
-            $pac = file_get_contents($file);
-            header('Content-Type: text/plain');
-            echo str_replace([
-                '~address~',
-                '~port~',
-            ], [
-                $address,
-                $port,
-            ], $pac);
+    switch ($type) {
+        case 'mirror':
+            require __DIR__ . '/bot.php';
+            require __DIR__ . '/i18n.php';
+            $bot = new Bot($c['key'], $i);
+            $bot->getMirror();
+            break;
+
+        case 's':
+            require __DIR__ . '/bot.php';
+            require __DIR__ . '/i18n.php';
+            $bot = new Bot($c['key'], $i);
+            if (!empty($_GET['b'])) {
+                $fs  = $bot->v2raySubscription($_GET['s'], 1);
+                header("Location: $fs");
+                exit;
+            } else {
+                header('Content-Type: application/json');
+                echo $bot->v2raySubscription($_GET['s']);
+            }
             exit;
-        }
+
+        case 'si':
+            require __DIR__ . '/bot.php';
+            require __DIR__ . '/i18n.php';
+            $bot = new Bot($c['key'], $i);
+            if (!empty($_GET['b'])) {
+                    $fs  = $bot->singboxSubscription($_GET['s'], 1);
+                    header("Location: $fs");
+                    exit;
+            } else {
+                header('Content-Type: application/json');
+                echo $bot->singboxSubscription($_GET['s']);
+            }
+            exit;
+
+        default:
+            if (file_exists($file = __DIR__ . "/zapretlists/$type")) {
+                $pac = file_get_contents($file);
+                header('Content-Type: text/plain');
+                echo str_replace([
+                    '~address~',
+                    '~port~',
+                ], [
+                    $address,
+                    $port,
+                ], $pac);
+                exit;
+            }
+            break;
     }
 }
 if (!empty($_GET['hash'])) {

app/updatepac.php

@@ -218,8 +218,19 @@ function start()
         $text .= $tail ? "$tail\n" : '';
 
         // create pac
-        $domains = elzw(json_encode($t));
-        $pac     = 'function FindProxyForURL(t,e){"indexOf"in Array.prototype||(Array.prototype.indexOf=function(t,e){void 0===e&&(e=0),e<0&&(e+=this.length),e<0&&(e=0);for(var n=this.length;e<n;e++)if(e in this&&this[e]===t)return e;return -1}),"dlzw"in String.prototype||(String.prototype.dlzw=function(t){for(var e in text=this.split(""),code=256,o=phrase="",last=text.length,keys=[],text){if(o+=(cc="".charCodeAt.call(this[e],0))<256?text[e]:keys[cc],last==e)break;phrase&&phrase.length>0&&(keys[code]=phrase+(cc<256?text[e]:keys[cc][0]),code++),phrase=cc<256?text[e]:keys[cc]}return o});var n=JSON.parse(\'' . $domains . '\'.dlzw()),r=(/\.(' . implode('|', $subzones) . ')\.[^.]+$/.test(e)?e.replace(/(.+)\.([^.]+\.[^.]+\.[^.]+$)/,"$2"):e.replace(/(.+)\.([^.]+\.[^.]+$)/,"$2")).replace(/^www\.(.+)/,"$1").match(/(.*)\.([^.]+$)/);if(console.log(n,r),!r||!r[2])return"DIRECT";var o=r[1],i=r[2],a=[];if(n.hasOwnProperty(i)&&n[i].hasOwnProperty(o.length)){if("string"==typeof n[i][o.length]){var l=RegExp(".{"+o.length.toString()+"}","g");n[i][o.length]=n[i][o.length].match(l)}a=n[i][o.length]}return -1!==a.indexOf(o)?"SOCKS5 ~address~:~port~; DIRECT":"DIRECT"}';
+        $domains = json_encode($t);
+        $pac     = <<<PAC
+                    function FindProxyForURL(t, e) {
+                        var n = JSON.parse('$domains'),
+                        r = e.match(/((?:.+\.)*(.+))\.([^.]+)$/);
+                        if (r && n.hasOwnProperty(r[3]) && (n[r[3]].hasOwnProperty(r[1].length) && (-1 !== n[r[3]][r[1].length].indexOf(r[1])) || n[r[3]].hasOwnProperty(r[2].length) && (-1 !== n[r[3]][r[2].length].indexOf(r[2])))) {
+                            return "SOCKS5 ~address~:~port~; DIRECT";
+                        }
+                        return "DIRECT";
+                    }
+                    PAC;
+        $pac = preg_replace("~\s{2,}~", '', $pac);
+        $pac = preg_replace("~\n~", '', $pac);
         file_put_contents(__DIR__ . '/zapretlists/pac', $pac);
         $text .= "Create minified pac 100%\n";
     }
@@ -227,7 +238,7 @@ function start()
     // create reverse PAC
     $domains = array_filter($conf['reverselist'], fn($x) => $x == true);
     if (empty($domains)) {
-        $text .= "Empty reverse domains. Delete reverse pac files";
+        // $text .= "Empty reverse domains. Delete reverse pac files";
         unlink(__DIR__ . '/zapretlists/rmpac');
         unlink(__DIR__ . '/zapretlists/rpac');
     } else {
@@ -258,8 +269,19 @@ function start()
         // fclose($f);
         $text .= $tail ? "$tail\n" : '';
 
-        $domains = elzw(json_encode($t));
-        $pac     = 'function FindProxyForURL(t,e){"indexOf"in Array.prototype||(Array.prototype.indexOf=function(t,e){void 0===e&&(e=0),e<0&&(e+=this.length),e<0&&(e=0);for(var n=this.length;e<n;e++)if(e in this&&this[e]===t)return e;return -1}),"dlzw"in String.prototype||(String.prototype.dlzw=function(t){for(var e in text=this.split(""),code=256,o=phrase="",last=text.length,keys=[],text){if(o+=(cc="".charCodeAt.call(this[e],0))<256?text[e]:keys[cc],last==e)break;phrase&&phrase.length>0&&(keys[code]=phrase+(cc<256?text[e]:keys[cc][0]),code++),phrase=cc<256?text[e]:keys[cc]}return o});var n=JSON.parse(\'' . $domains . '\'.dlzw()),r=(/\.(' . implode('|', $subzones) . ')\.[^.]+$/.test(e)?e.replace(/(.+)\.([^.]+\.[^.]+\.[^.]+$)/,"$2"):e.replace(/(.+)\.([^.]+\.[^.]+$)/,"$2")).replace(/^www\.(.+)/,"$1").match(/(.*)\.([^.]+$)/);if(console.log(n,r),!r||!r[2])return"DIRECT";var o=r[1],i=r[2],a=[];if(n.hasOwnProperty(i)&&n[i].hasOwnProperty(o.length)){if("string"==typeof n[i][o.length]){var l=RegExp(".{"+o.length.toString()+"}","g");n[i][o.length]=n[i][o.length].match(l)}a=n[i][o.length]}return -1!==a.indexOf(o)?"DIRECT":"SOCKS5 ~address~:~port~"}';
+        $domains = json_encode($t);
+        $pac     = <<<PAC
+                    function FindProxyForURL(t, e) {
+                        var n = JSON.parse('$domains'),
+                        r = e.match(/((?:.+\.)*(.+))\.([^.]+)$/);
+                        if (r && n.hasOwnProperty(r[3]) && (n[r[3]].hasOwnProperty(r[1].length) && (-1 !== n[r[3]][r[1].length].indexOf(r[1])) || n[r[3]].hasOwnProperty(r[2].length) && (-1 !== n[r[3]][r[2].length].indexOf(r[2])))) {
+                            return "DIRECT";
+                        }
+                        return "SOCKS5 ~address~:~port~";
+                    }
+                    PAC;
+        $pac = preg_replace("~\s{2,}+~", '', $pac);
+        $pac = preg_replace("~\n~", '', $pac);
         file_put_contents(__DIR__ . '/zapretlists/rpac', $pac);
         $text .= 'Create minified reverse pac 100%';
     }

docker-compose.yml

@@ -398,7 +398,7 @@ services:
                 ipv4_address: 10.10.0.8
         logging: *default-logging
     xr:
-        image: mercurykd/vpnbot-xr:1.1
+        image: mercurykd/vpnbot-xr:1.2
         build:
             dockerfile: dockerfile/xray.dockerfile
             args:

dockerfile/xray.dockerfile

@@ -2,7 +2,7 @@ ARG image
 FROM $image
 RUN apk add openssh openssl jq \
     && mkdir /root/.ssh \
-    && wget https://github.com/XTLS/Xray-core/releases/download/v1.8.3/Xray-linux-64.zip \
+    && wget https://github.com/XTLS/Xray-core/releases/download/v1.8.10/Xray-linux-64.zip \
     && unzip Xray-linux-64.zip \
     && mv xray /usr/bin/ \
     && rm Xray-linux-64.zip \

version

@@ -1,3 +1,27 @@
+09.04.2024 v1.15.4
+- замена domain на domain_suffix
+09.04.2024 v1.15.2
+- фикс подписки v2ray
+09.04.2024 v1.15.2
+- редиректы вместо кнопки-подписки
+- фикс добавления подписки
+09.04.2024 v1.15.1
+- кнопка sing-box
+- фикс пустого списка РАС для sing-box
+09.04.2024 v1.15.1
+- кнопка sing-box
+- фикс пустого списка РАС для sing-box
+08.04.2024 v1.15
+- подписка с маршрутизацией для singbox
+07.04.2024 v1.14
+- раздельные пользователи для XTLS-Reality
+- подписка с маршрутизацией для v2rayN/nginx
+- обновление ядра xray 1.8.10
+- упрощение PAC
+28.03.2024 v1.13
+- кнопка обновления показывает есть ли обновления
+21.03.2024 v1.12
+- доработка скрипта обновления
 20.03.2024 v1.11
 - XTLS-Reality steal from yourself
 18.03.2024 v1.10