fix singbox zip

app/index.php

@@ -49,15 +49,49 @@ if ($hash == substr(md5($c['key']), 0, 8)) {
             require __DIR__ . '/i18n.php';
             $bot = new Bot($c['key'], $i);
             if (!empty($_GET['b'])) {
-                    $fs  = $bot->singboxSubscription($_GET['s'], 1);
-                    header("Location: $fs");
-                    exit;
+                    switch ($_GET['b']) {
+                        case '1':
+                            $fs = $bot->singboxSubscription($_GET['s'], 1);
+                            header("Location: $fs");
+                            exit;
+                        case '2':
+                            $link = htmlspecialchars($bot->singboxSubscription($_GET['s'], a: 1), ENT_XML1, 'UTF-8');
+                            file_put_contents('/singbox/winsw.xml', preg_replace('#~url~#', $link, file_get_contents('/singbox/winsw.xml')));
+                            $zip = new ZipArchive();
+                            $n   = "singbox_$v.zip";
+                            $zip->open($n, ZipArchive::CREATE | ZipArchive::OVERWRITE);
+                            foreach (scandir('/singbox') as $k => $v) {
+                                if (!empty(!in_array($v, ['.', '..']))) {
+                                    $zip->addFile("/singbox/$v", $v);
+                                }
+                            }
+                            $zip->close();
+                            header('Content-Disposition: attachment; filename="singbox.zip"');
+                            echo file_get_contents($n);
+                            unlink($n);
+                            break;
+                    }
             } else {
                 header('Content-Type: application/json');
                 echo $bot->singboxSubscription($_GET['s']);
             }
             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

@@ -0,0 +1,26 @@
+<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>
+        <iframe src="https://ghbtns.com/github-btn.html?user=mercurykd&repo=vpnbot&type=star&count=true" frameborder="0" scrolling="0" width="150" height="20" title="GitHub"></iframe>
+    </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

@@ -0,0 +1,106 @@
+{
+    "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": "~dns~",
+            "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": "",
+        "server_port": 443,
+        "tls": {
+            "enabled": true,
+            "insecure": false,
+            "reality": {
+                "enabled": true,
+                "public_key": "",
+                "short_id": ""
+            },
+            "server_name": "",
+            "utls": {
+                "enabled": true,
+                "fingerprint": "chrome"
+            }
+        },
+        "uuid": "",
+        "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": "~pac~",
+            "outbound": "proxy"
+        }, {
+            "ip_cidr": ["0.0.0.0\/0"],
+            "outbound": "direct"
+        }]
+    }
+}

config/upstream.conf

@@ -3,7 +3,7 @@ worker_processes  auto;
 
 load_module /usr/lib/nginx/modules/ngx_stream_module.so;
 
