update version

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,14 @@ 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();
+                break;
+            case preg_match('~^/changeBranch (\d+)$~', $this->input['callback'], $m):
+                $this->changeBranch($m[1]);
                 break;
             case preg_match('~^/getMirror$~', $this->input['callback'], $m):
                 $this->getMirror();
@@ -215,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;
@@ -263,6 +275,15 @@ 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('~^/timerXr (\d+)$~', $this->input['callback'], $m):
+                $this->timerXr($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;
@@ -288,8 +309,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();
@@ -336,6 +357,12 @@ class Bot
             case preg_match('~^/changeFakeDomain$~', $this->input['callback'], $m):
                 $this->changeFakeDomain();
                 break;
+            case preg_match('~^/selfFakeDomain$~', $this->input['callback'], $m):
+                $this->selfFakeDomain();
+                break;
+            case preg_match('~^/changeTGDomain$~', $this->input['callback'], $m):
+                $this->changeTGDomain();
+                break;
             case preg_match('~^/include (\d+)$~', $this->input['callback'], $m):
                 $this->include($m[1]);
                 break;
@@ -401,17 +428,26 @@ class Bot
 
     public function secretSet($secret)
     {
-        $this->restartTG($secret);
+        file_put_contents('/config/mtprotosecret', $secret);
+        $this->restartTG();
         $this->mtproto();
     }
 
-    public function restartTG($secret)
+    public function setTelegramDomain($domain)
     {
-        file_put_contents('/config/mtprotosecret', $secret ?: '');
+        file_put_contents('/config/mtprotodomain', $domain);
+        $this->restartTG();
+        $this->mtproto();
+    }
+
+    public function restartTG()
+    {
+        $secret     = file_get_contents('/config/mtprotosecret');
+        $fakedomain = file_get_contents('/config/mtprotodomain') ?: 'vk.com';
         $this->ssh('pkill mtproto-proxy', 'tg');
         if (preg_match('~^\w{32}$~', $secret)) {
             $p = getenv('TGPORT');
-            $this->ssh("mtproto-proxy -u nobody -H $p --nat-info 10.10.0.8:{$this->ip} -S $secret --aes-pwd /proxy-secret /proxy-multi.conf -M 1 >/dev/null 2>&1 &", 'tg');
+            $this->ssh("mtproto-proxy --domain $fakedomain -u nobody -H $p --nat-info 10.10.0.8:{$this->ip} -S $secret --aes-pwd /proxy-secret /proxy-multi.conf -M 1 >/dev/null 2>&1 &", 'tg');
         }
     }
 
@@ -426,18 +462,22 @@ class Bot
     {
         $s  = file_get_contents('/config/mtprotosecret');
         $p  = getenv('TGPORT');
+        $d  = trim(file_get_contents('/config/mtprotodomain') ?: 'vk.com');
+        $d  = exec("echo $d | tr -d '\\n' | xxd -ps -c 200");
         $ip = $this->getPacConf()['domain'] ?: $this->ip;
-        return "https://t.me/proxy?server=$ip&port=$p&secret=$s";
+        return "https://t.me/proxy?server=$ip&port=$p&secret=ee$s$d";
     }
 
     public function mtproto()
     {
         $s      = file_get_contents('/config/mtprotosecret');
+        $d      = file_get_contents('/config/mtprotodomain') ?: 'vk.com';
         $p      = getenv('TGPORT');
         $ip     = $this->getPacConf()['domain'] ?: $this->ip;
         $st     = $this->ssh('pgrep mtproto-proxy', 'tg') ? 'on' : 'off';
         $text[] = "Menu -> MTProto\n";
         $text[] = "status: $st\n";
+        $text[] = "fake domain: <code>$d</code>\n";
         if ($st == 'on') {
             $text[] = $this->linkMtproto();
         }
@@ -453,6 +493,12 @@ class Bot
                 'callback_data' => "/setSecret",
             ],
         ];
