luci-app-internet-detector: Fixes for dark style

README.md

@@ -8,53 +8,41 @@ Internet-detector is an application for checking the availability of the Interne
 **Features:**
  - It can run continuously as a system service or only in an open web interface.
  - Checking the availability of a host using ping or by connecting via TCP to a specified port.
- - Execution of custom shell scripts when connecting and disconnecting the Internet.
  - LED indication of Internet availability.
 ![](https://github.com/gSpotx2f/luci-app-internet-detector/blob/master/screenshots/internet-led.jpg)
+ - Performing actions when connecting and disconnecting the Internet (Restarting network, modem or device. Executing custom shell scripts).
+ - Sending email notification when Internet access is restored.
  - The daemon is written entirely in Lua using the nixio library.
 
 ## Installation notes
 
 **OpenWrt >= 21.02:**
 
-    wget --no-check-certificate -O /tmp/internet-detector_0.4-3_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/current/internet-detector_0.4-3_all.ipk
-    opkg install /tmp/internet-detector_0.4-3_all.ipk
-    rm /tmp/internet-detector_0.4-3_all.ipk
+    opkg update
+    wget --no-check-certificate -O /tmp/internet-detector_0.6-0_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/current/internet-detector_0.6-0_all.ipk
+    opkg install /tmp/internet-detector_0.6-0_all.ipk
+    rm /tmp/internet-detector_0.6-0_all.ipk
     /etc/init.d/internet-detector start
     /etc/init.d/internet-detector enable
 
-    wget --no-check-certificate -O /tmp/luci-app-internet-detector_0.4-3_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/current/luci-app-internet-detector_0.4-3_all.ipk
-    opkg install /tmp/luci-app-internet-detector_0.4-3_all.ipk
-    rm /tmp/luci-app-internet-detector_0.4-3_all.ipk
+    wget --no-check-certificate -O /tmp/luci-app-internet-detector_0.6-1_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/current/luci-app-internet-detector_0.6-1_all.ipk
+    opkg install /tmp/luci-app-internet-detector_0.6-1_all.ipk
+    rm /tmp/luci-app-internet-detector_0.6-1_all.ipk
     /etc/init.d/rpcd restart
 
+Email notification:
+
+	opkg install mailsend
+
 i18n-ru:
 
-    wget --no-check-certificate -O /tmp/luci-i18n-internet-detector-ru_0.4-3_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/current/luci-i18n-internet-detector-ru_0.4-3_all.ipk
-    opkg install /tmp/luci-i18n-internet-detector-ru_0.4-3_all.ipk
-    rm /tmp/luci-i18n-internet-detector-ru_0.4-3_all.ipk
+    wget --no-check-certificate -O /tmp/luci-i18n-internet-detector-ru_0.6-1_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/current/luci-i18n-internet-detector-ru_0.6-1_all.ipk
+    opkg install /tmp/luci-i18n-internet-detector-ru_0.6-1_all.ipk
+    rm /tmp/luci-i18n-internet-detector-ru_0.6-1_all.ipk
 
-**OpenWrt 19.07:**
-
-    wget --no-check-certificate -O /tmp/internet-detector_0.3.0-1_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/19.07/internet-detector_0.3.0-1_all.ipk
-    opkg install /tmp/internet-detector_0.3.0-1_all.ipk
-    rm /tmp/internet-detector_0.3.0-1_all.ipk
-    /etc/init.d/internet-detector start
-    /etc/init.d/internet-detector enable
-
-    wget --no-check-certificate -O /tmp/luci-app-internet-detector_0.3.0-2_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/19.07/luci-app-internet-detector_0.3.0-2_all.ipk
-    opkg install /tmp/luci-app-internet-detector_0.3.0-2_all.ipk
-    rm /tmp/luci-app-internet-detector_0.3.0-2_all.ipk
-    /etc/init.d/rpcd restart
-
-i18n-ru:
-
-    wget --no-check-certificate -O /tmp/luci-i18n-internet-detector-ru_0.3.0-2_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/19.07/luci-i18n-internet-detector-ru_0.3.0-2_all.ipk
-    opkg install /tmp/luci-i18n-internet-detector-ru_0.3.0-2_all.ipk
-    rm /tmp/luci-i18n-internet-detector-ru_0.3.0-2_all.ipk
+**[OpenWrt 19.07](https://github.com/gSpotx2f/luci-app-internet-detector/tree/19.07)**
 
 ## Screenshots:
 
 ![](https://github.com/gSpotx2f/luci-app-internet-detector/blob/master/screenshots/01.jpg)
-![](https://github.com/gSpotx2f/luci-app-internet-detector/blob/master/screenshots/03.jpg)
-![](https://github.com/gSpotx2f/luci-app-internet-detector/blob/master/screenshots/04.jpg)
+![](https://github.com/gSpotx2f/luci-app-internet-detector/blob/master/screenshots/02.jpg)

internet-detector/Makefile

@@ -5,8 +5,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=internet-detector
-PKG_VERSION:=0.4
-PKG_RELEASE:=3
+PKG_VERSION:=0.6
+PKG_RELEASE:=0
 PKG_MAINTAINER:=gSpot <https://github.com/gSpotx2f/luci-app-internet-detector>
 
 include $(INCLUDE_DIR)/package.mk
@@ -41,14 +41,19 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_CONF) ./files/etc/config/internet-detector $(1)/etc/config/internet-detector
 	$(INSTALL_DIR) $(1)/etc/internet-detector
 	$(INSTALL_BIN) ./files/etc/internet-detector/down-script $(1)/etc/internet-detector/down-script
-	$(INSTALL_BIN) ./files/etc/internet-detector/run-script $(1)/etc/internet-detector/run-script
 	$(INSTALL_BIN) ./files/etc/internet-detector/up-script $(1)/etc/internet-detector/up-script
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/etc/init.d/internet-detector $(1)/etc/init.d/internet-detector
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) ./files/usr/bin/internet-detector $(1)/usr/bin/internet-detector
 	$(INSTALL_DIR) $(1)/usr/lib/internet-detector
+	$(INSTALL_DATA) ./files/usr/lib/internet-detector/mod_email.lua $(1)/usr/lib/internet-detector/mod_email.lua
+	$(INSTALL_DATA) ./files/usr/lib/internet-detector/mod_public_ip.lua $(1)/usr/lib/internet-detector/mod_public_ip.lua
 	$(INSTALL_DATA) ./files/usr/lib/internet-detector/mod_led_control.lua $(1)/usr/lib/internet-detector/mod_led_control.lua
+	$(INSTALL_DATA) ./files/usr/lib/internet-detector/mod_modem_restart.lua $(1)/usr/lib/internet-detector/mod_modem_restart.lua
+	$(INSTALL_DATA) ./files/usr/lib/internet-detector/mod_network_restart.lua $(1)/usr/lib/internet-detector/mod_network_restart.lua
+	$(INSTALL_DATA) ./files/usr/lib/internet-detector/mod_reboot.lua $(1)/usr/lib/internet-detector/mod_reboot.lua
+	$(INSTALL_DATA) ./files/usr/lib/internet-detector/mod_user_scripts.lua $(1)/usr/lib/internet-detector/mod_user_scripts.lua
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))

internet-detector/files/etc/config/internet-detector

@@ -4,22 +4,49 @@ config main 'config'
 	list hosts '1.1.1.1'
 	option check_type '0'
 	option tcp_port '53'
-
-config main 'ui_config'
-	option interval_up '6'
-	option interval_down '1'
-	option connection_attempts '1'
-	option connection_timeout '1'
-
-config main 'service_config'
-	option interval_up '30'
-	option interval_down '5'
-	option connection_attempts '2'
-	option connection_timeout '2'
-	option enable_logger '1'
-	option enable_up_script '0'
-	option enable_down_script '0'
-	option enable_run_script '0'
+	option ui_interval_up '6'
+	option ui_interval_down '1'
+	option ui_connection_attempts '1'
+	option ui_connection_timeout '1'
+	option service_interval_up '30'
+	option service_interval_down '5'
+	option service_connection_attempts '2'
+	option service_connection_timeout '2'
+	option service_enable_logger '1'
 
 config module 'mod_led_control'
 	option enabled '0'
+
+config module 'mod_reboot'
+	option enabled '0'
+	option dead_period '3600'
+	option force_reboot_delay '300'
+
+config module 'mod_network_restart'
+	option enabled '0'
+	option dead_period '900'
+	option attempts '1'
+	option restart_timeout '0'
+
+config module 'mod_modem_restart'
+	option enabled '0'
+	option dead_period '600'
+	option any_band '0'
+
+config module 'mod_public_ip'
+	option enabled '0'
+	option provider 'opendns1'
+	option interval '600'
+	option timeout '3'
+
+config module 'mod_email'
+	option enabled '0'
+	option alive_period '0'
+	option mail_smtp 'smtp.gmail.com'
+	option mail_smtp_port '587'
+	option mail_security 'tls'
+
+config module 'mod_user_scripts'
+	option enabled '0'
+	option alive_period '0'
+	option dead_period '0'

internet-detector/files/etc/init.d/internet-detector

@@ -1,6 +1,6 @@
 #!/bin/sh /etc/rc.common
 
-START=99
+START=97
 STOP=01
 
 ID="/usr/bin/internet-detector"

internet-detector/files/etc/internet-detector/run-script

@@ -1,4 +0,0 @@
-#	Shell commands that are executed every time the Internet is checked for availability
-#
-#	$1 - (0|1) - internet status: 0 is up, 1 is down
-#

internet-detector/files/usr/bin/internet-detector

@@ -14,38 +14,36 @@
 -- Default settings
 
 local Config = {
-	["mode"]                 = 2,
-	["enableLogger"]         = true,
-	["enableUpScript"]       = false,
-	["enableDownScript"]     = false,
-	["enableRunScript"]      = false,
-	["intervalUp"]           = 30,
-	["intervalDown"]         = 5,
-	["connectionAttempts"]   = 1,
-	["UIConnectionAttempts"] = 1,
-	["hosts"]                = {
+	mode                 = 2,
+	enableLogger         = true,
+	intervalUp           = 30,
+	intervalDown         = 5,
+	connectionAttempts   = 2,
+	connectionTimeout    = 2,
+	UIConnectionAttempts = 1,
+	UIConnectionTimeout  = 1,
+	hosts                = {
 		[1] = "8.8.8.8",
 		[2] = "1.1.1.1",
 	},
-	["parsedHosts"]          = {},
-	["appName"]              = "internet-detector",
-	["commonDir"]            = "/tmp/run",
-	["pingCmd"]              = "ping",
-	["pingParams"]           = "-c 1",
-	["connectionTimeout"]    = 3,
-	["UIConnectionTimeout"]  = 1,
-	["tcpPort"]              = 53,
-	["checkType"]            = 0,	-- 0: TCP, 1: ping
-	["loggerLevel"]          = "info",
-	["modules"]              = {},
+	tcpPort              = 53,
+	pingPacketSize       = 56,
+	iface                = nil,
+	checkType            = 0,	-- 0: TCP, 1: ping
+	hostname             = "OpenWrt",
+	appName              = "internet-detector",
+	commonDir            = "/tmp/run",
+	debugLog             = "/tmp/internet-detector.debug",
+	pingCmd              = "/bin/ping",
+	pingParams           = "-c 1",
+	debug                = false,
+	modules              = {},
+	parsedHosts          = {},
 }
-Config.configDir  = "/etc/" .. Config.appName
-Config.modulesDir = "/usr/lib/" .. Config.appName
-Config.upScript   = Config.configDir .. "/" .. "up-script"
-Config.downScript = Config.configDir .. "/" .. "down-script"
-Config.runScript  = Config.configDir .. "/" .. "run-script"
-Config.pidFile    = Config.commonDir .. "/" .. Config.appName .. ".pid"
-Config.statusFile = Config.commonDir .. "/" .. Config.appName .. ".status"
+Config.configDir  = string.format("/etc/%s", Config.appName)
+Config.modulesDir = string.format("/usr/lib/%s", Config.appName)
+Config.pidFile    = string.format("%s/%s.pid", Config.commonDir, Config.appName)
+Config.statusFile = string.format("%s/%s.status", Config.commonDir, Config.appName)
 
 -- Importing packages
 
@@ -69,31 +67,48 @@ end
 local uciCursor             = uci.cursor()
 Config.mode                 = tonumber(uciCursor:get(
                                Config.appName, "config", "mode"))
+Config.enableLogger         = (tonumber(uciCursor:get(
+                               Config.appName, "config", "service_enable_logger")) ~= 0)
+Config.intervalUp           = tonumber(uciCursor:get(
+                               Config.appName, "config", "service_interval_up"))
+Config.intervalDown         = tonumber(uciCursor:get(
+                               Config.appName, "config", "service_interval_down"))
+Config.connectionAttempts   = tonumber(uciCursor:get(
+                               Config.appName, "config", "service_connection_attempts"))
+Config.connectionTimeout    = tonumber(uciCursor:get(
+                               Config.appName, "config", "service_connection_timeout"))
+Config.UIConnectionAttempts = tonumber(uciCursor:get(
+                               Config.appName, "config", "ui_connection_attempts"))
+Config.UIConnectionTimeout  = tonumber(uciCursor:get(
+                               Config.appName, "config", "ui_connection_timeout"))
 Config.hosts                = uciCursor:get(Config.appName, "config", "hosts")
+
+local tcpPort               = uciCursor:get(
+                               Config.appName, "config", "tcp_port")
+if tcpPort ~= nil then
+	Config.tcpPort = tonumber(tcpPort)
+end
+
+local pingPacketSize        = uciCursor:get(
+                               Config.appName, "config", "ping_packet_size")
+if pingPacketSize ~= nil then
+	Config.pingPacketSize = tonumber(pingPacketSize)
+end
+
+local iface                 = uciCursor:get(
+                               Config.appName, "config", "iface")
+if iface ~= nil then
+	Config.iface = iface
+end
+
 Config.checkType            = tonumber(uciCursor:get(
                                Config.appName, "config", "check_type"))
-Config.tcpPort              = tonumber(uciCursor:get(
-                               Config.appName, "config", "tcp_port"))
-Config.UIConnectionAttempts = tonumber(uciCursor:get(
-                               Config.appName, "ui_config", "connection_attempts"))
-Config.UIConnectionTimeout  = tonumber(uciCursor:get(
-                               Config.appName, "ui_config", "connection_timeout"))
-Config.enableLogger         = (tonumber(uciCursor:get(
-                               Config.appName, "service_config", "enable_logger")) ~= 0)
-Config.enableUpScript       = (tonumber(uciCursor:get(
-                               Config.appName, "service_config", "enable_up_script")) ~= 0)
-Config.enableDownScript     = (tonumber(uciCursor:get(
-                               Config.appName, "service_config", "enable_down_script")) ~= 0)
-Config.enableRunScript      = (tonumber(uciCursor:get(
-                               Config.appName, "service_config", "enable_run_script")) ~= 0)
-Config.intervalUp           = tonumber(uciCursor:get(
-                               Config.appName, "service_config", "interval_up"))
-Config.intervalDown         = tonumber(uciCursor:get(
-                               Config.appName, "service_config", "interval_down"))
-Config.connectionAttempts   = tonumber(uciCursor:get(
-                               Config.appName, "service_config", "connection_attempts"))
-Config.connectionTimeout    = tonumber(uciCursor:get(
-                               Config.appName, "service_config", "connection_timeout"))
+
+local hostname              = uciCursor:get("system", "@[0]", "hostname")
+if hostname ~= nil then
+	Config.hostname = hostname
+end
+
 
 local function writeValueToFile(filePath, str)
 	local retValue = false
@@ -117,6 +132,16 @@ local function readValueFromFile(filePath)
 	return retValue
 end
 
+local function statusJson(inet, t)
+	local lines = { [1] = string.format('"inet":%d', inet) }
+	if t then
+		for k, v in pairs(t) do
+			lines[#lines + 1] = string.format('"%s":"%s"', k, v)
+		end
+	end
+	return "{" .. table.concat(lines, ",") .. "}"
+end
+
 local function writeLogMessage(level, msg)
 	if Config.enableLogger then
 		nixio.syslog(level, msg)
@@ -124,7 +149,7 @@ local function writeLogMessage(level, msg)
 end
 
 local function loadModules()
-	package.path = string.format("%s;%s/?.lua", package.path, Config.modulesDir)
+	package.path   = string.format("%s;%s/?.lua", package.path, Config.modulesDir)
 	Config.modules = {}
 	uciCursor:foreach(
 		Config.appName,
@@ -134,6 +159,7 @@ local function loadModules()
 			if mod_name and s.enabled == "1" then
 				local m = prequire(mod_name)
 				if m then
+					m.config     = Config
 					m.syslog     = writeLogMessage
 					m.writeValue = writeValueToFile
 					m.readValue  = readValueFromFile
@@ -145,49 +171,76 @@ local function loadModules()
 	)
 end
 
-local function runExternalScript(scriptPath, inetStat)
-	if inetStat == nil then
-		inetStat = ""
-	end
-	if nixio.fs.access(scriptPath, "x") then
-		local fh = io.popen(
-			string.format('/bin/sh -c "%s %s" &', scriptPath, inetStat), "r")
-		fh:close()
-	end
-end
-
 local function parseHost(host)
-	local port
-	local addr = host:match("^[^:]+")
-	if host:find(":") then
-		port = host:match("[^:]+$")
-	end
-	return addr, port
+	local addr, port = host:match("^([^:]+):?(%d*)")
+	return addr, tonumber(port) or false
 end
 
 local function parseHosts()
 	Config.parsedHosts = {}
 	for k, v in ipairs(Config.hosts) do
 		local addr, port = parseHost(v)
-		Config.parsedHosts[k] = {[1] = addr, [2] = (tonumber(port) or false)}
+		Config.parsedHosts[k] = { addr = addr, port = port }
 	end
 end
 
 local function pingHost(host)
-	return os.execute(string.format("%s %s -W %d %s > /dev/null 2>&1",
-		Config.pingCmd, Config.pingParams, Config.connectionTimeout, host))
+	local ping = string.format(
+		"%s %s -W %d -s %d%s %s > /dev/null 2>&1",
+		Config.pingCmd,
+		Config.pingParams,
+		Config.connectionTimeout,
+		Config.pingPacketSize,
+		Config.iface and (" -I " .. Config.iface) or "",
+		host
+	)
+	local retCode = os.execute(ping)
+
+	-- Debug
+	if Config.debug then
+		io.stdout:write(string.format(
+			"--- Ping ---\ntime = %s\n%s\nretCode = %s\n", os.time(), ping, retCode)
+		)
+		io.stdout:flush()
+	end
+
+	return retCode
 end
 
-local function tcpConnectToHost(host, port)
+local function TCPConnectionToHost(host, port)
 	local retCode  = 1
 	local addrInfo = nixio.getaddrinfo(host, "any")
 	if addrInfo then
 		local family = addrInfo[1].family
 		if family then
-			local socket  = nixio.socket(family, "stream")
+			local socket = nixio.socket(family, "stream")
 			socket:setopt("socket", "sndtimeo", Config.connectionTimeout)
 			socket:setopt("socket", "rcvtimeo", Config.connectionTimeout)
+			if Config.iface then
+				socket:setopt("socket", "bindtodevice", Config.iface)
+			end
 			local success = socket:connect(host, port or Config.tcpPort)
+
+			-- Debug
+			if Config.debug then
+				local sockAddr, sockPort = socket:getsockname()
+				local peerAddr, peerPort = socket:getpeername()
+				io.stdout:write(string.format(
+					"--- TCP ---\ntime = %s\nconnectionTimeout = %s\niface = %s\nhost:port = %s:%s\nsockname = %s:%s\npeername = %s:%s\nsuccess = %s\n",
+					os.time(),
+					Config.connectionTimeout,
+					tostring(Config.iface),
+					host,
+					port or Config.tcpPort,
+					tostring(sockAddr),
+					tostring(sockPort),
+					tostring(peerAddr),
+					tostring(peerPort),
+					tostring(success))
+				)
+				io.stdout:flush()
+			end
+
 			socket:close()
 			retCode = success and 0 or 1
 		end
@@ -196,11 +249,11 @@ local function tcpConnectToHost(host, port)
 end
 
 local function checkHosts()
-	local checkFunc = (Config.checkType == 1) and pingHost or tcpConnectToHost
+	local checkFunc = (Config.checkType == 1) and pingHost or TCPConnectionToHost
 	local retCode   = 1
 	for k, v in ipairs(Config.parsedHosts) do
 		for i = 1, Config.connectionAttempts do
-			if checkFunc(v[1], v[2]) == 0 then
+			if checkFunc(v.addr, v.port) == 0 then
 				retCode = 0
 				break
 			end
@@ -213,46 +266,58 @@ local function checkHosts()
 end
 
 local function main()
-	local lastStatus
-	local currentStatus
+	local lastStatus, currentStatus, timeNow, timeDiff, lastTime
 	local interval = Config.intervalUp
+	local counter  = 0
 
 	while true do
-		currentStatus = checkHosts()
-		if not nixio.fs.access(Config.statusFile, "r") then
-			writeValueToFile(Config.statusFile, currentStatus)
-		end
+		if counter == 0 or counter >= interval then
+			currentStatus = checkHosts()
+			if not nixio.fs.access(Config.statusFile, "r") then
+				writeValueToFile(Config.statusFile, statusJson(currentStatus))
+			end
 
-		if currentStatus == 0 then
-			interval = Config.intervalUp
-			if lastStatus ~= nil and currentStatus ~= lastStatus then
-				writeValueToFile(Config.statusFile, currentStatus)
-				writeLogMessage("notice", "internet connected")
-				if Config.enableUpScript then
-					runExternalScript(Config.upScript)
-				end
-			end
-		else
-			interval = Config.intervalDown
-			if lastStatus ~= nil and currentStatus ~= lastStatus then
-				writeValueToFile(Config.statusFile, currentStatus)
-				writeLogMessage("notice", "internet disconnected")
-				if Config.enableDownScript then
-					runExternalScript(Config.downScript)
+			if currentStatus == 0 then
+				interval = Config.intervalUp
+				if lastStatus ~= nil and currentStatus ~= lastStatus then
+					writeValueToFile(Config.statusFile, statusJson(currentStatus))
+					writeLogMessage("notice", "Internet connected")
+				end
+			else
+				interval = Config.intervalDown
+				if lastStatus ~= nil and currentStatus ~= lastStatus then
+					writeValueToFile(Config.statusFile, statusJson(currentStatus))
+					writeLogMessage("notice", "Internet disconnected")
 				end
 			end
+			counter = 0
 		end
 
+		timeDiff = 0
 		for _, e in ipairs(Config.modules) do
-			e:run(currentStatus, lastStatus)
+			timeNow = nixio.sysinfo().uptime
+			if lastTime then
+				timeDiff = timeDiff + timeNow - lastTime
+			else
+				timeDiff = 1
+			end
+			lastTime = timeNow
+			e:run(currentStatus, lastStatus, timeDiff)
 		end
 
-		if Config.enableRunScript then
-			runExternalScript(Config.runScript, currentStatus)
+		local modulesStatus = {}
+		for k, v in ipairs(Config.modules) do
+			if v.status ~= nil then
+				modulesStatus[v.name] = v.status
+			end
+		end
+		if next(modulesStatus) then
+			writeValueToFile(Config.statusFile, statusJson(currentStatus, modulesStatus))
 		end
 
 		lastStatus = currentStatus
-		nixio.nanosleep(interval)
+		nixio.nanosleep(1)
+		counter    = counter + 1
 	end
 end
 
@@ -281,24 +346,29 @@ local function poll(attempts, timeout)
 		Config.connectionTimeout = timeout
 	end
 	if checkHosts() == 0 then
-		return "up"
+		return statusJson(0)
 	else
-		return "down"
+		return  statusJson(1)
 	end
 end
 
-local function inetStatus()
-	local inetStat = "down"
+local function inetStatus(json)
+	local inetStat = 1
 	if nixio.fs.access(Config.statusFile, "r") then
 		local inetStatVal = readValueFromFile(Config.statusFile)
-		if inetStatVal ~= nil and tonumber(inetStatVal) == 0 then
-			inetStat = "up"
-		end
+		inetStat = inetStatVal
 	elseif Config.mode == 1 then
 		inetStat = poll()
 	else
 		os.exit(126)
 	end
+	if not json then
+		local sVal = inetStat:match('"inet":[0-9]')
+		if sVal then
+			sVal = sVal:match("[0-9]")
+			inetStat = (tonumber(sVal) == 0) and "up" or "down"
+		end
+	end
 	return inetStat
 end
 
@@ -369,6 +439,30 @@ local function run()
 		)
 	end
 
+	-- Debug
+	if Config.debug then
+
+		local function inspectTable()
+			local tables = {}, f
+			f = function(t, prefix)
+				tables[t] = true
+				for k, v in pairs(t) do
+					io.stdout:write(string.format(
+						"%s%s = %s\n", prefix, k, tostring(v))
+					)
+					if type(v) == "table" and not tables[v] then
+						f(v, string.format("%s%s.", prefix, k))
+					end
+				end
+			end
+			return f
+		end
+
+		io.stdout:write("--- Config ---\n")
+		inspectTable()(Config, "Config.")
+		io.stdout:flush()
+	end
+
 	main()
 	if Config.enableLogger then
 		nixio.closelog()
@@ -382,7 +476,7 @@ local function noDaemon()
 	run()
 end
 
-local function daemon()
+local function daemon(debug)
 	if not preRun() then
 		return
 	end
@@ -392,12 +486,16 @@ local function daemon()
 		if nixio.fork() == 0 then
 			nixio.chdir("/")
 			nixio.umask(0)
-			local devnull = "/dev/null"
+			local output = "/dev/null"
+			if debug then
+				output       = Config.debugLog
+				Config.debug = true
+			end
 			io.stdout:flush()
 			io.stderr:flush()
-			nixio.dup(io.open(devnull, "r"), io.stdin)
-			nixio.dup(io.open(devnull, "a+"), io.stdout)
-			nixio.dup(io.open(devnull, "a+"), io.stderr)
+			nixio.dup(io.open("/dev/null", "r"), io.stdin)
+			nixio.dup(io.open(output, "a+"), io.stdout)
+			nixio.dup(io.open(output, "a+"), io.stderr)
 			run()
 		end
 		os.exit(0)
@@ -416,16 +514,18 @@ parseHosts()
 
 local function help()
 	return string.format(
-		"Usage: %s [start|no-daemon|stop|restart|status|inet-status|poll [<attempts num>] [<timeout sec>]|--help]",
+		"Usage: %s [start|stop|restart|no-daemon|debug|status|inet-status|inet-status-json|poll [<attempts num>] [<timeout sec>]|--help]",
 		arg[0]
 	)
 end
 
-local helpArgs = {["-h"] = true, ["--help"] = true, ["help"] = true}
+local helpArgs = { ["-h"] = true, ["--help"] = true, ["help"] = true }
 if arg[1] == "start" or #arg == 0 then
 	daemon()
 elseif arg[1] == "no-daemon" then
 	noDaemon()
+elseif arg[1] == "debug" then
+	daemon(true)
 elseif arg[1] == "stop" then
 	stop()
 elseif arg[1] == "restart" then
@@ -434,6 +534,8 @@ elseif arg[1] == "status" then
 	print(status())
 elseif arg[1] == "inet-status" then
 	print(inetStatus())
+elseif arg[1] == "inet-status-json" then
+	print(inetStatus(true))
 elseif arg[1] == "poll" then
 	local attempts, timeout
 	if arg[2] and arg[2]:match("[0-9]+") then

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

@@ -0,0 +1,139 @@
+--[[
+	Dependences:
+		mailsend
+--]]
+local nixio  = require("nixio")
+
+local Module = {
+	name               = "mod_email",
+	config             = {},
+	syslog             = function(level, msg) return true end,
+	writeValue         = function(filePath, str) return false end,
+	readValue          = function(filePath) return nil end,
+	alivePeriod        = 0,
+	hostAlias          = "OpenWrt",
+	mta                = "/usr/bin/mailsend",
+	mailRecipient      = "email@gmail.com",
+	mailSender         = "email@gmail.com",
+	mailUser           = "email@gmail.com",
+	mailPassword       = "password",
+	mailSmtp           = "smtp.gmail.com",
+	mailSmtpPort       = '587',
+	mailSecurity       = "tls",
+	status             = nil,
+	_enabled           = false,
+	_aliveCounter      = 0,
+	_msgSent           = true,
+	_disconnected      = true,
+	_lastDisconnection = nil,
+	_lastConnection    = nil,
+}
+
+function Module:init(t)
+	self.alivePeriod = tonumber(t.alive_period)
+	if t.host_alias then
+		self.hostAlias = t.host_alias
+	else
+		self.hostAlias = self.config.hostname
+	end
+
+	self.mailRecipient = t.mail_recipient
+	self.mailSender    = t.mail_sender
+	self.mailUser      = t.mail_user
+	self.mailPassword  = t.mail_password
+	self.mailSmtp      = t.mail_smtp
+	self.mailSmtpPort  = t.mail_smtp_port
+	self.mailSecurity  = t.mail_security
+
+	if nixio.fs.access(self.mta, "x") then
+		self._enabled = true
+	else
+		self._enabled = false
+		self.syslog("warning", string.format("%s: %s is not available", self.name, self.mta))
+	end
+
+	if (not self.mailRecipient or
+	    not self.mailSender or
+	    not self.mailUser or
+	    not self.mailPassword or
+	    not self.mailSmtp or
+	    not self.mailSmtpPort) then
+		self._enabled = false
+		self.syslog("warning", string.format(
+			"%s: Insufficient data to connect to the SMTP server", self.name))
+	end
+end
+
+function Module:sendMessage(msg)
+	local verboseArg = ""
+	-- Debug
+	if self.config.debug then
+		verboseArg = " -v"
+		io.stdout:write("--- mod_email ---\n")
+		io.stdout:flush()
+	end
+	local securityArgs = "-starttls -auth-login"
+	if self.mailSecurity == "ssl" then
+		securityArgs = "-ssl -auth"
+	end
+	local mtaCmd = string.format(
+		'%s%s %s -smtp "%s" -port %s -cs utf-8 -user "%s" -pass "%s" -f "%s" -t "%s" -sub "%s" -M "%s"',
+		self.mta, verboseArg, securityArgs, self.mailSmtp, self.mailSmtpPort,
+		self.mailUser, self.mailPassword, self.mailSender, self.mailRecipient,
+		string.format("%s notification", self.hostAlias),
+		string.format("%s:\n%s", self.hostAlias, msg))
+
+	if os.execute(mtaCmd) ~= 0 then
+		self.syslog("err", string.format(
+			"%s: An error occured while sending message", self.name))
+	else
+		self.syslog("info", string.format(
+			"%s: Message sent to %s", self.name, self.mailRecipient))
+	end
+end
+
+function Module:run(currentStatus, lastStatus, timeDiff)
+	if not self._enabled then
+		return
+	end
+
+	if currentStatus == 1 then
+		self._aliveCounter   = 0
+		self._msgSent        = false
+		self._lastConnection = nil
+		if not self._disconnected then
+			self._disconnected      = true
+			if not self._lastDisconnection then
+				self._lastDisconnection = os.date("%Y.%m.%d %H:%M:%S", os.time())
+			end
+		end
+	else
+		if not self._msgSent then
+
+			if not self._lastConnection then
+				self._lastConnection = os.date("%Y.%m.%d %H:%M:%S", os.time())
+			end
+
+			if self._aliveCounter >= self.alivePeriod then
+				local message = {}
+				if self._lastDisconnection then
+					message[#message + 1] = string.format(
+						"Internet disconnected: %s", self._lastDisconnection)
+					self._lastDisconnection = nil
+				end
+				if self._lastConnection then
+					message[#message + 1] = string.format(
+						"Internet connected: %s", self._lastConnection)
+					self:sendMessage(table.concat(message, ", "))
+					self._msgSent = true
+				end
+			else
+				self._aliveCounter = self._aliveCounter + timeDiff
+			end
+		end
+
+		self._disconnected = false
+	end
+end
+
+return Module

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

@@ -3,16 +3,20 @@ local nixio  = require("nixio")
 
 local Module = {
 	name                  = "mod_led_control",
-	sysLedsDir            = "/sys/class/leds",
+	config                = {},
 	syslog                = function(level, msg) return true end,
 	writeValue            = function(filePath, str) return false end,
 	readValue             = function(filePath) return nil end,
+	runInterval           = 5,
+	sysLedsDir            = "/sys/class/leds",
 	ledName               = nil,
+	status                = nil,
 	_enabled              = false,
 	_ledDir               = nil,
 	_ledMaxBrightnessFile = nil,
 	_ledBrightnessFile    = nil,
 	_ledMaxBrightness     = nil,
+	_counter              = 0,
 }
 
 function Module:resetLeds()
@@ -33,14 +37,14 @@ function Module:init(t)
 	if not self.ledName then
 		return
 	end
-	self._ledDir = string.format("%s/%s", self.sysLedsDir, self.ledName)
-	self._ledMaxBrightnessFile = self._ledDir .. "/max_brightness"
-	self._ledBrightnessFile    = self._ledDir .. "/brightness"
+	self._ledDir               = string.format("%s/%s", self.sysLedsDir, self.ledName)
+	self._ledMaxBrightnessFile = string.format("%s/max_brightness", self._ledDir)
+	self._ledBrightnessFile    = string.format("%s/brightness", self._ledDir)
 	self._ledMaxBrightness     = self.readValue(self._ledMaxBrightnessFile) or 1
 	if (not nixio.fs.access(self._ledDir, "r") or
 	    not nixio.fs.access(self._ledBrightnessFile, "r", "w")) then
 		self._enabled = false
-		self.syslog("warning", string.format('%s: "%s" is not available', self.name, self.ledName))
+		self.syslog("warning", string.format("%s: LED '%s' is not available", self.name, self.ledName))
 	else
 		self._enabled = true
 		-- Reset all LEDs
@@ -63,19 +67,25 @@ function Module:off()
 	self.writeValue(self._ledBrightnessFile, 0)
 end
 
-function Module:run(currentStatus, lastStatus)
+function Module:run(currentStatus, lastStatus, timeDiff)
 	if not self._enabled then
 		return
 	end
-	if currentStatus == 0 then
-		if not self:getCurrentState() then
-			self:on()
-		end
-	else
-		if self:getCurrentState() then
-			self:off()
+	if self._counter == 0 or self._counter >= self.runInterval or currentStatus ~= lastStatus then
+
+		if currentStatus == 0 then
+			if not self:getCurrentState() then
+				self:on()
+			end
+		else
+			if self:getCurrentState() then
+				self:off()
+			end
 		end
+
+		self._counter = 0
 	end
+	self._counter = self._counter + timeDiff
 end
 
 return Module

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

@@ -0,0 +1,85 @@
+--[[
+	Dependences:
+		modemmanager
+--]]
+local nixio  = require("nixio")
+
+local Module = {
+	name         = "mod_modem_restart",
+	config       = {},
+	syslog       = function(level, msg) return true end,
+	writeValue   = function(filePath, str) return false end,
+	readValue    = function(filePath) return nil end,
+	mmcli        = "/usr/bin/mmcli",
+	mmInit       = "/etc/init.d/modemmanager",
+	deadPeriod   = 0,
+	iface        = nil,
+	anyBand      = false,
+	status       = nil,
+	_enabled     = false,
+	_deadCounter = 0,
+	_restarted   = false,
+}
+
+function Module:toggleIface(flag)
+	return os.execute(
+		string.format("%s %s", (flag and "/sbin/ifup" or "/sbin/ifdown"), self.iface)
+	)
+end
+
+function Module:restartMM()
+	if self.anyBand then
+		self.syslog("info", string.format(
+			"%s: resetting current-bands to 'any'", self.name))
+		os.execute(string.format("%s -m any --set-current-bands=any", self.mmcli))
+	end
+
+	self.syslog("info", string.format("%s: reconnecting modem", self.name))
+	os.execute(string.format("%s restart", self.mmInit))
+
+	if self.iface then
+		self.syslog("info", string.format(
+			"%s: restarting network interface '%s'", self.name, self.iface))
+		self:toggleIface(false)
+		self:toggleIface(true)
+	end
+end
+
+function Module:init(t)
+	self.deadPeriod = tonumber(t.dead_period)
+	self.iface      = t.iface
+	self.anyBand    = (tonumber(t.any_band) ~= 0)
+
+	if not nixio.fs.access(self.mmcli, "x") then
+		self.anyBand = false
+	end
+
+	if nixio.fs.access(self.mmInit, "x") then
+		self._enabled = true
+	else
+		self._enabled = false
+		self.syslog("warning", string.format(
+			"%s: modemmanager service is not available", self.name))
+	end
+end
+
+function Module:run(currentStatus, lastStatus, timeDiff)
+	if not self._enabled then
+		return
+	end
+	if currentStatus == 1 then
+		if not self._restarted then
+			if self._deadCounter >= self.deadPeriod then
+				self:restartMM()
+				self._restarted = true
+			else
+				self._deadCounter = self._deadCounter + timeDiff
+			end
+		end
+	else
+		self._deadCounter = 0
+		self._restarted   = false
+	end
+end
+
+return Module

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

@@ -0,0 +1,92 @@
+
+local nixio  = require("nixio")
+
+local Module = {
+	name             = "mod_network_restart",
+	config           = {},
+	syslog           = function(level, msg) return true end,
+	writeValue       = function(filePath, str) return false end,
+	readValue        = function(filePath) return nil end,
+	iface            = false,
+	attempts         = 0,
+	deadPeriod       = 0,
+	restartTimeout   = 0,
+	status           = nil,
+	_attemptsCounter = 0,
+	_deadCounter     = 0,
+}
+
+function Module:toggleFunc(flag)
+	return
+end
+
+function Module:toggleDevice(flag)
+	local ip = "/sbin/ip"
+	if nixio.fs.access(ip, "x") then
+		return os.execute(
+			string.format("%s link set dev %s %s", ip, self.iface, (flag and "up" or "down"))
+		)
+	end
+end
+
+function Module:toggleIface(flag)
+	return os.execute(
+		string.format("%s %s", (flag and "/sbin/ifup" or "/sbin/ifdown"), self.iface)
+	)
+end
+
+function Module:ifaceUp()
+	self:toggleFunc(true)
+end
+
+function Module:ifaceDown()
+	self:toggleFunc(false)
+end
+
+function Module:networkRestart()
+	return os.execute("/etc/init.d/network restart")
+end
+
+function Module:init(t)
+	local iface = t.iface
+	if iface then
+		self.iface = iface
+		if self.iface:match("^@") then
+			self.iface      = self.iface:gsub("^@", "")
+			self.toggleFunc = self.toggleIface
+		else
+			self.toggleFunc = self.toggleDevice
+		end
+	end
+	self.attempts       = tonumber(t.attempts)
+	self.deadPeriod     = tonumber(t.dead_period)
+	self.restartTimeout = tonumber(t.restart_timeout)
+end
+
+function Module:run(currentStatus, lastStatus, timeDiff)
+	if currentStatus == 1 then
+		if self.attempts == 0 or self._attemptsCounter < self.attempts then
+			if self._deadCounter >= self.deadPeriod then
+				if self.iface then
+					self.syslog("info", string.format(
+						"%s: restarting network interface '%s'", self.name, self.iface))
+					self:ifaceDown()
+					nixio.nanosleep(self.restartTimeout)
+					self:ifaceUp()
+				else
+					self.syslog("info", string.format("%s: restarting network", self.name))
+					self:networkRestart()
+				end
+				self._deadCounter     = 0
+				self._attemptsCounter = self._attemptsCounter + 1
+			else
+				self._deadCounter = self._deadCounter + timeDiff
+			end
+		end
+	else
+		self._attemptsCounter = 0
+		self._deadCounter     = 0
+	end
+end
+
+return Module

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

@@ -0,0 +1,139 @@
+
+local nixio  = require("nixio")
+
+local Module = {
+	name         = "mod_public_ip",
+	config       = {},
+	syslog       = function(level, msg) return true end,
+	writeValue   = function(filePath, str) return false end,
+	readValue    = function(filePath) return nil end,
+	runInterval  = 600,
+	nslookup     = "/usr/bin/nslookup",
+	timeout      = 3,
+	providers    = {
+		opendns1 = {
+			name = "opendns1", server = "208.67.222.222",
+			host = "myip.opendns.com", queryType = "a"
+		},
+		opendns2 = {
+			name = "opendns2", server = "208.67.220.220",
+			host = "myip.opendns.com", queryType = "a"
+		},
+		opendns3 = {
+			name = "opendns3", server = "208.67.222.220",
+			host = "myip.opendns.com", queryType = "a"
+		},
+		opendns4 = {
+			name = "opendns4", server = "208.67.220.222",
+			host = "myip.opendns.com", queryType = "a"
+		},
+		akamai   = {
+			name = "akamai", server = "ns1-1.akamaitech.net",
+			host = "whoami.akamai.net", queryType = "a"
+		},
+		google   = {
+			name = "google", server = "ns1.google.com",
+			host = "o-o.myaddr.l.google.com", queryType = "txt"
+		},
+	},
+	status       = nil,
+	_provider    = nil,
+	_nslookupCmd = nil,
+	_currentIp   = nil,
+	_enabled     = false,
+	_counter     = 0,
+}
+
+function Module:parseA(str)
+	res = str:match("Name:%s+" .. self._provider.host .. "\nAddress:%s+[%w.:]+")
+	if res then
+		return res:match("[%w.:]+$")
+	end
+end
+
+function Module:parseGoogle(str)
+	res = str:match(self._provider.host .. '%s+text%s+=%s+"[%w.:]+"')
+	if res then
+		return res:gsub('"', ''):match("[%w.:]+$")
+	end
+end
+
+function Module:resolveIP()
+	local res
+	local fh = io.popen(self._nslookupCmd, "r")
+	if fh then
+		output = fh:read("*a")
+		fh:close()
+		if self._provider.name == "google" then
+			res = self:parseGoogle(output)
+		else
+			res = self:parseA(output)
+		end
+	else
+		self.syslog("err", string.format(
+			"%s: Nslookup call failed (%s)", self.name, self.nslookup))
+	end
+	return res or "Undefined"
+end
+
+function Module:init(t)
+	if t.interval then
+		self.runInterval = tonumber(t.interval)
+	end
+	if t.timeout then
+		self.timeout = tonumber(t.timeout)
+	end
+	if t.provider then
+		self._provider = self.providers[t.provider]
+	else
+		self._provider = self.providers.opendns1
+	end
+	if not nixio.fs.access(self.nslookup, "x") then
+		self._enabled = false
+		self.syslog(
+			"warning",
+			string.format("%s: '%s' does not exists", self.name, self.nslookup)
+		)
+	else
+		self._enabled     = true
+		self._nslookupCmd = string.format(
+			"%s -type=%s -timeout=%d %s %s",
+			self.nslookup,
+			self._provider.queryType,
+			self.timeout,
+			self._provider.host,
+			self._provider.server
+		)
+	end
+end
+
+function Module:run(currentStatus, lastStatus, timeDiff)
+	if not self._enabled then
+		return
+	end
+	if currentStatus == 0 then
+		if self._counter == 0 or self._counter >= self.runInterval or currentStatus ~= lastStatus then
+			local ip = self:resolveIP()
+			if ip ~= self._currentIp then
+				self.status = ip
+				self.syslog(
+					"notice",
+					string.format("%s: public IP address %s", self.name, ip)
+				)
+			else
+				self.status = nil
+			end
+			self._currentIp = ip
+			self._counter   = 0
+		else
+			self.status = nil
+		end
+	else
+		self.status     = nil
+		self._currentIp = nil
+		self._counter   = 0
+	end
+	self._counter = self._counter + timeDiff
+end
+
+return Module

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

@@ -0,0 +1,47 @@
+
+local nixio  = require("nixio")
+
+local Module = {
+	name             = "mod_reboot",
+	config           = {},
+	syslog           = function(level, msg) return true end,
+	writeValue       = function(filePath, str) return false end,
+	readValue        = function(filePath) return nil end,
+	deadPeriod       = 0,
+	forceRebootDelay = 0,
+	status           = nil,
+	_deadCounter     = 0,
+}
+
+function Module:rebootDevice()
+	self.syslog("warning", string.format("%s: reboot", self.name))
+	os.execute("/sbin/reboot &")
+
+	if self.forceRebootDelay > 0 then
+		nixio.nanosleep(self.forceRebootDelay)
+		self.syslog("warning", string.format("%s: force reboot", self.name))
+		self.writeValue("/proc/sys/kernel/sysrq", "1")
+		self.writeValue("/proc/sysrq-trigger", "b")
+	end
+end
+
+function Module:init(t)
+	self.deadPeriod       = tonumber(t.dead_period)
+	self.forceRebootDelay = tonumber(t.force_reboot_delay)
+end
+
+function Module:run(currentStatus, lastStatus, timeDiff)
+	if currentStatus == 1 then
+		if self._deadCounter >= self.deadPeriod then
+			self:rebootDevice()
+			self._deadCounter = 0
+		else
+			self._deadCounter = self._deadCounter + timeDiff
+		end
+
+	else
+		self._deadCounter = 0
+	end
+end
+
+return Module

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

@@ -0,0 +1,64 @@
+
+local nixio  = require("nixio")
+
+local Module = {
+	name                = "mod_user_scripts",
+	config              = {},
+	syslog              = function(level, msg) return true end,
+	writeValue          = function(filePath, str) return false end,
+	readValue           = function(filePath) return nil end,
+	deadPeriod          = 0,
+	alivePeriod         = 0,
+	upScript            = "",
+	downScript          = "",
+	status              = nil,
+	_deadCounter        = 0,
+	_aliveCounter       = 0,
+	_upScriptExecuted   = true,
+	_downScriptExecuted = true,
+}
+
+function Module:runExternalScript(scriptPath)
+	if nixio.fs.access(scriptPath, "x") then
+		os.execute(string.format('/bin/sh -c "%s" &', scriptPath))
+	end
+end
+
+function Module:init(t)
+	self.deadPeriod  = tonumber(t.dead_period)
+	self.alivePeriod = tonumber(t.alive_period)
+	if self.config.configDir then
+		self.upScript   = string.format("%s/up-script", self.config.configDir)
+		self.downScript = string.format("%s/down-script", self.config.configDir)
+	end
+end
+
+function Module:run(currentStatus, lastStatus, timeDiff)
+	if currentStatus == 1 then
+		self._aliveCounter       = 0
+		self._downScriptExecuted = false
+
+		if not self._upScriptExecuted then
+			if self._deadCounter >= self.deadPeriod then
+				self:runExternalScript(self.downScript)
+				self._upScriptExecuted = true
+			else
+				self._deadCounter = self._deadCounter + timeDiff
+			end
+		end
+	else
+		self._deadCounter      = 0
+		self._upScriptExecuted = false
+
+		if not self._downScriptExecuted then
+			if self._aliveCounter >= self.alivePeriod then
+				self:runExternalScript(self.upScript)
+				self._downScriptExecuted = true
+			else
+				self._aliveCounter = self._aliveCounter + timeDiff
+			end
+		end
+	end
+end
+
+return Module

luci-app-internet-detector/Makefile

@@ -4,7 +4,7 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=0.4-3
+PKG_VERSION:=0.6-1
 LUCI_TITLE:=LuCI support for internet-detector
 LUCI_DEPENDS:=+internet-detector
 LUCI_PKGARCH:=all

luci-app-internet-detector/htdocs/luci-static/resources/view/status/include/00_internet.js

@@ -3,10 +3,52 @@
 'require fs';
 'require uci';
 
+document.head.append(E('style', {'type': 'text/css'},
+`
+:root {
+	--app-id-font-color: #fff;
+	--app-id-connected-color: #2ea256;
+	--app-id-disconnected-color: #ff4e54;
+	--app-id-undefined-color: #8a8a8a;
+}
+:root[data-darkmode="true"] {
+	--app-id-connected-color: #005F20;
+	--app-id-disconnected-color: #a93734;
+	--app-id-undefined-color: #4d4d4d;
+}
+.id-connected {
+	background-color: var(--app-id-connected-color) !important;
+	color: var(--app-id-font-color) !important;
+}
+.id-disconnected {
+	background-color: var(--app-id-disconnected-color) !important;
+	color: var(--app-id-font-color) !important;
+}
+.id-undefined {
+	background-color: var(--app-id-undefined-color) !important;
+	color: var(--app-id-font-color) !important;
+}
+`));
+
 return baseclass.extend({
 	title      : _('Internet'),
+	appName    : 'internet-detector',
 	execPath   : '/usr/bin/internet-detector',
 	inetStatus : null,
+	publicIp   : null,
+
+	inetStatusFromJson: function(res) {
+		let curInetStatus = null;
+		let curPubIp      = null;
+		if(res.code === 0) {
+			try {
+				let json          = JSON.parse(res.stdout.trim());
+				curInetStatus = json.inet;
+				curPubIp      = json.mod_public_ip;
+			} catch(e) {};
+		};
+		return [ curInetStatus, curPubIp ];
+	},
 
 	load: async function() {
 		if(!(
@@ -14,10 +56,10 @@ return baseclass.extend({
 			'uiCheckIntervalDown' in window &&
 			'currentAppMode' in window
 		)) {
-			await uci.load('internet-detector').then(data => {
-				window.uiCheckIntervalUp   = Number(uci.get('internet-detector', 'ui_config', 'interval_up'));
-				window.uiCheckIntervalDown = Number(uci.get('internet-detector', 'ui_config', 'interval_down'));
-				window.currentAppMode      = uci.get('internet-detector', 'config', 'mode');
+			await uci.load(this.appName).then(data => {
+				window.uiCheckIntervalUp   = Number(uci.get(this.appName, 'config', 'ui_interval_up'));
+				window.uiCheckIntervalDown = Number(uci.get(this.appName, 'config', 'ui_interval_down'));
+				window.currentAppMode      = uci.get(this.appName, 'config', 'mode');
 			}).catch(e => {});
 		};
 
@@ -37,7 +79,7 @@ return baseclass.extend({
 			};
 
 			window.internetDetectorCounter = 0;
-			return L.resolveDefault(fs.exec(this.execPath, [ 'inet-status' ]), null);
+			return L.resolveDefault(fs.exec(this.execPath, [ 'inet-status-json' ]), null);
 		}
 		else {
 			window.internetDetectorState = 2;
@@ -50,31 +92,22 @@ return baseclass.extend({
 		};
 
 		if(data) {
-			this.inetStatus = (data.code === 0) ? data.stdout.trim() : null;
-			if(this.inetStatus === 'up') {
-				window.internetDetectorState = 0;
-			}
-			else if(this.inetStatus === 'down') {
-				window.internetDetectorState = 1;
-			}
-			else {
-				window.internetDetectorState = 2;
-			};
+			[ window.internetDetectorState, this.publicIp ] = this.inetStatusFromJson(data);
 		};
 
 		let internetStatus = E('span', { 'class': 'label' });
 
 		if(window.internetDetectorState === 0) {
-			internetStatus.textContent      = _('Connected');
-			internetStatus.style.background = '#46a546';
+			internetStatus.textContent      = _('Connected') + (this.publicIp ? ' | %s: %s'.format(_('Public IP'), _(this.publicIp)) : '');
+			internetStatus.className = "label id-connected";
 		}
 		else if(window.internetDetectorState === 1) {
 			internetStatus.textContent      = _('Disconnected');
-			internetStatus.style.background = '#ff6c74';
+			internetStatus.className = "label id-disconnected";
 		}
 		else {
-			internetStatus.textContent = _('Undefined');
-			internetStatus.background  = '#cccccc';
+			internetStatus.textContent      = _('Undefined');
+			internetStatus.className = "label id-undefined";
 		};
 
 		return E('div', {

luci-app-internet-detector/po/ru/internet-detector.po

@@ -9,23 +9,46 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.4.2\n"
 "Last-Translator: \n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? "
+"1 : 2);\n"
 "Language: ru\n"
 
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
+msgstr "Имя <abbr title=\"Светодиод\">LED</abbr>"
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> control"
+msgstr "Управление <abbr title=\"Светодиод\">LED</abbr>"
+
+msgid ""
+"<abbr title=\"Light Emitting Diode\">LED</abbr> is on when Internet is "
+"available."
+msgstr "<abbr title=\"Светодиод\">LED</abbr> включен если Интернет доступен."
+
 msgid "Alive interval"
 msgstr "Интервал при подключении"
 
+msgid "Alive period"
+msgstr "Период после подключения"
+
+msgid ""
+"An email will be sent when the internet connection is restored after being "
+"disconnected."
+msgstr "Сообщение будет отправлено при восстановлении соединения с Интернет после отключения."
+
 msgid "An error has occurred"
 msgstr "Произошла ошибка"
 
+msgid "Big: 248 bytes"
+msgstr "Большой: 248 байт"
+
 msgid "Check type"
 msgstr "Тип проверки"
 
 msgid "Checking Internet availability."
 msgstr "Проверка доступности Интернет."
 
-msgid "Collecting data..."
-msgstr "Сбор данных..."
+msgid "Checking the real public IP address."
+msgstr "Проверка реального публичного IP адреса."
 
 msgid "Command failed"
 msgstr "Команда не выполнена"
@@ -39,23 +62,29 @@ msgstr "Попытки подключения"
 msgid "Connection timeout"
 msgstr "Таймаут соединения"
 
-msgid "Connections"
-msgstr "Подключения"
-
 msgid "Contents have been saved."
 msgstr "Содержимое сохранено."
 
 msgid "Dead interval"
 msgstr "Интервал при отключении"
 
-msgid "Default port value for TCP connections"
-msgstr "Стандартное значение порта для TCP-подключений"
+msgid "Dead period"
+msgstr "Период после отключения"
+
+msgid "Default port value for TCP connections."
+msgstr "Стандартное значение порта для TCP-подключений."
+
+msgid "Device will be rebooted when the Internet is disconnected."
+msgstr "Устройство будет перезагружено при отключении Интернет."
+
+msgid "Disable forced reboot"
+msgstr "Отключить принудительную перезагрузку"
 
 msgid "Disabled"
 msgstr "Отключен"
 
-msgid "Disabled: detector is completely off"
-msgstr "Отключен: детектор полностью выключен"
+msgid "Disabled: detector is completely off."
+msgstr "Отключен: детектор полностью выключен."
 
 msgid "Disconnected"
 msgstr "Отключен"
@@ -63,64 +92,89 @@ msgstr "Отключен"
 msgid "Dismiss"
 msgstr "Закрыть"
 
+msgid "DNS provider"
+msgstr "DNS провайдер"
+
 msgid "Edit"
 msgstr "Изменить"
 
 msgid "Edit down-script"
 msgstr "Изменить down-script"
 
-msgid "Edit run-script"
-msgstr "Изменить run-script"
-
 msgid "Edit up-script"
 msgstr "Изменить up-script"
 
-msgid "Enable down-script"
-msgstr "Включить down-script"
+msgid "Email notification"
+msgstr "Уведомление по email"
+
+msgid "Email address of the recipient."
+msgstr "Email-адрес получателя."
+
+msgid "Email address of the sender."
+msgstr "Email-адрес отправителя."
+
+msgid "Enable"
+msgstr "Включить"
 
 msgid "Enable logging"
 msgstr "Включить запись событий в лог"
 
-msgid "Enable run-script"
-msgstr "Включить run-script"
-
-msgid "Enable up-script"
-msgstr "Включить up-script"
-
 msgid "Enabled"
 msgstr "Включен"
 
-msgid "Execute commands every time the Internet is checked for availability"
-msgstr "Выполнение команд при каждой проверке доступности Интернет"
+msgid "Expecting:"
+msgstr "Ожидается:"
 
-msgid "Execute commands when the Internet is connected"
-msgstr "Выполнение команд при подключении к Интернет"
+msgid "Public IP"
+msgstr "Публичный IP"
 
-msgid "Execute commands when the Internet is disconnected"
-msgstr "Выполнение команд при отключении от Интернет"
+msgid "Public IP address"
+msgstr "Публичный IP адрес"
 
 msgid "Failed to get %s init status: %s"
 msgstr "Не удалось получить статус инициализации %s: %s"
 
-msgid "Host availability check type"
-msgstr "Тип проверки доступности хоста"
+msgid "Forced reboot delay"
+msgstr "Задержка принудительной перезагрузки"
+
+msgid "Host alias"
+msgstr "Псевдоним хоста"
+
+msgid "Host availability check type."
+msgstr "Тип проверки доступности хоста."
+
+msgid "Host identifier in messages. If not specified, hostname will be used."
+msgstr "Идентификатор хоста в сообщениях. Если не указан, будет использовано имя хоста."
+
+msgid "Hostname/IP address of the SMTP server."
+msgstr "Имя хоста/IP-адрес SMTP-сервера."
 
 msgid "Hosts"
 msgstr "Хосты"
 
-msgid "Hosts polling interval when the Internet is down"
-msgstr "Интервал опроса хостов если Интернет не доступен"
+msgid "Hosts polling interval when the Internet is down."
+msgstr "Интервал опроса хостов если Интернет не доступен."
 
-msgid "Hosts polling interval when the Internet is up"
-msgstr "Интервал опроса хостов если Интернет доступен"
+msgid "Hosts polling interval when the Internet is up."
+msgstr "Интервал опроса хостов если Интернет доступен."
 
-msgid "Hosts to check Internet availability. Hosts are polled (in list order) until at least one of them responds"
-msgstr "Хосты для проверки доступности Интернет. Хосты опрашиваются (в порядке списка) до тех пор, пока хотя бы один из них не ответит"
+msgid ""
+"Hosts to check Internet availability. Hosts are polled (in list order) until "
+"at least one of them responds."
+msgstr ""
+"Хосты для проверки доступности Интернет. Хосты опрашиваются (в порядке "
+"списка) до тех пор, пока хотя бы один из них не ответит."
+
+msgid "Huge: 1492 bytes"
+msgstr "Огромный: 1492 байта"
+
+msgid "Interface"
+msgstr "Интерфейс"
 
 msgid "Internet"
 msgstr "Интернет"
 
-msgid "Internet detector"
+msgid "Internet Detector"
 msgstr "Интернет-детектор"
 
 msgid "Internet detector mode"
@@ -129,36 +183,178 @@ msgstr "Режим интернет-детектора"
 msgid "Internet status"
 msgstr "Статус Интернет"
 
+msgid "Interval between IP address requests."
+msgstr "Интервал между запросами IP адреса."
+
+msgid "Jumbo: 9000 bytes"
+msgstr "Гигантский: 9000 байт"
+
+msgid "LED control"
+msgstr "Управление LED"
+
 msgid "Loading"
 msgstr "Загрузка"
 
+msgid ""
+"Longest period of time after connecting to Internet before \"up-script\" "
+"runs."
+msgstr ""
+"Максимальный промежуток времени после подключения к Интернет перед запуском "
+"\"up-script\"."
+
+msgid ""
+"Longest period of time after connecting to the Internet before sending a "
+"message."
+msgstr "Максимальный промежуток времени после отключения Интернет перед отправкой сообщения."
+
+msgid ""
+"Longest period of time after disconnecting from Internet before \"down-script"
+"\" runs."
+msgstr ""
+"Максимальный промежуток времени после отключения Интернет перед запуском "
+"\"down-script\"."
+
+msgid "Longest period of time without Internet access before modem restart."
+msgstr ""
+"Максимальное время отсутствия доступа в Интренет перед перезапуском модема."
+
+msgid "Longest period of time without Internet access before network restart."
+msgstr ""
+"Максимальное время отсутствия доступа в Интренет перед перезапуском сети."
+
+msgid ""
+"Longest period of time without Internet access until the device is rebooted."
+msgstr ""
+"Максимальное время отсутствия доступа в Интренет перед перезагрузкой "
+"устройства."
+
+msgid "Mailsend is not available..."
+msgstr "Mailsend недоступен..."
+
 msgid "Main settings"
 msgstr "Основные настройки"
 
-msgid "Maximum timeout for waiting for a response from the host"
-msgstr "Маскимальный таймаут ожидания ответа от хоста"
+msgid "Maximum number of attempts to connect to each host."
+msgstr "Максимальное количество попыток подключения к каждому хосту."
 
-msgid "Maximum number of attempts to connect to each host"
-msgstr "Максимальное количество попыток подключения к каждому хосту"
+msgid ""
+"Maximum number of network restart attempts before Internet access is "
+"available."
+msgstr ""
+"Максимальное количество попыток перезапуска сети до появления доступа в "
+"Интренет."
+
+msgid "Maximum timeout for waiting for a response from the host."
+msgstr "Максимальный таймаут ожидания ответа от хоста."
+
+msgid "Modem will be restarted when the Internet is disconnected."
+msgstr "Модем будет перезапущен при отключении Интернет."
+
+msgid "ModemManager is not available..."
+msgstr "ModemManager недоступен..."
+
+msgid ""
+"ModemManger interface. If specified, it will be restarted after restarting "
+"ModemManager."
+msgstr ""
+"Интерфейс ModemManager. Если задан, то будет перезапущен после перезапуска "
+"ModemManger."
+
+msgid ""
+"Network interface for Internet access. If not specified, the default "
+"interface is used."
+msgstr ""
+"Сетевой интерфейс для доступа в Интернет. Если не указан, используется "
+"интерфейс по умолчанию."
+
+msgid ""
+"Network interface to restart. If not specified, then the network service is restarted."
+msgstr ""
+"Сетевой интерфейс для перезапуска. Если не задан, то будет перезапущена сетевая "
+"служба."
+
+msgid "Network will be restarted when the Internet is disconnected."
+msgstr "Сеть будет перезапущена при отключении Интернет."
+
+msgid "No <abbr title=\"Light Emitting Diode\">LED</abbr>s available..."
+msgstr "Нет доступных <abbr title=\"Светодиод\">LED</abbr>..."
+
+msgid "One of the following:"
+msgstr "Одно из следующих значений:"
+
+msgid "Password"
+msgstr "Пароль"
+
+msgid "Password for SMTP authentication."
+msgstr "Пароль для SMTP-аутентификации."
+
+msgid ""
+"Performing actions when connecting and disconnecting the Internet (available "
+"in the \"Service\" mode)."
+msgstr ""
+"Выполнение действий при подключении и отключении Интернет (доступно в режиме "
+"\"Служба\")."
 
 msgid "Ping host"
 msgstr "Пинг хоста"
 
+msgid "Ping packet size"
+msgstr "Размер пакета Ping"
+
+msgid "Polling interval"
+msgstr "Интервал опроса"
+
+msgid "Reboot device"
+msgstr "Перезагрузка устройства"
+
+msgid "Recipient"
+msgstr "Получатель"
+
 msgid "Restart"
 msgstr "Перезапуск"
 
+msgid "Restart attempts"
+msgstr "Попытки перезапуска"
+
+msgid "Restart modem"
+msgstr "Перезапуск модема"
+
+msgid "Restart network"
+msgstr "Перезапуск сети"
+
 msgid "Restart service"
 msgstr "Перезапуск службы"
 
+msgid "Restart timeout"
+msgstr "Таймаут перезапуска"
+
 msgid "Run service at startup"
 msgstr "Запуск службы при старте"
 
 msgid "Running"
 msgstr "Выполняется"
 
+msgid "SMTP server"
+msgstr "SMTP-сервер"
+
+msgid "SMTP server port"
+msgstr "Порт SMTP-сервера"
+
+msgid "SSL: SMTP over SSL."
+msgstr "SSL: SMTP поверх SSL."
+
 msgid "Save"
 msgstr "Сохранить"
 
+msgid "Security"
+msgstr "Безопасность"
+
+msgid "Sender"
+msgstr "Отправитель"
+
+msgid "Server response timeout"
+msgstr "Таймаут ответа сервера"
+
 msgid "Service"
 msgstr "Служба"
 
@@ -168,17 +364,32 @@ msgstr "Не удалось выполнить действие службы \"%
 msgid "Service configuration"
 msgstr "Конфигурация службы"
 
-msgid "Service: detector always runs as a system service"
-msgstr "Служба: детектор работает постоянно, как системная служба"
+msgid "Service for determining the public IP address through DNS."
+msgstr "Сервис для определения публичного IP адреса через DNS."
 
-msgid "Shell commands that are executed every time the Internet is checked for availability"
-msgstr "Команды shell выполняемые при каждой проверке доступности Интернет"
+msgid "Service modules"
+msgstr "Модули службы"
 
-msgid "Shell commands that run when connected to the Internet"
-msgstr "Команды shell выполняемые при подключении к Интернет"
+msgid "Service: detector always runs as a system service."
+msgstr "Служба: детектор работает постоянно, как системная служба."
 
-msgid "Shell commands to run when disconnected from the Internet"
-msgstr "Команды shell выполняемые при отключении от Интернет"
+msgid "Set the modem to be allowed to use any band."
+msgstr "Разрешить модему использование любой частоты."
+
+msgid "Shell commands that run when connected to the Internet."
+msgstr "Команды shell выполняемые при подключении к Интернет."
+
+msgid "Shell commands to run when connected or disconnected from the Internet."
+msgstr "Команды shell выполняемые при подключении или отключении Интернет."
+
+msgid "Shell commands to run when disconnected from the Internet."
+msgstr "Команды shell выполняемые при отключении от Интернет."
+
+msgid "Small: 1 byte"
+msgstr "Маленький: 1 байт"
+
+msgid "Standard: 56 bytes"
+msgstr "Стандартный: 56 байт"
 
 msgid "Stopped"
 msgstr "Остановлена"
@@ -189,6 +400,15 @@ msgstr "TCP-порт"
 msgid "TCP port connection"
 msgstr "Подключение к TCP-порту"
 
+msgid "TLS: use STARTTLS if the server supports it."
+msgstr "TLS: использовать STARTTLS если сервер поддерживает."
+
+msgid "Timeout between stopping and starting the interface."
+msgstr "Таймаут между остановкой и запуском интерфейса."
+
+msgid "Type a time string"
+msgstr "Введите строку времени"
+
 msgid "UI detector configuration"
 msgstr "Конфигурация UI детектора"
 
@@ -201,41 +421,57 @@ msgstr "Невозможно сохранить содержимое"
 msgid "Undefined"
 msgstr "Неопределён"
 
+msgid "Unlock modem bands"
+msgstr "Освободить частоты модема"
+
+msgid "User"
+msgstr "Пользователь"
+
+msgid "User scripts"
+msgstr "Пользовательские скрипты"
+
+msgid "Username for SMTP authentication."
+msgstr "Имя пользователя для SMTP-аутентификации."
+
+msgid "Waiting for a reboot to complete before performing a forced reboot."
+msgstr ""
+"Ожидание завершения перезагрузки перед выполнением принудительной "
+"перезагрузки."
+
 msgid "Web UI only"
 msgstr "Только web-интерфейс"
 
-msgid "Web UI only: detector works only when the Web UI is open (UI detector)"
-msgstr "Только web-интерфейс: детектор работает только в web-интерфейсе (UI детектор)"
+msgid "Web UI only: detector works only when the Web UI is open (UI detector)."
+msgstr ""
+"Только web-интерфейс: детектор работает только в web-интерфейсе (UI "
+"детектор)."
 
-msgid "Write messages to the system log"
-msgstr "Записывать сообщения в системный журнал"
+msgid "Windows: 32 bytes"
+msgstr "Windows: 32 байта"
+
+msgid "Write messages to the system log."
+msgstr "Записывать сообщения в системный журнал."
 
 msgid "down-script"
-msgstr ""
+msgstr "down-script"
+
+msgid "hour"
+msgstr "час"
+
+msgid "hours"
+msgstr "часы"
 
 msgid "min"
 msgstr "мин"
 
-msgid "run-script"
-msgstr ""
+msgid "minutes"
+msgstr "минуты"
 
 msgid "sec"
 msgstr "сек"
 
+msgid "seconds"
+msgstr "секунды"
+
 msgid "up-script"
-msgstr ""
-
-msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> control"
-msgstr "Управление <abbr title=\"Светодиод\">LED</abbr>"
-
-msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> is on when Internet is available."
-msgstr "<abbr title=\"Светодиод\">LED</abbr> включен если Интернет доступен."
-
-msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
-msgstr "Имя <abbr title=\"Светодиод\">LED</abbr>"
-
-msgid "Enable <abbr title=\"Light Emitting Diode\">LED</abbr> control"
-msgstr "Включить управление <abbr title=\"Светодиод\">LED</abbr>"
-
-msgid "No <abbr title=\"Light Emitting Diode\">LED</abbr>s available..."
-msgstr "Нет доступных <abbr title=\"Светодиод\">LED</abbr>..."
+msgstr "up-script"

luci-app-internet-detector/po/templates/internet-detector.pot

@@ -1,19 +1,41 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
+msgstr ""
+
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> control"
+msgstr ""
+
+msgid ""
+"<abbr title=\"Light Emitting Diode\">LED</abbr> is on when Internet is "
+"available."
+msgstr ""
+
 msgid "Alive interval"
 msgstr ""
 
+msgid "Alive period"
+msgstr ""
+
+msgid ""
+"An email will be sent when the internet connection is restored after being "
+"disconnected."
+msgstr ""
+
 msgid "An error has occurred"
 msgstr ""
 
+msgid "Big: 248 bytes"
+msgstr ""
+
 msgid "Check type"
 msgstr ""
 
 msgid "Checking Internet availability."
 msgstr ""
 
-msgid "Collecting data..."
+msgid "Checking the real public IP address."
 msgstr ""
 
 msgid "Command failed"
@@ -28,22 +50,28 @@ msgstr ""
 msgid "Connection timeout"
 msgstr ""
 
-msgid "Connections"
-msgstr ""
-
 msgid "Contents have been saved."
 msgstr ""
 
 msgid "Dead interval"
 msgstr ""
 
-msgid "Default port value for TCP connections"
+msgid "Dead period"
+msgstr ""
+
+msgid "Default port value for TCP connections."
+msgstr ""
+
+msgid "Device will be rebooted when the Internet is disconnected."
+msgstr ""
+
+msgid "Disable forced reboot"
 msgstr ""
 
 msgid "Disabled"
 msgstr ""
 
-msgid "Disabled: detector is completely off"
+msgid "Disabled: detector is completely off."
 msgstr ""
 
 msgid "Disconnected"
@@ -52,64 +80,87 @@ msgstr ""
 msgid "Dismiss"
 msgstr ""
 
+msgid "DNS provider"
+msgstr ""
+
 msgid "Edit"
 msgstr ""
 
 msgid "Edit down-script"
 msgstr ""
 
-msgid "Edit run-script"
-msgstr ""
-
 msgid "Edit up-script"
 msgstr ""
 
-msgid "Enable down-script"
+msgid "Email notification"
+msgstr ""
+
+msgid "Email address of the recipient."
+msgstr ""
+
+msgid "Email address of the sender."
+msgstr ""
+
+msgid "Enable"
 msgstr ""
 
 msgid "Enable logging"
 msgstr ""
 
-msgid "Enable run-script"
-msgstr ""
-
-msgid "Enable up-script"
-msgstr ""
-
 msgid "Enabled"
 msgstr ""
 
-msgid "Execute commands every time the Internet is checked for availability"
+msgid "Expecting:"
 msgstr ""
 
-msgid "Execute commands when the Internet is connected"
+msgid "Public IP"
 msgstr ""
 
-msgid "Execute commands when the Internet is disconnected"
+msgid "Public IP address"
 msgstr ""
 
 msgid "Failed to get %s init status: %s"
 msgstr ""
 
-msgid "Host availability check type"
+msgid "Forced reboot delay"
+msgstr ""
+
+msgid "Host alias"
+msgstr ""
+
+msgid "Host availability check type."
+msgstr ""
+
+msgid "Host identifier in messages. If not specified, hostname will be used."
+msgstr ""
+
+msgid "Hostname/IP address of the SMTP server."
 msgstr ""
 
 msgid "Hosts"
 msgstr ""
 
-msgid "Hosts polling interval when the Internet is down"
+msgid "Hosts polling interval when the Internet is down."
 msgstr ""
 
-msgid "Hosts polling interval when the Internet is up"
+msgid "Hosts polling interval when the Internet is up."
 msgstr ""
 
-msgid "Hosts to check Internet availability. Hosts are polled (in list order) until at least one of them responds"
+msgid ""
+"Hosts to check Internet availability. Hosts are polled (in list order) until "
+"at least one of them responds."
+msgstr ""
+
+msgid "Huge: 1492 bytes"
+msgstr ""
+
+msgid "Interface"
 msgstr ""
 
 msgid "Internet"
 msgstr ""
 
-msgid "Internet detector"
+msgid "Internet Detector"
 msgstr ""
 
 msgid "Internet detector mode"
@@ -118,33 +169,160 @@ msgstr ""
 msgid "Internet status"
 msgstr ""
 
+msgid "Interval between IP address requests."
+msgstr ""
+
+msgid "Jumbo: 9000 bytes"
+msgstr ""
+
+msgid "LED control"
+msgstr ""
+
 msgid "Loading"
 msgstr ""
 
+msgid ""
+"Longest period of time after connecting to Internet before \"up-script\" "
+"runs."
+msgstr ""
+
+msgid ""
+"Longest period of time after connecting to the Internet before sending a "
+"message."
+msgstr ""
+
+msgid ""
+"Longest period of time after disconnecting from Internet before \"down-script"
+"\" runs."
+msgstr ""
+
+msgid "Longest period of time without Internet access before modem restart."
+msgstr ""
+
+msgid "Longest period of time without Internet access before network restart."
+msgstr ""
+
+msgid ""
+"Longest period of time without Internet access until the device is rebooted."
+msgstr ""
+
+msgid "Mailsend is not available..."
+msgstr ""
+
 msgid "Main settings"
 msgstr ""
 
-msgid "Maximum timeout for waiting for a response from the host"
+msgid "Maximum number of attempts to connect to each host."
 msgstr ""
 
-msgid "Maximum number of attempts to connect to each host"
+msgid ""
+"Maximum number of network restart attempts before Internet access is "
+"available."
+msgstr ""
+
+msgid "Maximum timeout for waiting for a response from the host."
+msgstr ""
+
+msgid "Modem will be restarted when the Internet is disconnected."
+msgstr ""
+
+msgid "ModemManager is not available..."
+msgstr ""
+
+msgid ""
+"ModemManger interface. If specified, it will be restarted after restarting "
+"ModemManager."
+msgstr ""
+
+msgid ""
+"Network interface for Internet access. If not specified, the default "
+"interface is used."
+msgstr ""
+
+msgid ""
+"Network interface to restart. If not specified, then the network service is restarted."
+msgstr ""
+
+msgid "Network will be restarted when the Internet is disconnected."
+msgstr ""
+
+msgid "No <abbr title=\"Light Emitting Diode\">LED</abbr>s available..."
+msgstr ""
+
+msgid "One of the following:"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid "Password for SMTP authentication."
+msgstr ""
+
+msgid ""
+"Performing actions when connecting and disconnecting the Internet (available "
+"in the \"Service\" mode)."
 msgstr ""
 
 msgid "Ping host"
 msgstr ""
 
+msgid "Ping packet size"
+msgstr ""
+
+msgid "Polling interval"
+msgstr ""
+
+msgid "Reboot device"
+msgstr ""
+
+msgid "Recipient"
+msgstr ""
+
 msgid "Restart"
 msgstr ""
 
+msgid "Restart attempts"
+msgstr ""
+
+msgid "Restart modem"
+msgstr ""
+
+msgid "Restart network"
+msgstr ""
+
 msgid "Restart service"
 msgstr ""
 
+msgid "Restart timeout"
+msgstr ""
+
 msgid "Run service at startup"
 msgstr ""
 
 msgid "Running"
 msgstr ""
 
+msgid "SMTP server"
+msgstr ""
+
+msgid "SMTP server port"
+msgstr ""
+
+msgid "SSL: SMTP over SSL."
+msgstr ""
+
+msgid "Save"
+msgstr ""
+
+msgid "Security"
+msgstr ""
+
+msgid "Sender"
+msgstr ""
+
+msgid "Server response timeout"
+msgstr ""
+
 msgid "Service"
 msgstr ""
 
@@ -154,16 +332,31 @@ msgstr ""
 msgid "Service configuration"
 msgstr ""
 
-msgid "Service: detector always runs as a system service"
+msgid "Service for determining the public IP address through DNS."
 msgstr ""
 
-msgid "Shell commands that are executed every time the Internet is checked for availability"
+msgid "Service modules"
 msgstr ""
 
-msgid "Shell commands that run when connected to the Internet"
+msgid "Service: detector always runs as a system service."
 msgstr ""
 
-msgid "Shell commands to run when disconnected from the Internet"
+msgid "Set the modem to be allowed to use any band."
+msgstr ""
+
+msgid "Shell commands that run when connected to the Internet."
+msgstr ""
+
+msgid "Shell commands to run when connected or disconnected from the Internet."
+msgstr ""
+
+msgid "Shell commands to run when disconnected from the Internet."
+msgstr ""
+
+msgid "Small: 1 byte"
+msgstr ""
+
+msgid "Standard: 56 bytes"
 msgstr ""
 
 msgid "Stopped"
@@ -175,6 +368,15 @@ msgstr ""
 msgid "TCP port connection"
 msgstr ""
 
+msgid "TLS: use STARTTLS if the server supports it."
+msgstr ""
+
+msgid "Timeout between stopping and starting the interface."
+msgstr ""
+
+msgid "Type a time string"
+msgstr ""
+
 msgid "UI detector configuration"
 msgstr ""
 
@@ -187,41 +389,53 @@ msgstr ""
 msgid "Undefined"
 msgstr ""
 
+msgid "Unlock modem bands"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "User scripts"
+msgstr ""
+
+msgid "Username for SMTP authentication."
+msgstr ""
+
+msgid "Waiting for a reboot to complete before performing a forced reboot."
+msgstr ""
+
 msgid "Web UI only"
 msgstr ""
 
-msgid "Web UI only: detector works only when the Web UI is open (UI detector)"
+msgid "Web UI only: detector works only when the Web UI is open (UI detector)."
 msgstr ""
 
-msgid "Write messages to the system log"
+msgid "Windows: 32 bytes"
+msgstr ""
+
+msgid "Write messages to the system log."
 msgstr ""
 
 msgid "down-script"
 msgstr ""
 
+msgid "hour"
+msgstr ""
+
+msgid "hours"
+msgstr ""
+
 msgid "min"
 msgstr ""
 
-msgid "run-script"
+msgid "minutes"
 msgstr ""
 
 msgid "sec"
 msgstr ""
 
+msgid "seconds"
+msgstr ""
+
 msgid "up-script"
 msgstr ""
-
-msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> control"
-msgstr ""
-
-msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> is on when Internet is available."
-msgstr ""
-
-msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
-msgstr ""
-
-msgid "Enable <abbr title=\"Light Emitting Diode\">LED</abbr> control"
-msgstr ""
-
-msgid "No <abbr title=\"Light Emitting Diode\">LED</abbr>s available..."
-msgstr ""

luci-app-internet-detector/root/usr/share/luci/menu.d/luci-app-internet-detector.json

@@ -1,6 +1,6 @@
 {
 	"admin/services/internet-detector": {
-		"title": "Internet detector",
+		"title": "Internet Detector",
 		"order": 80,
 		"action": {
 			"type": "view",
@@ -10,7 +10,8 @@
 			"acl": [ "luci-app-internet-detector" ],
 			"fs": {
 				"/usr/bin/internet-detector": "executable"
-			}
+			},
+			"uci": { "internet-detector": true }
 		}
 	}
 }

luci-app-internet-detector/root/usr/share/rpcd/acl.d/luci-app-internet-detector.json

@@ -6,8 +6,8 @@
 				"/sys/class/leds": [ "list" ],
 				"/etc/internet-detector/up-script": [ "read" ],
 				"/etc/internet-detector/down-script": [ "read" ],
-				"/etc/internet-detector/run-script": [ "read" ],
-				"/usr/bin/internet-detector*": [ "exec" ]
+				"/usr/bin/internet-detector*": [ "exec" ],
+				"/usr/bin/mailsend": [ "exec" ]
 			},
 			"uci": [ "internet-detector" ],
 			"ubus": {
@@ -17,8 +17,7 @@
 		"write": {
 			"file": {
 				"/etc/internet-detector/up-script": [ "write" ],
-				"/etc/internet-detector/down-script": [ "write" ],
-				"/etc/internet-detector/run-script": [ "write" ]
+				"/etc/internet-detector/down-script": [ "write" ]
 			},
 			"uci": [ "internet-detector" ]
 		}