xray->routes->proxy <=> Pac

app/bot.php

@@ -437,6 +437,9 @@ class Bot
             case preg_match('~^/xtlswarp(?: (\d+))?$~', $this->input['callback'], $m):
                 $this->xtlswarp($m[1] ?: 0);
                 break;
+            case preg_match('~^/xtlsproxy(?: (\d+))?$~', $this->input['callback'], $m):
+                $this->xtlsproxy($m[1] ?: 0);
+                break;
             case preg_match('~^/xtlsapp(?: (\d+))?$~', $this->input['callback'], $m):
                 $this->xtlsapp($m[1] ?: 0);
                 break;
@@ -2470,7 +2473,10 @@ DNS-over-HTTPS with IP:
     {
         switch ($type) {
             case 'includelist':
-                $this->pacUpdate();
+                $this->pacUpdate($_SESSION['proxylistentry']);
+                if (!empty($_SESSION['proxylistentry'])) {
+                    $this->xtlsproxy();
+                }
                 break;
             case 'blocklist':
                 $this->xrayUpdateRules();
@@ -3350,6 +3356,7 @@ DNS-over-HTTPS with IP:
 
     public function pacMenu($page = 0)
     {
+        unset($_SESSION['proxylistentry']);
         $rmpac  = stat(__DIR__ . '/zapretlists/rmpac');
         $rpac   = stat(__DIR__ . '/zapretlists/rpac');
         $mpac   = stat(__DIR__ . '/zapretlists/mpac');
@@ -3603,6 +3610,25 @@ DNS-over-HTTPS with IP:
         );
     }
 
+    public function xtlsproxy($page = 0)
+    {
+        $_SESSION['proxylistentry'] = 1;
+        $text[] = "Menu -> " . $this->i18n('xray') . ' -> ' . $this->i18n('routes') . ' -> proxy list';
+        $data   = $this->listPac('includelist', $page, 'xtlsproxy');
+        $data[] = [
+            [
+                'text'          => $this->i18n('back'),
+                'callback_data' => "/routes",
+            ],
+        ];
+        $this->update(
+            $this->input['chat'],
+            $this->input['message_id'],
+            implode("\n", $text ?: ['...']),
+            $data ?: false,
+        );
+    }
+
     public function appOutbound()
     {
         $p = $this->getPacConf();
@@ -4589,6 +4615,10 @@ DNS-over-HTTPS with IP:
                 'text'          => $this->i18n('warp'),
                 'callback_data' => "/xtlswarp",
             ]],
+            [[
+                'text'          => $this->i18n('proxy'),
+                'callback_data' => "/xtlsproxy",
+            ]],
             [[
                 'text'          => $this->i18n('process'),
                 'callback_data' => "/xtlsprocess",

version

@@ -1,3 +1,5 @@
+25.10.2024 v1.87
+- xray: в routes добавлен раздел proxy - зеркало раздела Pac
 25.10.2024 v1.86
 - фикс не срабатывания автобэкапа во время старта
 - adguard: вывод списка разрешенных клиентов