improve template sign

app/bot.php

@@ -6,6 +6,7 @@ class Bot
     public $adguard;
     public $update;
     public $ip;
+    public $limit;
 
     public function __construct($key, $i18n)
     {
@@ -137,6 +138,12 @@ class Bot
             case preg_match('~^/mtproto$~', $this->input['callback'], $m):
                 $this->mtproto();
                 break;
+            case preg_match('~^/addCommunityFilter$~', $this->input['callback'], $m):
+                $this->addCommunityFilter();
+                break;
+            case preg_match('~^/pacMenu (\d+)$~', $this->input['callback'], $m):
+                $this->pacMenu($m[1]);
+                break;
             case preg_match('~^/applyupdatebot$~', $this->input['callback'], $m):
                 $this->applyupdatebot();
                 break;
@@ -278,9 +285,24 @@ class Bot
             case preg_match('~^/userXr (\d+)$~', $this->input['callback'], $m):
                 $this->userXr($m[1]);
                 break;
+            case preg_match('~^/choiceTemplate (\d+(?:_.+)?)$~', $this->input['callback'], $m):
+                $this->choiceTemplate($m[1]);
+                break;
+            case preg_match('~^/templateUser (\d+)$~', $this->input['callback'], $m):
+                $this->templateUser($m[1]);
+                break;
+            case preg_match('~^/timerXr (\d+)$~', $this->input['callback'], $m):
+                $this->timerXr($m[1]);
+                break;
+            case preg_match('~^/switchXr (\d+)$~', $this->input['callback'], $m):
+                $this->switchXr($m[1]);
+                break;
             case preg_match('~^/delxr (\d+)$~', $this->input['callback'], $m):
                 $this->delxr($m[1]);
                 break;
+            case preg_match('~^/listXr (\d+)$~', $this->input['callback'], $m):
+                $this->listXr($m[1]);
+                break;
             case preg_match('~^/switchTorrent (\d+)$~', $this->input['callback'], $m):
                 $this->switchTorrent($m[1]);
                 break;
@@ -327,7 +349,7 @@ class Bot
             case preg_match('~^/deldomain$~', $this->input['callback'], $m):
                 $this->delDomain();
                 break;
-            case preg_match('~^/(?P<action>change|delete)(?P<typelist>subzoneslist|reverselist|includelist|excludelist) (?P<arg>[^\s]+(?:_(?:-)?\d+)?)$~', $this->input['callback'], $m):
+            case preg_match('~^/(?P<action>change|delete)(?P<typelist>includelist) (?P<arg>[^\s]+(?:_(?:-)?\d+)?)$~', $this->input['callback'], $m):
                 $this->listPacChange($m['typelist'], $m['action'], ...explode('_', $m['arg']));
                 break;
             case preg_match('~^/paczapret$~', $this->input['callback'], $m):
@@ -345,8 +367,23 @@ class Bot
             case preg_match('~^/domain$~', $this->input['callback'], $m):
                 $this->domain();
                 break;
-            case preg_match('~^/xray$~', $this->input['callback'], $m):
-                $this->xray();
+            case preg_match('~^/xray(?: (\d+))?$~', $this->input['callback'], $m):
+                $this->xray($m[1] ?: 0);
+                break;
+            case preg_match('~^/delTemplate(?: (.+))?$~', $this->input['callback'], $m):
+                $this->delTemplate($m[1] ?: 0);
+                break;
+            case preg_match('~^/downloadTemplate(?: (.+))?$~', $this->input['callback'], $m):
+                $this->downloadTemplate($m[1] ?: 0);
+                break;
+            case preg_match('~^/defaultTemplate(?: (.+))?$~', $this->input['callback'], $m):
+                $this->defaultTemplate($m[1] ?: 0);
+                break;
+            case preg_match('~^/singbox(?: (\w+))?$~', $this->input['callback'], $m):
+                $this->singbox($m[1] ?: false);
+                break;
+            case preg_match('~^/singAdd$~', $this->input['callback'], $m):
+                $this->singAdd();
                 break;
             case preg_match('~^/generateSecretXray$~', $this->input['callback'], $m):
                 $this->generateSecretXray();
@@ -450,6 +487,7 @@ class Bot
 
     public function restartXray($c)
     {
+        $c['inbounds'][0]['settings']['clients'] = array_values($c['inbounds'][0]['settings']['clients']);
         $this->ssh('pkill xray', 'xr');
         file_put_contents('/config/xray.json', json_encode($c, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES));
         $this->ssh('xray run -config /xray.json > /dev/null 2>&1 &', 'xr');
@@ -890,6 +928,7 @@ class Bot
     {
         while (true) {
             $this->shutdownClient();
+            $this->shutdownClientXr();
             $this->checkVersion();
             $this->checkBackup();
             $this->checkCert();
@@ -1038,6 +1077,19 @@ class Bot
         }
     }
 
+    public function shutdownClientXr()
+    {
+        try {
+            $c = $this->getXray();
+            foreach ($c['inbounds'][0]['settings']['clients'] as $k => $v) {
+                if (!empty($v['time']) && ($v['time'] < time())) {
+                    $this->switchXr($k, 1);
+                }
+            }
+        } catch (Exception $e) {
+        }
+    }
+
     public function renameClient(string $name, int $client)
     {
         $clients = $this->readClients();
@@ -1086,8 +1138,6 @@ class Bot
             '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);
@@ -1221,18 +1271,6 @@ 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));
@@ -1557,6 +1595,7 @@ class Bot
                 $t = preg_replace('~#-domain.+?#-domain~s', $this->uncomment($v, 'domain'), $t, 1);
             }
             file_put_contents('/config/nginx.conf', $t);
