singbox: domain -> domain_suffix

app/bot.php

@@ -3467,17 +3467,6 @@ DNS-over-HTTPS with IP:
         $c      = $this->getXray();
         $text[] = "Menu -> " . $this->i18n('xray');
         $text[] = "fake domain: <code>{$c['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0]}</code>";
-
-        $data[] = [
-            [
-                'text'    => 'android',
-                'web_app' => ['url' => 'https://github.com/2dust/v2rayNG/releases'],
-            ],
-            [
-                'text'    => 'windows',
-                'web_app' => ['url' => 'https://github.com/2dust/v2rayN/releases'],
-            ],
-        ];
         $data[] = [
             [
                 'text'          => $this->i18n('changeFakeDomain'),
@@ -3516,18 +3505,27 @@ DNS-over-HTTPS with IP:
         );
     }
 
-    public function userXr($i)
+    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);
-        $link   = "$scheme://{$domain}/pac?h=$hash&t=s&s={$c['inbounds'][0]['settings']['clients'][$i]['id']}";
-
+        $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 subscription: <code>$link</code>";
+        $text[] = "v2ray: <a href='$v2ray'>$v2ray</a>\n";
+        $text[] = "sing-box: <a href='$sing'>$sing</a>";
 
         $data[] = [
             [
@@ -3561,15 +3559,18 @@ DNS-over-HTTPS with IP:
         );
     }
 
-    public function v2raySubscription($key)
+    public function v2raySubscription($key, $fs = 0)
     {
-        $domain = $this->getPacConf()['domain'] ?: $this->ip;
-        $xr     = $this->getXray();
         $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;
             }
@@ -3646,7 +3647,7 @@ DNS-over-HTTPS with IP:
                         "network"         => "tcp",
                         "security"        => "reality",
                         "realitySettings" => [
-                            "serverName"  => $domain,
+                            "serverName"  => $xr['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0],
                             "fingerprint" => "chrome",
                             "show"        => false,
                             "publicKey"   => $pac['xray'],
@@ -3689,9 +3690,160 @@ DNS-over-HTTPS with IP:
                 ]
             ]
         ];
+        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 = [
+            "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"          => "tls://" . ($pac['adguardkey'] ? "{$pac['adguardkey']}." : '') . "$domain",
+                        "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"          => $domain,
+                    "server_port"     => 443,
+                    "tls"             => [
+                        "enabled"  => true,
+                        "insecure" => false,
+                        "reality"  => [
+                            "enabled"    => true,
+                            "public_key" => $pac['xray'],
+                            "short_id"   => $xr['inbounds'][0]['streamSettings']['realitySettings']['shortIds'][0],
+                        ],
+                        "server_name" => $xr['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0],
+                        "utls"        => [
+                            "enabled"     => true,
+                            "fingerprint" => "chrome"
+                        ]
+                    ],
+                    "uuid"            => $key,
+                    "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"   => array_keys(array_filter($pac['includelist'])),
+                        "outbound" => "proxy"
+                    ],
+                    [
+                        "ip_cidr" => [
+                            "0.0.0.0/0"
+                        ],
+                        "outbound" => "direct"
+                    ]
+                ]
+            ]
+        ];
+        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);

app/i18n.php

@@ -266,8 +266,8 @@ $i = [
         'ru' => 'фейковый домен',
     ],
     'selfFakeDomain'  => [
-        'en' => 'selfFakeDomain',
-        'ru' => 'домен бота',
+        'en' => 'steal from yourself',
+        'ru' => 'steal from yourself',
     ],
     'page'  => [
         'en' => 'pagination',
@@ -326,7 +326,7 @@ $i = [
         'ru' => 'нет обновлений',
     ],
     'have updates'  => [
-        'en' => 'have updates',
-        'ru' => 'есть обновления',
+        'en' => '🟢 have updates',
+        'ru' => '🟢 есть обновления',
     ],
 ];

app/index.php

@@ -34,7 +34,28 @@ if ($hash == substr(md5($c['key']), 0, 8)) {
             require __DIR__ . '/bot.php';
             require __DIR__ . '/i18n.php';
             $bot = new Bot($c['key'], $i);
-            $bot->v2raySubscription($_GET['s']);
+            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:

version

@@ -1,3 +1,18 @@
+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