fix import, fix ws transport

* 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

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

app/index.php

@@ -17,10 +17,13 @@ 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';
@@ -36,7 +39,7 @@ if ($hash == substr(md5($c['key']), 0, 8)) {
 
         case 'te':
             if (!empty($_GET['te'])) {
-                $t = $bot->getPacConf()["{$_GET['ty']}templates"][urldecode($_GET['te'])];
+                $t = $bot->getPacConf()["{$_GET['ty']}templates"][$_GET['te']];
             } else {
                 $t = json_decode(file_get_contents("/config/{$_GET['ty']}.json"), true);
             }

app/service.php

@@ -40,3 +40,4 @@ file_put_contents('/update/message', '');
 file_put_contents('/update/reload_message', '');
 $bot->restartTG();
 $bot->sslip();
+$bot->cleanDocker();

app/updatepac.php

@@ -89,11 +89,14 @@ 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'])) {
-    $domains = $include;
+        $domains = array_filter($conf['includelist'], fn($x) => $x == true);
+    }
     if (empty($domains)) {
         $text = "Empty domains. Delete pac files";
         unlink(__DIR__ . '/zapretlists/mpac');
@@ -146,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');
@@ -197,6 +203,7 @@ function start()
         file_put_contents(__DIR__ . '/zapretlists/rpac', $pac);
         $text .= 'Create minified reverse pac 100%';
     }
+
     endScript($text);
 }
 
@@ -242,7 +249,6 @@ $load = [
     '-',
     '\\',
 ];