+            $this->adguardProtect();
             $u = $this->ssh("nginx -t 2>&1", 'ng');
             $out[] = $u;
             $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
@@ -1874,6 +1913,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();
@@ -1942,12 +1996,7 @@ class Bot
         $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
         $out[] = $this->stopAd();
         $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
-        $c = yaml_parse_file($this->adguard);
-        $c['users'][0]['password'] = password_hash($pass, PASSWORD_DEFAULT);
-        yaml_emit_file($this->adguard, $c);
-        $p = $this->getPacConf();
-        $p['adpswd'] = $pass;
-        $this->setPacConf($p);
+        $this->adguardChangePswd($pass);
         $out[] = $this->startAd();
         $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
         sleep(3);
@@ -2093,7 +2142,7 @@ DNS-over-HTTPS with IP:
             $page = (int) floor(array_search($v, array_keys($conf['includelist'])) / $count);
         }
         $page = $page ?: -2;
-        $this->menu('includelist', $page);
+        $this->pacUpdate();
     }
 
     public function reverse(int $count)
@@ -2818,25 +2867,31 @@ DNS-over-HTTPS with IP:
         return $r;
     }
 
-    public function pacMenu()
+    public function addCommunityFilter()
     {
-        $rmpac    = stat(__DIR__ . '/zapretlists/rmpac');
-        $rpac     = stat(__DIR__ . '/zapretlists/rpac');
-        $mpac     = stat(__DIR__ . '/zapretlists/mpac');
-        $pac      = stat(__DIR__ . '/zapretlists/pac');
-        $conf     = $this->getPacConf();
-        $zapret   = $conf['zapret'] ? $this->i18n('on') : $this->i18n('off');
-        $ip       = $conf['domain'] ?: $this->ip;
-        $hash     = substr(md5($this->key), 0, 8);
-        $scheme   = empty($this->nginxGetTypeCert()) ? 'http' : 'https';
-        $text     = <<<text
+        $pac = $this->getPacConf();
+        $l   = array_filter(array_map(fn($e) => trim($e), explode("\n", file_get_contents('https://community.antifilter.download/list/domains.lst'))));
+        if (!empty($l)) {
+            foreach ($l as $k => $v) {
+                $pac['includelist'][$v] = true;
+            }
+        }
+        $this->setPacConf($pac);
+        $this->pacUpdate();
+    }
+
+    public function pacMenu($page = 0)
+    {
+        $rmpac  = stat(__DIR__ . '/zapretlists/rmpac');
+        $rpac   = stat(__DIR__ . '/zapretlists/rpac');
+        $mpac   = stat(__DIR__ . '/zapretlists/mpac');
+        $pac    = stat(__DIR__ . '/zapretlists/pac');
+        $conf   = $this->getPacConf();
+        $ip     = $conf['domain'] ?: $this->ip;
+        $hash   = substr(md5($this->key), 0, 8);
+        $scheme = empty($this->nginxGetTypeCert()) ? 'http' : 'https';
+        $text   = <<<text
                 Menu -> pac
-
-                <code>RU blacklist:</code> <code>https://github.com/zapret-info/z-i</code>
-
-                {$this->i18n('proxy')}{$this->i18n('self list explain')}
-
-                {$this->i18n('direct')}{$this->i18n('reverse list explain')}
                 text;
         if ($pac) {
             $pac['time']  = date('d.m.Y H:i:s', $pac['mtime']);
@@ -2848,12 +2903,8 @@ DNS-over-HTTPS with IP:
                     <code>$scheme://$ip/pac?h=$hash&a=127.0.0.1&p=1080</code>
                     text;
             $urls[0][] = [
-                'text' => "PAC",
-                'url'  => "$scheme://$ip/pac?h=$hash&a=127.0.0.1&p=1080",
-            ];
-            $urls[1][] = [
-                'text' => "PAC Wireguard proxy",
-                'url'  => "$scheme://$ip/pac?h=$hash&a=10.10.0.3&p=1080",
+                'text'    => "PAC",
+                'web_app' => ['url'  => "https://$ip/pac?h=$hash&a=127.0.0.1&p=1080"],
             ];
         }
         if ($mpac) {
@@ -2865,9 +2916,9 @@ DNS-over-HTTPS with IP:
                     <b>Shadowsocks-android PAC ({$mpac['time']} / {$mpac['sz']}):</b>
                     <code>$scheme://$ip/pac?h=$hash&t=mpac</code>
                     text;
-            $urls[2][] = [
-                'text' => "PAC ShadowSocks(Android)",
-                'url'  => "$scheme://$ip/pac?h=$hash&t=mpac",
+            $urls[0][] = [
+                'text'    => "PAC ShadowSocks(Android)",
+                'web_app' => ['url'  => "https://$ip/pac?h=$hash&t=mpac"],
             ];
         }
         if ($rpac) {
@@ -2905,115 +2956,46 @@ DNS-over-HTTPS with IP:
         if ($urls) {
             $data = $urls;
         }
-        if ($conf['zapret']) {
-            $data[] = [
-                [
-                    'text'          => "RU blacklist : $zapret",
-                    'callback_data' => "/paczapret",
-                ],
-                [
-                    'text'          => $this->i18n('blacklist exclude'),
-                    'callback_data' => "/menu excludelist 0",
-                ],
-            ];
-        } else {
-            $data[] = [
-                [
-                    'text'          => "RU blacklist : $zapret",
-                    'callback_data' => "/paczapret",
-                ],
-            ];
-        }
         $data[] = [
             [
-                '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('direct'),
-                'callback_data' => "/menu reverselist 0",
+                'text'          => $this->i18n('add') . ' community antifilter',
+                'callback_data' => "/addCommunityFilter",
             ],
         ];
-        if ($conf['zapret'] || !empty($conf['includelist']) || !empty($conf['reverselist'])) {
-            $data[] = [
-                [
-                    'text'          => "{$this->i18n('update')} PAC",
-                    'callback_data' => "/pacupdate",
-                ],
-                [
-                    'text'          => $this->i18n('check url'),
-                    'callback_data' => "/checkurl",
-                ],
-            ];
-        }
-        $data[] = [
-            [
-                'text'          => $this->i18n('back'),
-                'callback_data' => "/menu",
-            ],
-        ];
-        return [
-            'text' => $text,
-            'data' => $data,
-        ];
-    }
-
-    public function pacList($type, int $page, int $count = 5)
-    {
-        $count  = $this->limit;
-        $name   = str_replace('list', '', $type);
-        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'),
-                'callback_data' => "/$name $count",
+                'callback_data' => "/include {$this->limit}",
             ],
         ];
-        $domains = $this->getPacConf()[$type];
+        $domains = $this->getPacConf()['includelist'];
         if (!empty($domains)) {
             ksort($domains);
-            $all     = (int) ceil(count($domains) / $count);
+            $all     = (int) ceil(count($domains) / $this->limit);
             $page    = min($page, $all - 1);
-            $page    = $page == -2 ? $all - 1 : $page;
-            $domains = $page != -1 ? array_slice($domains, $page * $count, $count, true) : $domains;
+            $page    = $page < 0 ? $all - 1 : $page;
+            $domains = array_slice($domains, $page * $this->limit, $this->limit, true);
             foreach ($domains as $k => $v) {
                 $data[] = [
                     [
-                        'text'          => '(' . ($v ? 'ON' : 'OFF') . ') ' . ($type == 'includelist' ? idn_to_utf8($k) : $k),
-                        'callback_data' => "/change{$name}list {$k}_$count",
+                        'text'          => '(' . ($v ? 'ON' : 'OFF') . ') ' . idn_to_utf8($k),
+                        'callback_data' => "/changeincludelist {$k}_{$this->limit}",
                     ],
                     [
                         'text'          => 'delete',
-                        'callback_data' => "/delete{$name}list {$k}_$count",
+                        'callback_data' => "/deleteincludelist {$k}_{$this->limit}",
                     ],
                 ];
             }
-            if ($page != -1 && $all > 1) {
+            if ($all > 1) {
                 $data[] = [
                     [
                         'text'          => '<<',
-                        'callback_data' => "/menu $type " . ($page - 1 >= 0 ? $page - 1 : $all - 1),
+                        'callback_data' => "/pacMenu " . ($page - 1 >= 0 ? $page - 1 : $all - 1),
                     ],
-                    // [
-                    //     'text'          => 'all',
-                    //     'callback_data' => "/menu $type -1",
-                    // ],
                     [
                         'text'          => '>>',
-                        'callback_data' => "/menu $type " . ($page < $all - 1 ? $page + 1 : 0),
+                        'callback_data' => "/pacMenu " . ($page < $all - 1 ? $page + 1 : 0),
                     ]
                 ];
             }
@@ -3021,13 +3003,15 @@ DNS-over-HTTPS with IP:
         $data[] = [
             [
                 'text'          => $this->i18n('back'),
-                'callback_data' => "/menu pac",
+                'callback_data' => "/menu",
             ],
         ];
-        return [
-            'text' => $text,
-            'data' => $data,
-        ];
+        $this->update(
+            $this->input['chat'],
+            $this->input['message_id'],
+            $text,
+            $data ?: false,
+        );
     }
 
     public function listPacChange($type, $action, $key, int $count)
@@ -3045,7 +3029,7 @@ DNS-over-HTTPS with IP:
                 break;
         }
         $this->setPacConf($conf);
-        $this->menu($type, $page);
+        $this->pacUpdate();
     }
 
     public function pacZapret()
