sing-box template: block rule first

app/bot.php

@@ -4513,10 +4513,14 @@ DNS-over-HTTPS with IP:
 
     public function addWarpPlus($key)
     {
-        $c         = $this->getPacConf();
-        $c['warp'] = $key;
+        $c = $this->getPacConf();
+        if (!empty($key)) {
+            $c['warp'] = $key;
+            $this->send($this->input['chat'], 'Warp registration license: ' . $this->ssh("warp-cli --accept-tos registration license $key 2>&1", 'wp'));
+        } else {
+            unset($c['warp']);
+        }
         $this->setPacConf($c);
-        $this->send($this->input['chat'], 'Warp registration license: ' . $this->ssh("warp-cli --accept-tos registration license $key", 'wp'));
         sleep(1);
         $this->warp();
     }
@@ -4540,12 +4544,12 @@ DNS-over-HTTPS with IP:
         } else {
             $this->ssh('warp-svc > /dev/null 2>&1 &', 'wp');
             sleep(3);
-            $this->ssh('warp-cli --accept-tos registration new', 'wp');
+            $this->send($this->input['chat'], 'Registration: ' . $this->ssh('warp-cli --accept-tos registration new 2>&1', 'wp'));
             if (!empty($p['warp'])) {
-                $this->ssh("warp-cli --accept-tos registration license {$p['warp']}", 'wp');
+                $this->send($this->input['chat'], 'License: ' . $this->ssh("warp-cli --accept-tos registration license {$p['warp']} 2>&1", 'wp'));
             }
-            $this->ssh('warp-cli --accept-tos mode proxy', 'wp');
-            $this->ssh('warp-cli --accept-tos connect', 'wp');
+            $this->send($this->input['chat'], 'Proxy mode: ' . $this->ssh('warp-cli --accept-tos mode proxy 2>&1', 'wp'));
+            $this->send($this->input['chat'], 'Connect: ' . $this->ssh('warp-cli --accept-tos connect 2>&1', 'wp'));
             unset($p['warpoff']);
         }
         $this->setPacConf($p);
@@ -4653,14 +4657,27 @@ DNS-over-HTTPS with IP:
         $text[] = "<a href='$scheme://{$domain}/pac?h=$hash&t=si&r=si&s={$c['id']}#{$c['email']}'>sing-box</a>";
         $text[] = "<a href='$scheme://{$domain}/pac?h=$hash&t=s&r=st&s={$c['id']}#{$c['email']}'>streisand</a>";
         $text[] = "<a href='$scheme://{$domain}/pac?h=$hash&t=si&r=h&s={$c['id']}#{$c['email']}'>hiddify</a>";
+        $text[] = "<a href='$scheme://{$domain}/pac?h=$hash&t=si&r=k&s={$c['id']}#{$c['email']}'>karing</a>";
+
+        $si = "$scheme://{$domain}/pac/" . base64_encode(serialize([
+            'h' => $hash,
+            't' => 'si',
+            's' => $c['id'],
+        ]));
+        $xr = "$scheme://{$domain}/pac/" . base64_encode(serialize([
+            'h' => $hash,
+            't' => 's',
+            's' => $c['id'],
+        ]));
+
+        $text[] = "\nxray config: <pre><code>$xr</code></pre>";
+        $text[] = "sing-box config: <pre><code>$si</code></pre>";
 
-        $text[] = "\nv2ray config: <pre><code>$scheme://{$domain}/pac?h=$hash&t=s&s={$c['id']}</code></pre>";
-        $text[] = "sing-box config: <pre><code>$scheme://{$domain}/pac?h=$hash&t=si&s={$c['id']}</code></pre>";
         $text[] = "sing-box windows: <a href='$scheme://{$domain}/pac?h=$hash&t=si&r=w&s={$c['id']}'>windows service</a>";
 
         $data[] = [
             [
-                'text'    => 'v2ray',
+                'text'    => 'xray',
                 'web_app' => ['url' => "https://{$domain}/pac?h=$hash&t=s&s={$c['id']}"],
             ],
             [
@@ -4822,6 +4839,9 @@ DNS-over-HTTPS with IP:
                 case 'v':
                     header("Location: v2rayng://install-config?url=$v2");
                     exit;
+                case 'k':
+                    header("Location: karing://install-config?url=$si");
+                    exit;
                 case 'h':
                     header("Location: hiddify://install-config/?url=$si");
                     exit;
@@ -5041,12 +5061,12 @@ DNS-over-HTTPS with IP:
                     }
                     $ruleset[] = [
                         "tag"             => $r['name'],
-                        "url"             => "$scheme://{$domain}/pac?" . http_build_query([
+                        "url"             => "$scheme://{$domain}/pac/" . base64_encode(serialize([
                             'h' => $hash,
                             't' => 'si',
                             's' => $uid,
                             'r' => $r['name'],
-                        ]),
+                        ])),
                         "update_interval" => $r['interval'],
                         "type"            => "remote",
                         "format"          => "binary",

config/sing.json

@@ -110,6 +110,20 @@
                 "protocol": "dns",
                 "outbound": "dns-out"
             },
+            {
+                "createruleset": [
+                    {
+                        "name": "block",
+                        "interval": "15s",
+                        "rules": [
+                            {
+                                "domain_suffix": "~block~"
+                            }
+                        ]
+                    }
+                ],
+                "outbound": "block"
+            },
             {
                 "createruleset": [
                     {
@@ -133,20 +147,6 @@
                 ],
                 "outbound": "proxy"
             },
-            {
-                "createruleset": [
-                    {
-                        "name": "block",
-                        "interval": "15s",
-                        "rules": [
-                            {
-                                "domain_suffix": "~block~"
-                            }
-                        ]
-                    }
-                ],
-                "outbound": "block"
-            },
             {
                 "outbound": "direct"
             }

version

@@ -1,3 +1,9 @@
+06.10.2024 v1.63
+- приоритет правила block над остальными в стандартном шаблоне sing-box
+30.09.2024 v1.62
+- импорт профиля xray в karing
+30.09.2024 v1.61.1
+- фикс удаления ключа варпа через ноль
 29.09.2024 v1.61
 - включение/отключение процесса warp
 29.09.2024 v1.60