Merge 6b6818efa4 into 784ed39930

DockerEntrypoint.sh

@@ -2,22 +2,11 @@
 
 FINISH_FILE="$GEODATA_DIR/cron-job-finished.txt"
 
-MAX_WAIT=300  # 5 minutes
+while [ ! -f "$FINISH_FILE" ]; do
-ELAPSED=0
+  echo "Still waiting... (looking for $FINISH_FILE)"
-INTERVAL=10
+  sleep 10
-
-while [ ! -f "$FINISH_FILE" ] && [ $ELAPSED -lt $MAX_WAIT ]; do
-  echo "Still waiting for geodata initialization... ($ELAPSED/$MAX_WAIT seconds)"
-  sleep $INTERVAL
-  ELAPSED=$((ELAPSED + INTERVAL))
 done
 
-if [ ! -f "$FINISH_FILE" ]; then
-  echo "ERROR: Geodata initialization timed out after $MAX_WAIT seconds"
-  echo "Container startup aborted."
-  exit 1
-fi
-
 # Start fail2ban
 [ "$XUI_ENABLE_FAIL2BAN" = "true" ] && fail2ban-client -x start
 

docker-compose.yml

@@ -35,7 +35,7 @@ services:
     build:
       context: docker-cron-runner
       args:
-        XRAY_VERSION: "${XRAY_VERSION:-v25.10.15}"
+        XRAY_VERSION: "v25.10.15"
         XRAY_BUILD_DIR: "/app/xray"
     container_name: geodata_cron
     restart: unless-stopped

docker-cron-runner/xray-tools.sh

@@ -122,25 +122,7 @@ install_xray_core() {
     cd "$XRAYDIR"
 
     wget -q "https://github.com/XTLS/Xray-core/releases/download/${XRAY_VERSION}/Xray-linux-${ARCH}.zip"
-
+    unzip "Xray-linux-${ARCH}.zip" -d ./xray-unzip
-    # Validate the downloaded zip file
-    if [ ! -f "Xray-linux-${ARCH}.zip" ] || [ ! -s "Xray-linux-${ARCH}.zip" ]; then
-        echo "[ERR] Failed to download Xray-core zip or file is empty"
-        cd "$OLD_DIR"
-        return 1
-    fi
-
-    unzip -q "Xray-linux-${ARCH}.zip" -d ./xray-unzip
-
-    # Validate the extracted xray binary
-    if [ ! -f "./xray-unzip/xray" ] || [ ! -s "./xray-unzip/xray" ]; then
-        echo "[ERR] Failed to extract xray binary"
-        rm -rf ./xray-unzip
-        rm -f "Xray-linux-${ARCH}.zip"
-        cd "$OLD_DIR"
-        return 1
-    fi
-
     cp ./xray-unzip/xray ./"xray-linux-${FNAME}"
     rm -r xray-unzip
     rm "Xray-linux-${ARCH}.zip"

install.sh

@@ -44,15 +44,11 @@ install_base() {
     ubuntu | debian | armbian)
         apt-get update && apt-get install -y -q wget curl tar tzdata
         ;;
-        fedora | amzn | virtuozzo | rhel | almalinux | rocky | ol)
+    centos | rhel | almalinux | rocky | ol)
-            dnf -y update && dnf install -y -q wget curl tar tzdata
+        yum -y update && yum install -y -q wget curl tar tzdata
         ;;
-        centos)
+    fedora | amzn | virtuozzo)
-            if [[ "${VERSION_ID}" =~ ^7 ]]; then
-                yum -y update && yum install -y wget curl tar tzdata
-            else
         dnf -y update && dnf install -y -q wget curl tar tzdata
-            fi
         ;;
     arch | manjaro | parch)
         pacman -Syu && pacman -Syu --noconfirm wget curl tar tzdata

update.sh

@@ -76,15 +76,11 @@ install_base() {
 	ubuntu | debian | armbian)
 		apt-get update >/dev/null 2>&1 && apt-get install -y -q wget curl tar tzdata >/dev/null 2>&1
 		;;