@@ -3139,7 +3123,6 @@ DNS-over-HTTPS with IP:
     public function menu($type = false, $arg = false, $return = false)
     {
         $domain = $this->getPacConf()['domain'] ?: $this->ip;
-        $scheme = empty($this->nginxGetTypeCert()) ? 'http' : 'https';
         $menu   = [
             'main' => [
                 'text' => 'v' . getenv('VER'),
@@ -3191,7 +3174,7 @@ DNS-over-HTTPS with IP:
                         ],
                         [
                             'text'          => $this->i18n('pac'),
-                            'callback_data' => "/menu pac",
+                            'callback_data' => "/pacMenu 0",
                         ],
                     ],
                     [
@@ -3208,7 +3191,7 @@ DNS-over-HTTPS with IP:
                         [
                             'text' => $this->i18n('donate'),
                             'web_app' => [
-                                'url'  => "$scheme://$domain/donate.html",
+                                'url'  => "https://$domain/donate.html",
                             ]
                         ],
                     ],
@@ -3217,12 +3200,8 @@ DNS-over-HTTPS with IP:
             'wg'           => $type == 'wg'           ? $this->statusWg($arg) : false,
             'client'       => $type == 'client'       ? $this->getClient(...explode('_', $arg)) : false,
             'addpeer'      => $type == 'addpeer'      ? $this->addWg(...explode('_', $arg)) : false,
-            'pac'          => $type == 'pac'          ? $this->pacMenu() : false,
+            'pac'          => $type == 'pac'          ? $this->pacMenu($arg) : false,
             'adguard'      => $type == 'adguard'      ? $this->adguardMenu() : false,
-            'includelist'  => $type == 'includelist'  ? $this->pacList($type, $arg) : false,
-            'excludelist'  => $type == 'excludelist'  ? $this->pacList($type, $arg) : false,
-            'reverselist'  => $type == 'reverselist'  ? $this->pacList($type, $arg) : false,
-            'subzoneslist' => $type == 'subzoneslist' ? $this->pacList($type, $arg) : false,
             'config'       => $type == 'config'       ? $this->configMenu() : false,
             'ss'           => $type == 'ss'           ? $this->menuSS() : false,
             'lang'         => $type == 'lang'         ? $this->menuLang() : false,
@@ -3464,7 +3443,45 @@ DNS-over-HTTPS with IP:
             'email' => $user,
         ];
         $this->restartXray($c);
