Update Dockerfile

Dockerfile

@@ -1,10 +1,9 @@
 FROM rust:slim-bullseye
 
-# 1. Установка зависимостей
+# 1. Установка системных зависимостей
 RUN apt-get update && apt-get install -y \
     curl \
     unzip \
-    python3 \
     build-essential \
     libssl-dev \
     pkg-config \
@@ -21,113 +20,119 @@ RUN curl -Lo ndk.zip https://dl.google.com/android/repository/android-ndk-r25c-l
 ENV ANDROID_NDK_HOME=/opt/android-ndk
 ENV PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin
 
-# 3. Настройка Rust для Android
+# 3. Настройка Rust таргетов
 RUN rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android
 RUN cargo install cargo-ndk
 
-# 4. Создание проекта Rust
+# 4. Инициализация проекта
 WORKDIR /app
 RUN cargo init --lib --name vless_core
 
-# 5. Настройка Cargo.toml (ИСПРАВЛЕНО: добавлена секция [package])
-RUN printf '[package]\n\
-name = "vless_core"\n\
-version = "0.1.0"\n\
-edition = "2021"\n\
-\n\
-[lib]\n\
-crate-type = ["cdylib"]\n\
-\n\
-[dependencies]\n\
-tokio = { version = "1", features = ["full"] }\n\
-libc = "0.2"\n\
-anyhow = "1.0"\n\
-log = "0.4"\n\
-android_logger = "0.13"\n\
-lazy_static = "1.4"\n\
-serde = { version = "1.0", features = ["derive"] }\n\
-serde_json = "1.0"\n' > Cargo.toml
-
-# 6. Написание исходного кода (src/lib.rs)
-# Используем printf для корректной обработки переносов строк и спецсимволов
-RUN printf 'use std::ffi::CStr;\n\
-use std::os::raw::{c_char, c_int};\n\
-use std::sync::{Arc, Mutex};\n\
-use log::{info, error, LevelFilter};\n\
-use android_logger::Config;\n\
-use tokio::runtime::Runtime;\n\
-use tokio::task::JoinHandle;\n\
-\n\
-lazy_static::lazy_static! {\n\
-    static ref RUNTIME: Runtime = Runtime::new().unwrap();\n\
-    static ref VPN_HANDLE: Arc<Mutex<Option<JoinHandle<()>>>> = Arc::new(Mutex::new(None));\n\
-}\n\
-\n\
-#[no_mangle]\n\
-pub extern "C" fn init_logger() {\n\
-    android_logger::init_once(Config::default().with_max_level(LevelFilter::Info).with_tag("MandreVlessNative"));\n\
-    info!("Native Logger Initialized");\n\
-}\n\
-\n\
-#[derive(serde::Deserialize)]\n\
-struct VlessConfig {\n\
-    uuid: String,\n\
-    address: String,\n\
-    port: u16,\n\
-}\n\
-\n\
-async fn vless_worker(config: VlessConfig) {\n\
-    info!("Starting VLESS Core connecting to {}:{}", config.address, config.port);\n\
-    loop {\n\
-        info!("VLESS Keepalive: Ping to {}", config.address);\n\
-        tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;\n\
-    }\n\
-}\n\
-\n\
-#[no_mangle]\n\
-pub extern "C" fn start_vless(config_json: *const c_char) -> c_int {\n\
-    let c_str = unsafe { if config_json.is_null() { return -1; } CStr::from_ptr(config_json) };\n\
-    let str_slice = match c_str.to_str() {\n\
-        Ok(s) => s,\n\
-        Err(_) => return -2,\n\
-    };\n\
-\n\
-    let config: VlessConfig = match serde_json::from_str(str_slice) {\n\
-        Ok(c) => c,\n\
-        Err(e) => {\n\
-            error!("Config parse error: {}", e);\n\
-            return -3;\n\
-        }\n\
-    };\n\
-\n\
-    let mut handle = VPN_HANDLE.lock().unwrap();\n\
-    if handle.is_some() {\n\
-        return 1;\n\
-    }\n\
-\n\
-    *handle = Some(RUNTIME.spawn(vless_worker(config)));\n\
-    info!("VLESS Service Started");\n\
-    return 0;\n\
-}\n\
-\n\
-#[no_mangle]\n\
-pub extern "C" fn stop_vless() -> c_int {\n\
-    let mut handle = VPN_HANDLE.lock().unwrap();\n\
-    if let Some(h) = handle.take() {\n\
-        h.abort();\n\
-        info!("VLESS Service Stopped");\n\
-        return 0;\n\
-    }\n\
-    return 1;\n\
-}\n' > src/lib.rs
-
-# 7. Сборка библиотек под разные архитектуры
+# 5. Создание Cargo.toml (через cat EOF для надежности)
+RUN cat <<EOF > Cargo.toml
+[package]
+name = "vless_core"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+tokio = { version = "1", features = ["full"] }
+libc = "0.2"
+anyhow = "1.0"
+log = "0.4"
+android_logger = "0.13"
+lazy_static = "1.4"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+EOF
+
+# 6. Создание src/lib.rs (Исправлен импорт Serde)
+RUN cat <<EOF > src/lib.rs
+use std::ffi::CStr;
+use std::os::raw::{c_char, c_int};
+use std::sync::{Arc, Mutex};
+use log::{info, error, LevelFilter};
+use android_logger::Config;
+use tokio::runtime::Runtime;
+use tokio::task::JoinHandle;
+use serde::Deserialize; // Явный импорт для устранения ошибки E0277
+
+lazy_static::lazy_static! {
+    static ref RUNTIME: Runtime = Runtime::new().unwrap();
+    static ref VPN_HANDLE: Arc<Mutex<Option<JoinHandle<()>>>> = Arc::new(Mutex::new(None));
+}
+
+#[no_mangle]
+pub extern "C" fn init_logger() {
+    android_logger::init_once(Config::default().with_max_level(LevelFilter::Info).with_tag("MandreVlessNative"));
+    info!("Native Logger Initialized");
+}
+
+// Добавлен дериватив Deserialize
+#[derive(Deserialize)]
+struct VlessConfig {
+    uuid: String,
+    address: String,
+    port: u16,
+}
+
+async fn vless_worker(config: VlessConfig) {
+    info!("Starting VLESS Core connecting to {}:{}", config.address, config.port);
+    loop {
+        // Здесь будет реальная логика VLESS (TCP/UDP стримы)
+        info!("VLESS Keepalive: Ping to {}", config.address);
+        tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn start_vless(config_json: *const c_char) -> c_int {
+    let c_str = unsafe { if config_json.is_null() { return -1; } CStr::from_ptr(config_json) };
+    let str_slice = match c_str.to_str() {
+        Ok(s) => s,
+        Err(_) => return -2,
+    };
+
+    let config: VlessConfig = match serde_json::from_str(str_slice) {
+        Ok(c) => c,
+        Err(e) => {
+            error!("Config parse error: {}", e);
+            return -3;
+        }
+    };
+
+    let mut handle = VPN_HANDLE.lock().unwrap();
+    if handle.is_some() {
+        return 1;
+    }
+
+    *handle = Some(RUNTIME.spawn(vless_worker(config)));
+    info!("VLESS Service Started");
+    return 0;
+}
+
+#[no_mangle]
+pub extern "C" fn stop_vless() -> c_int {
+    let mut handle = VPN_HANDLE.lock().unwrap();
+    if let Some(h) = handle.take() {
+        h.abort();
+        info!("VLESS Service Stopped");
+        return 0;
+    }
+    return 1;
+}
+EOF
+
+# 7. Компиляция
 RUN cargo ndk -t armeabi-v7a -t arm64-v8a -t x86_64 -o ./jniLibs build --release
 
-# 8. Упаковка в ZIP
+# 8. Упаковка
 WORKDIR /app
 RUN zip -r vless_libs.zip jniLibs
 
-# 9. Запуск сервера для скачивания
+# 9. Сервер раздачи
 EXPOSE 7860
 CMD ["python3", "-m", "http.server", "7860"]