🏅 Sync 2026-03-24 02:21:05

internet-detector/Makefile

@@ -1,12 +1,12 @@
 #
-# (с) 2025 gSpot (https://github.com/gSpotx2f/luci-app-internet-detector)
+# (с) 2026 gSpot (https://github.com/gSpotx2f/luci-app-internet-detector)
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=internet-detector
-PKG_VERSION:=1.7.1
-PKG_RELEASE:=1
+PKG_VERSION:=1.7.2
+PKG_RELEASE:=2
 PKG_MAINTAINER:=gSpot <https://github.com/gSpotx2f/luci-app-internet-detector>
 
 include $(INCLUDE_DIR)/package.mk

internet-detector/files/usr/lib/lua/internet-detector/main.lua

@@ -53,15 +53,18 @@ local InternetDetector = {
 		proxy_type          = nil,
 		proxy_host          = nil,
 		proxy_port          = nil,
+		proxy_user          = nil,
+		proxy_passwd        = nil,
 		iface               = nil,
 		instance            = nil,
 	},
-	modules       = {},
-	parsedHosts   = {},
-	proxyString   = "",
-	uiCounter     = 0,
-	pidFile       = nil,
-	statusFile    = nil,
+	modules         = {},
+	parsedHosts     = {},
+	proxyAuthString = "",
+	proxyString     = "",
+	uiCounter       = 0,
+	pidFile         = nil,
+	statusFile      = nil,
 }
 InternetDetector.configDir      = string.format("/etc/%s", InternetDetector.appName)
 InternetDetector.modulesDir     = string.format(
@@ -277,6 +280,7 @@ function InternetDetector:TCPConnectionToHost(host, port)
 				if not ok then
 					self:debugOutput(string.format(
 						"SOCKET ERROR: %s, %s", errMsg, errNum))
+
 					unistd.close(sock)
 					return retCode
 				end
@@ -357,6 +361,7 @@ function InternetDetector:httpRequest(url)
 		curl,
 		retCode,
 		tostring(data)))
+
 	return retCode, data
 end
 
@@ -420,11 +425,18 @@ function InternetDetector:mainLoop()
 		self:parseUrls()
 		if (self.serviceConfig.proxy_type and self.serviceConfig.proxy_host and
 			self.serviceConfig.proxy_port) then
+			if self.serviceConfig.proxy_user and self.serviceConfig.proxy_passwd then
+				self.proxyAuthString = string.format(
+					' --proxy-user "%s:%s"',
+					self.serviceConfig.proxy_user,
+					self.serviceConfig.proxy_passwd)
+			end
 			self.proxyString = string.format(
-				" --proxy %s://%s:%d",
+				" --proxy %s://%s:%d%s",
 				self.serviceConfig.proxy_type,
 				self.serviceConfig.proxy_host,
-				self.serviceConfig.proxy_port)
+				self.serviceConfig.proxy_port,
+				self.proxyAuthString)
 		end
 	else
 		self:parseHosts()
@@ -516,7 +528,7 @@ function InternetDetector:mainLoop()
 			end
 		end
 
-		mTimeDiff   = 0
+		mTimeDiff = 0
 		for _, e in ipairs(self.modules) do
 			mTimeNow = time.clock_gettime(time.CLOCK_MONOTONIC).tv_sec
 			if mLastTime then