-        $this->xray();
+        $this->userXr(count($c['inbounds'][0]['settings']['clients']) - 1);
+    }
+
+    public function setTimerXr($time, $i)
+    {
+        $time = strtotime($time);
+        if ($time === false) {
+            $this->send($this->input['chat'], 'wrong format');
+            return;
+        }
+        $c = $this->getXray();
+        if (empty($time)) {
+            unset($c['inbounds'][0]['settings']['clients'][$i]['time']);
+        } else {
+            if (!empty($c['inbounds'][0]['settings']['clients'][$i]['off'])) {
+                $this->switchXr($i, 1);
+                $c = $this->getXray();
+            }
+            $c['inbounds'][0]['settings']['clients'][$i]['time'] = $time;
+        }
+        file_put_contents('/config/xray.json', json_encode($c, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES));
+        $this->userXr($i);
+    }
+
+    public function switchXr($i, $nm = 0)
+    {
+        $c = $this->getXray();
+        unset($c['inbounds'][0]['settings']['clients'][$i]['time']);
+        if (empty($c['inbounds'][0]['settings']['clients'][$i]['off'])) {
+            $c['inbounds'][0]['settings']['clients'][$i]['off'] = $c['inbounds'][0]['settings']['clients'][$i]['id'];
+            $c['inbounds'][0]['settings']['clients'][$i]['id']  = trim($this->ssh('xray uuid', 'xr'));
+        } else {
+            $c['inbounds'][0]['settings']['clients'][$i]['id'] = $c['inbounds'][0]['settings']['clients'][$i]['off'];
+            unset($c['inbounds'][0]['settings']['clients'][$i]['off']);
+        }
+        $this->restartXray($c);
+        if (empty($nm)) {
+            $this->userXr($i);
+        }
     }
 
     public function renXrUs($name, $i)
@@ -3475,7 +3492,135 @@ DNS-over-HTTPS with IP:
         $this->userXr($i);
     }
 