-        fedora | amzn | virtuozzo | rhel | almalinux | rocky | ol)
+	centos | rhel | almalinux | rocky | ol)
-            dnf -y update >/dev/null 2>&1 && dnf install -y -q wget curl tar tzdata >/dev/null 2>&1
-        ;;
-        centos)
-            if [[ "${VERSION_ID}" =~ ^7 ]]; then
 		yum -y update >/dev/null 2>&1 && yum install -y -q wget curl tar tzdata >/dev/null 2>&1
-            else
+		;;
+	fedora | amzn | virtuozzo)
 		dnf -y update >/dev/null 2>&1 && dnf install -y -q wget curl tar tzdata >/dev/null 2>&1
-            fi
 		;;
 	arch | manjaro | parch)
 		pacman -Syu >/dev/null 2>&1 && pacman -Syu --noconfirm wget curl tar tzdata >/dev/null 2>&1

web/service/tgbot.go

@@ -210,7 +210,7 @@ func (t *Tgbot) Start(i18nFS embed.FS) error {
 	// Parse admin IDs from comma-separated string
 	if tgBotID != "" {
 		for _, adminID := range strings.Split(tgBotID, ",") {
-			id, err := strconv.ParseInt(adminID, 10, 64)
+			id, err := strconv.Atoi(adminID)
 			if err != nil {
 				logger.Warning("Failed to parse admin ID from Telegram bot chat ID:", err)
 				return err
@@ -905,8 +905,8 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
 				t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.answers.errorOperation"))
 				t.searchClient(chatId, email, callbackQuery.Message.GetMessageID())
 			case "add_client_limit_traffic_c":
-				limitTraffic, _ := strconv.ParseInt(dataArray[1], 10, 64)
+				limitTraffic, _ := strconv.Atoi(dataArray[1])
-				client_TotalGB = limitTraffic * 1024 * 1024 * 1024
+				client_TotalGB = int64(limitTraffic) * 1024 * 1024 * 1024
 				messageId := callbackQuery.Message.GetMessageID()
 				inbound, err := t.inboundService.GetInbound(receiver_inbound_ID)
 				if err != nil {
@@ -1010,7 +1010,7 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
 				t.editMessageCallbackTgBot(chatId, callbackQuery.Message.GetMessageID(), inlineKeyboard)
 			case "reset_exp_c":
 				if len(dataArray) == 3 {
-					days, err := strconv.ParseInt(dataArray[2], 10, 64)
+					days, err := strconv.Atoi(dataArray[2])
 					if err == nil {
 						var date int64
 						if days > 0 {
@@ -1115,7 +1115,7 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
 				t.searchClient(chatId, email, callbackQuery.Message.GetMessageID())
 			case "add_client_reset_exp_c":
 				client_ExpiryTime = 0
-				days, _ := strconv.ParseInt(dataArray[1], 10, 64)
+				days, _ := strconv.Atoi(dataArray[1])
 				var date int64
 				if client_ExpiryTime > 0 {
 					if client_ExpiryTime-time.Now().Unix()*1000 < 0 {
@@ -2952,12 +2952,10 @@ func (t *Tgbot) clientInfoMsg(
 	}
 
 	status := t.I18nBot("tgbot.offline")
-	isOnline := false
 	if p.IsRunning() {
 		for _, online := range p.GetOnlineClients() {
 			if online == traffic.Email {
 				status = t.I18nBot("tgbot.online")
-				isOnline = true
 				break
 			}
 		}
@@ -2970,9 +2968,6 @@ func (t *Tgbot) clientInfoMsg(
 	}
 	if printOnline {
 		output += t.I18nBot("tgbot.messages.online", "Status=="+status)
-		if !isOnline && traffic.LastOnline > 0 {
-			output += t.I18nBot("tgbot.messages.lastOnline", "Time=="+time.UnixMilli(traffic.LastOnline).Format("2006-01-02 15:04:05"))
-		}
 	}
 	if printActive {
 		output += t.I18nBot("tgbot.messages.active", "Enable=="+active)

web/translation/translate.ar_EG.toml

@@ -663,7 +663,6 @@
 "active" = "💡 مفعل: {{ .Enable }}\r\n"
 "enabled" = "🚨 مفعل: {{ .Enable }}\r\n"
 "online" = "🌐 حالة الاتصال: {{ .Status }}\r\n"
-"lastOnline" = "🔙 آخر متصل: {{ .Time }}\r\n"
 "email" = "📧 الإيميل: {{ .Email }}\r\n"
 "upload" = "🔼 رفع: ↑{{ .Upload }}\r\n"
 "download" = "🔽 تنزيل: ↓{{ .Download }}\r\n"

web/translation/translate.en_US.toml

@@ -663,7 +663,6 @@
 "active" = "💡 Active: {{ .Enable }}\r\n"
 "enabled" = "🚨 Enabled: {{ .Enable }}\r\n"
 "online" = "🌐 Connection status: {{ .Status }}\r\n"
-"lastOnline" = "🔙 Last online: {{ .Time }}\r\n"
 "email" = "📧 Email: {{ .Email }}\r\n"
 "upload" = "🔼 Upload: ↑{{ .Upload }}\r\n"
 "download" = "🔽 Download: ↓{{ .Download }}\r\n"

web/translation/translate.es_ES.toml

@@ -663,7 +663,6 @@
 "active" = "💡 Activo: {{ .Enable }}\r\n"
 "enabled" = "🚨 Habilitado: {{ .Enable }}\r\n"
 "online" = "🌐 Estado de conexión: {{ .Status }}\r\n"
-"lastOnline" = "🔙 Última conexión: {{ .Time }}\r\n"
 "email" = "📧 Email: {{ .Email }}\r\n"
 "upload" = "🔼 Subida: ↑{{ .Upload }}\r\n"
 "download" = "🔽 Bajada: ↓{{ .Download }}\r\n"

web/translation/translate.fa_IR.toml

@@ -663,7 +663,6 @@
 "active" = "💡 فعال: {{ .Enable }}\r\n"
 "enabled" = "🚨 وضعیت: {{ .Enable }}\r\n"
 "online" = "🌐 وضعیت اتصال: {{ .Status }}\r\n"
-"lastOnline" = "🔙 آخرین فعالیت: {{ .Time }}\r\n"
 "email" = "📧 ایمیل: {{ .Email }}\r\n"
 "upload" = "🔼 آپلود↑: {{ .Upload }}\r\n"
 "download" = "🔽 دانلود↓: {{ .Download }}\r\n"

web/translation/translate.id_ID.toml

@@ -663,7 +663,6 @@
 "active" = "💡 Aktif: {{ .Enable }}\r\n"
 "enabled" = "🚨 Diaktifkan: {{ .Enable }}\r\n"
 "online" = "🌐 Status Koneksi: {{ .Status }}\r\n"
-"lastOnline" = "🔙 Terakhir online: {{ .Time }}\r\n"
 "email" = "📧 Email: {{ .Email }}\r\n"
 "upload" = "🔼 Unggah: ↑{{ .Upload }}\r\n"
 "download" = "🔽 Unduh: ↓{{ .Download }}\r\n"

web/translation/translate.ja_JP.toml

@@ -663,7 +663,6 @@
 "active" = "💡 有効：{{ .Enable }}\r\n"
 "enabled" = "🚨 有効化済み：{{ .Enable }}\r\n"
 "online" = "🌐 接続ステータス：{{ .Status }}\r\n"
-"lastOnline" = "🔙 最終オンライン: {{ .Time }}\r\n"
 "email" = "📧 メール：{{ .Email }}\r\n"
 "upload" = "🔼 アップロード↑：{{ .Upload }}\r\n"
 "download" = "🔽 ダウンロード↓：{{ .Download }}\r\n"

web/translation/translate.pt_BR.toml

@@ -663,7 +663,6 @@
 "active" = "💡 Ativo: {{ .Enable }}\r\n"
 "enabled" = "🚨 Ativado: {{ .Enable }}\r\n"
 "online" = "🌐 Status da conexão: {{ .Status }}\r\n"
-"lastOnline" = "🔙 Última vez online: {{ .Time }}\r\n"
 "email" = "📧 Email: {{ .Email }}\r\n"
 "upload" = "🔼 Upload: ↑{{ .Upload }}\r\n"
 "download" = "🔽 Download: ↓{{ .Download }}\r\n"

web/translation/translate.ru_RU.toml

@@ -663,7 +663,6 @@
 "active" = "💡 Активен: {{ .Enable }}\r\n"
 "enabled" = "🚨 Активен: {{ .Enable }}\r\n"
 "online" = "🌐 Статус соединения: {{ .Status }}\r\n"
-"lastOnline" = "🔙 Был(а) в сети: {{ .Time }}\r\n"
 "email" = "📧 Email: {{ .Email }}\r\n"
 "upload" = "🔼 Исходящий трафик: ↑{{ .Upload }}\r\n"
 "download" = "🔽 Входящий трафик: ↓{{ .Download }}\r\n"

web/translation/translate.tr_TR.toml

@@ -663,7 +663,6 @@
 "active" = "💡 Aktif: {{ .Enable }}\r\n"
 "enabled" = "🚨 Etkin: {{ .Enable }}\r\n"
 "online" = "🌐 Bağlantı durumu: {{ .Status }}\r\n"
-"lastOnline" = "🔙 Son çevrimiçi: {{ .Time }}\r\n"
 "email" = "📧 E-posta: {{ .Email }}\r\n"
 "upload" = "🔼 Yükleme: ↑{{ .Upload }}\r\n"
 "download" = "🔽 İndirme: ↓{{ .Download }}\r\n"

web/translation/translate.uk_UA.toml

@@ -663,7 +663,6 @@
 "active" = "💡 Активний: {{ .Enable }}\r\n"
 "enabled" = "🚨 Увімкнено: {{ .Enable }}\r\n"
 "online" = "🌐 Стан підключення: {{ .Status }}\r\n"
-"lastOnline" = "🔙 Був(ла) онлайн: {{ .Time }}\r\n"
 "email" = "📧 Електронна пошта: {{ .Email }}\r\n"
 "upload" = "🔼 Upload: ↑{{ .Upload }}\r\n"
 "download" = "🔽 Download: ↓{{ .Download }}\r\n"

web/translation/translate.vi_VN.toml

@@ -663,7 +663,6 @@
 "active" = "💡 Đang hoạt động: {{ .Enable }}\r\n"
 "enabled" = "🚨 Đã bật: {{ .Enable }}\r\n"
 "online" = "🌐 Trạng thái kết nối: {{ .Status }}\r\n"
-"lastOnline" = "🔙 Lần online gần nhất: {{ .Time }}\r\n"
 "email" = "📧 Email: {{ .Email }}\r\n"
 "upload" = "🔼 Tải lên: ↑{{ .Upload }}\r\n"
 "download" = "🔽 Tải xuống: ↓{{ .Download }}\r\n"

web/translation/translate.zh_CN.toml

@@ -663,7 +663,6 @@
 "active" = "💡 激活：{{ .Enable }}\r\n"
 "enabled" = "🚨 已启用：{{ .Enable }}\r\n"
 "online" = "🌐 连接状态：{{ .Status }}\r\n"
-"lastOnline" = "🔙 上次在线: {{ .Time }}\r\n"
 "email" = "📧 邮箱：{{ .Email }}\r\n"
 "upload" = "🔼 上传↑：{{ .Upload }}\r\n"
 "download" = "🔽 下载↓：{{ .Download }}\r\n"

web/translation/translate.zh_TW.toml

@@ -663,7 +663,6 @@
 "active" = "💡 啟用：{{ .Enable }}\r\n"
 "enabled" = "🚨 已啟用：{{ .Enable }}\r\n"
 "online" = "🌐 連線狀態：{{ .Status }}\r\n"
-"lastOnline" = "🔙 上次上線: {{ .Time }}\r\n"
 "email" = "📧 郵箱：{{ .Email }}\r\n"
 "upload" = "🔼 上傳↑：{{ .Upload }}\r\n"
 "download" = "🔽 下載↓：{{ .Download }}\r\n"

x-ui.sh

@@ -511,15 +511,11 @@ enable_bbr() {
     ubuntu | debian | armbian)
         apt-get update && apt-get install -yqq --no-install-recommends ca-certificates
         ;;
-    fedora | amzn | virtuozzo | rhel | almalinux | rocky | ol)
+    centos | rhel | almalinux | rocky | ol)
-        dnf -y update && dnf -y install ca-certificates
-        ;;
-    centos)
-            if [[ "${VERSION_ID}" =~ ^7 ]]; then
         yum -y update && yum -y install ca-certificates
-            else
+        ;;
+    fedora | amzn | virtuozzo)
         dnf -y update && dnf -y install ca-certificates
-            fi
         ;;
     arch | manjaro | parch)
         pacman -Sy --noconfirm ca-certificates
@@ -1058,15 +1054,12 @@ ssl_cert_issue() {
     ubuntu | debian | armbian)
         apt-get update && apt-get install socat -y
         ;;
-    fedora | amzn | virtuozzo | rhel | almalinux | rocky | ol)
+    centos | rhel | almalinux | rocky | ol)
+        yum -y update && yum -y install socat
+        ;;
+    fedora | amzn | virtuozzo)
         dnf -y update && dnf -y install socat
         ;;
-    centos)
-            if [[ "${VERSION_ID}" =~ ^7 ]]; then
-                yum -y update && yum -y install socat
-            else
-                dnf -y update && dnf -y install socat
-            fi
     arch | manjaro | parch)
         pacman -Sy --noconfirm socat
         ;;
@@ -1074,7 +1067,7 @@ ssl_cert_issue() {
         zypper refresh && zypper -q install -y socat
         ;;
     alpine)
-        apk add socat curl openssl
+        apk add socat
         ;;
     *)
         echo -e "${red}Unsupported operating system. Please check the script and install the necessary packages manually.${plain}\n"
@@ -1525,16 +1518,12 @@ install_iplimit() {
         armbian)
             apt-get update && apt-get install fail2ban -y
             ;;
-        fedora | amzn | virtuozzo | rhel | almalinux | rocky | ol)
+        centos | rhel | almalinux | rocky | ol)
-            dnf -y update && dnf -y install fail2ban
-            ;;
-        centos)
-            if [[ "${VERSION_ID}" =~ ^7 ]]; then
             yum update -y && yum install epel-release -y
             yum -y install fail2ban
-            else
+            ;;
+        fedora | amzn | virtuozzo)
             dnf -y update && dnf -y install fail2ban
-            fi
             ;;
         arch | manjaro | parch)
             pacman -Syu --noconfirm fail2ban
@@ -1629,18 +1618,13 @@ remove_iplimit() {
             apt-get purge -y fail2ban -y
             apt-get autoremove -y
             ;;
-        fedora | amzn | virtuozzo | rhel | almalinux | rocky | ol)
+        centos | rhel | almalinux | rocky | ol)
-            dnf remove fail2ban -y
-            dnf autoremove -y
-            ;;
-        centos)
-            if [[ "${VERSION_ID}" =~ ^7 ]]; then    
             yum remove fail2ban -y
             yum autoremove -y
-            else
+            ;;
+        fedora | amzn | virtuozzo)
             dnf remove fail2ban -y
             dnf autoremove -y
-            fi
             ;;
         arch | manjaro | parch)
             pacman -Rns --noconfirm fail2ban