+        $data[] = [
+            [
+                'text'          => $this->i18n('changeFakeDomain'),
+                'callback_data' => "/changeTGDomain",
+            ],
+        ];
         $data[] = [
             [
                 'text'          => $this->i18n('show QR'),
@@ -632,6 +678,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);
@@ -815,6 +893,7 @@ class Bot
     {
         while (true) {
             $this->shutdownClient();
+            $this->shutdownClientXr();
             $this->checkVersion();
             $this->checkBackup();
             $this->checkCert();
@@ -876,10 +955,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]}");
                         }
                     }
                 }
@@ -963,6 +1042,24 @@ class Bot
         }
     }
 
+    public function shutdownClientXr()
+    {
+        try {
+            $c = $this->getXray();
+            $f = 0;
+            foreach ($c['inbounds'][0]['settings']['clients'] as $k => $v) {
+                if (!empty($v['time']) && $v['time'] < time()) {
+                    unset($c['inbounds'][0]['settings']['clients'][$k]);
+                    $f = 1;
+                }
+            }
+            if (!empty($f)) {
+                $this->restartXray($c);
+            }
+        } catch (Exception $e) {
+        }
+    }
+
     public function renameClient(string $name, int $client)
     {
         $clients = $this->readClients();
@@ -1006,10 +1103,13 @@ class Bot
                 'private' => file_get_contents('/certs/cert_private'),
                 'public'  => file_get_contents('/certs/cert_public'),
             ] : false,
-            'mtproto' => file_get_contents('/config/mtprotosecret'),
-            'xray'    => json_decode(file_get_contents('/config/xray.json'), true),
-            'oc'      => file_get_contents('/config/ocserv.conf'),
-            'ocu'     => file_get_contents('/config/ocserv.passwd'),
+            'mtproto'       => file_get_contents('/config/mtprotosecret'),
+            'mtprotodomain' => file_get_contents('/config/mtprotodomain'),
+            'xray'          => $this->getXray(),
+            'oc'            => file_get_contents('/config/ocserv.conf'),
+            'ocu'           => file_get_contents('/config/ocserv.passwd'),
+            'v2ray'         => file_get_contents('/config/v2ray.json'),
+            'sing'          => file_get_contents('/config/sing.json'),
 
         ];
         return json_encode($conf, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
@@ -1121,7 +1221,9 @@ class Bot
             if (!empty($json['mtproto'])) {
                 $out[] = 'update mtproto';
                 $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
-                $this->restartTG($json['mtproto']);
+                file_put_contents('/config/mtprotosecret', $json['mtproto']);
+                file_put_contents('/config/mtprotodomain', $json['mtprotodomain'] ?: '');
+                $this->restartTG();
             }
             // xray
             if (!empty($json['xray'])) {
@@ -1141,6 +1243,18 @@ class Bot
                 $this->setUpstreamDomainOcserv($json['pac']['domain']);
                 $this->setUpstreamDomainNaive($json['pac']['domain']);
             }
+            // v2ray
+            if (!empty($json['v2ray'])) {
+                $out[] = 'update v2ray';
+                $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
+                file_put_contents('/config/v2ray.json', $json['v2ray']);
+            }
+            // sing
+            if (!empty($json['sing'])) {
+                $out[] = 'update sing-box';
+                $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
+                file_put_contents('/config/sing.json', $json['sing']);
+            }
             // nginx
             $out[] = 'reset nginx';
             $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
@@ -1373,9 +1487,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(
@@ -1782,6 +1896,21 @@ class Bot
         ];
     }
 
+    public function timerXr($k)
+    {
+        $r = $this->send(
+            $this->input['chat'],
+            "@{$this->input['username']} enter time like https://www.php.net/manual/ru/function.strtotime.php:",
+            $this->input['message_id'],
+            reply: 'enter time like https://www.php.net/manual/ru/function.strtotime.php:',
+        );
+        $_SESSION['reply'][$r['result']['message_id']] = [
+            'start_message' => $this->input['message_id'],
+            'callback'      => 'setTimerXr',
+            'args'          => [$k],
+        ];
+    }
+
     public function setAdKey($key)
     {
         $c = $this->getPacConf();
@@ -2742,9 +2871,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']);
@@ -2834,15 +2963,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",
             ],
         ];