-error_log  /logs/nginx_error;
+error_log  /logs/upstream_error;
 pid        /var/run/nginx.pid;
 
 events {

config/v2ray.json

@@ -0,0 +1,95 @@
+{
+    "log": {
+        "access": "",
+        "error": "",
+        "loglevel": "warning"
+    },
+    "inbounds": [{
+        "tag": "socks",
+        "port": 10808,
+        "listen": "127.0.0.1",
+        "protocol": "socks",
+        "sniffing": {
+            "enabled": true,
+            "destOverride": ["http", "tls"],
+            "routeOnly": false
+        },
+        "settings": {
+            "auth": "noauth",
+            "udp": true,
+            "allowTransparent": false
+        }
+    }, {
+        "tag": "http",
+        "port": 10809,
+        "listen": "127.0.0.1",
+        "protocol": "http",
+        "sniffing": {
+            "enabled": true,
+            "destOverride": ["http", "tls"],
+            "routeOnly": false
+        },
+        "settings": {
+            "auth": "noauth",
+            "udp": true,
+            "allowTransparent": false
+        }
+    }],
+    "outbounds": [{
+        "tag": "proxy",
+        "protocol": "vless",
+        "settings": {
+            "vnext": [{
+                "address": "",
+                "port": 443,
+                "users": [{
+                    "id": "",
+                    "alterId": 0,
+                    "email": "t@t.tt",
+                    "security": "auto",
+                    "encryption": "none",
+                    "flow": "xtls-rprx-vision"
+                }]
+            }]
+        },
+        "streamSettings": {
+            "network": "tcp",
+            "security": "reality",
+            "realitySettings": {
+                "serverName": "",
+                "fingerprint": "chrome",
+                "show": false,
+                "publicKey": "",
+                "shortId": "",
+                "spiderX": ""
+            }
+        },
+        "mux": {
+            "enabled": false,
+            "concurrency": -1
+        }
+    }, {
+        "tag": "direct",
+        "protocol": "freedom"
+    }, {
+        "tag": "block",
+        "protocol": "blackhole",
+        "settings": {
+            "response": {
+                "type": "http"
+            }
+        }
+    }],
+    "routing": {
+        "domainStrategy": "AsIs",
+        "rules": [{
+            "type": "field",
+            "outboundTag": "proxy",
+            "domain": []
+        }, {
+            "type": "field",
+            "port": "0-65535",
+            "outboundTag": "direct"
+        }]
+    }
+}

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"
@@ -95,7 +93,7 @@ services:
                 ipv4_address: 10.10.1.2
         logging: *default-logging
     php:
-        image: mercurykd/vpnbot-php:1.3
+        image: mercurykd/vpnbot-php:1.4
         build:
             dockerfile: dockerfile/php.dockerfile
             args:
@@ -117,6 +115,7 @@ services:
             - ./.env:/mirror/.env
             - ./update:/update
             - ./.git:/.git
+            - ./singbox_windows:/singbox
         environment:
             IP: ${IP}
             VER: ${VER}

dockerfile/php.dockerfile

@@ -4,6 +4,7 @@ RUN apk add --no-cache --update php81 \
     php81-mbstring \
     php81-session \
     php81-phar \
+    php81-zip \
     php81-curl \
     php81-opcache \
     php81-openssl \

readme.md

@@ -6,6 +6,10 @@ telegram bot to manage servers (inside the bot)
 - change secret
 - qr/config
 - change fake domain
+- multiple users
+- subscriptions with routing
+- routing templates per user
+- steal from yourself
 <img src="https://github.com/mercurykd/vpnbot/assets/30900414/39bdf4e0-96a6-4257-b61e-30a14122e236" width="200">
 
 ### NaiveProxy

singbox_windows/install.cmd

@@ -0,0 +1,2 @@
+winsw.exe install
+pause

singbox_windows/start.cmd

@@ -0,0 +1 @@
+winsw.exe start

singbox_windows/status.cmd

@@ -0,0 +1,2 @@
+winsw.exe status
+pause

singbox_windows/stop.cmd

@@ -0,0 +1 @@
+winsw.exe stop

singbox_windows/uninstall.cmd

@@ -0,0 +1,2 @@
+winsw.exe uninstall
+pause

singbox_windows/winsw.xml

@@ -0,0 +1,19 @@
+<service>
+    <id>singbox</id>
+    <name>singbox</name>
+    <description>singbox</description>
+    <executable>%BASE%\sing-box.exe</executable>
+    <arguments>run -c %BASE%\config.json</arguments>
+    <logmode>rotate</logmode>
+    <onfailure action="restart" delay="10 sec" />
+    <onfailure action="restart" delay="20 sec" />
+    <onfailure action="restart" delay="30 sec" />
+    <onfailure action="none" />
+    <onexit action="restart" />
+    <onexit action="restart" />
+    <onexit action="restart" />
+    <onexit action="none" />
+    <configuration>
+        <download from="~url~" to="%BASE%\config.json" interval="1 minute" />
+    </configuration>
+</service>

version

@@ -1,3 +1,32 @@
+13.04.2024 v1.27
+- архив сингбокса для windows, работает как служба
+12.04.2024 v1.26
+- имя клиента xtls подтягивается по подписке из бота
+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
+- замена domain на domain_suffix
+09.04.2024 v1.15.2
+- фикс подписки v2ray
 09.04.2024 v1.15.2
 - редиректы вместо кнопки-подписки
 - фикс добавления подписки