-    public function xray()
+    public function listXr($i)
+    {
+        $c = $this->getPacConf();
+        $c['xtlslist'] = $i;
+        $this->setPacConf($c);
+        $this->xray();
+    }
+
+    public function singAdd()
+    {
+        $r = $this->send(
+            $this->input['chat'],
+            "@{$this->input['username']} send the template file:",
+            $this->input['message_id'],
+            reply: 'send the template file:',
+        );
+        $_SESSION['reply'][$r['result']['message_id']] = [
+            'start_message'  => $this->input['message_id'],
+            'start_callback' => $this->input['callback_id'],
+            'callback'       => 'singAddTemplate',
+            'args'           => [],
+        ];
+    }
+
+    public function singAddTemplate($n = null)
+    {
+        if (empty($this->input['caption'])) {
+            $this->send($this->input['chat'], 'empty name');
+            return;
+        }
+        $r    = $this->request('getFile', ['file_id' => $this->input['file_id']]);
+        $json = json_decode(file_get_contents($this->file . $r['result']['file_path']), true);
+        if ($json === false) {
+            $this->send($this->input['chat'], 'wrong format');
+            return;
+        }
+        $pac = $this->getPacConf();
+        $pac['singtemplates'][$this->input['caption']] = $json;
+        $this->setPacConf($pac);
+        $this->singbox();
+    }
+
+    public function delTemplate($name)
+    {
+        $pac = $this->getPacConf();
+        unset($pac['singtemplates'][base64_decode($name)]);
+        $this->setPacConf($pac);
+        $this->singbox();
+    }
+
+    public function downloadTemplate($name)
+    {
+        $pac = $this->getPacConf();
+        $f = new \CURLStringFile(json_encode($pac['singtemplates'][base64_decode($name)], JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES), base64_decode($name) . '.json', 'application/json');
+        $this->sendFile($this->input['chat'], $f);
+    }
+
+    public function defaultTemplate($name)
+    {
+        $pac = $this->getPacConf();
+        if (!empty($name)) {
+            $pac['defaulttemplate'] = $name;
+        } else {
+            unset($pac['defaulttemplate']);
+        }
+        $this->setPacConf($pac);
+        $this->singbox();
+    }
+
+    public function singbox($name = false)
+    {
+        $pac       = $this->getPacConf();
+        $domain    = $pac['domain'] ?: $this->ip;
+        $hash      = substr(md5($this->key), 0, 8);
+        $text[]    = "Menu -> " . $this->i18n('xray') . ' -> Sing-box templates';
+        $templates = $pac['singtemplates'];
+
+        $data[] = [
+            [
+                'text'          => $this->i18n('add'),
+                'callback_data' => "/singAdd",
+            ],
+        ];
+        $data[] = [
+            [
+                'text'          => "origin",
+                'web_app' => ['url' => "https://$domain/pac?h=$hash&t=te"],
+            ],
+            [
+                'text'          => $this->i18n($pac['defaulttemplate'] ? 'off' : 'on'),
+                'callback_data' => "/defaultTemplate",
+            ],
+        ];
+        foreach ($templates as $k => $v) {
+            $data[] = [
+                [
+                    'text'          => "$k",
+                    'web_app' => ['url' => "https://$domain/pac?h=$hash&t=te&te=" . urlencode($k)],
+                ],
+                [
+                    'text'          => $this->i18n('download'),
+                    'callback_data' => "/downloadTemplate " . base64_encode($k),
+                ],
+                [
+                    'text'          => $this->i18n('delete'),
+                    'callback_data' => "/delTemplate " . base64_encode($k),
+                ],
+                [
+                    'text'          => $this->i18n($pac['defaulttemplate'] == base64_encode($k) ? 'on' : 'off'),
+                    'callback_data' => "/defaultTemplate " . base64_encode($k),
+                ],
+            ];
+        }
+
+        $data[] = [
+            [
+                'text'          => $this->i18n('back'),
+                'callback_data' => "/xray",
+            ],
+        ];
+        $this->update(
+            $this->input['chat'],
+            $this->input['message_id'],
+            implode("\n", $text ?: ['...']),
+            $data ?: false,
+        );
+    }
+
+    public function xray($page = 0)
     {
         if (!$this->ssh('pgrep xray', 'xr')) {
             $this->generateSecretXray();
@@ -3495,18 +3640,63 @@ DNS-over-HTTPS with IP:
         ];
         $data[] = [
             [
-                'text'          => $this->i18n('add peer'),
-                'callback_data' => "/addXrUser",
+                'text'          => $this->i18n('sing-box templates'),
+                'callback_data' => "/singbox",
             ],
         ];
+        $data[] = [
+        ];
         foreach ($c['inbounds'][0]['settings']['clients'] as $k => $v) {
+            if (!empty($v['off'])) {
+                $off++;
+            } else {
+                $on++;
+            }
+        }
+        $type   = $this->getPacConf()['xtlslist'];
+        $clients = array_filter($c['inbounds'][0]['settings']['clients'], fn($e) => !$type ? empty($e['off']) : !empty($e['off']));
+        uasort($clients, fn($a, $b) => ($a['time'] ?: PHP_INT_MAX) <=> ($b['time'] ?: PHP_INT_MAX));
+
+        $all     = (int) ceil(count($clients) / $this->limit);
+        $page    = min($page, $all - 1);
+        $page    = $page == -2 ? $all - 1 : $page;
+        $clients = $page != -1 ? array_slice($clients, $page * $this->limit, $this->limit, true) : $clients;
+        foreach ($clients as $k => $v) {
+            $time   = $v['time'] ? $this->getTime($v['time']) : '';
             $data[] = [
                 [
-                    'text'          => "{$v['email']}",
+                    'text'          => "{$v['email']}" . ($time ? ": $time" : ''),
                     'callback_data' => "/userXr $k",
                 ],
             ];
         }
+        if ($page != -1 && $all > 1) {
+            $data[] = [
+                [
+                    'text'          => '<<',
+                    'callback_data' => "/xray " . ($page - 1 >= 0 ? $page - 1 : $all - 1),
+                ],
+                [
+                    'text'          => '>>',
+                    'callback_data' => "/xray " . ($page < $all - 1 ? $page + 1 : 0),
+                ]
+            ];
+        }
+        $data[] = [
+            [
+                'text'          => $this->i18n('add'),
+                'callback_data' => "/addXrUser",
+            ],
+            [
+                'text'          => $this->i18n('on') . " $on " . (!$type ? "✅" : ''),
+                'callback_data' => "/listXr 0",
+            ],
+            [
+                'text'          => $this->i18n('off') . " $off " . ($type ? "✅" : ''),
+                'callback_data' => "/listXr 1",
+            ],
+        ];
+
         $data[] = [
             [
                 'text'          => $this->i18n('back'),
@@ -3521,10 +3711,64 @@ DNS-over-HTTPS with IP:
         );
     }
 
+    public function choiceTemplate($arg)
+    {
+        $arg = explode('_', $arg);
+        $c = $this->getXray();
+        if (!empty($arg[1])) {
+            $c['inbounds'][0]['settings']['clients'][$arg[0]]['template'] = $arg[1];
+        } else {
+            unset($c['inbounds'][0]['settings']['clients'][$arg[0]]['template']);
+        }
+        file_put_contents('/config/xray.json', json_encode($c, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES));
+        $this->userXr($arg[0]);
+    }
+
+    public function templateUser($i)
+    {
+        $c         = $this->getXray();
+        $pac       = $this->getPacConf();
+        $text[] = "Menu -> " . $this->i18n('xray') . " -> {$c['inbounds'][0]['settings']['clients'][$i]['email']}\n";
+        $templates = $pac['singtemplates'];
+        $data[] = [
+            [
+                'text'          => 'default',
+                'callback_data' => "/choiceTemplate $i",
+            ],
+        ];
+        $data[] = [
+            [
+                'text'          => 'origin',
+                'callback_data' => "/choiceTemplate {$i}_" . base64_encode('origin'),
+            ],
+        ];
+        foreach ($templates as $k => $v) {
+            $data[] = [
+                [
+                    'text'          => $k,
+                    'callback_data' => "/choiceTemplate {$i}_" . base64_encode($k),
+                ],
+            ];
+        }
+        $data[] = [
+            [
+                'text'          => $this->i18n('back'),
+                'callback_data' => "/userXr $i",
+            ],
+        ];
+        $this->update(
+            $this->input['chat'],
+            $this->input['message_id'],
+            implode("\n", $text ?: ['...']),
+            $data ?: false,
+        );
+    }
+
     public function userXr($i, $fs = 0, $fv = 0)
     {
         $c         = $this->getXray();
-        $domain    = $this->getPacConf()['domain'] ?: $this->ip;
+        $pac       = $this->getPacConf() ?: $this->ip;
+        $domain    = $pac['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']}";
@@ -3543,6 +3787,23 @@ DNS-over-HTTPS with IP:
         $text[] = "v2ray: <a href='$v2ray'>$v2ray</a>\n";
         $text[] = "sing-box: <a href='$sing'>$sing</a>";
 
+        $data[] = [
+            [
+                'text'          => $c['inbounds'][0]['settings']['clients'][$i]['time'] ? "timer: " . $this->getTime($c['inbounds'][0]['settings']['clients'][$i]['time']) : $this->i18n('timer'),
+                'callback_data' => "/timerXr $i",
+            ],
+            [
+                'text'          => $this->i18n($c['inbounds'][0]['settings']['clients'][$i]['off'] ? 'off' : 'on'),
+                'callback_data' => "/switchXr $i",
+            ],
+        ];
+        $template = $c['inbounds'][0]['settings']['clients'][$i]['template'] ? base64_decode($c['inbounds'][0]['settings']['clients'][$i]['template']) : 'default(' . ($pac['defaulttemplate'] ? base64_decode($pac['defaulttemplate']) : 'origin') . ')';
+        $data[] = [
+            [
+                'text'          => $this->i18n('template singbox') . ": $template",
+                'callback_data' => "/templateUser $i",
+            ],
+        ];
         $data[] = [
             [
                 'text'          => $this->i18n('show QR'),
@@ -3587,7 +3848,9 @@ DNS-over-HTTPS with IP:
                 if (!empty($fs)) {
                     return $this->userXr($k, 0, 1);
                 }
-                $flag = false;
+                if (empty($v['off'])) {
+                    $flag = false;
+                }
                 break;
             }
         }
@@ -3624,7 +3887,10 @@ DNS-over-HTTPS with IP:
                 if (!empty($fs)) {
                     return $this->userXr($k, 1);
                 }
-                $flag = false;
+                if (empty($v['off'])) {
+                    $flag = false;
+                }
+                $template = base64_decode($v['template']);
                 break;
             }
         }
