Merge branch 'main' into main

fix LibreSpeed installing, move the SpaceSaver inside
2026-02-28 13:13:00 +00:00 · 2026-02-27 23:04:05 +07:00 · 2026-02-27 23:03:19 +07:00 · 2026-02-27 22:42:58 +07:00
4 changed files with 124 additions and 29 deletions
--- a/SpaceSaver/index.html
+++ b/SpaceSaver/index.html
@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<link rel="stylesheet" href="style.css">
+	<title>SpaceSaver</title>
+</head>
+<body>
+	<div>
+		<b>SpaceSaver (Безопасное хранилище)</b>
+			<div>
+				<form id="loginForm">
+    				<div class="input-group">
+      					<svg class="icon" viewBox="64 64 896 896" fill="currentColor">
+        					<path d="M858.5 763.6a374 374 0 0 0-80.6-119.5 375.63 375.63 0 0 0-119.5-80.6c-.4-.2-.8-.3-1.2-.5C719.5 518 760 444.7 760 362c0-137-111-248-248-248S264 225 264 362c0 82.7 40.5 156 102.8 201.1-.4.2-.8.3-1.2.5-44.8 18.9-85 46-119.5 80.6a375.63 375.63 0 0 0-80.6 119.5A371.7 371.7 0 0 0 136 901.8a8 8 0 0 0 8 8.2h60c4.4 0 7.9-3.5 8-7.8 2-77.2 33-149.5 87.8-204.3 56.7-56.7 132-87.9 212.2-87.9s155.5 31.2 212.2 87.9C779 752.7 810 825 812 902.2c.1 4.4 3.6 7.8 8 7.8h60a8 8 0 0 0 8-8.2c-1-47.8-10.9-94.3-29.5-138.2zM512 534c-45.9 0-89.1-17.9-121.6-50.4S340 407.9 340 362c0-45.9 17.9-89.1 50.4-121.6S466.1 190 512 190s89.1 17.9 121.6 50.4S684 316.1 684 362c0 45.9-17.9 89.1-50.4 121.6S557.9 534 512 534z"/>
+      					</svg>
+      					<input placeholder="Username" type="text" name="username" autocomplete="username" autofocus required>
+    				</div>
+
+    				<div class="input-group">
+      					<svg class="icon" viewBox="64 64 896 896" fill="currentColor">
+        					<path d="M832 464h-68V240c0-70.7-57.3-128-128-128H388c-70.7 0-128 57.3-128 128v224h-68c-17.7 0-32 14.3-32 32v384c0 17.7 14.3 32 32 32h640c17.7 0 32-14.3 32-32V496c0-17.7-14.3-32-32-32zM332 240c0-30.9 25.1-56 56-56h248c30.9 0 56 25.1 56 56v224H332V240zm460 600H232V536h560v304zM484 701v53c0 4.4 3.6 8 8 8h40c4.4 0 8-3.6 8-8v-53a48.01 48.01 0 1 0-56 0z"/>
+      					</svg>
+      			<input placeholder="Password" type="password" name="password" autocomplete="current-password" required>
+    		</div>
+
+    		<button type="submit">Enter</button>
+
+    		<div class="error-message" id="errorMsg">Неверный пароль или имя пользователя</div>
+  </form>
+</div>
+<script src="script.js"></script>
+</body>
+</html>
--- a/SpaceSaver/script.js
+++ b/SpaceSaver/script.js
@ -0,0 +1,6 @@
+document.getElementById('loginForm').addEventListener('submit', function(e) {
+    e.preventDefault();
+    document.getElementById('errorMsg').style.display = 'block';
+    document.querySelector('input[name="username"]').value = '';
+    document.querySelector('input[name="password"]').value = '';
+  });
--- a/SpaceSaver/style.css
+++ b/SpaceSaver/style.css
@ -0,0 +1,64 @@
+body {
+      min-height: 100vh;
+      background: #0a0e14;
+      color: #e0e7ff;
+      font-family: system-ui, sans-serif;
+      
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+
+* {
+      margin: 0;
+      padding: 0;
+      box-sizing: border-box;
+    }
+
+.error-message {
+      color: #f85149;
+      font-size: 0.95rem;
+      margin-top: 1rem;
+      min-height: 1.2rem;
+      display: none;
+    }
+
+.input-group {
+      position: relative;
+      margin-bottom: 1.2rem;
+    }
+
+.icon {
+      position: absolute;
+      left: 1rem;
+      top: 50%;
+      transform: translateY(-50%);
+      width: 20px;
+      height: 20px;
+      color: #8b949e;
+      pointer-events: none;
+    }
+
+input {
+      width: 100%;
+      height: 44px;
+      padding: 0 1rem 0 2.8rem;
+      background: #0d1117;
+      border: 1px solid #30363d;
+      border-radius: 6px;
+      color: #e6edf3;
+      font-size: 1rem;
+      line-height: 1.4;
+    }
+
+button {
+      width: 100%;
+      padding: 0.95rem;
+      background: #238636;
+      color: white;
+      border: none;
+      border-radius: 6px;
+      font-size: 1.05rem;
+      cursor: pointer;
+      margin-top: 0.8rem;
+    }
--- a/x-ui.sh
+++ b/x-ui.sh
@ -1672,28 +1672,16 @@ run_speedtest() {
 }

 run_librespeed() {
-    #Test GO
-    if command -v go &>/dev/null; then
-        echo -e "${green}${plain} GO installed!"
-    else
-        #Intalling GO
-        echo echo -e "${yellow}${plain} Installing GO..."
-        VERSION=$(curl -s https://go.dev/dl/?mode=json | grep -m 1 'version' | cut -d'"' -f4)
-        wget https://go.dev/dl/$VERSION.linux-amd64.tar.gz
-        rm -rf /usr/local/go && tar -C /usr/local -xzf $VERSION.linux-amd64.tar.gz
-        export PATH=$PATH:/usr/local/go/bin
-        echo -e "${green}${plain} GO installed!"
-    fi

-    found=$(find / -type d -name "speedtest-cli" 2>/dev/null)
-    if [ -n "$found" ]; then
-        echo "Test speed..."
-        $found/out/librespeed-cli-linux-amd64
+    if command -v librespeed-cli &>/dev/null; then
+        librespeed-cli
    else
-        echo -e "${yellow}${plain}Installing Librespeed..."
-        git clone https://github.com/librespeed/speedtest-cli
-        cd speedtest-cli/ && ./build.sh
-        echo -e "${green}${plain}Start this option again!"
+        #Intalling LibreSpeed
+        echo -e "${yellow} Installing LibreSpeed..."
+        VERSION=$(curl -s "https://api.github.com/repos/librespeed/speedtest-cli/releases/latest"| grep '"tag_name":' | sed -E 's/.*"v?([^"]+)".*/\1/')
+        wget https://github.com/librespeed/speedtest-cli/releases/download/v${VERSION}/librespeed-cli_${VERSION}_linux_amd64.tar.gz
+        tar -xzvf librespeed-cli_${VERSION}_linux_amd64.tar.gz && mv librespeed-cli /usr/bin
+        librespeed-cli
    fi
 }

@ -1768,8 +1756,6 @@ create_honeypot() {


        echo -e "${yellow}Installing HoneyPot..."
-
-        git clone https://github.com/d3l1f3r/SpaceSaver.git
        mv SpaceSaver/ /var/www/html/

        # Config for apache2
@ -2408,6 +2394,7 @@ show_usage() {
 │  ${blue}x-ui start${plain}                 - Start                            │
 │  ${blue}x-ui stop${plain}                  - Stop                             │
 │  ${blue}x-ui restart${plain}               - Restart                          │
+|  ${blue}x-ui restart-xray${plain}          - Restart Xray                     │
 │  ${blue}x-ui status${plain}                - Current Status                   │
 │  ${blue}x-ui settings${plain}              - Current Settings                 │
 │  ${blue}x-ui enable${plain}                - Enable Autostart on OS Startup   │
@ -2575,6 +2562,9 @@ if [[ $# > 0 ]]; then
    "restart")
        check_install 0 && restart 0
        ;;
+    "restart-xray")
+        check_install 0 && restart_xray 0
+        ;;
    "status")
        check_install 0 && status 0
        ;;
Author	SHA1	Message	Date
menschenfresser	91aad724c2	Merge branch 'main' into main	2026-02-27 23:04:05 +07:00
delifer	4b5f5db4ed	fix LibreSpeed installing, move the SpaceSaver inside	2026-02-27 23:03:19 +07:00
delifer	58922be758	fix LibreSpeed installing, move the SpaceSaver inside	2026-02-27 22:42:58 +07:00