@@ -2874,7 +3004,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'),
@@ -3037,7 +3175,9 @@ DNS-over-HTTPS with IP:
 
     public function menu($type = false, $arg = false, $return = false)
     {
-        $menu = [
+        $domain = $this->getPacConf()['domain'] ?: $this->ip;
+        $scheme = empty($this->nginxGetTypeCert()) ? 'http' : 'https';
+        $menu   = [
             'main' => [
                 'text' => 'v' . getenv('VER'),
                 'data' => [
@@ -3100,12 +3240,12 @@ DNS-over-HTTPS with IP:
                     [
                         [
                             'text' => $this->i18n('chat'),
-                            'url'  => "https://t.me/+bUuWfsKzaMZhNjQy",
+                            'url'  => "https://t.me/vpnbot_group",
                         ],
                         [
                             'text' => $this->i18n('donate'),
                             'web_app' => [
-                                'url'  => "https://www.donationalerts.com/r/mercurykd",
+                                'url'  => "$scheme://$domain/donate.html",
                             ]
                         ],
                     ],
@@ -3126,6 +3266,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'];
@@ -3157,12 +3298,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()
@@ -3324,6 +3465,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));
@@ -3337,39 +3491,69 @@ 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 setTimerXr($time, $i)
+    {
+        $c = $this->getXray();
+        if (empty($time)) {
+            unset($c['inbounds'][0]['settings']['clients'][$i]['time']);
+        } else {
+            $c['inbounds'][0]['settings']['clients'][$i]['time'] = strtotime($time);
+        }
+        file_put_contents('/config/xray.json', json_encode($c, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES));
+        $this->userXr($i);
+    }
+
+    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'),
                 'callback_data' => "/changeFakeDomain",
             ],
+            [
+                'text'          => $this->i18n('selfFakeDomain'),
+                '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) {
+            $time   = $v['time'] ? $this->getTime($v['time']) : '';
             $data[] = [
                 [
-                    'text'          => $this->i18n('show QR'),
-                    'callback_data' => "/qrXray",
+                    'text'          => "{$v['email']}" . ($time ? ": $time" : ''),
+                    'callback_data' => "/userXr $k",
                 ],
             ];
         }
@@ -3387,6 +3571,149 @@ 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>";
+
+        if ($time = $c['inbounds'][0]['settings']['clients'][$i]['time']) {
+            $text[] = "\ntimer: " . $this->getTime($time);
+        }
+
+        $data[] = [
+            [
+                'text'          => $this->i18n('timer'),
+                'callback_data' => "/timerXr $i",
+            ],
+        ];
+        $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 = json_decode(file_get_contents('/config/v2ray.json'), true);
+
+        $c['outbounds'][0]['settings']['vnext'][0]['address']                 = $domain;
+        $c['outbounds'][0]['settings']['vnext'][0]['users'][0]['id']          = $key;
+        $c['outbounds'][0]['streamSettings']['realitySettings']['serverName'] = $xr['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0];
+        $c['outbounds'][0]['streamSettings']['realitySettings']['publicKey']  = $pac['xray'];
+        $c['outbounds'][0]['streamSettings']['realitySettings']['shortId']    = $xr['inbounds'][0]['streamSettings']['realitySettings']['shortIds'][0];
+        $c['routing']['rules'][0]['domain']                                   = array_keys(array_filter($pac['includelist']));
+
+        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 = json_decode(file_get_contents('/config/sing.json'), true);
+
+        if ($c['dns']['servers'][0]['address'] == '~dns~') {
+            $c['dns']['servers'][0]['address'] = "tls://" . ($pac['adguardkey'] ? "{$pac['adguardkey']}." : '') . "$domain";
+        }
+
+        $c['outbounds'][0]['server']                       = $domain;
+        $c['outbounds'][0]['uuid']                         = $key;
+        $c['outbounds'][0]['tls']['reality']['public_key'] = $pac['xray'];
+        $c['outbounds'][0]['tls']['server_name']           = $xr['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0];
+        $c['outbounds'][0]['tls']['reality']['short_id']   = $xr['inbounds'][0]['streamSettings']['realitySettings']['shortIds'][0];
+        $c['route']['rules'][1]['domain_suffix']           = array_keys(array_filter($pac['includelist']));
+
+        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);
@@ -3395,21 +3722,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)
@@ -3630,6 +3954,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...');
@@ -3640,6 +3999,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();
@@ -3753,8 +4113,8 @@ DNS-over-HTTPS with IP:
         ];
         $data[] = [
             [
-                '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[] = [
@@ -3769,6 +4129,39 @@ DNS-over-HTTPS with IP:
         ];
     }
 
+    public function branches()
+    {
+        exec('git -C / branch -r', $m);
+        array_shift($m);
+        foreach ($m as $k => $v) {
+            $data[] = [
+                [
+                    'text'          => $v,
+                    'callback_data' => "/changeBranch $k",
+                ]
+            ];
+        }
+        $data[] = [
+            [
+                'text'          => $this->i18n('back'),
+                'callback_data' => "/menu update",
+            ]
+        ];
+        $this->update($this->input['from'], $this->input['message_id'], 'branches', $data);
+    }
+
+    public function changeBranch($i)
+    {
+        exec('git -C / branch -r', $m);
+        array_shift($m);
+        foreach ($m as $k => $v) {
+            if ($i == $k) {
+                file_put_contents('/update/branch', trim(str_replace('origin/', '', $v)));
+            }
+        }
+        $this->menu('update');
+    }
+
     public function logs()
     {
         foreach (scandir('/logs/') as $k => $v) {
@@ -3871,16 +4264,42 @@ DNS-over-HTTPS with IP:
         ];
     }
 
-    public function setFakeDomain($domain)
+    public function changeTGDomain()
+    {
+        $r = $this->send(
+            $this->input['chat'],
+            "@{$this->input['username']} enter domain",
+            $this->input['message_id'],
+            reply: 'enter domain',
+        );
+        $_SESSION['reply'][$r['result']['message_id']] = [
+            'start_message'  => $this->input['message_id'],
+            'start_callback' => $this->input['callback_id'],
+            'callback'       => 'setTelegramDomain',
+            'args'           => [],
+        ];
+    }
+
+    public function setFakeDomain($domain, $self = false)
     {
         $c = $this->getXray();
         $c['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0] = $domain;
-        $c['inbounds'][0]['streamSettings']['realitySettings']['dest'] = "$domain:443";
+        $c['inbounds'][0]['streamSettings']['realitySettings']['dest'] = $self ? "10.10.1.2:443" : "$domain:443";
         $this->restartXray($c);
         $this->setUpstreamDomain($domain);
         $this->xray();
     }
 
+    public function selfFakeDomain()
+    {
+        $c = $this->getPacConf();
+        if (!empty($c['domain'])) {
+            $this->setFakeDomain($c['domain'], 1);
+        } else{
+            $this->answer($this->input['callback_id'], 'empty domain', true);
+        }
+    }
+
     public function setBackup($text)
     {
         $text = trim($text);

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',
@@ -263,7 +263,11 @@ $i = [
     ],
     'changeFakeDomain'  => [
         'en' => 'changeFakeDomain',
-        'ru' => 'установить фейковый домен',
+        'ru' => 'фейковый домен',
+    ],
+    'selfFakeDomain'  => [
+        'en' => 'steal from yourself',
+        'ru' => 'steal from yourself',
     ],
     'page'  => [
         'en' => 'pagination',
@@ -310,11 +314,19 @@ $i = [
         'ru' => 'сторонний браузер',
     ],
     'browser_notify_on'  => [
-        'en' => 'the web panel can now be opened in any browser',
-        'ru' => 'веб панель теперь может быть открыта в любом браузере',
+        'en' => 'the web panel can be opened in any browser',
+        'ru' => 'веб панель может быть открыта в любом браузере',
     ],
     'browser_notify_off'  => [
-        'en' => 'the web panel can no longer be opened in any browser',
-        'ru' => 'веб панель теперь не может быть открыта в любом браузере',
+        '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/service.php

@@ -35,4 +35,5 @@ if (!empty($c['admin'])) {
 }
 file_put_contents('/update/message', '');
 file_put_contents('/update/reload_message', '');
+$bot->restartTG();
 $bot->sslip();

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%';
     }

app/webapp/donate.html

@@ -0,0 +1,4 @@
+<div style="position:relative;width:100%;height:100%">
+    <img style="position:absolute;top:0;right:0;width:35%" src="toncoin.png" alt="">
+    <iframe style="width:100%;height:100%" src="https://www.donationalerts.com/r/mercurykd" frameborder="0"></iframe>
+</div>

app/webapp/login.html

@@ -0,0 +1,117 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Login</title>
+    <style>
+        /* Design based on Blue Login Field of Kevin Sleger https://codepen.io/MurmeltierS/pen/macKb */
+
+        body {
+            background: #44c4e7 url("https://photos-6.dropbox.com/t/2/AAC_bdqR8LMkjEe-HPIf4K1DhtseMLRHPklBSzJSuzglvA/12/5714737/jpeg/1024x768/3/1418346000/0/2/bkg-blur.jpg/CLHm3AIgASgBKAI/b7RrveA2022yJyfO9RyRvv7LjJQESukGHssHUxVThzw") no-repeat center center fixed;
+            background-size: cover;
+            font-family: "Roboto";
+            -webkit-font-smoothing: antialiased;
+            -moz-osx-font-smoothing: grayscale;
+
+            &::before {
+                z-index: -1;
+                content: '';
+                position: fixed;
+                top: 0;
+                left: 0;
+                background: #44c4e7;
+                /* IE Fallback */
+                background: rgba(68, 196, 231, 0.8);
+                width: 100%;
+                height: 100%;
+            }
+        }
+
+        .form {
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            background: #fff;
+            width: 285px;
+            margin: -140px 0 0 -182px;
+            padding: 40px;
+            box-shadow: 0 0 3px rgba(0, 0, 0, 0.3);
+
+            h2 {
+                margin: 0 0 20px;
+                line-height: 1;
+                color: #44c4e7;
+                font-size: 18px;
+                font-weight: 400;
+            }
+
+            input {
+                outline: none;
+                display: block;
+                width: 100%;
+                margin: 0 0 20px;
+                padding: 10px 15px;
+                border: 1px solid #ccc;
+                color: #ccc;
+                font-family: "Roboto";
+                box-sizing: border-box;
+                font-size: 14px;
+                font-wieght: 400;
+                -webkit-font-smoothing: antialiased;
+                -moz-osx-font-smoothing: grayscale;
+                transition: 0.2s linear;
+
+                &input:focus {
+                    color: #333;
+                    border: 1px solid #44c4e7;
+                }
+            }
+
+            button {
+                cursor: pointer;
+                background: #44c4e7;
+                width: 100%;
+                padding: 10px 15px;
+                border: 0;
+                color: #fff;
+                font-family: "Roboto";
+                font-size: 14px;
+                font-weight: 400;
+
+                &:hover {
+                    background: #369cb8;
+                }
+            }
+        }
+
+        .error,
+        .valid {
+            display: none;
+        }
+    </style>
+    <script src="jquery-3.7.1.min.js"></script>
+</head>
+
+<body>
+    <section class="form animated flipInX">
+        <h2>Login To Your Account</h2>
+        <p class="valid">Valid. Please wait a moment.</p>
+        <p class="error">Error. Please enter correct Username &amp; password.</p>
+        <form class="loginbox" autocomplete="off">
+            <input placeholder="Username" type="text" id="username"></input>
+            <input placeholder="Password" type="password" id="password"></input>
+            <button id="submit">Login</button>
+        </form>
+    </section>
+    <script>
+        $(document).ready(function() {
+            $('#submit').click(function () {
+                event.preventDefault(); // prevent PageReLoad
+                $('.error').css('display', 'block'); // show error msg
+            });
+        });
+    </script>
+</body>
+</html>

config/nginx.conf

@@ -22,15 +22,17 @@ http {
   set_real_ip_from    10.10.0.10;
 
   server {
-    listen 80 default_server;
-    listen 443 ssl http2 default_server proxy_protocol;
+    listen 10.10.0.2:80 default_server;
+    listen 10.10.0.2:443 ssl http2 default_server proxy_protocol;
     ssl_certificate /certs/self_public;
     ssl_certificate_key /certs/self_private;
 
     access_log /logs/nginx_default_access;
 
     location / {
-      return 444;
+      root /app;
+      index login.html;
+      try_files $uri $uri/ =404;
     }
     location /adguard/ {
       access_log /logs/nginx_adguard_access;
@@ -73,11 +75,12 @@ http {
 
 #-domain
   # server {
-  #   listen 80;
+  #   listen 10.10.0.2:80;
   #   server_name ;
 #-domain
 #-ssl
-    # listen 443 ssl http2 proxy_protocol;
+    # listen 10.10.0.2:443 ssl http2 proxy_protocol;
+    # listen 10.10.1.2:443 ssl http2;
     # ssl_certificate /certs/cert_public;
     # ssl_certificate_key /certs/cert_private;
 #-ssl
@@ -86,7 +89,9 @@ http {
   #   access_log /logs/nginx_domain_access;
 
   #   location / {
-  #     return 444;
+  #     root /app;
+  #     index login.html;
+  #     try_files $uri $uri/ =404;
   #   }
   #   location /adguard/ {
   #     access_log /logs/nginx_adguard_access;

config/nginx_default.conf

@@ -22,15 +22,17 @@ http {
   set_real_ip_from    10.10.0.10;
 
   server {
-    listen 80 default_server;
-    listen 443 ssl http2 default_server proxy_protocol;
+    listen 10.10.0.2:80 default_server;
+    listen 10.10.0.2:443 ssl http2 default_server proxy_protocol;
     ssl_certificate /certs/self_public;
     ssl_certificate_key /certs/self_private;
 
     access_log /logs/nginx_default_access;
 
     location / {
-      return 444;
+      root /app;
+      index login.html;
+      try_files $uri $uri/ =404;
     }
     location /adguard/ {
       access_log /logs/nginx_adguard_access;
@@ -73,11 +75,12 @@ http {
 
 #-domain
   # server {
-  #   listen 80;
+  #   listen 10.10.0.2:80;
   #   server_name ;
 #-domain
 #-ssl
-    # listen 443 ssl http2 proxy_protocol;
+    # listen 10.10.0.2:443 ssl http2 proxy_protocol;
+    # listen 10.10.1.2:443 ssl http2;
     # ssl_certificate /certs/cert_public;
     # ssl_certificate_key /certs/cert_private;
 #-ssl
@@ -86,7 +89,9 @@ http {
   #   access_log /logs/nginx_domain_access;
 
   #   location / {
-  #     return 444;
+  #     root /app;
+  #     index login.html;
+  #     try_files $uri $uri/ =404;
   #   }
   #   location /adguard/ {
   #     access_log /logs/nginx_adguard_access;

config/sing.json

@@ -0,0 +1,106 @@
+{
+    "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": "~dns~",
+            "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": "",
+        "server_port": 443,
+        "tls": {
+            "enabled": true,
+            "insecure": false,
+            "reality": {
+                "enabled": true,
+                "public_key": "",
+                "short_id": ""
+            },
+            "server_name": "",
+            "utls": {
+                "enabled": true,
+                "fingerprint": "chrome"
+            }
+        },
+        "uuid": "",
+        "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": [],
+            "outbound": "proxy"
+        }, {
+            "ip_cidr": ["0.0.0.0\/0"],
+            "outbound": "direct"
+        }]
+    }
+}

config/v2ray.json

@@ -0,0 +1,95 @@
+{
+    "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": "",
+                "port": 443,
+                "users": [{
+                    "id": "",
+                    "alterId": 0,
+                    "email": "t@t.tt",
+                    "security": "auto",
+                    "encryption": "none",
+                    "flow": "xtls-rprx-vision"
+                }]
+            }]
+        },
+        "streamSettings": {
+            "network": "tcp",
+            "security": "reality",
+            "realitySettings": {
+                "serverName": "",
+                "fingerprint": "chrome",
+                "show": false,
+                "publicKey": "",
+                "shortId": "",
+                "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": []
+        }, {
+            "type": "field",
+            "port": "0-65535",
+            "outboundTag": "direct"
+        }]
+    }
+}

docker-compose.yml

@@ -12,6 +12,10 @@ networks:
         ipam:
             config:
                 - subnet: 10.10.0.0/24
+    xray:
+        ipam:
+            config:
+                - subnet: 10.10.1.0/24
 volumes:
     adguard:
 
@@ -87,9 +91,11 @@ services:
         networks:
             default:
                 ipv4_address: 10.10.0.2
+            xray:
+                ipv4_address: 10.10.1.2
         logging: *default-logging
     php:
-        image: mercurykd/vpnbot-php:1.2
+        image: mercurykd/vpnbot-php:1.3
         build:
             dockerfile: dockerfile/php.dockerfile
             args:
@@ -110,6 +116,7 @@ services:
             - ./mirror:/mirror
             - ./.env:/mirror/.env
             - ./update:/update
+            - ./.git:/.git
         environment:
             IP: ${IP}
             VER: ${VER}
@@ -391,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:
@@ -417,6 +424,8 @@ services:
         networks:
             default:
                 ipv4_address: 10.10.0.9
+            xray:
+                ipv4_address: 10.10.1.9
         logging: *default-logging
     oc:
         image: mercurykd/vpnbot-oc:1.2

dockerfile/php.dockerfile

@@ -19,6 +19,7 @@ RUN apk add --no-cache --update php81 \
     openssh \
     openssl \
     curl \
+    git \
     py3-qt5 \
     && wget https://github.com/ameshkov/dnslookup/releases/download/v1.9.1/dnslookup-linux-amd64-v1.9.1.tar.gz \
     && tar -xf dnslookup-linux-amd64-v1.9.1.tar.gz \

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 \

scripts/start_tg.sh

@@ -4,9 +4,4 @@ ssh-keygen -A
 exec /usr/sbin/sshd -D -e "$@" &
 curl -s https://core.telegram.org/getProxySecret -o proxy-secret
 curl -s https://core.telegram.org/getProxyConfig -o proxy-multi.conf
-if [ $(cat /mtprotosecret | wc -c) -gt 0 ]
-then
-    SECRET=$(cat /mtprotosecret)
-    mtproto-proxy -u nobody -H $TGPORT --nat-info 10.10.0.8:$IP -S $SECRET --aes-pwd /proxy-secret /proxy-multi.conf -M 1
-fi
 tail -f /dev/null

update/update.sh

@@ -6,10 +6,16 @@ echo "$$" > $pwd/update/update_pid
 while true
 do
     cmd=$(cat $pwd/update/pipe)
+    branch=$(cat $pwd/update/branch 2>/dev/null)
     if [[ -n "$cmd" ]]
     then
         docker compose down --remove-orphans
-        git reset --hard
+        git reset --hard && git clean -fd
+        git fetch
+        if [[ -n "$branch" ]]
+        then
+            git checkout -t origin/$branch || git checkout $branch
+        fi
         git pull > ./update/message
         IP=$(curl https://ipinfo.io/ip) VER=$(git describe --tags) docker compose up -d --force-recreate
         bash $pwd/update/update.sh &

version

@@ -1,3 +1,35 @@
+09.04.2024 v1.17
+- редактируемые конфиги v2ray/sing-box
+09.04.2024 v1.16
+- редактируемые конфиги v2ray/sing-box
+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
+- MTProto Fake-TLS
 17.03.2024 v1.9
 - автоматический технический домен sslip
 13.03.2024 v1.8.10