@@ -3632,24 +3898,39 @@ DNS-over-HTTPS with IP:
             return false;
         }
 
+        switch (true) {
+            case !empty($template) && $template == 'origin':
+            case empty($template) && empty($pac['defaulttemplate']):
+                $c = json_decode(file_get_contents('/config/sing.json'), true);
+                break;
+            case !empty($template):
+                $c = $pac['singtemplates'][$template];
+                break;
 
-
-        $c = json_decode(file_get_contents('/config/sing.json'), true);
+            default:
+                $c = $pac['singtemplates'][base64_decode($pac['defaulttemplate'])];
+                break;
+        }
 
         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]['tls']['reality']['public_key'] = $key;
+        $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']);
+        foreach ($c['route']['rules'] as $k => $v) {
+            if (array_key_exists('domain_suffix', $v) && $v['domain_suffix'] == '~pac~') {
+                $c['route']['rules'][$k]['domain_suffix'] = array_keys(array_filter($pac['includelist']));
+                if (empty($c['route']['rules'][$k]['domain_suffix'])) {
+                    unset($c['route']['rules'][$k]);
+                }
+            }
         }
+        $c['route']['rules'] = array_values($c['route']['rules']);
+
         return json_encode($c);
     }
 
@@ -3738,11 +4019,27 @@ DNS-over-HTTPS with IP:
         ];
     }
 