-
 switch ($_SERVER['argv'][1]) {
     case 'start':
         $bot                       = new Bot($c['key'], $i);

app/webapp/donate.html

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

@@ -64,6 +64,17 @@ http {
       proxy_set_header Upgrade $http_upgrade;
       proxy_set_header Connection "upgrade";
     }
+    location /ws {
+        proxy_pass http://xr:443;
+        proxy_redirect off;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_read_timeout 5d;
+    }
     location ~\.well-known {
       access_log /logs/nginx_certbot_access;
       root /certs/;
@@ -124,6 +135,17 @@ http {
   #     proxy_set_header Upgrade $http_upgrade;
   #     proxy_set_header Connection "upgrade";
   #   }
+  #   location /ws {
+  #       proxy_pass http://xr:443;
+  #       proxy_redirect off;
+  #       proxy_http_version 1.1;
+  #       proxy_set_header Upgrade $http_upgrade;
+  #       proxy_set_header Connection "upgrade";
+  #       proxy_set_header Host $host;
+  #       proxy_set_header X-Real-IP $remote_addr;
+  #       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+  #       proxy_read_timeout 5d;
+  #    }
 #-domain
 #-ssl
   #   # The DoH server block

config/nginx_default.conf

@@ -64,6 +64,17 @@ http {
       proxy_set_header Upgrade $http_upgrade;
       proxy_set_header Connection "upgrade";
     }
+    location /ws {
+        proxy_pass http://xr:443;
+        proxy_redirect off;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_read_timeout 5d;
+    }
     location ~\.well-known {
       access_log /logs/nginx_certbot_access;
       root /certs/;
@@ -124,6 +135,17 @@ http {
   #     proxy_set_header Upgrade $http_upgrade;
   #     proxy_set_header Connection "upgrade";
   #   }
+  #   location /ws {
+  #       proxy_pass http://xr:443;
+  #       proxy_redirect off;
+  #       proxy_http_version 1.1;
+  #       proxy_set_header Upgrade $http_upgrade;
+  #       proxy_set_header Connection "upgrade";
+  #       proxy_set_header Host $host;
+  #       proxy_set_header X-Real-IP $remote_addr;
+  #       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+  #       proxy_read_timeout 5d;
+  #    }
 #-domain
 #-ssl
   #   # The DoH server block

config/sing.json

@@ -3,104 +3,154 @@
         "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
+        "rules": [
-        }],
+            {
+                "outbound": "any",
+                "server": "dns-direct",
+                "disable_cache": false
+            }
+        ],
         "strategy": "ipv4_only",
         "independent_cache": true
     },
-    "outbounds": [{
+    "outbounds": [
-        "flow": "xtls-rprx-vision",
+        {
-        "packet_encoding": "",
+            "flow": "xtls-rprx-vision",
-        "server": "",
+            "packet_encoding": "",
-        "server_port": 443,
+            "server": "",
-        "tls": {
+            "server_port": 443,
-            "enabled": true,
+            "tls": {
-            "insecure": false,
-            "reality": {
                 "enabled": true,
-                "public_key": "",
+                "insecure": false,
-                "short_id": ""
+                "reality": {
+                    "enabled": true,
+                    "public_key": "",
+                    "short_id": ""
+                },
+                "server_name": "",
+                "utls": {
+                    "enabled": true,
+                    "fingerprint": "chrome"
+                }
             },
-            "server_name": "",
+            "uuid": "",
-            "utls": {
+            "type": "vless",
-                "enabled": true,
+            "domain_strategy": "ipv4_only",
-                "fingerprint": "chrome"
+            "tag": "proxy"
-            }
         },
-        "uuid": "",
+        {
-        "type": "vless",
+            "type": "direct",
-        "domain_strategy": "ipv4_only",
+            "tag": "direct"
-        "tag": "proxy"
+        },
-    }, {
+        {
-        "type": "direct",
+            "type": "block",
-        "tag": "direct"
+            "tag": "block"
-    }, {
+        },
-        "type": "block",
+        {
-        "tag": "block"
+            "type": "dns",
-    }, {
+            "tag": "dns-out"
-        "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"
     }
 }

docker-compose.yml

@@ -19,7 +19,7 @@ volumes:
 
 services:
     up:
-        image: mercurykd/vpnbot-up:1.1
+        image: mercurykd/vpnbot-ng:1.1
         build:
             context: dockerfile
             dockerfile: nginx.dockerfile
@@ -93,7 +93,7 @@ services:
                 ipv4_address: 10.10.1.2
         logging: *default-logging
     php:
-        image: mercurykd/vpnbot-php:1.4
+        image: mercurykd/vpnbot-php:1.5
         build:
             dockerfile: dockerfile/php.dockerfile
             args:
@@ -116,6 +116,7 @@ services:
             - ./update:/update
             - ./.git:/.git
             - ./singbox_windows:/singbox
+            - /var/run/docker.sock:/var/run/docker.sock:ro
         environment:
             IP: ${IP}
             VER: ${VER}
@@ -142,7 +143,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:
@@ -157,6 +158,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}
@@ -189,7 +191,7 @@ services:
             - oc
             - np
     proxy:
-        image: mercurykd/vpnbot-ss:1.1
+        image: mercurykd/vpnbot-ss:1.2
         build:
             dockerfile: dockerfile/shadowsocks.dockerfile
             args:
@@ -336,7 +338,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,7 +399,7 @@ services:
                 ipv4_address: 10.10.0.8
         logging: *default-logging
     xr:
-        image: mercurykd/vpnbot-xr:1.2
+        image: mercurykd/vpnbot-xr:1.3
         build:
             dockerfile: dockerfile/xray.dockerfile
             args:
@@ -491,7 +493,7 @@ services:
                 ipv4_address: 10.10.0.12
         logging: *default-logging
     wp:
-        image: mercurykd/vpnbot-wp:1.1
+        image: mercurykd/vpnbot-wp:1.2
         build:
             dockerfile: dockerfile/warp.dockerfile
             args:
@@ -501,7 +503,7 @@ services:
         devices:
             - /dev/net/tun:/dev/net/tun
         volumes:
-            - ./config/.profile:/root/.bashrc:ro
+            - ./config/.profile:/root/.ashrc:ro
             - ./ssh:/ssh
             - ./config/sshd_config:/etc/ssh/sshd_config
             - ./config:/config
@@ -512,8 +514,11 @@ services:
         depends_on:
             php:
                 condition: service_healthy
-        environment:
+        env_file:
-            TZ: ${TZ}
+            - path: ./.env
+              required: true # default
+            - path: ./override.env
+              required: false
         stop_grace_period: 1s
         command: ["/bin/sh", "/start_wp.sh"]
         networks:

dockerfile/php.dockerfile

@@ -26,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/warp.dockerfile

@@ -1,6 +1,16 @@
-FROM ubuntu:22.04
+FROM ubuntu:22.04 AS build
-RUN apt update && apt install -y curl gpg socat jq lsb-release openssh-server \
+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 \
+    && 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

@@ -2,7 +2,7 @@ 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 \
+    && wget -O Xray-linux-64.zip $(wget -q -O - https://api.github.com/repos/XTLS/Xray-core/releases/latest | grep browser_download_url | cut -d\" -f4 | egrep 'Xray-linux-64.zip$') \
     && unzip Xray-linux-64.zip \
     && mv xray /usr/bin/ \
     && rm Xray-linux-64.zip \

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,7 +31,7 @@ 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: # консоль сервиса

scripts/start_wp.sh

@@ -1,7 +1,6 @@
 cat /ssh/key.pub > /root/.ssh/authorized_keys
-echo 'HostKeyAlgorithms +ssh-rsa' >> /etc/ssh/sshd_config
+ssh-keygen -A
-echo 'PubkeyAcceptedKeyTypes +ssh-rsa' >> /etc/ssh/sshd_config
+exec /usr/sbin/sshd -D -e "$@" &
-service ssh start
 warp-svc > /dev/null &
 sleep 3
 warp-cli --accept-tos registration new

singbox_windows/update.cmd

@@ -1,35 +0,0 @@
-@echo off
-setlocal
-
-set "exe_path=sing-box.exe"
-set "URL=~url~"
-set "FileName=config.json"
-set "PreviousHash="
-
-taskkill /IM "%exe_path%" /F
-powershell -command "(New-Object System.Net.WebClient).DownloadFile('%URL%', '%FileName%')"
-for /F "skip=1 delims=" %%H in ('2^>nul CertUtil -hashfile "%FileName%" SHA256') do (
-    if not defined PreviousHash set "PreviousHash=%%H"
-)
-start "" /B "%CD%\%exe_path%" run -c "%FileName%"
-echo "%PreviousHash%"
-:loop
-powershell -command "(New-Object System.Net.WebClient).DownloadFile('%URL%', '%FileName%')"
-for /F "skip=1 delims=" %%H in ('2^>nul CertUtil -hashfile "%FileName%" SHA256') do (
-    if not defined HASH set "HASH=%%H"
-)
-set "CurrentHash=%HASH%"
-set "HASH="
-echo "%CurrentHash%"
-if "%CurrentHash%" NEQ "%PreviousHash%" (
-    echo "change"
-    set "PreviousHash=%CurrentHash%"
-    taskkill /IM "%exe_path%" /F
-    start "" /B "%CD%\%exe_path%" run -c "%FileName%"
-) else (
-    echo "not change"
-)
-
-timeout /t 15 /nobreak
-
-goto :loop

singbox_windows/winsw3.xml

@@ -2,7 +2,8 @@
     <id>singbox</id>
     <name>singbox</name>
     <description>singbox</description>
-    <executable>%BASE%\update.cmd</executable>
+    <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" />
@@ -12,4 +13,5 @@
     <onexit action="restart" />
     <onexit action="restart" />
     <onexit action="none" />
+    <download from="~url~" to="%BASE%\config.json"/>
 </service>

version

@@ -1,4 +1,46 @@
-18.04.2024 v1.30.1
+03.09.2024 v1.46.1
+- fix import
+- fix websocket domain
+03.09.2024 v1.46
+- возможность добавить кастомный поддомен для Letsencrypt
+03.09.2024 v1.45
+- выбор транспорта reality/websocket
+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
 - улучшение сообщения об обновлениях