karing import url

app/bot.php

@@ -145,6 +145,9 @@ class Bot
             case preg_match('~^/appOutbound$~', $this->input['callback'], $m):
                 $this->appOutbound();
                 break;
+            case preg_match('~^/offWarp$~', $this->input['callback'], $m):
+                $this->offWarp();
+                break;
             case preg_match('~^/addSubdomain$~', $this->input['callback'], $m):
                 $this->addSubdomain();
                 break;
@@ -4510,33 +4513,67 @@ 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();
     }
 
     public function warpStatus()
     {
-        $st = $this->ssh('curl -m 1 -x socks5://127.0.0.1:40000 https://cloudflare.com/cdn-cgi/trace', 'wp');
-        preg_match('~warp=(\w+)~', $st, $m);
-        return $m[1];
+        if (!empty($this->ssh('pgrep warp-svc', 'wp'))) {
+            $st = $this->ssh('curl -m 1 -x socks5://127.0.0.1:40000 https://cloudflare.com/cdn-cgi/trace', 'wp');
+            preg_match('~warp=(\w+)~', $st, $m);
+            return $m[1];
+        }
+        return 'off';
+    }
+
+    public function offWarp()
+    {
+        $p = $this->getPacConf();
+        if (empty($p['warpoff'])) {
+            $this->ssh('pkill warp-svc', 'wp');
+            $p['warpoff'] = 1;
+        } else {
+            $this->ssh('warp-svc > /dev/null 2>&1 &', 'wp');
+            sleep(3);
+            $this->send($this->input['chat'], 'Registration: ' . $this->ssh('warp-cli --accept-tos registration new 2>&1', 'wp'));
+            if (!empty($p['warp'])) {
+                $this->send($this->input['chat'], 'License: ' . $this->ssh("warp-cli --accept-tos registration license {$p['warp']} 2>&1", '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);
+        $this->warp();
     }
 
     public function warp()
     {
+        $p      = $this->getPacConf();
         $text[] = "Menu -> " . $this->i18n('warp');
         $text[] = "status: " . $this->warpStatus();
         $text[] = "key: " . $this->getPacConf()['warp'];
+        $data[] = [
+            [
+                'text'          => $this->i18n($p['warpoff'] ? 'off' : 'on'),
+                'callback_data' => "/offWarp",
+            ],
+        ];
         $data[] = [
             [
                 'text'          => $this->i18n('set key'),
                 'callback_data' => "/warpPlus",
             ],
         ];
-
         $data[] = [
             [
                 'text'          => $this->i18n('back'),
@@ -4620,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']}"],
             ],
             [
@@ -4789,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;
@@ -5008,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",

scripts/start_wp.sh

@@ -1,14 +1,18 @@
 cat /ssh/key.pub > /root/.ssh/authorized_keys
 ssh-keygen -A
 exec /usr/sbin/sshd -D -e "$@" &
-warp-svc > /dev/null &
-sleep 3
-warp-cli --accept-tos registration new
+off=$(cat /config/pac.json | jq -r .warpoff)
 key=$(cat /config/pac.json | jq -r .warp)
-if [ ! -z "$key" ]
+if [ "$off" == 'null' ]
 then
-    warp-cli --accept-tos registration license $key
+    warp-svc > /dev/null &
+    sleep 3
+    warp-cli --accept-tos registration new
+    if [ ! -z "$key" ]
+    then
+        warp-cli --accept-tos registration license $key
+    fi
+    warp-cli --accept-tos mode proxy
+    warp-cli --accept-tos connect
 fi
-warp-cli --accept-tos mode proxy
-warp-cli --accept-tos connect
 socat TCP-LISTEN:4000,fork TCP:127.0.0.1:40000

version

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