Merge branch 'master' into singbox

* added sing-box from repo (#12)

* edge repo for sing-box (#13)

* added sing-box from repo

* add testing repo for sing-box

* Revert "added sing-box from repo (#12)"

This reverts commit 256e43352a.

* Revert "edge repo for sing-box (#13)"

This reverts commit bb1ac60acc.

* Update shadowsocks.dockerfile

---------

Co-authored-by: mercury <mercury.kd@gmail.com>

app/i18n.php

@@ -1,6 +1,10 @@
 <?php
 
 $i = [
+    'warp'             => [
+        'en' => 'warp',
+        'ru' => 'warp',
+    ],
     'wg_title'             => [
         'en' => 'Wireguard',
         'ru' => 'Wireguard',
@@ -237,6 +241,10 @@ $i = [
         'en' => 'defaultDNS',
         'ru' => 'дефолтный днс',
     ],
+    'defaultMTU'  => [
+        'en' => 'defaultMTU',
+        'ru' => 'дефолтный MTU',
+    ],
     'debug'  => [
         'en' => 'debug mode',
         'ru' => 'режим отладки',
@@ -254,8 +262,8 @@ $i = [
         'ru' => 'очистить',
     ],
     'xray'  => [
-        'en' => 'XTLS-Reality',
+        'en' => 'Sing-box',
-        'ru' => 'XTLS-Reality',
+        'ru' => 'Sing-box',
     ],
     'geodb'  => [
         'en' => 'GeoIp/GeoSite',

app/index.php

@@ -17,55 +17,31 @@ if ('POST' == $_SERVER['REQUEST_METHOD'] && $_GET['k'] == $c['key']) {
 }
 
 // pac
-$type = $_GET['t'] ?? 'pac';
+if (!empty($t = unserialize(base64_decode(explode('/', $_SERVER['REQUEST_URI'])[2])))) { // fix sing-box import
+    $_GET = array_merge($_GET, $t);
+}
+$type    = $_GET['t'] ?? 'pac';
 $address = $_GET['a'] ?: '127.0.0.1';
-$port = $_GET['p'] ?: '1080';
+$port    = $_GET['p'] ?: '1080';
-$hash = $_GET['h'];
+$hash    = $_GET['h'];
 if ($hash == substr(md5($c['key']), 0, 8)) {
+    require __DIR__ . '/bot.php';
+    require __DIR__ . '/i18n.php';
+    $bot = new Bot($c['key'], $i);
     switch ($type) {
         case 'mirror':
-            require __DIR__ . '/bot.php';
-            require __DIR__ . '/i18n.php';
-            $bot = new Bot($c['key'], $i);
             $bot->getMirror();
             break;
-
         case 's':
-            require __DIR__ . '/bot.php';
-            require __DIR__ . '/i18n.php';
-            $bot = new Bot($c['key'], $i);
-            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';
+            $bot->subscription();
-            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;
 
         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'])];
+                $t = $bot->getPacConf()["{$_GET['ty']}templates"][$_GET['te']];
             } else {
-                $t = json_decode(file_get_contents('/config/sing.json'), true);
+                $t = json_decode(file_get_contents("/config/{$_GET['ty']}.json"), true);
             }
             if ($t) {
                 header('Content-Type: application/json');

app/init.php

@@ -2,13 +2,16 @@
 
 require __DIR__ . '/timezone.php';
 
-// require __DIR__ . '/debug.php';
 require __DIR__ . '/bot.php';
 require __DIR__ . '/config.php';
 require __DIR__ . '/i18n.php';
+if ($c['debug']) {
+    require __DIR__ . '/debug.php';
+}
 
 $bot = new Bot($c['key'], $i);
 $bot->adguardProtect();
+$bot->adguardCheckPswd();
 $bot->setcommands();
 $bot->syncPortClients();
 $bot->setwebhook();

app/service.php

@@ -2,11 +2,14 @@
 
 require __DIR__ . '/timezone.php';
 
-// require __DIR__ . '/debug.php';
 require __DIR__ . '/bot.php';
 require __DIR__ . '/config.php';
 require __DIR__ . '/i18n.php';
 
+if ($c['debug']) {
+    require __DIR__ . '/debug.php';
+}
+
 $bot = new Bot($c['key'], $i);
 
 if (!empty($c['admin'])) {
@@ -37,3 +40,4 @@ file_put_contents('/update/message', '');
 file_put_contents('/update/reload_message', '');
 $bot->restartTG();
 $bot->sslip();
+$bot->cleanDocker();

app/updatepac.php

@@ -89,98 +89,13 @@ function start()
 
     $conf = $bot->getPacConf();
 
-    $subzones = array_keys(array_filter($conf['subzoneslist'], fn($x) => $x == true));
+    if (!empty($conf['subzoneslist'])) {
+        $subzones = array_keys(array_filter($conf['subzoneslist'], fn($x) => $x == true));
+    }
 
     // check && exclude
-    $include = array_filter($conf['includelist'], fn($x) => $x == true);
+    if (!empty($conf['includelist'])) {
-    if ($conf['zapret']) {
+        $domains = array_filter($conf['includelist'], fn($x) => $x == true);
-        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;
     }
     if (empty($domains)) {
         $text = "Empty domains. Delete pac files";
@@ -234,10 +149,13 @@ function start()
         file_put_contents(__DIR__ . '/zapretlists/pac', $pac);
         $text .= "Create minified pac 100%\n";
     }
-
     // create reverse PAC
-    $domains = array_filter($conf['reverselist'], fn($x) => $x == true);
+    unset($domains);
+    if (!empty($conf['reverselist'])) {
+        $domains = array_filter($conf['reverselist'], fn($x) => $x == true);
+    }
     if (empty($domains)) {
+
         // $text .= "Empty reverse domains. Delete reverse pac files";
         unlink(__DIR__ . '/zapretlists/rmpac');
         unlink(__DIR__ . '/zapretlists/rpac');
@@ -285,6 +203,7 @@ function start()
         file_put_contents(__DIR__ . '/zapretlists/rpac', $pac);
         $text .= 'Create minified reverse pac 100%';
     }
+
     endScript($text);
 }
 
@@ -330,7 +249,6 @@ $load = [
     '-',
     '\\',
 ];
-
 switch ($_SERVER['argv'][1]) {
     case 'start':
         $bot                       = new Bot($c['key'], $i);

app/webapp/donate.html

@@ -16,6 +16,7 @@
     <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>

config/nginx.conf

@@ -2,7 +2,6 @@ user  nginx;
 worker_processes  auto;
 
 error_log  /logs/nginx_error;
-pid        /var/run/nginx.pid;
 
 events {
     worker_connections  1024;
@@ -22,8 +21,8 @@ http {
   set_real_ip_from    10.10.0.10;
 
   server {
-    listen 10.10.0.2:80 default_server;
+    listen 80 default_server;
-    listen 10.10.0.2:443 ssl http2 default_server proxy_protocol;
+    listen 443 ssl http2 default_server proxy_protocol;
     ssl_certificate /certs/self_public;
     ssl_certificate_key /certs/self_private;
 
@@ -75,12 +74,11 @@ http {
 
 #-domain
   # server {
-  #   listen 10.10.0.2:80;
+  #   listen 80;
   #   server_name ;
 #-domain
 #-ssl
-    # listen 10.10.0.2:443 ssl http2 proxy_protocol;
+    # listen 443 ssl http2 proxy_protocol;
-    # listen 10.10.1.2:443 ssl http2;
     # ssl_certificate /certs/cert_public;
     # ssl_certificate_key /certs/cert_private;
 #-ssl

config/nginx_default.conf

@@ -2,7 +2,6 @@ user  nginx;
 worker_processes  auto;
 
 error_log  /logs/nginx_error;
-pid        /var/run/nginx.pid;
 
 events {
     worker_connections  1024;
@@ -22,8 +21,8 @@ http {
   set_real_ip_from    10.10.0.10;
 
   server {
-    listen 10.10.0.2:80 default_server;
+    listen 80 default_server;
-    listen 10.10.0.2:443 ssl http2 default_server proxy_protocol;
+    listen 443 ssl http2 default_server proxy_protocol;
     ssl_certificate /certs/self_public;
     ssl_certificate_key /certs/self_private;
 
@@ -75,12 +74,11 @@ http {
 
 #-domain
   # server {
-  #   listen 10.10.0.2:80;
+  #   listen 80;
   #   server_name ;
 #-domain
 #-ssl
-    # listen 10.10.0.2:443 ssl http2 proxy_protocol;
+    # listen 443 ssl http2 proxy_protocol;
-    # listen 10.10.1.2:443 ssl http2;
     # ssl_certificate /certs/cert_public;
     # ssl_certificate_key /certs/cert_private;
 #-ssl

config/pac.json

@@ -1,99 +1,3 @@
 {
-    "zapret": false,
+    "includelist": []
-    "excludelist": {
-        "(?:v|w)ul(?:c|k)an": true,
-        "^\\d": true,
-        "^a\\w-": true,
-        "^admiral": true,
-        "^avtomaty": true,
-        "^azart": true,
-        "^azimob": true,
-        "^baltplay": true,
-        "a(?:s|z)ino": true,
-        "adrenalin": true,
-        "alco": true,
-        "bet": true,
-        "prostitut": true,
-        "zenit": true,
-        "zerkalo": true,
-        "777": true
-    },
-    "includelist": {},
-    "reverselist": {},
-    "subzoneslist": {
-        "3dn": false,
-        "3nx": true,
-        "akadns": true,
-        "appspot": true,
-        "azurewebsites": true,
-        "beget": true,
-        "berlogovo": true,
-        "biz": true,
-        "brightcove": true,
-        "cc": true,
-        "cloudfront": true,
-        "co": true,
-        "com": true,
-        "cu": true,
-        "ddns": true,
-        "deviantart": true,
-        "dn": true,
-        "dp": true,
-        "dyndns": true,
-        "edgecastcdn": true,
-        "edu": true,
-        "eu": true,
-        "fastly": true,
-        "force": true,
-        "github": true,
-        "google": true,
-        "googleusercontent": true,
-        "gov": true,
-        "herokuapp": true,
-        "hldns": true,
-        "ho": true,
-        "hopto": true,
-        "hwcdn": true,
-        "i": true,
-        "iboards": true,
-        "in": true,
-        "info": true,
-        "int": true,
-        "itch": true,
-        "keenetic": true,
-        "kiev": true,
-        "kirov": true,
-        "linode": true,
-        "livejournal": true,
-        "maryno": true,
-        "mil": true,
-        "msk": true,
-        "my1": true,
-        "mybb2": true,
-        "ne": true,
-        "net": true,
-        "netdna-ssl": true,
-        "nnov": true,
-        "notion": true,
-        "nov": true,
-        "od": true,
-        "org": true,
-        "pp": true,
-        "pximg": true,
-        "pythonanywhere": true,
-        "ru": true,
-        "scaleway": true,
-        "sl": true,
-        "sl-reverse": true,
-        "spb": true,
-        "tilda": true,
-        "trafficmanager": true,
-        "tut": true,
-        "u-stream": true,
-        "ucoz": true,
-        "v": true,
-        "vercel": true,
-        "wix": true,
-        "wixmp": true
-    }
 }

config/sing.json

@@ -3,104 +3,110 @@
         "level": "error",
         "timestamp": true
     },
-    "inbounds": [{
+    "inbounds": [
-        "type": "tun",
+        {
-        "tag": "tun-in",
+            "type": "tun",
-        "domain_strategy": "prefer_ipv4",
+            "tag": "tun-in",
-        "interface_name": "sing-tun",
+            "domain_strategy": "prefer_ipv4",
-        "inet4_address": "172.19.0.1\/30",
+            "interface_name": "sing-tun",
-        "mtu": 1400,
+            "inet4_address": "172.19.0.1\/30",
-        "gso": true,
+            "mtu": 1400,
-        "auto_route": true,
+            "gso": true,
-        "strict_route": true,
+            "auto_route": true,
-        "sniff": true,
+            "strict_route": true,
-        "endpoint_independent_nat": false,
+            "sniff": true,
-        "stack": "mixed",
+            "endpoint_independent_nat": false,
-        "platform": {
+            "stack": "mixed",
-            "http_proxy": {
+            "platform": {
-                "enabled": false,
+                "http_proxy": {
-                "server": "127.0.0.1",
+                    "enabled": false,
-                "server_port": 2080
+                    "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": []
         }
-    }, {
+    ],
-        "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": [{
+        "servers": [
-            "tag": "dns_direct",
+            {
-            "address": "~dns~",
+                "tag": "dns_direct",
-            "address_resolver": "dns-remote",
+                "address": "~dns~",
-            "strategy": "prefer_ipv4",
+                "address_resolver": "dns-remote",
-            "detour": "direct"
+                "strategy": "prefer_ipv4",
-        }, {
+                "detour": "direct"
-            "tag": "dns-remote",
+            },
-            "address": "tcp:\/\/8.8.8.8",
+            {
-            "address_strategy": "prefer_ipv4",
+                "tag": "dns-remote",
-            "strategy": "prefer_ipv4",
+                "address": "tcp:\/\/8.8.8.8",
-            "detour": "direct"
+                "address_strategy": "prefer_ipv4",
-        }],
+                "strategy": "prefer_ipv4",
-        "rules": [{
+                "detour": "direct"
-            "outbound": "any",
+            }
-            "server": "dns-direct",
+        ],
-            "disable_cache": false
-        }],
         "strategy": "ipv4_only",
         "independent_cache": true
     },
-    "outbounds": [{
+    "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": [{
+        "rules": [
-            "protocol": "dns",
+            {
-            "outbound": "dns-out"
+                "protocol": "dns",
-        }, {
+                "outbound": "dns-out"
-            "domain_suffix": "~pac~",
+            },
-            "outbound": "proxy"
+            {
-        }, {
+                "createruleset": [
-            "ip_cidr": ["0.0.0.0\/0"],
+                    {
-            "outbound": "direct"
+                        "name": "pac",
-        }]
+                        "interval": "15s",
+                        "rules": [
+                            {
+                                "domain_suffix": "~pac~"
+                            }
+                        ]
+                    },
+                    {
+                        "name": "warp",
+                        "interval": "15s",
+                        "rules": [
+                            {
+                                "domain_suffix": "~warp~"
+                            }
+                        ]
+                    }
+                ],
+                "outbound": "proxy"
+            },
+            {
+                "createruleset": [
+                    {
+                        "name": "block",
+                        "interval": "15s",
+                        "rules": [
+                            {
+                                "domain_suffix": "~block~"
+                            }
+                        ]
+                    }
+                ],
+                "outbound": "block"
+            },
+            {
+                "outbound": "direct"
+            }
+        ],
+        "final": "direct"
     }
 }

config/singbox.json

@@ -0,0 +1,26 @@
+{
+    "inbounds": [],
+    "log": {
+        "level": "info"
+    },
+    "outbounds": [
+        {
+            "type": "direct",
+            "tag": "direct"
+        },
+        {
+            "type": "block",
+            "tag": "block"
+        },
+        {
+            "type": "socks",
+            "tag": "warp",
+            "server": "10.10.0.13",
+            "server_port": 4000
+        }
+    ],
+    "route" : {
+        "rules": [],
+        "final": "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 {
@@ -15,8 +15,12 @@ stream {
         server ng:443;
     }
 
-    upstream reality {
+    upstream si {
-        server xr:443;
+        server si:443;
+    }
+
+    upstream singbox {
+        server 127.0.0.1:4443;
     }
 
     upstream ocserv {
@@ -30,7 +34,7 @@ stream {
     map_hash_bucket_size 128;
     map $ssl_preread_server_name $sni_name {
         #domain
-        www.microsoft.com reality;
+        vk.com singbox;
         #domain
 
         #ocserv
@@ -43,17 +47,22 @@ stream {
         default other;
     }
 
+    server {
+        listen          4443 reuseport proxy_protocol;
+        proxy_pass      si;
+    }
+
     server {
         listen          443 reuseport;
         proxy_pass      $sni_name;
-        proxy_protocol  on;
         ssl_preread     on;
+        proxy_protocol  on;
     }
 
     server {
         listen          443 udp;
         proxy_pass      $sni_name;
-        proxy_protocol  on;
         ssl_preread     on;
+        proxy_protocol  on;
     }
 }

config/v2ray.json

@@ -85,7 +85,7 @@
         "rules": [{
             "type": "field",
             "outboundTag": "proxy",
-            "domain": []
+            "domain": "~pac~"
         }, {
             "type": "field",
             "port": "0-65535",

config/xray.json

@@ -1,66 +0,0 @@
-{
-    "inbounds": [
-        {
-            "port": 443,
-            "protocol": "vless",
-            "settings": {
-                "clients": [
-                    {
-                        "email": "user1@myserver",
-                        "flow": "xtls-rprx-vision",
-                        "id": ""
-                    }
-                ],
-                "decryption": "none"
-            },
-            "sniffing": {
-                "destOverride": [
-                    "http",
-                    "tls"
-                ],
-                "enabled": true
-            },
-            "streamSettings": {
-                "network": "tcp",
-                "realitySettings": {
-                    "dest": "www.microsoft.com:443",
-                    "maxClientVer": "",
-                    "maxTimeDiff": 0,
-                    "minClientVer": "",
-                    "privateKey": "",
-                    "serverNames": [
-                        "www.microsoft.com"
-                    ],
-                    "shortIds": [],
-                    "show": false,
-                    "xver": 0
-                },
-                "tcpSettings": {
-                    "acceptProxyProtocol": true
-                },
-                "sockopt": {
-                    "acceptProxyProtocol": true
-                },
-                "security": "reality"
-            },
-            "tag": "vless_tls"
-        }
-    ],
-    "log": {
-        "loglevel": "info"
-    },
-    "outbounds": [
-        {
-            "protocol": "freedom",
-            "tag": "direct"
-        },
-        {
-            "protocol": "blackhole",
-            "tag": "block"
-        }
-    ],
-    "routing": {
-        "domainStrategy": "AsIs",
-        "rules": []
-    }
-}

docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.7"
-
 x-logging:
       &default-logging
       driver: "json-file"
@@ -12,16 +10,12 @@ networks:
         ipam:
             config:
                 - subnet: 10.10.0.0/24
-    xray:
-        ipam:
-            config:
-                - subnet: 10.10.1.0/24
 volumes:
     adguard:
 
 services:
     up:
-        image: mercurykd/vpnbot-up:1.1
+        image: mercurykd/vpnbot-ng:1.1
         build:
             context: dockerfile
             dockerfile: nginx.dockerfile
@@ -29,9 +23,9 @@ services:
                 image: ${IMAGE}
         volumes:
             - ./config/.profile:/root/.ashrc:ro
-            - ./config/upstream.conf:/etc/nginx/nginx.conf
             - ./scripts/start_upstream.sh:/start_upstream.sh
             - ./ssh:/ssh
+            - ./config:/config
             - ./config/sshd_config:/etc/ssh/sshd_config
             - ./logs/:/logs/
         ports:
@@ -65,9 +59,7 @@ services:
                 image: ${IMAGE}
         volumes:
             - ./config/.profile:/root/.ashrc:ro
-            - ./config/nginx.conf:/etc/nginx/nginx.conf
+            - ./config:/config
-            - ./config/include.conf:/etc/nginx/include.conf
-            - ./config/nginx_default.conf:/nginx_default.conf
             - ./scripts/start_ng.sh:/start_ng.sh
             - ./certs/:/certs/
             - ./ssh:/ssh
@@ -91,11 +83,9 @@ services:
         networks:
             default:
                 ipv4_address: 10.10.0.2
-            xray:
-                ipv4_address: 10.10.1.2
         logging: *default-logging
     php:
-        image: mercurykd/vpnbot-php:1.3
+        image: mercurykd/vpnbot-php:1.5
         build:
             dockerfile: dockerfile/php.dockerfile
             args:
@@ -117,6 +107,8 @@ services:
             - ./.env:/mirror/.env
             - ./update:/update
             - ./.git:/.git
+            - ./singbox_windows:/singbox
+            - /var/run/docker.sock:/var/run/docker.sock:ro
         environment:
             IP: ${IP}
             VER: ${VER}
@@ -143,7 +135,7 @@ services:
             timeout: 5s
             retries: 5
     service:
-        image: mercurykd/vpnbot-php:1.2
+        image: mercurykd/vpnbot-php:1.5
         build:
             dockerfile: dockerfile/php.dockerfile
             args:
@@ -158,6 +150,7 @@ services:
             - ./logs/:/logs/
             - ./update:/update
             - ./scripts/start_service.sh:/start_service.sh
+            - /var/run/docker.sock:/var/run/docker.sock:ro
         environment:
             IP: ${IP}
             VER: ${VER}
@@ -186,11 +179,11 @@ services:
             - ad
             - ss
             - tg
-            - xr
+            - si
             - oc
             - np
     proxy:
-        image: mercurykd/vpnbot-ss:1.1
+        image: mercurykd/vpnbot-ss:1.2
         build:
             dockerfile: dockerfile/shadowsocks.dockerfile
             args:
@@ -337,7 +330,7 @@ services:
         entrypoint: ["/bin/sh", "/start_ad.sh"]
         logging: *default-logging
     ss:
-        image: mercurykd/vpnbot-ss:1.1
+        image: mercurykd/vpnbot-ss:1.2
         build:
             dockerfile: dockerfile/shadowsocks.dockerfile
             args:
@@ -397,20 +390,21 @@ services:
             default:
                 ipv4_address: 10.10.0.8
         logging: *default-logging
-    xr:
+    si:
-        image: mercurykd/vpnbot-xr:1.2
+        image: mercurykd/vpnbot-sb:1.2
         build:
-            dockerfile: dockerfile/xray.dockerfile
+            dockerfile: dockerfile/singbox.dockerfile
             args:
                 image: ${IMAGE}
         volumes:
             - ./config/.profile:/root/.ashrc:ro
             - ./ssh:/ssh
             - ./config/sshd_config:/etc/ssh/sshd_config
-            - ./config/xray.json:/xray.json
+            - ./config:/config
-            - ./scripts/start_xray.sh:/start_xray.sh
+            - ./certs:/certs
-        hostname: xray
+            - ./scripts/start_sing.sh:/start_sing.sh
-        container_name: xray-${VER}
+        hostname: singbox
+        container_name: singbox-${VER}
         depends_on:
             php:
                 condition: service_healthy
@@ -420,12 +414,10 @@ services:
             - path: ./override.env
               required: false
         stop_grace_period: 1s
-        command: ["/bin/sh", "/start_xray.sh"]
+        command: ["/bin/sh", "/start_sing.sh"]
         networks:
             default:
                 ipv4_address: 10.10.0.9
-            xray:
-                ipv4_address: 10.10.1.9
         logging: *default-logging
     oc:
         image: mercurykd/vpnbot-oc:1.2
@@ -491,3 +483,36 @@ services:
             default:
                 ipv4_address: 10.10.0.12
         logging: *default-logging
+    wp:
+        image: mercurykd/vpnbot-wp:1.2
+        build:
+            dockerfile: dockerfile/warp.dockerfile
+            args:
+                image: ${IMAGE}
+        cap_add:
+            - NET_ADMIN
+        devices:
+            - /dev/net/tun:/dev/net/tun
+        volumes:
+            - ./config/.profile:/root/.ashrc:ro
+            - ./ssh:/ssh
+            - ./config/sshd_config:/etc/ssh/sshd_config
+            - ./config:/config
+            - ./certs:/certs
+            - ./scripts/start_wp.sh:/start_wp.sh
+        hostname: warp
+        container_name: warp-${VER}
+        depends_on:
+            php:
+                condition: service_healthy
+        env_file:
+            - path: ./.env
+              required: true # default
+            - path: ./override.env
+              required: false
+        stop_grace_period: 1s
+        command: ["/bin/sh", "/start_wp.sh"]
+        networks:
+            default:
+                ipv4_address: 10.10.0.13
+        logging: *default-logging

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 \
@@ -25,5 +26,10 @@ RUN apk add --no-cache --update php81 \
     && tar -xf dnslookup-linux-amd64-v1.9.1.tar.gz \
     && mv linux-amd64/dnslookup /usr/bin \
     && rm dnslookup-linux-amd64-v1.9.1.tar.gz \
-    && rm -rf /linux-amd64
+    && rm -rf /linux-amd64 \
+    && wget https://github.com/SagerNet/sing-box/releases/download/v1.8.11/sing-box-1.8.11-linux-amd64.tar.gz \
+    && tar -xf sing-box-1.8.11-linux-amd64.tar.gz \
+    && mv sing-box-1.8.11-linux-amd64/sing-box /usr/bin \
+    && rm sing-box-1.8.11-linux-amd64.tar.gz \
+    && rm -rf /sing-box-1.8.11-linux-amd64
 ENV ENV="/root/.ashrc"

dockerfile/shadowsocks.dockerfile

@@ -2,16 +2,16 @@ ARG image
 FROM $image
 RUN apk add openssh git xz \
     && mkdir /root/.ssh \
-    && wget https://github.com/shadowsocks/shadowsocks-rust/releases/download/v1.15.3/shadowsocks-v1.15.3.x86_64-unknown-linux-musl.tar.xz \
+    && wget -O shadowsocks-rust.x86_64-unknown-linux-musl.tar.xz $(wget -q -O - https://api.github.com/repos/shadowsocks/shadowsocks-rust/releases/latest | grep browser_download_url | cut -d\" -f4 | egrep '.x86_64-unknown-linux-musl.tar.xz$') \
-    && tar -xf shadowsocks-v1.15.3.x86_64-unknown-linux-musl.tar.xz \
+    && tar -xf shadowsocks-rust.x86_64-unknown-linux-musl.tar.xz \
-    && wget https://github.com/teddysun/v2ray-plugin/releases/download/v5.7.0/v2ray-plugin-linux-amd64-v5.7.0.tar.gz \
+    && wget -O v2ray-plugin-linux-amd64.tar.gz $(wget -q -O - https://api.github.com/repos/teddysun/v2ray-plugin/releases/latest | grep browser_download_url | cut -d\" -f4 | egrep 'v2ray-plugin-linux-amd64') \
-    && tar -xf v2ray-plugin-linux-amd64-v5.7.0.tar.gz \
+    && tar -xf v2ray-plugin-linux-amd64.tar.gz \
     && mv sslocal /usr/bin/ \
     && mv ssserver /usr/bin/ \
     && mv ssmanager /usr/bin/ \
     && mv ssservice /usr/bin/ \
     && mv ssurl /usr/bin/ \
     && mv v2ray-plugin_linux_amd64 /usr/bin/v2ray-plugin \
-    && rm v2ray-plugin-linux-amd64-v5.7.0.tar.gz\
+    && rm v2ray-plugin-linux-amd64.tar.gz \
-    && rm shadowsocks-v1.15.3.x86_64-unknown-linux-musl.tar.xz
+    && rm shadowsocks-rust.x86_64-unknown-linux-musl.tar.xz
 ENV ENV="/root/.ashrc"

dockerfile/singbox.dockerfile

@@ -0,0 +1,9 @@
+ARG image
+FROM $image
+RUN apk add openssh openssl jq \
+    && mkdir /root/.ssh \
+    && wget https://github.com/SagerNet/sing-box/releases/download/v1.9.3/sing-box-1.9.3-linux-amd64.tar.gz \
+    && tar -xf sing-box-1.9.3-linux-amd64.tar.gz \
+    && mv sing-box-1.9.3-linux-amd64/sing-box /usr/bin \
+    && rm sing-box-1.9.3-linux-amd64.tar.gz \
+    && rm -rf /sing-box-1.9.3-linux-amd64

dockerfile/warp.dockerfile

@@ -0,0 +1,16 @@
+FROM ubuntu:22.04 AS build
+RUN apt update && apt install -y curl gpg lsb-release \
+    && curl -fsSL https://pkg.cloudflareclient.com/pubkey.gpg | gpg --yes --dearmor --output /usr/share/keyrings/cloudflare-warp-archive-keyring.gpg \
+    && echo "deb [signed-by=/usr/share/keyrings/cloudflare-warp-archive-keyring.gpg] https://pkg.cloudflareclient.com/ $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/cloudflare-client.list \
+    && apt update && apt install -y cloudflare-warp
+
+FROM alpine:3.17
+ARG GLIBC_VERSION=2.34-r0
+COPY --from=build /usr/bin/warp-cli /usr/bin/warp-svc /usr/local/bin/
+RUN apk add --no-cache dbus-libs wget socat openssh-server jq curl \
+    && mkdir /tmp/glibc-pkgs \
+    && for PKG in glibc-$GLIBC_VERSION.apk glibc-bin-$GLIBC_VERSION.apk; do wget -q --directory-prefix /tmp/glibc-pkgs https://github.com/sgerrand/alpine-pkg-glibc/releases/download/$GLIBC_VERSION/$PKG; done \
+    && apk add --no-cache --allow-untrusted --force-overwrite /tmp/glibc-pkgs/* \
+    && rm -rf /tmp/glibc-pkgs \
+    && /usr/glibc-compat/sbin/ldconfig /lib /usr/glibc-compat/lib \
+    && mkdir /root/.ssh

dockerfile/wireguard.dockerfile

@@ -1,6 +1,8 @@
 ARG image
 FROM $image
-RUN apk add --no-cache --virtual .build-deps alpine-sdk git go \
+COPY --from=golang:1.22.3-alpine /usr/local/go/ /usr/local/go/
+ENV PATH="/usr/local/go/bin:${PATH}"
+RUN apk add --no-cache --virtual .build-deps alpine-sdk git \
     && apk add iproute2 linux-headers iptables xtables-addons openssh wireguard-tools jq bash htop \
     && git clone https://github.com/amnezia-vpn/amneziawg-go \
     && git clone https://github.com/amnezia-vpn/amneziawg-tools.git \

dockerfile/xray.dockerfile

@@ -1,12 +0,0 @@
-ARG image
-FROM $image
-RUN apk add openssh openssl jq \
-    && mkdir /root/.ssh \
-    && wget https://github.com/XTLS/Xray-core/releases/download/v1.8.10/Xray-linux-64.zip \
-    && unzip Xray-linux-64.zip \
-    && mv xray /usr/bin/ \
-    && rm Xray-linux-64.zip \
-    && rm geoip.dat \
-    && rm geosite.dat \
-    && chmod +x /usr/bin/xray
-ENV ENV="/root/.ashrc"

makefile

@@ -9,7 +9,7 @@ d: # остановка контейнеров
 	docker compose down --remove-orphans
 dv: # остановка контейнеров
 	docker compose down -v
-r: d cleanf u cleanf
+r: d u
 ps: # список контейнеров
 	docker compose ps
 l: # логи из контейнеров
@@ -31,13 +31,13 @@ up: # консоль сервиса
 ad: # консоль сервиса
 	docker compose exec ad /bin/sh
 wp: # консоль сервиса
-	docker compose exec wp bash
+	docker compose exec wp /bin/sh
 proxy: # консоль сервиса
 	docker compose exec proxy /bin/sh
 tg: # консоль сервиса
 	docker compose exec tg /bin/sh
-xr: # консоль сервиса
+si: # консоль сервиса
-	docker compose exec xr /bin/sh
+	docker compose exec si /bin/sh
 oc: # консоль сервиса
 	docker compose exec oc /bin/sh
 clean:

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

scripts/start_ng.sh

@@ -1,8 +1,8 @@
 cat /ssh/key.pub > /root/.ssh/authorized_keys
 ssh-keygen -A
 exec /usr/sbin/sshd -D -e "$@" &
-sed "s/ss:[0-9]\+/ss:$SSPORT/" /nginx_default.conf > change_port
+sed "s/ss:[0-9]\+/ss:$SSPORT/" /config/nginx_default.conf > change_port
-cat change_port > /nginx_default.conf
+cat change_port > /config/nginx_default.conf
-sed "s/ss:[0-9]\+/ss:$SSPORT/" /etc/nginx/nginx.conf > change_port
+sed "s/ss:[0-9]\+/ss:$SSPORT/" /config/nginx.conf > change_port
-cat change_port > /etc/nginx/nginx.conf
+cat change_port > /config/nginx.conf
-nginx -g "daemon off;"
+nginx -g "daemon off;" -c /config/nginx.conf

scripts/start_sing.sh

@@ -0,0 +1,5 @@
+cat /ssh/key.pub > /root/.ssh/authorized_keys
+ssh-keygen -A
+exec /usr/sbin/sshd -D -e "$@" &
+sing-box run -c /config/singbox.json > /dev/null &
+tail -f /dev/null

scripts/start_upstream.sh

@@ -1,4 +1,4 @@
 cat /ssh/key.pub > /root/.ssh/authorized_keys
 ssh-keygen -A
 exec /usr/sbin/sshd -D -e "$@" &
-nginx -g "daemon off;"
+nginx -g "daemon off;" -c /config/upstream.conf

scripts/start_wp.sh

@@ -0,0 +1,14 @@
+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
+key=$(cat /config/pac.json | jq -r .warp)
+if [ ! -z "$key" ]
+then
+    warp-cli --accept-tos registration license $key
+fi
+warp-cli --accept-tos mode proxy
+warp-cli --accept-tos connect
+socat TCP-LISTEN:4000,fork TCP:127.0.0.1:40000

scripts/start_xray.sh

@@ -1,8 +0,0 @@
-cat /ssh/key.pub > /root/.ssh/authorized_keys
-ssh-keygen -A
-exec /usr/sbin/sshd -D -e "$@" &
-if [ $(cat /xray.json | jq -r '.inbounds[0].settings.clients[0].id' | wc -c) -gt 1 ]
-then
-    xray run -config /xray.json > /dev/null &
-fi
-tail -f /dev/null

singbox_windows/install.cmd

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

singbox_windows/restart.cmd

@@ -0,0 +1,2 @@
+winsw3.exe stop
+winsw3.exe start

singbox_windows/start.cmd

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

singbox_windows/status.cmd

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

singbox_windows/stop.cmd

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

singbox_windows/uninstall.cmd

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

singbox_windows/winsw3.xml

@@ -0,0 +1,17 @@
+<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" />
+    <download from="~url~" to="%BASE%\config.json"/>
+</service>

update/update.sh

@@ -9,16 +9,25 @@ do
     branch=$(cat $pwd/update/branch 2>/dev/null)
     if [[ -n "$cmd" ]]
     then
+        key=$(cat $pwd/update/key)
+        curl -H "Content-Type: application/json" -X POST https://api.telegram.org/bot$key/editMessageText -d "$(cat $pwd/update/curl | sed 's/"text":"~t~"/"text": "останавливаю бота"/')"
         docker compose down --remove-orphans
+        curl -H "Content-Type: application/json" -X POST https://api.telegram.org/bot$key/editMessageText -d "$(cat $pwd/update/curl | sed 's/"text":"~t~"/"text": "очищаю директорию"/')"
         git reset --hard && git clean -fd
+        curl -H "Content-Type: application/json" -X POST https://api.telegram.org/bot$key/editMessageText -d "$(cat $pwd/update/curl | sed 's/"text":"~t~"/"text": "скачиваю обновление"/')"
         git fetch
         if [[ -n "$branch" ]]
         then
+            curl -H "Content-Type: application/json" -X POST https://api.telegram.org/bot$key/editMessageText -d "$(cat $pwd/update/curl | sed 's/"text":"~t~"/"text": "меняю ветку"/')"
             git checkout -t origin/$branch || git checkout $branch
         fi
+        curl -H "Content-Type: application/json" -X POST https://api.telegram.org/bot$key/editMessageText -d "$(cat $pwd/update/curl | sed 's/"text":"~t~"/"text": "применяю обновления"/')"
         git pull > ./update/message
+        curl -H "Content-Type: application/json" -X POST https://api.telegram.org/bot$key/editMessageText -d "$(cat $pwd/update/curl | sed 's/"text":"~t~"/"text": "запускаю бота"/')"
         IP=$(curl https://ipinfo.io/ip) VER=$(git describe --tags) docker compose up -d --force-recreate
         bash $pwd/update/update.sh &
+        > $pwd/update/key
+        > $pwd/update/curl
         exit 0
     fi
     sleep 1

version

@@ -1,3 +1,67 @@
+26.08.2024 v1.44
+- qr для xtls
+- фикс действий на элементом списков
+21.08.2024 v1.43
+- singbox:поддержка кастомных outbound для ruleset
+16.08.2024 v1.42.1
+- фикс добавления рулсетов с длинными урл
+16.08.2024 v1.42
+- добавлена возможность сохранять/восстанавливать список доменов/правил маршрутизации
+- изменена ссылка на сингбокс-конфиг для совместимости с клиентом сингбокса (фикс импорта в sing-box)
+- sing-box: добавлена возможность добавлять свои packagename (outbound:proxy)
+- sing-box: добавлена возможность добавлять свои ruleset с указанием outbound и временем обновления
+- sing-box: списки доменов pac/warp/block трансформируются в собственный ruleset и присутствуют в шаблоне origin всегда, даже если они пустые. это дает возможность не ждать перезагрузки конфига клиентом
+09.08.2024 v1.41.1
+- фикс для "удалить все" в списках доменов
+06.08.2024 v1.41
+- возможность очистить РАС лист
+03.08.2024 v1.40
+- возможность менять MTU для Wireguard/Amnezia
+- раздельный qr для AmneziaWG + AmneziaVPN
+18.05.2024 v1.39
+- изменен автобэкап
+04.05.2024 v1.38
+- changelog в сообщении новой версии
+04.05.2024 v1.37.1
+- warp на образе alpine (thx @zmeyzloy)
+- фикс выбора шаблона singbox
+22.04.2024 v1.35
+- очистка старых образов
+19.04.2024 v1.34
+- формирование rule_set из шаблона singbox
+18.04.2024 v1.33
+- вывод статуса warp в меню
+18.04.2024 v1.32
+- фиксы в названии и отображении выбранного шаблона xtls
+18.04.2024 v1.31
+- возможность устанавливать ключ для warp
+16.04.2024 v1.30.1
+- улучшение сообщения об обновлениях
+16.04.2024 v1.30
+- улучшение скрипта обновления
+16.04.2024 v1.29
+- рефакторинг подписок
+- кнопки импорта для различных клиентов
+- шаблоны для v2ray
+15.04.2024 v1.28
+- xtls: список блокировки, список warp
+- улучшение отображения таймера
+14.04.2024 v1.27.1
+- singbox windows: замена winsw на winsw3, + скрипт обновления подписки
+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