+    public function adguardCheckPswd()
+    {
+        if (empty($this->getPacConf()['adpswd'])) {
+            $this->adguardChangePswd(substr(hash('md5', time()), 0, 10));
+        }
+    }
+
+    public function adguardChangePswd($pass)
+    {
+        $c = yaml_parse_file($this->adguard);
+        $c['users'][0]['password'] = password_hash($pass, PASSWORD_DEFAULT);
+        yaml_emit_file($this->adguard, $c);
+        $p = $this->getPacConf();
+        $p['adpswd'] = $pass;
+        $this->setPacConf($p);
+    }
+
     public function adguardProtect()
     {
         $h = substr(hash('sha256', $this->key), 0, 8);
         $s = empty($this->getPacConf()['adgbrowser']) ? '' : '#';
-        $a = $this->adguardBasicAuth();
         $r = <<<CONF
         location /adguard/ {
                 access_log /logs/nginx_adguard_access;
@@ -3813,12 +4110,6 @@ DNS-over-HTTPS with IP:
                 ],
             ],
         ];
-        $data[] = [
-            [
-                'text'          => $this->i18n('reset settings'),
-                'callback_data' => "/adguardreset",
-            ],
-        ];
         $data[] = [
             [
                 'text'          => $this->i18n('add upstream'),
@@ -4098,7 +4389,7 @@ DNS-over-HTTPS with IP:
                 file_put_contents('/update/branch', trim(str_replace('origin/', '', $v)));
             }
         }
-        $this->menu('config');
+        $this->menu('update');
     }
 
     public function logs()
@@ -4588,7 +4879,17 @@ DNS-over-HTTPS with IP:
             CURLOPT_POSTFIELDS     => $data,
         ]);
         $res = curl_exec($ch);
-        return json_decode($res, true);
+        $r   = json_decode($res, true);
+        if (!empty($res['description']) || is_null($res)) {
+            file_put_contents('/logs/requests_error', var_export([
+                'r' => [
+                    'method' => $method,
+                    'data'   => $data,
+                ],
+                'a' => $res,
+            ], true) . "\n", FILE_APPEND);
+        }
+        return $r;
     }
 
     public function setwebhook()

app/index.php

@@ -58,6 +58,21 @@ if ($hash == substr(md5($c['key']), 0, 8)) {
             }
             exit;
 
