Update Dockerfile

Dockerfile

@@ -1,6 +1,9 @@
 # Используем базовый образ Node.js
 FROM node:20-bookworm
 
+# Работаем под root для установки и настройки WARP
+USER root
+
 # Установка необходимых зависимостей
 RUN apt-get update && apt-get install -y \
     curl \
@@ -8,6 +11,7 @@ RUN apt-get update && apt-get install -y \
     ca-certificates \
     lsb-release \
     iptables \
+    sudo \
     && rm -rf /var/lib/apt/lists/*
 
 # Установка Cloudflare WARP
@@ -27,7 +31,7 @@ RUN npm install
 # Создаем файл приложения
 RUN echo "const express = require('express');" > app.js \
     && echo "const axios = require('axios');" >> app.js \
-    && echo "const SocksProxyAgent = require('socks-proxy-agent');" >> app.js \
+    && echo "const { SocksProxyAgent } = require('socks-proxy-agent');" >> app.js \
     && echo "const app = express();" >> app.js \
     && echo "const port = 7860;" >> app.js \
     && echo "const proxyUrl = 'socks5://127.0.0.1:1080';" >> app.js \
@@ -36,8 +40,9 @@ RUN echo "const express = require('express');" > app.js \
     && echo "  try {" >> app.js \
     && echo "    const response = await axios.get('https://ip.oxylabs.io/location', { " >> app.js \
     && echo "      httpsAgent: agent," >> app.js \
+    && echo "      httpAgent: agent," >> app.js \
     && echo "      proxy: false," >> app.js \
-    && echo "      timeout: 5000" >> app.js \
+    && echo "      timeout: 10000" >> app.js \
     && echo "    });" >> app.js \
     && echo "    res.type('json').send(JSON.stringify(response.data, null, 2));" >> app.js \
     && echo "  } catch (error) {" >> app.js \
@@ -46,31 +51,71 @@ RUN echo "const express = require('express');" > app.js \
     && echo "});" >> app.js \
     && echo "app.listen(port, () => console.log('Server running on port ' + port));" >> app.js
 
-# Скрипт запуска (в одном файле)
+# Скрипт запуска
 RUN echo '#!/bin/bash' > /entrypoint.sh \
-    && echo '# Запуск WARP сервиса' >> /entrypoint.sh \
-    && echo 'warp-svc &' >> /entrypoint.sh \
-    && echo 'sleep 5' >> /entrypoint.sh \
-    && echo '# Регистрация и настройка' >> /entrypoint.sh \
-    && echo 'warp-cli registration new --accept-tos' >> /entrypoint.sh \
+    && echo 'set -e' >> /entrypoint.sh \
+    && echo '' >> /entrypoint.sh \
+    && echo '# Запуск WARP сервиса с правами root' >> /entrypoint.sh \
+    && echo 'echo "Starting WARP service..."' >> /entrypoint.sh \
+    && echo '/usr/bin/warp-svc &' >> /entrypoint.sh \
+    && echo 'WARP_PID=$!' >> /entrypoint.sh \
+    && echo '' >> /entrypoint.sh \
+    && echo '# Ждём запуска сервиса' >> /entrypoint.sh \
+    && echo 'echo "Waiting for WARP service to start..."' >> /entrypoint.sh \
+    && echo 'sleep 10' >> /entrypoint.sh \
+    && echo '' >> /entrypoint.sh \
+    && echo '# Проверяем статус сервиса' >> /entrypoint.sh \
+    && echo 'for i in {1..5}; do' >> /entrypoint.sh \
+    && echo '  if warp-cli status 2>/dev/null; then' >> /entrypoint.sh \
+    && echo '    echo "WARP service is running"' >> /entrypoint.sh \
+    && echo '    break' >> /entrypoint.sh \
+    && echo '  fi' >> /entrypoint.sh \
+    && echo '  echo "Waiting for service... attempt $i"' >> /entrypoint.sh \
+    && echo '  sleep 5' >> /entrypoint.sh \
+    && echo 'done' >> /entrypoint.sh \
+    && echo '' >> /entrypoint.sh \
+    && echo '# Регистрация' >> /entrypoint.sh \
+    && echo 'echo "Registering WARP..."' >> /entrypoint.sh \
+    && echo 'yes | warp-cli registration new || true' >> /entrypoint.sh \
+    && echo '' >> /entrypoint.sh \
+    && echo '# Настройка режима прокси' >> /entrypoint.sh \
+    && echo 'echo "Setting proxy mode..."' >> /entrypoint.sh \
     && echo 'warp-cli mode proxy' >> /entrypoint.sh \
     && echo 'warp-cli proxy port 1080' >> /entrypoint.sh \
-    && echo '# Первоначальное подключение' >> /entrypoint.sh \
+    && echo '' >> /entrypoint.sh \
+    && echo '# Подключение' >> /entrypoint.sh \
+    && echo 'echo "Connecting to WARP..."' >> /entrypoint.sh \
     && echo 'warp-cli connect' >> /entrypoint.sh \
-    && echo '# Цикл ротации IP каждые 5 минут' >> /entrypoint.sh \
-    && echo 'while true; do' >> /entrypoint.sh \
-    && echo '  sleep 300' >> /entrypoint.sh \
-    && echo '  warp-cli disconnect' >> /entrypoint.sh \
-    && echo '  sleep 5' >> /entrypoint.sh \
-    && echo '  warp-cli connect' >> /entrypoint.sh \
-    && echo '  echo "IP rotated at $(date)"' >> /entrypoint.sh \
-    && echo 'done &' >> /entrypoint.sh \
+    && echo '' >> /entrypoint.sh \
+    && echo '# Проверка подключения' >> /entrypoint.sh \
+    && echo 'sleep 5' >> /entrypoint.sh \
+    && echo 'warp-cli status' >> /entrypoint.sh \
+    && echo '' >> /entrypoint.sh \
+    && echo '# Функция ротации IP' >> /entrypoint.sh \
+    && echo 'rotate_ip() {' >> /entrypoint.sh \
+    && echo '  while true; do' >> /entrypoint.sh \
+    && echo '    sleep 300' >> /entrypoint.sh \
+    && echo '    echo "Rotating IP..."' >> /entrypoint.sh \
+    && echo '    warp-cli disconnect || true' >> /entrypoint.sh \
+    && echo '    sleep 5' >> /entrypoint.sh \
+    && echo '    warp-cli connect || true' >> /entrypoint.sh \
+    && echo '    echo "IP rotated at $(date)"' >> /entrypoint.sh \
+    && echo '  done' >> /entrypoint.sh \
+    && echo '}' >> /entrypoint.sh \
+    && echo '' >> /entrypoint.sh \
+    && echo '# Запуск ротации в фоне' >> /entrypoint.sh \
+    && echo 'rotate_ip &' >> /entrypoint.sh \
+    && echo '' >> /entrypoint.sh \
     && echo '# Запуск Express сервера' >> /entrypoint.sh \
-    && echo 'node app.js' >> /entrypoint.sh \
+    && echo 'echo "Starting Express server..."' >> /entrypoint.sh \
+    && echo 'exec node app.js' >> /entrypoint.sh \
     && chmod +x /entrypoint.sh
 
 # Открываем порт
 EXPOSE 7860
 
+# Запускаем как root для работы с WARP
+USER root
+
 # Запускаем скрипт
-CMD ["/bin/bash", "/entrypoint.sh"]
+CMD ["/bin/bash", "/entrypoint.sh"]