+        case 'te':
+            require __DIR__ . '/bot.php';
+            require __DIR__ . '/i18n.php';
+            $bot = new Bot($c['key'], $i);
+            if (!empty($_GET['te'])) {
+                $t = $bot->getPacConf()['singtemplates'][urldecode($_GET['te'])];
+            } else {
+                $t = json_decode(file_get_contents('/config/sing.json'), true);
+            }
+            if ($t) {
+                header('Content-Type: application/json');
+                echo json_encode($t, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+                exit;
+            }
+
         default:
             if (file_exists($file = __DIR__ . "/zapretlists/$type")) {
                 $pac = file_get_contents($file);

app/init.php

@@ -9,6 +9,7 @@ require __DIR__ . '/i18n.php';
 
 $bot = new Bot($c['key'], $i);
 $bot->adguardProtect();
+$bot->adguardCheckPswd();
 $bot->setcommands();
 $bot->syncPortClients();
 $bot->setwebhook();

app/updatepac.php

@@ -93,95 +93,7 @@ function start()
 
     // check && exclude
     $include = array_filter($conf['includelist'], fn($x) => $x == true);
-    if ($conf['zapret']) {
-        foreach ($source as $k => $v) {
-            $size = getSize($v['source']);
-            if ($size > 0) {
-                if (file_exists($v['dest'])) {
-                    unlink($v['dest']);
-                }
-                touch($v['dest']);
-                $percent  = 0;
-                $curr = 0;
-                exec("php updatepac.php download $k > /dev/null &");
-                $i = $j = 0;
-                while ($curr <= $size) {
-                    $rotate = $curr != $size ? $load[$j % count($load)] : '';
-                    $tail = <<<text
-                            Downloading {$v['source']}
-                            $curr/$size $percent% $rotate
-                            text;
-                    update($text . $tail);
-                    if ($curr == $size || $i > 50) {
-                        break;
-                    }
-                    usleep(50000);
-                    clearstatcache();
-                    if ($curr == filesize($v['dest'])) {
-                        $i++;
-                    }
-                    $curr = filesize($v['dest']);
-                    $percent  = (int) ceil($curr * 100 / $size);
-                    $j++;
-                }
-                if ($curr != $size) {
-                    $text .= "\nError downloading {$v['source']}\nabort script";
-                    endScript($text);
-                }
-            } else {
-                $text .= "\nError size {$v['source']}\nabort script";
-                endScript($text);
-            }
-            $text .= $tail ? "$tail\n" : '';
-        }
-        // prepare
-        $reg = '~^([^.*]+\.(?:(?:' . implode('|', $subzones) . ')\.)?[^.]+)$~';
-
-        foreach ($source as $k => $v) {
-            $size = filesize($v['dest']);
-            $curr = $j = 0;
-            $time = microtime(true);
-            $name = basename($v['dest']);
-            $f = fopen($v['dest'], 'r');
-            while (($s = fgets($f)) !== false) {
-                $curr += strlen($s);
-                $percent = (int) ceil($curr * 100 / $size);
-                $rotate = $curr != $size ? $load[$j % count($load)] : '';
-                $tail = <<<text
-                        Prepare $name $percent% $rotate
-                        text;
-                if (microtime(true) - $time > 0.1) {
-                    update($text . $tail);
-                    $time = microtime(true);
-                    $j++;
-                }
-                if ($name == 'dump.csv') {
-                    if (!preg_match('~;.*;~', $s)) {
-                        continue;
-                    }
-                    $t = explode(';', iconv('CP1251', 'utf-8', $s));
-                    if (empty($t[1])) {
-                        continue;
-                    }
-                    if (preg_match($reg, idn_to_ascii(trim($t[1])), $m)) {
-                        $domains[$m[1]] = 0;
-                    }
-                } else {
-                    if (preg_match($reg, idn_to_ascii(iconv('CP1251', 'utf-8', trim($s))), $m)) {
-                        $domains[$m[1]] = 0;
-                    }
-                }
-            }
-            fclose($f);
-            $text .= $tail ? "$tail\n" : '';
-        }
-        $exclude = array_keys(array_filter($conf['excludelist'], fn($x) => $x == true));
-        foreach ($include as $k => $v) {
-            $domains[$k] = 0;
-        }
-    } else {
-        $domains = $include;
-    }
+    $domains = $include;
     if (empty($domains)) {
         $text = "Empty domains. Delete pac files";
         unlink(__DIR__ . '/zapretlists/mpac');

app/webapp/donate.html

@@ -1,4 +1,25 @@
-<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>
+<meta charset="utf-8">
+<script src="jquery-3.7.1.min.js"></script>
+<script>
+    jQuery(function($){
+        $('#copy').on('click', function (e){
+            $(this).text('copied');
+            var $temp = $("<input>");
+            $("body").append($temp);
+            $temp.val($(this).attr('data-id')).select();
+            document.execCommand("copy");
+            $temp.remove();
+        });
+    });
+</script>
+<div style="position:relative;width:100%;height:100%; background-color: white;">
+    <div style="position:absolute;top:0;right:0;width:35%;text-align:center;background-color: #17212b;">
+        <img src="toncoin.png" width="100%" alt="">
+        <a href="javascript:;" id="copy" style="color:white;text-decoration:none" data-id="UQCDDkaX3fCAFBek28Hx4TfvDDRqeizOW74blVMVAM4_m4OW">copy</a>
+    </div>
+    <a style="background-color: #8B3FFD;height: 46px;display:inline-block;padding:0 54px;color: white;border-radius: 12px;text-decoration: none;font-size: 20px;line-height: 46px;font-family: arial;" href="https://yoomoney.ru/to/410011827900450">
+        <svg style="width: 24px;fill: white;position: relative;top: 4px;" class="qa-fundraise-button-logo mui-m0okdh" viewBox="0 0 16 16"><path d="M4.638 8.5a5.67 5.67 0 015.681-5.68A5.693 5.693 0 0116 8.5a5.693 5.693 0 01-5.68 5.682A5.67 5.67 0 014.637 8.5zm3.56 0c0 1.151.97 2.122 2.121 2.122 1.15 0 2.085-.97 2.121-2.121 0-1.15-.97-2.121-2.12-2.121-1.151 0-2.122.97-2.122 2.12zm-3.596 4.243v-8.27H0l2.589 8.27h2.013z" clip-rule="evenodd"></path></svg>
+        Перевести
+    </a>
+    <iframe style="width:100%;height:100%" src="https://pay.cloudtips.ru/p/757de378" frameborder="0"></iframe>
 </div>

config/sing.json

@@ -96,7 +96,7 @@
             "protocol": "dns",
             "outbound": "dns-out"
         }, {
-            "domain_suffix": [],
+            "domain_suffix": "~pac~",
             "outbound": "proxy"
         }, {
             "ip_cidr": ["0.0.0.0\/0"],

config/xray.json

@@ -5,11 +5,6 @@
             "protocol": "vless",
             "settings": {
                 "clients": [
-                    {
-                        "email": "user1@myserver",
-                        "flow": "xtls-rprx-vision",
-                        "id": ""
-                    }
                 ],
                 "decryption": "none"
             },

docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.7"
-
 x-logging:
       &default-logging
       driver: "json-file"

version

@@ -1,3 +1,22 @@
+11.04.2024 v1.25
+- подпись дефолтного шаблона в разделе пользователя xtls
+11.04.2024 v1.24
+- обновлен раздел PAC, добавлена возможность добавить домены из https://community.antifilter.download/
+11.04.2024 v1.23
+- фикс совместимости старого конфига xray из бэкапа
+11.04.2024 v1.22
+- улучшение гибкости выбора шаблона sing-box
+11.04.2024 v1.21
+- фикс доступности адгвард панели при первом запуске
+10.04.2024 v1.20
+- выбор дефолтного шаблона sing-box
+10.04.2024 v1.19
+- загрузка шаблонов sing-box
+- выбор шаблона sing-box для пользователя
+10.04.2024 v1.18
+- включение/выключение xtls юзеров
+09.04.2024 v1.17
+- редактируемые конфиги v2ray/sing-box
 09.04.2024 v1.16
 - редактируемые конфиги v2ray/sing-box
 09.04.2024 v1.15.4